合并中京代码

shuili-admin/src/main/resources/application-druid-test.yml

@@ -2,17 +2,13 @@
 spring:
     datasource:
         type: com.alibaba.druid.pool.DruidDataSource
-        driverClassName: com.mysql.cj.jdbc.Driver
-#        driverClassName: org.gjt.mm.mysql.Driver
+        driverClassName: com.mysql.jdbc.Driver
         druid:
             # 主库数据源
             master:
-                url: jdbc:mysql://47.93.254.187:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
-                username: shuili
-                password: wuxukgdvJ1!@!
-                #url: jdbc:mysql://19.15.225.193:15016/ygc_slgcyxgl?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8&allowMultiQueries=true
-                #username: zhsl_ygc_sgcyxgl
-                #password: J[@D|&.<:_G+)sp2
+                url: jdbc:mysql://mysql:3306/sgc_yg?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=false&serverTimezone=GMT%2B8
+                username: root
+                password: mysql123456
             # 从库数据源
             slave:
                 # 从数据源开关/默认关闭
@@ -59,4 +55,3 @@ spring:
                 wall:
                     config:
                         multi-statement-allow: true
-

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

@@ -130,14 +130,15 @@ spring:
   # redis 配置
   redis:
     # 地址
-    host: 192.168.2.189
-#    cluster:
-#     nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006
-#     max-redirects: 3
+    host: redis
+    database: 2
+    #    cluster:
+    #     nodes: 192.168.1.20:7001,192.168.1.20:7002,192.168.1.20:7003,192.168.1.20:7004,192.168.1.20:7005,192.168.1.20:7006
+    #     max-redirects: 3
     # 端口，默认为6379
     port: 6379
     # 密码
-    password:
+    password: redis12345
     # 连接超时时间
     timeout: 10s
     lettuce: