Merge branch 'master' of http://39.98.38.2:13000/dumingliang/sh-model-platform

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

@@ -6,7 +6,7 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://39.98.38.2:13306/sh_project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://192.168.0.146:3306/sh_project?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
         username: shmodel
         password: shmodel#$0526
       # 从库数据源
@@ -62,13 +62,13 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 127.0.0.1
+    host: 192.168.0.146
     # 端口，默认为6379
     port: 6379
     # 数据库索引
-    database: 5
+    database: 6
     # 密码
-    password:
+    password: 123456
     # 连接超时时间
     timeout: 20s
     lettuce: