From 4d2de76e4be5eded12833556d1042c61e00cf03c Mon Sep 17 00:00:00 2001
From: flystar32 <flystar32@163.com>
Date: Mon, 11 Mar 2019 11:32:57 +0800
Subject: [PATCH] support spring cloud nacos config enabled , Polish #411

---
 .../cloud/alibaba/nacos/NacosConfigAutoConfiguration.java       | 2 ++
 .../cloud/alibaba/nacos/NacosConfigBootstrapConfiguration.java  | 2 +-
 .../nacos/endpoint/NacosConfigEndpointAutoConfiguration.java    | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java
index 3833293e..caacccd8 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfiguration.java
@@ -17,6 +17,7 @@
 package org.springframework.cloud.alibaba.nacos;
 
 import org.springframework.beans.factory.BeanFactoryUtils;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.cloud.alibaba.nacos.refresh.NacosContextRefresher;
 import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
 import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshProperties;
@@ -28,6 +29,7 @@ import org.springframework.context.annotation.Configuration;
  * @author juven.xuxb
  */
 @Configuration
+@ConditionalOnProperty(name = "spring.cloud.nacos.config.enabled", matchIfMissing = true)
 public class NacosConfigAutoConfiguration {
 
 	@Bean
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfiguration.java
index 94933a4d..5a6ad2bb 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfiguration.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfiguration.java
@@ -26,6 +26,7 @@ import org.springframework.context.annotation.Configuration;
  * @author xiaojing
  */
 @Configuration
+@ConditionalOnProperty(name = "spring.cloud.nacos.config.enabled", matchIfMissing = true)
 public class NacosConfigBootstrapConfiguration {
 
 	@Bean
@@ -35,7 +36,6 @@ public class NacosConfigBootstrapConfiguration {
 	}
 
 	@Bean
-	@ConditionalOnProperty(name = "spring.cloud.nacos.config.enabled", matchIfMissing = true)
 	public NacosPropertySourceLocator nacosPropertySourceLocator(
 			NacosConfigProperties nacosConfigProperties) {
 		return new NacosPropertySourceLocator(nacosConfigProperties);
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java
index e853546d..21d77f7f 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/endpoint/NacosConfigEndpointAutoConfiguration.java
@@ -21,6 +21,7 @@ import org.springframework.boot.actuate.autoconfigure.endpoint.condition.Conditi
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnWebApplication;
 import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
 import org.springframework.cloud.alibaba.nacos.refresh.NacosRefreshHistory;
@@ -31,6 +32,7 @@ import org.springframework.context.annotation.Bean;
  */
 @ConditionalOnWebApplication
 @ConditionalOnClass(value = Endpoint.class)
+@ConditionalOnProperty(name = "spring.cloud.nacos.config.enabled", matchIfMissing = true)
 public class NacosConfigEndpointAutoConfiguration {
 
 	@Autowired