Merge remote-tracking branch 'origin/dev' into dev

liquidnet-bus-support/liquidnet-support-config/src/main/resources/application-test.yml

@@ -11,7 +11,7 @@ liquidnet:
     path: ./logs
     name: support-config
   eureka:
-    host: 172.17.207.177:7001,172.17.121.158:7001,172.17.121.157:7001
+    host: 172.17.207.177:7001
   rabbitmq:
     host: 127.0.0.1
     port: 5672

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-test-server1.yml

@@ -13,7 +13,7 @@ spring:
 
 eureka:
   instance:
-    hostname: eureka-server1
+    hostname: 172.17.207.177
     preferIpAddress: true
     health-check-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/health
     status-page-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/info
@@ -25,10 +25,10 @@ eureka:
     enable-self-preservation: false  # 设为false，关闭自我保护 #自我保护设置 解决Eureka Server不踢出已关停的节点的问题,同时客户端也需要配置
     eviction-interval-timer-in-ms: 4000 # 清理间隔（单位毫秒，默认是60*1000）
   client:
-    register-with-eureka: false #禁止自己当做服务注册
-    fetch-registry: false       #屏蔽注册信息
+    register-with-eureka: true #禁止自己当做服务注册
+    fetch-registry: true       #屏蔽注册信息
     serviceUrl:
-      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@eureka-server2:7001${server.servlet.context-path}/eureka,http://${spring.security.user.name}:${spring.security.user.password}@eureka-server3:7001${server.servlet.context-path}/eureka
+      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@172.17.121.157:7001${server.servlet.context-path}/eureka,http://${spring.security.user.name}:${spring.security.user.password}@172.17.121.158:7001${server.servlet.context-path}/eureka
 #  instance:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-test-server2.yml

@@ -13,7 +13,7 @@ spring:
 
 eureka:
   instance:
-    hostname: eureka-server2
+    hostname: 172.17.121.157
     preferIpAddress: true
     health-check-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/health
     status-page-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/info
@@ -25,10 +25,10 @@ eureka:
     enable-self-preservation: false  # 设为false，关闭自我保护 #自我保护设置 解决Eureka Server不踢出已关停的节点的问题,同时客户端也需要配置
     eviction-interval-timer-in-ms: 4000 # 清理间隔（单位毫秒，默认是60*1000）
   client:
-    register-with-eureka: false #禁止自己当做服务注册
-    fetch-registry: false       #屏蔽注册信息
+    register-with-eureka: true #禁止自己当做服务注册
+    fetch-registry: true       #屏蔽注册信息
     serviceUrl:
-      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@eureka-server1:7001${server.servlet.context-path}/eureka,http://${spring.security.user.name}:${spring.security.user.password}@eureka-server3:7001${server.servlet.context-path}/eureka
+      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@172.17.207.177:7001${server.servlet.context-path}/eureka,http://${spring.security.user.name}:${spring.security.user.password}@172.17.121.158:7001${server.servlet.context-path}/eureka
 #  instance:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}

liquidnet-bus-support/liquidnet-support-eureka/src/main/resources/application-test-server3.yml

@@ -13,7 +13,7 @@ spring:
 
 eureka:
   instance:
-    hostname: eureka-server3
+    hostname: 172.17.121.158
     preferIpAddress: true
     health-check-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/health
     status-page-url: http://localhost:${server.port}${server.servlet.context-path}/actuator/info
@@ -25,10 +25,10 @@ eureka:
     enable-self-preservation: false  # 设为false，关闭自我保护 #自我保护设置 解决Eureka Server不踢出已关停的节点的问题,同时客户端也需要配置
     eviction-interval-timer-in-ms: 4000 # 清理间隔（单位毫秒，默认是60*1000）
   client:
-    register-with-eureka: false #禁止自己当做服务注册
-    fetch-registry: false       #屏蔽注册信息
+    register-with-eureka: true #禁止自己当做服务注册
+    fetch-registry: true       #屏蔽注册信息
     serviceUrl:
-      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@eureka-server1:7001${server.servlet.context-path}/eureka,http://${spring.security.user.name}:${spring.security.user.password}@eureka-server2:7001${server.servlet.context-path}/eureka
+      defaultZone:  http://${spring.security.user.name}:${spring.security.user.password}@172.17.207.177:7001${server.servlet.context-path}/eureka,http://${spring.security.user.name}:${spring.security.user.password}@172.17.121.157:7001${server.servlet.context-path}/eureka
 #  instance:
 #    prefer-ip-address: true
 #    instance-id: ${spring.application.name}:${server.port}