合并代码

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

@@ -1,6 +1,7 @@
 ribbon:
   ReadTimeout: 600000
   ConnectTimeout: 600000
+
 spring:
   servlet:
     multipart:
@@ -13,10 +14,7 @@ spring:
     time-zone: GMT+8
   datasource:
     driver-class-name: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://183.222.39.242:3306/mosty_jcgl?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_jcgl?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_jcgl?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     username: mostyDB1
     password: mostyDBMysql1
     hikari:
@@ -27,23 +25,10 @@ spring:
       connection-timeout: 60000
       connection-test-query: SELECT 1
   # Redis数据库索引（默认为0）
-#  redis:
-#    database: 8
-#    # Redis服务器地址
-#    host: 183.222.39.242
-#    # Redis服务器连接端口
-#    port: 6379
-#    # Redis服务器连接密码（默认为空）
-#    password: mosty888
-#    # 连接超时时间（毫秒）
-#    timeout: 2000
-#    jedis:
-#      pool:
-#        max-active: 50
   redis:
     database: 1
     # Redis服务器地址
-    host: 172.20.19.130
+    host: 192.168.1.129
     # Redis服务器连接端口
     port: 63799
     # Redis服务器连接密码（默认为空）

mosty-websocket/src/main/resources/bootstrap.yml

@@ -2,21 +2,19 @@ server:
   port: 8026
   servlet:
     context-path: /mosty-websocket/
+
 spring:
   application:
     name: mosty-websocket
   cloud:
     nacos:
       discovery:
-#        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
-#        server-addr: 183.222.39.242:8848
         register-enabled: true
         namespace: f23c13d4-0935-42e0-850e-a2216125f2ae
-        server-addr: 172.20.19.130:18848
+        server-addr: 192.168.1.129:18848
         username: nacosDev1
         password: nacosDev1
 
-
 # 开启健康监控
 management:
   endpoints:
@@ -28,4 +26,3 @@ management:
       show-details: always
     auditevents:
       enabled: true
-