Merge branch 'dev' into test

zt-module-databus/zt-module-databus-server-app/src/main/resources/application-dev.yml

@@ -37,17 +37,11 @@ spring:
       primary: master
       datasource:
         master:
-          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
-          #username: SYSDBA
-          #password: pgbsci6ddJ6Sqj@e
           url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
           password: P@ssword25
         slave: # 模拟从库，可根据自己需要修改 # 模拟从库，可根据自己需要修改
           lazy: true # 开启懒加载，保证启动速度
-          #url: jdbc:dm://172.16.46.247:1050?schema=RUOYI-VUE-PRO
-          #username: SYSDBA
-          #password: pgbsci6ddJ6Sqj@e
           url: jdbc:dm://172.17.11.98:20870?schema=JYGK_TEST
           username: SYSDBA
           password: P@ssword25
@@ -58,8 +52,9 @@ spring:
       host: 172.16.46.63 # 地址
       port: 30379 # 端口
       database: 0 # 数据库索引
-      username: zt-redis # 密码，建议生产环境开启
+      username: zt-redis
       password: P@ssword25
+#    password: 123456 # 密码，建议生产环境开启
 
 xxl:
   job: