合并代码

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

@@ -1,6 +1,7 @@
 ribbon:
   ReadTimeout: 600000
   ConnectTimeout: 600000
+
 spring:
   servlet:
     multipart:
@@ -9,15 +10,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://183.222.39.242:3306/mosty_wzzx?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_wzzx?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_wzzx?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&useSSL=false&allowMultiQueries=true&rewriteBatchedStatements=true&serverTimezone=Asia/Shanghai
     username: mostyDB1
     password: mostyDBMysql1
     hikari:
@@ -28,23 +26,10 @@ spring:
       connection-timeout: 60000 # ????????????250????????????30?
       connection-test-query: SELECT 1 # ???????????????
   # Redis数据库索引（默认为0）
-#  redis:
-#    database: 8
-#    # Redis服务器地址
-#    host: 183.222.39.242
-#    # Redis服务器连接端口
-#    port: 6379
-#    # Redis服务器连接密码（默认为空）
-#    password: mosty888
-#    # 连接超时时间（毫秒）
-#    timeout: 20000000
-#    jedis:
-#      pool:
-#        max-active: 1000
   redis:
     database: 1
     # Redis服务器地址
-    host: 172.20.19.130
+    host: 192.168.1.129
     # Redis服务器连接端口
     port: 63799
     # Redis服务器连接密码（默认为空）
@@ -78,6 +63,7 @@ magic-api:
     datasource:
   response-code:
     success: 10000
+
 exclude:
   pathPatterns:
     swagger:
@@ -86,6 +72,7 @@ exclude:
       - /v2/**
       - /swagger-ui.html/**
       - /docs.html/**
+
 custom:
   #POINAME分组位置信息默偏移天数
   userTrackPoiNameOffset: -15
@@ -96,7 +83,6 @@ custom:
     LzUdpPort: 18004
     LzUdpTest: false
 
-
 config:
   orgCode: 510600000000
 

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

@@ -2,21 +2,19 @@ server:
   port: 51822
   servlet:
     context-path: /mosty-wzzx/
+
 spring:
   application:
     name: mosty-wzzx
   cloud:
     nacos:
       discovery:
-#        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
-#        server-addr: 183.222.39.242:8848
-        register-enabled: true # 是否将自己注册到配置中心，让其他服务发现调用（本地调试使用）
+        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:
@@ -40,4 +38,3 @@ management:
 # 日志
 #logging:
 #  file: /application/applogs/admin.log
-