Merge remote-tracking branch 'origin/master'

ibzlite-util/src/main/resources/application-sys.yml

@@ -21,6 +21,12 @@ spring:
       max-file-size: 100MB
       max-request-size: 100MB
   datasource:
+    username: a_A_5d9d78509
+    password: '@6dEfb3@'
+    url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
+    driver-class-name: com.mysql.jdbc.Driver
+    isSyncDBSchema: false
+    defaultSchema: a_A_5d9d78509
     dynamic:
       druid: #以下是全局默认值，可以全局更改
         filters: stat,wall,log4j2
@@ -43,21 +49,21 @@ spring:
         max-pool-prepared-statement-per-connection-size: 20
       datasource:
         master:
-          username: a_A_5d9d78509
-          password: '@6dEfb3@'
-          url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-          driver-class-name: com.mysql.jdbc.Driver
+          username: ${spring.datasource.username}
+          password: ${spring.datasource.password}
+          url: ${spring.datasource.url}
+          driver-class-name: ${spring.datasource.driver-class-name}
           conf: classpath:liquibase/master.xml
-          isSyncDBSchema: false
-          defaultSchema: a_A_5d9d78509
+          isSyncDBSchema: ${spring.datasource.isSyncDBSchema}
+          defaultSchema: ${spring.datasource.defaultSchema}
         db2:
-          username: a_A_5d9d78509
-          password: '@6dEfb3@'
-          url: jdbc:mysql://172.16.180.232:3306/a_A_5d9d78509?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8&useOldAliasMetadataBehavior=true&allowMultiQueries=true
-          driver-class-name: com.mysql.jdbc.Driver
+          username: ${spring.datasource.username}
+          password: ${spring.datasource.password}
+          url: ${spring.datasource.url}
+          driver-class-name: ${spring.datasource.driver-class-name}
           conf: classpath:liquibase/master.xml
-          isSyncDBSchema: false
-          defaultSchema: a_A_5d9d78509
+          isSyncDBSchema: ${spring.datasource.isSyncDBSchema}
+          defaultSchema: ${spring.datasource.defaultSchema}
 
 #Mybatis-plus配置
 mybatis-plus: