Commit 72ebc49f by Nepxion

修复Consul下,对@ConditionalOnBean(ServiceRegistry.class)不执行的问题

parent d9c8d814
...@@ -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)
......
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