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

service/trade-service-others/trade-service-others-account/src/main/resources/application.yml

@@ -19,7 +19,7 @@ spring:
       taomi:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://127.0.0.1:3306/taomi?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
+        url: jdbc:mysql://172.18.0.194:3306/taomi?serverTimezone=Asia/Shanghai&characterEncoding=utf8&useSSL=false&zeroDateTimeBehavior=convertToNull
         username: root
         password: '012099'
         # 初始连接数

service/trade-service-others/trade-service-others-pays/src/main/resources/application-dev.yml

@@ -5,7 +5,7 @@ spring:
       taomi:
         type: com.alibaba.druid.pool.DruidDataSource
         driver-class-name: com.mysql.cj.jdbc.Driver
-        url: jdbc:mysql://127.0.0.1:3306/taomi?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
+        url: jdbc:mysql://172.18.0.194:3306/taomi?useUnicode=true&characterEncoding=UTF-8&autoReconnect=true&useSSL=false&zeroDateTimeBehavior=convertToNull&serverTimezone=Asia/Shanghai
         username: root
         password: '012099'
 #      ds-1: