From f6bb64fc7d49d1316fc4b7c7205c7da96339fff2 Mon Sep 17 00:00:00 2001
From: chuntaojun <liaochuntao@live.com>
Date: Wed, 4 Sep 2019 15:37:47 +0800
Subject: [PATCH] fix(nacos):

---
 .../com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java    | 1 -
 .../alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java   | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
index 8bc3c6ee..bdc0b2d3 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigAutoConfiguration.java
@@ -61,7 +61,6 @@ public class NacosConfigAutoConfiguration {
 
 	@Bean
 	public NacosContextRefresher nacosContextRefresher(
-			NacosConfigProperties nacosConfigProperties,
 			NacosConfigManager nacosConfigManager,
 			NacosRefreshProperties nacosRefreshProperties,
 			NacosRefreshHistory refreshHistory) {
diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java
index 393b7f03..0a5712e1 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/com/alibaba/cloud/nacos/NacosConfigBootstrapConfiguration.java
@@ -37,6 +37,7 @@ public class NacosConfigBootstrapConfiguration {
 	}
 
 	@Bean
+	@ConditionalOnMissingBean
 	public NacosConfigManager nacosConfigManager() {
 		return new NacosConfigManager();
 	}