Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
discovery
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
谢捷峰
discovery
Commits
eacde14e
Commit
eacde14e
authored
Jul 01, 2018
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
preferIpAddress属性还是由使用者自行决定
parent
1a39be31
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
16 additions
and
5 deletions
+16
-5
discovery-plugin-framework-consul/src/main/java/com/nepxion/discovery/plugin/framework/context/ConsulApplicationContextInitializer.java
+5
-0
discovery-plugin-framework-eureka/src/main/java/com/nepxion/discovery/plugin/framework/context/EurekaApplicationContextInitializer.java
+4
-5
discovery-plugin-framework-zookeeper/src/main/java/com/nepxion/discovery/plugin/framework/context/ZookeeperApplicationContextInitializer.java
+5
-0
discovery-springcloud-example/src/main/resources/bootstrap.properties
+2
-0
No files found.
discovery-plugin-framework-consul/src/main/java/com/nepxion/discovery/plugin/framework/context/ConsulApplicationContextInitializer.java
View file @
eacde14e
...
@@ -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
;
}
}
...
...
discovery-plugin-framework-eureka/src/main/java/com/nepxion/discovery/plugin/framework/context/EurekaApplicationContextInitializer.java
View file @
eacde14e
...
@@ -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
i
nstanceConfig
=
(
EurekaInstanceConfigBean
)
bean
;
EurekaInstanceConfigBean
eurekaI
nstanceConfig = (EurekaInstanceConfigBean) bean;
i
nstanceConfig
.
setPreferIpAddress
(
true
);
eurekaI
nstanceConfig.setPreferIpAddress(true);
return
bean
;
return bean;
*/
}
else
{
}
else
{
return
bean
;
return
bean
;
}
}
...
...
discovery-plugin-framework-zookeeper/src/main/java/com/nepxion/discovery/plugin/framework/context/ZookeeperApplicationContextInitializer.java
View file @
eacde14e
...
@@ -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
;
}
}
...
...
discovery-springcloud-example/src/main/resources/bootstrap.properties
View file @
eacde14e
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment