合并代码

mosty-yjzl/src/main/resources/application.yml

@@ -1,6 +1,7 @@
 ribbon:
   ReadTimeout: 6000000
   ConnectTimeout: 6000000
+
 spring:
   kafka:
     producer:
@@ -12,15 +13,12 @@ spring:
   jackson:
     serialization:
       write-dates-as-timestamps: false
-    #    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
+    #  格式化返回时间 yyyy-MM-dd HH:mm:ss
     date-format: yyyy-MM-dd HH:mm:ss
     time-zone: GMT+8
   datasource:
     driver-class-name: com.mysql.jdbc.Driver
-#    url: jdbc:mysql://192.168.200.131:3306/mosty_yjzl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
-#    username: root
-#    password: mosty888
-    url: jdbc:mysql://172.20.19.130:33306/mosty_yjzl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://192.168.1.129:33306/mosty_yjzl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     username: mostyDB1
     password: mostyDBMysql1
     hikari:
@@ -32,13 +30,13 @@ spring:
       connection-test-query: SELECT 1 # ???????????????
   # Redis数据库索引（默认为0）
   redis:
-    database: 8
+    database: 1
     # Redis服务器地址
-    host: 192.168.200.131
+    host: 192.168.1.129
     # Redis服务器连接端口
-    port: 6379
+    port: 63799
     # Redis服务器连接密码（默认为空）
-    password: mosty888
+    password: redis1994Inferno
     # 连接超时时间（毫秒）
     timeout: 2000
     jedis:
@@ -68,6 +66,7 @@ magic-api:
     datasource:
   response-code:
     success: 10000
+
 exclude:
   pathPatterns:
     swagger: