Merge branch 'master' of http://192.168.60.201/root/dsk-cr20g

dsk-admin/src/main/resources/application-test.yml

@@ -49,9 +49,9 @@ spring:
           driverClassName: com.mysql.cj.jdbc.Driver
           # jdbc 所有参数配置参考 https://lionli.blog.csdn.net/article/details/122018562
           # rewriteBatchedStatements=true 批处理优化 大幅提升批量插入更新删除性能(对数据库有性能损耗 使用批量操作应考虑性能问题)
-          url: jdbc:mysql://120.46.64.239:3306/dsk_operate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-          username: dskdev
-          password: encPHwi8dbKeL8ZX
+          url: jdbc:mysql://123.60.218.188:3306/dsk_operate?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+          username: dev
+          password: encPHwi8dbKeL!6X
         # 从库数据源
 #        slave:
 #          lazy: true
@@ -101,13 +101,13 @@ spring:
 --- # redis 单机配置(单机与集群只能开启一个另一个需要注释掉)
 spring:
   redis:
-    host: 120.46.64.239
+    host: 123.60.218.188
     # 端口，默认为6379
     port: 6379
     # 数据库索引
     database: 13
     # 密码
-    password: zfTFIJjaN#6xB83r
+    password: zfTFIJjaN#6xB64r
     # 密码(如没有密码请注释掉)
     # password:
     # 连接超时时间
@@ -187,7 +187,7 @@ sms:
     territory: ap-guangzhou
 
 dsk:
-  exportBackUrl: http://120.46.64.239:9099/prod-api/export/backUrl
+  exportBackUrl: http://123.60.218.188:9099/prod-api/export/backUrl
 
 sa-token:
   # 是否允许同一账号并发登录 (为true时允许一起登录, 为false时新登录挤掉旧登录)