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
c6a11a68
Commit
c6a11a68
authored
Oct 01, 2018
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
重构类结构
parent
b8501411
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
9 deletions
+12
-9
discovery-plugin-strategy-starter-service/src/main/java/com/nepxion/discovery/plugin/strategy/service/configuration/ServiceStrategyAutoConfiguration.java
+8
-6
discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/configuration/StrategyLoadBalanceConfiguration.java
+4
-3
No files found.
discovery-plugin-strategy-starter-service/src/main/java/com/nepxion/discovery/plugin/strategy/service/configuration/ServiceStrategyAutoConfiguration.java
View file @
c6a11a68
...
...
@@ -10,13 +10,14 @@ package com.nepxion.discovery.plugin.strategy.service.configuration;
*/
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.
Value
;
import
org.springframework.beans.factory.annotation.
Autowired
;
import
org.springframework.boot.autoconfigure.AutoConfigureBefore
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnProperty
;
import
org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.core.env.ConfigurableEnvironment
;
import
com.nepxion.discovery.common.exception.DiscoveryException
;
import
com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledAdapter
;
...
...
@@ -32,15 +33,13 @@ import com.nepxion.discovery.plugin.strategy.service.constant.ServiceStrategyCon
@AutoConfigureBefore
(
RibbonClientConfiguration
.
class
)
@ConditionalOnProperty
(
value
=
StrategyConstant
.
SPRING_APPLICATION_STRATEGY_CONTROL_ENABLED
,
matchIfMissing
=
true
)
public
class
ServiceStrategyAutoConfiguration
{
@Value
(
"${"
+
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_SCAN_PACKAGES
+
":}"
)
private
String
scanPackages
;
@Value
(
"${"
+
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_REQUEST_HEADERS
+
":}"
)
private
String
requestHeaders
;
@Autowired
private
ConfigurableEnvironment
environment
;
@Bean
@ConditionalOnProperty
(
value
=
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_SCAN_PACKAGES
,
matchIfMissing
=
false
)
public
ServiceStrategyAutoScanProxy
serviceStrategyAutoScanProxy
()
{
String
scanPackages
=
environment
.
getProperty
(
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_SCAN_PACKAGES
);
if
(
StringUtils
.
isEmpty
(
scanPackages
))
{
throw
new
DiscoveryException
(
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_SCAN_PACKAGES
+
"'s value can't be empty, remove it if useless"
);
}
...
...
@@ -55,6 +54,7 @@ public class ServiceStrategyAutoConfiguration {
@Bean
@ConditionalOnProperty
(
value
=
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_SCAN_PACKAGES
,
matchIfMissing
=
false
)
public
ServiceStrategyInterceptor
serviceStrategyInterceptor
()
{
String
scanPackages
=
environment
.
getProperty
(
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_SCAN_PACKAGES
);
if
(
StringUtils
.
isEmpty
(
scanPackages
))
{
throw
new
DiscoveryException
(
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_SCAN_PACKAGES
+
" can't be empty, remove it if useless"
);
}
...
...
@@ -69,6 +69,7 @@ public class ServiceStrategyAutoConfiguration {
@Bean
@ConditionalOnProperty
(
value
=
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_REQUEST_HEADERS
,
matchIfMissing
=
false
)
public
FeignStrategyInterceptor
feignStrategyInterceptor
()
{
String
requestHeaders
=
environment
.
getProperty
(
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_REQUEST_HEADERS
);
if
(
StringUtils
.
isEmpty
(
requestHeaders
))
{
throw
new
DiscoveryException
(
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_REQUEST_HEADERS
+
" can't be empty, remove it if useless"
);
}
...
...
@@ -79,6 +80,7 @@ public class ServiceStrategyAutoConfiguration {
@Bean
@ConditionalOnProperty
(
value
=
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_REQUEST_HEADERS
,
matchIfMissing
=
false
)
public
RestTemplateStrategyInterceptor
restTemplateStrategyInterceptor
()
{
String
requestHeaders
=
environment
.
getProperty
(
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_REQUEST_HEADERS
);
if
(
StringUtils
.
isEmpty
(
requestHeaders
))
{
throw
new
DiscoveryException
(
ServiceStrategyConstant
.
SPRING_APPLICATION_STRATEGY_REQUEST_HEADERS
+
" can't be empty, remove it if useless"
);
}
...
...
discovery-plugin-strategy/src/main/java/com/nepxion/discovery/plugin/strategy/configuration/StrategyLoadBalanceConfiguration.java
View file @
c6a11a68
...
...
@@ -10,13 +10,13 @@ package com.nepxion.discovery.plugin.strategy.configuration;
*/
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Value
;
import
org.springframework.boot.autoconfigure.AutoConfigureBefore
;
import
org.springframework.cloud.netflix.ribbon.PropertiesFactory
;
import
org.springframework.cloud.netflix.ribbon.RibbonClientConfiguration
;
import
org.springframework.cloud.netflix.ribbon.RibbonClientName
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.core.env.ConfigurableEnvironment
;
import
com.nepxion.discovery.plugin.framework.adapter.PluginAdapter
;
import
com.nepxion.discovery.plugin.strategy.adapter.DiscoveryEnabledAdapter
;
...
...
@@ -31,8 +31,8 @@ import com.netflix.loadbalancer.IRule;
@Configuration
@AutoConfigureBefore
(
RibbonClientConfiguration
.
class
)
public
class
StrategyLoadBalanceConfiguration
{
@
Value
(
"${"
+
StrategyConstant
.
SPRING_APPLICATION_STRATEGY_ZONE_AVOIDANCE_RULE_ENABLED
+
":true}"
)
private
boolean
zoneAvoidanceRuleEnabled
;
@
Autowired
private
ConfigurableEnvironment
environment
;
@RibbonClientName
private
String
serviceId
=
"client"
;
...
...
@@ -52,6 +52,7 @@ public class StrategyLoadBalanceConfiguration {
return
this
.
propertiesFactory
.
get
(
IRule
.
class
,
config
,
serviceId
);
}
boolean
zoneAvoidanceRuleEnabled
=
environment
.
getProperty
(
StrategyConstant
.
SPRING_APPLICATION_STRATEGY_ZONE_AVOIDANCE_RULE_ENABLED
,
Boolean
.
class
,
Boolean
.
TRUE
);
if
(
zoneAvoidanceRuleEnabled
)
{
DiscoveryEnabledZoneAvoidanceRule
discoveryEnabledRule
=
new
DiscoveryEnabledZoneAvoidanceRule
();
discoveryEnabledRule
.
initWithNiwsConfig
(
config
);
...
...
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