Commit eacde14e by Nepxion

preferIpAddress属性还是由使用者自行决定

parent 1a39be31
...@@ -22,6 +22,11 @@ public class ConsulApplicationContextInitializer extends PluginApplicationContex ...@@ -22,6 +22,11 @@ public class ConsulApplicationContextInitializer extends PluginApplicationContex
ConsulServiceRegistry consulServiceRegistry = (ConsulServiceRegistry) bean; ConsulServiceRegistry consulServiceRegistry = (ConsulServiceRegistry) bean;
return new ConsulServiceRegistryDecorator(consulServiceRegistry, applicationContext); return new ConsulServiceRegistryDecorator(consulServiceRegistry, applicationContext);
/*} else if (bean instanceof ConsulDiscoveryProperties) {
ConsulDiscoveryProperties consulDiscoveryProperties = (ConsulDiscoveryProperties) bean;
consulDiscoveryProperties.setPreferIpAddress(true);
return bean;*/
} else { } else {
return bean; return bean;
} }
......
...@@ -10,7 +10,6 @@ package com.nepxion.discovery.plugin.framework.context; ...@@ -10,7 +10,6 @@ package com.nepxion.discovery.plugin.framework.context;
*/ */
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.cloud.netflix.eureka.EurekaInstanceConfigBean;
import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry; import org.springframework.cloud.netflix.eureka.serviceregistry.EurekaServiceRegistry;
import org.springframework.context.ConfigurableApplicationContext; import org.springframework.context.ConfigurableApplicationContext;
...@@ -23,11 +22,11 @@ public class EurekaApplicationContextInitializer extends PluginApplicationContex ...@@ -23,11 +22,11 @@ public class EurekaApplicationContextInitializer extends PluginApplicationContex
EurekaServiceRegistry eurekaServiceRegistry = (EurekaServiceRegistry) bean; EurekaServiceRegistry eurekaServiceRegistry = (EurekaServiceRegistry) bean;
return new EurekaServiceRegistryDecorator(eurekaServiceRegistry, applicationContext); return new EurekaServiceRegistryDecorator(eurekaServiceRegistry, applicationContext);
} else if (bean instanceof EurekaInstanceConfigBean) { /*} else if (bean instanceof EurekaInstanceConfigBean) {
EurekaInstanceConfigBean instanceConfig = (EurekaInstanceConfigBean) bean; EurekaInstanceConfigBean eurekaInstanceConfig = (EurekaInstanceConfigBean) bean;
instanceConfig.setPreferIpAddress(true); eurekaInstanceConfig.setPreferIpAddress(true);
return bean; return bean;*/
} else { } else {
return bean; return bean;
} }
......
...@@ -22,6 +22,11 @@ public class ZookeeperApplicationContextInitializer extends PluginApplicationCon ...@@ -22,6 +22,11 @@ public class ZookeeperApplicationContextInitializer extends PluginApplicationCon
ZookeeperServiceRegistry zookeeperServiceRegistry = (ZookeeperServiceRegistry) bean; ZookeeperServiceRegistry zookeeperServiceRegistry = (ZookeeperServiceRegistry) bean;
return new ZookeeperServiceRegistryDecorator(zookeeperServiceRegistry, applicationContext); return new ZookeeperServiceRegistryDecorator(zookeeperServiceRegistry, applicationContext);
/*} else if (bean instanceof ZookeeperDiscoveryProperties) {
ZookeeperDiscoveryProperties zookeeperDiscoveryProperties = (ZookeeperDiscoveryProperties) bean;
zookeeperDiscoveryProperties.setPreferIpAddress(true);
return bean;*/
} else { } else {
return bean; return bean;
} }
......
...@@ -7,10 +7,12 @@ eureka.instance.preferIpAddress=true ...@@ -7,10 +7,12 @@ eureka.instance.preferIpAddress=true
# Consul config # Consul config
spring.cloud.consul.host=localhost spring.cloud.consul.host=localhost
spring.cloud.consul.port=8500 spring.cloud.consul.port=8500
spring.cloud.consul.discovery.preferIpAddress=true
# Zookeeper config # Zookeeper config
spring.cloud.zookeeper.connectString=localhost:2181 spring.cloud.zookeeper.connectString=localhost:2181
spring.cloud.zookeeper.discovery.root=/spring-cloud-service spring.cloud.zookeeper.discovery.root=/spring-cloud-service
spring.cloud.zookeeper.discovery.preferIpAddress=true
# Admin config(management.health.consul.enabled必须配置在bootstrap.properties里,配置在application.properties无效) # Admin config(management.health.consul.enabled必须配置在bootstrap.properties里,配置在application.properties无效)
management.security.enabled=false management.security.enabled=false
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment