Merge remote-tracking branch 'origin/master'

@@ -89,19 +89,23 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000
       datasource:
         master:
+          #url: jdbc:mysql://47.104.179.187:6003/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           url: jdbc:mysql://113.249.91.27:3306/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          #url: jdbc:mysql://20.0.99.3:3306/sk-zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
           password: jkauto@123
           driver-class-name: com.mysql.jdbc.Driver
         # 恩菲数据同步
         nf-db:
           url: jdbc:mysql://113.249.91.27:3306/zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
+          #url: jdbc:mysql://20.0.99.3:3306/zhongye?characterEncoding=UTF-8&useUnicode=true&useSSL=false
           username: root
           password: jkauto@123
           driver-class-name: com.mysql.jdbc.Driver
         # 多数据源配置
         pg-db:
           url: jdbc:postgresql://113.249.91.27:10086/postgres?useUnicode=true&characterEncoding=UTF8
+          #url: jdbc:postgresql://20.0.99.3:10086/postgres?useUnicode=true&characterEncoding=UTF8
           username: postgres
           password: jkauto@123
           driver-class-name: org.postgresql.Driver