迭代版本 v2.1.x

pom.xml

@@ -13,8 +13,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <java.version>1.8</java.version>
-        <spring.boot.version>2.0.1.RELEASE</spring.boot.version>
-        <activiti.version>5.22.0</activiti.version>
+        <spring.boot.version>2.1.4.RELEASE</spring.boot.version>
     </properties>
 
     <dependencyManagement>
@@ -34,7 +33,7 @@
         <dependency>
             <groupId>org.91isoft</groupId>
             <artifactId>91isoft_spbt</artifactId>
-            <version>2.1.2.beta</version>
+            <version>2.1.5.6_beta13</version>
         </dependency>
 
     </dependencies>

src/main/resources/application-dev.yml

@@ -6,51 +6,8 @@ server:
       context-path: /
       session:
         timeout: PT480M
-    #uri-encoding: UTF-8
-#  ssl:
-#        key-store: classpath:client1.p12
-#        key-store-password: 123456
-#        key-store-type: PKCS12
-#        key-alias: client1
-
-# logging:   #使用logback-spring 注释掉logging 否则影响
-#  level:
-#    root: INFO
-#    org.springframework.web: DEBUG
-
-druid:
-  url: jdbc:mysql://127.0.0.1:3306/mall?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
-  username: root
-  password: cy
-  initial-size: 1
-  min-idle: 1
-  max-active: 20
-  test-on-borrow: true
-
-#  power:
-#    url: jdbc:mysql://127.0.0.1:3306/power?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
-#    username: root
-#    password: 123456
-#    initial-size: 1
-#    min-idle: 1
-#    max-active: 20
-#    test-on-borrow: true
-#    driverClass: com.mysql.jdbc.Driver
-#  pmiss:
-#    url: jdbc:mysql://127.0.0.1:3306/mall2?useUnicode=true&characterEncoding=UTF-8&useSSL=false&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
-#    username: root
-#    password: 123456
-#    initial-size: 1
-#    min-idle: 1
-#    max-active: 20
-#    test-on-borrow: true
-#    driverClass: com.mysql.jdbc.Driver
-
-
 mybatis:
   mapper-locations: "classpath*:mapper/**/**/*.xml"
-
-
 mapper:
   mappers:
   - org.rcisoft.core.base.CyBaseMapper
@@ -76,26 +33,16 @@ spring:
     charset: UTF-8
     suffix: .ftl
     template-loader-path: classpath:/templates/
-#  redis:
-#    host: 127.0.0.1
-#    port: 6379
-#    pool:
-#      max-idle: 50
-#      max-active: 1000
-#      min-idle: 5
-#      max-wait: -1
-#    database: 0
-#    password: 123456
-#    timeout: 3600
+  datasource:
+    driver-class-name: com.mysql.cj.jdbc.Driver
+    url: jdbc:mysql://106.2.13.209:20001/spcl_sys?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true
+    username: root
+    password: cy
 springfox:
   documentation:
     swagger:
       v2:
         path: /api-docs
-#jwtAuth:
-#  header: Authorization
-#  token_header: CyBear
-#  secret_key: base64EncodedSecretKey
 jwt:
   header: Authorization
   secret: mySecret
@@ -117,6 +64,8 @@ cy:
     role_undelete: ["8492d7e67ca64809bb6ded8823659866"]
     user_undelete: ["admin","333e421d32d9425ea99afce95b603902"]
   model:
+    schema: spbt
+    druid: false
     multipleDs: false
     quartz: false
     redis: false
@@ -124,7 +73,8 @@ cy:
     decryptParam: false
     swagger2Config: true
     activiti: true
-    security:i
+    security:
+      enable: true
       permit-all:
           permitUnStatic:
             - "/static/**"
@@ -156,3 +106,10 @@ global:
   decryptKey: cyKey
   resetPassword: 123456
 
+knife4j:
+  markdowns: classpath:markdown/*
+  basic:
+    enable: false
+    username: zhangsan
+    password: 123456
+