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
72ebc49f
Commit
72ebc49f
authored
Jun 29, 2018
by
Nepxion
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修复Consul下,对@ConditionalOnBean(ServiceRegistry.class)不执行的问题
parent
d9c8d814
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/configuration/AdminAutoConfiguration.java
+2
-2
No files found.
discovery-plugin-admin-center/src/main/java/com/nepxion/discovery/plugin/admincenter/configuration/AdminAutoConfiguration.java
View file @
72ebc49f
...
@@ -11,7 +11,6 @@ package com.nepxion.discovery.plugin.admincenter.configuration;
...
@@ -11,7 +11,6 @@ package com.nepxion.discovery.plugin.admincenter.configuration;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.actuate.endpoint.Endpoint
;
import
org.springframework.boot.actuate.endpoint.Endpoint
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnBean
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
import
org.springframework.cloud.client.serviceregistry.Registration
;
import
org.springframework.cloud.client.serviceregistry.Registration
;
import
org.springframework.cloud.client.serviceregistry.ServiceRegistry
;
import
org.springframework.cloud.client.serviceregistry.ServiceRegistry
;
...
@@ -23,7 +22,8 @@ import com.nepxion.discovery.plugin.admincenter.endpoint.AdminEndpoint;
...
@@ -23,7 +22,8 @@ import com.nepxion.discovery.plugin.admincenter.endpoint.AdminEndpoint;
@Configuration
@Configuration
// @ConditionalOnProperty(value = PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, matchIfMissing = true)
// @ConditionalOnProperty(value = PluginConstant.SPRING_APPLICATION_DISCOVERY_CONTROL_ENABLED, matchIfMissing = true)
public
class
AdminAutoConfiguration
{
public
class
AdminAutoConfiguration
{
@ConditionalOnBean
(
ServiceRegistry
.
class
)
// 在Consul下,@ConditionalOnBean(ServiceRegistry.class)为false,估计跟装载顺序有关,装载AdminEndpointConfiguration的时候,ServiceRegistry Bean还没产生
// @ConditionalOnBean(ServiceRegistry.class)
@ConditionalOnClass
(
Endpoint
.
class
)
@ConditionalOnClass
(
Endpoint
.
class
)
protected
static
class
AdminEndpointConfiguration
{
protected
static
class
AdminEndpointConfiguration
{
@Autowired
(
required
=
false
)
@Autowired
(
required
=
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