合并代码

applications/commons/commons-server/src/main/resources/application.yml

@@ -53,7 +53,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.253.35:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8510/eureka/
 server:
   port: 8920
   tomcat:

frontend/saas-web/app.json

@@ -296,8 +296,7 @@
         },*/
         "compressor":null,
         "server": {
-            //            "basePath": "http://192.168.253.181:8560",
-            "basePath": "http://192.168.253.35:8560",
+            "basePath": "http://192.168.253.181:8560",
             "urlPattern": "^\/api\/"
         }
     },
@@ -307,8 +306,7 @@
      */
     "testing": {
         "server": {
-            //            "basePath": "http://192.168.0.181:8560",
-            "basePath": "http://192.168.253.35:8560",
+            "basePath": "http://192.168.0.181:8560",
             "urlPattern": "^\/api\/"
         }
     },
@@ -321,8 +319,7 @@
             "delay": 250
         },
         "server": {
-            //            "basePath": "http://192.168.0.181:8560",
-            "basePath": "http://192.168.253.35:8560",
+            "basePath": "http://192.168.0.181:8560",
             "urlPattern": "^\/api\/"
         }
     },