Merge remote-tracking branch 'origin/master'

src/main/resources/application-dev.yml

@@ -100,9 +100,9 @@ eureka:
       defaultZone: http://10.242.31.158:5001/eureka,http://10.242.31.158:5002/eureka,http://10.242.31.158:5003/eureka
   instance:
     prefer-ip-address: true
-    hostname: http://10.242.31.158
-    # instance-ip: ${spring.cloud.client.ip-address}:${server.port}
-    instance-ip: http://10.242.31.158:${server.port}
+    instance-id: http://10.242.31.158:${server.port}
+    # 这是客户端的注册地址， eureka 会通过这个地址建立管道
+    ip-address: 10.242.31.158
 
 mybatis-plus:
   configuration: