Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

base-servers/admin-server/src/main/resources/application.yml

@@ -20,7 +20,7 @@ eureka:
   client:
     registryFetchIntervalSeconds: 5
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@127.0.0.1:8500/eureka/
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@192.168.0.181:8500/eureka/
 info:
   name: '@project.artifactId@'
   description: '@project.description@'

base-servers/admin-server/src/main/resources/config/application-docker.yml

@@ -1,6 +1,4 @@
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@eureka-server:8080/eureka/
-server:
-  port: 8080
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/

base-servers/eureka-server/src/main/resources/config/application-docker.yml

@@ -1,5 +1,5 @@
 eureka:
   instance:
-    hostname: eureka-server
+    hostname: saas-eureka-server
 server:
-  port: 8080
+  port: 8500

base-servers/zipkin-server/src/main/resources/config/application-docker.yml

@@ -1,6 +1,4 @@
 eureka:
   client:
     serviceUrl:
-      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@eureka-server:8080/eureka/
-server:
-  port: 8080
+      defaultZone: http://${spring.security.user.name}:${spring.security.user.password}@saas-eureka-server:8500/eureka/