Merge branch 'feature-bieao' of lift-manager/lift-server into develop

lift-business-service/src/main/resources/application-test.yml

@@ -1,16 +1,16 @@
 spring:
   datasource:
-    url: jdbc:mysql://111.47.6.224:13769/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.122:3306/rdsliftmanager?characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai
     username: root
-    password: Tyty-2020
+    password: Ty-20526
     driver-class-name: com.mysql.cj.jdbc.Driver
 
   #redis缓存配置
   redis:
     database: 0 #数据库索引，默认为0
-    host: 111.47.6.224 #服务器地址
-    port: 13789 #端口
-    password: newtyty #验证密码
+    host: 192.168.1.122 #服务器地址
+    port: 6379 #端口
+    password: tytykj #验证密码
     jedis:
       pool:
         max-active: 8 #最大连接数