合并代码

mosty-gateway/mosty-gateway.iml

@@ -12,10 +12,10 @@
             <entry key="com.zeroturnaround.jrebel.remoting.DeleteUnindexedFiles" value="false" />
             <entry key="com.zeroturnaround.jrebel.remoting.ModuleRemoteServerSelection" value="off" />
             <entry key="jrebelEnabled" value="true" />
-            <entry key="lastExternalPluginCheckTime" value="1747276765359" />
+            <entry key="lastExternalPluginCheckTime" value="1757036647255" />
           </map>
         </option>
-        <option name="version" value="13" />
+        <option name="version" value="15" />
       </configuration>
     </facet>
   </component>

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

@@ -1,5 +1,6 @@
 ribbon:
   ReadTimeout: 600000
   ConnectTimeout: 600000
+
 servlet:
   context-path: mosty-api

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

@@ -5,20 +5,15 @@ spring:
   application:
     name: mosty-gateway
   redis:
-#    host: 192.168.200.131
-#    port: 6379
-#    password: mosty888
-    host: 172.20.19.130
+    host: 192.168.1.129
     port: 63799
     password: redis1994Inferno
   cloud:
     nacos:
       discovery:
-#        namespace: 657d1843-b590-41ac-b5e7-5d261bf00de9
-#        server-addr: 192.168.200.131: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
     gateway:
@@ -145,4 +140,3 @@ management:
 # 日志
 #logging:
 #  file: /application/applogs/admin.log
-