Merge remote-tracking branch 'origin/master'

zh-baseversion-admin/src/main/resources/application-test.yml

@@ -57,20 +57,12 @@ spring:
                         multi-statement-allow: true
     # redis 配置
     redis:
-      # 地址
-#      host: 36.139.41.10
-      host: 121.29.1.158
-#      host: 36.139.125.48
-#      host: 36.139.41.83
-      #host: 121.29.1.158
-      # 端口，默认为6379
-#      port: 6379
-      port: 6380
-      #      port: 6380
+      host: 36.138.180.82
+      port: 63798
       # 数据库索引
       database: 0
       # 密码
-      password: 1qaz2wsx3edc
+      password: 1qaz2wsx3edc@
       # 连接超时时间
       timeout: 10s
       lettuce: