Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-config/liquidnet-config/liquidnet-service-dragon.yml

@@ -69,6 +69,8 @@ spring:
       max-request-size: 10MB
   profiles:
     include: common-service #这里加载management相关公共配置
+  autoconfigure:
+    exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   rabbitmq:
     addresses: ${liquidnet.rabbitmq.host}
     port: ${liquidnet.rabbitmq.port}
@@ -114,26 +116,6 @@ spring:
       uri: mongodb://${liquidnet.mongodb.user}:${liquidnet.mongodb.pwd}@${liquidnet.mongodb.host}/?authSource=admin&maxPoolSize=2000&waitQueueMultiple=100
       sslEnabled: ${liquidnet.mongodb.sslEnabled}
       database: ${liquidnet.mongodb.database}
-  datasource:
-    name: ${liquidnet.mysql.database-name}
-    url: jdbc:mysql://${liquidnet.mysql.urlHostAndPort}/${liquidnet.mysql.database-name}?serverTimezone=Asia/Shanghai&characterEncoding=utf-8&useSSL=false
-    username: ${liquidnet.mysql.username}
-    password: ${liquidnet.mysql.password}
-    #    type: org.apache.tomcat.jdbc.pool.DataSource
-    driver-class-name: com.mysql.cj.jdbc.Driver
-    filters: stat
-    maxActive: 20
-    initialSize: 1
-    maxWait: 60000
-    minIdle: 1
-    timeBetweenEvictionRunsMillis: 60000
-    minEvictableIdleTimeMillis: 300000
-    validationQuery: select 'x'
-    testWhileIdle: true
-    testOnBorrow: false
-    testOnReturn: false
-    poolPreparedStatements: true
-    maxOpenPreparedStatements: 20
 # -----------------------------------------------------------
 
 # -----------------------------------------------------------

liquidnet-bus-config/liquidnet-config/liquidnet-service-kylin.yml

@@ -69,6 +69,9 @@ spring:
       max-request-size: 10MB
   profiles:
     include: common-service #这里加载management相关公共配置
+  autoconfigure:
+    exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
+
   rabbitmq:
     addresses: ${liquidnet.rabbitmq.host}
     port: ${liquidnet.rabbitmq.port}

liquidnet-bus-config/liquidnet-config/liquidnet-service-order.yml

@@ -69,6 +69,8 @@ spring:
       max-request-size: 10MB
   profiles:
     include: common-service #这里加载management相关公共配置
+  autoconfigure:
+    exclude: org.springframework.cloud.bus.BusAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration
   rabbitmq:
     addresses: ${liquidnet.rabbitmq.host}
     port: ${liquidnet.rabbitmq.port}