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
2886064c
Commit
2886064c
authored
Jul 04, 2018
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复Bug
parent
88f43e99
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
6 deletions
+0
-6
discovery-plugin-framework-consul/src/main/java/com/nepxion/discovery/plugin/framework/configuration/ConsulLoadBalanceConfiguration.java
+0
-2
discovery-plugin-framework-eureka/src/main/java/com/nepxion/discovery/plugin/framework/configuration/EurekaLoadBalanceConfiguration.java
+0
-2
discovery-plugin-framework-zookeeper/src/main/java/com/nepxion/discovery/plugin/framework/configuration/ZookeeperLoadBalanceConfiguration.java
+0
-2
No files found.
discovery-plugin-framework-consul/src/main/java/com/nepxion/discovery/plugin/framework/configuration/ConsulLoadBalanceConfiguration.java
View file @
2886064c
...
...
@@ -11,7 +11,6 @@ package com.nepxion.discovery.plugin.framework.configuration;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.cloud.consul.discovery.ConsulDiscoveryProperties
;
import
org.springframework.cloud.consul.discovery.ConsulRibbonClientConfiguration
;
import
org.springframework.context.annotation.Bean
;
...
...
@@ -37,7 +36,6 @@ public class ConsulLoadBalanceConfiguration {
private
ConsulClient
client
;
@Bean
@ConditionalOnMissingBean
public
ServerList
<?>
ribbonServerList
(
IClientConfig
config
,
ConsulDiscoveryProperties
properties
)
{
ConsulServerListDecorator
serverList
=
new
ConsulServerListDecorator
(
client
,
properties
);
serverList
.
initWithNiwsConfig
(
config
);
...
...
discovery-plugin-framework-eureka/src/main/java/com/nepxion/discovery/plugin/framework/configuration/EurekaLoadBalanceConfiguration.java
View file @
2886064c
...
...
@@ -14,7 +14,6 @@ import javax.inject.Provider;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.cloud.netflix.ribbon.PropertiesFactory
;
import
org.springframework.cloud.netflix.ribbon.eureka.DomainExtractingServerList
;
import
org.springframework.cloud.netflix.ribbon.eureka.EurekaRibbonClientConfiguration
;
...
...
@@ -47,7 +46,6 @@ public class EurekaLoadBalanceConfiguration {
private
LoadBalanceListenerExecutor
loadBalanceListenerExecutor
;
@Bean
@ConditionalOnMissingBean
public
ServerList
<?>
ribbonServerList
(
IClientConfig
config
,
Provider
<
EurekaClient
>
eurekaClientProvider
)
{
if
(
this
.
propertiesFactory
.
isSet
(
ServerList
.
class
,
serviceId
))
{
return
this
.
propertiesFactory
.
get
(
ServerList
.
class
,
config
,
serviceId
);
...
...
discovery-plugin-framework-zookeeper/src/main/java/com/nepxion/discovery/plugin/framework/configuration/ZookeeperLoadBalanceConfiguration.java
View file @
2886064c
...
...
@@ -11,7 +11,6 @@ package com.nepxion.discovery.plugin.framework.configuration;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.AutoConfigureAfter
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.cloud.zookeeper.discovery.ZookeeperRibbonClientConfiguration
;
import
org.springframework.cloud.zookeeper.serviceregistry.ZookeeperServiceRegistry
;
import
org.springframework.context.annotation.Bean
;
...
...
@@ -36,7 +35,6 @@ public class ZookeeperLoadBalanceConfiguration {
private
ZookeeperServiceRegistry
registry
;
@Bean
@ConditionalOnMissingBean
public
ServerList
<?>
ribbonServerList
(
IClientConfig
config
)
{
@SuppressWarnings
(
"deprecation"
)
ZookeeperServerListDecorator
serverList
=
new
ZookeeperServerListDecorator
(
this
.
registry
.
getServiceDiscoveryRef
().
get
());
...
...
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