From 81cd7b9f10991cd567a071552d58a2a97bcabad5 Mon Sep 17 00:00:00 2001
From: flystar32 <flystar32@163.com>
Date: Wed, 19 Dec 2018 22:06:32 +0800
Subject: [PATCH 1/2] fix test case

---
 .../cloud/alibaba/nacos/NacosConfigProperties.java            | 4 ++++
 .../alibaba/nacos/NacosConfigAutoConfigurationTests.java      | 4 ++--
 .../alibaba/nacos/NacosConfigBootstrapConfigurationTests.java | 4 ++--
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java
index 7483a7fc9..941672204 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/NacosConfigProperties.java
@@ -267,6 +267,10 @@ public class NacosConfigProperties {
 		this.extConfig = extConfig;
 	}
 
+	public void setName(String name) {
+		this.name = name;
+	}
+
 	public void setActiveProfiles(String[] activeProfiles) {
 		this.activeProfiles = activeProfiles;
 	}
diff --git a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfigurationTests.java b/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfigurationTests.java
index 66126759f..4ecb4ddfb 100644
--- a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfigurationTests.java
+++ b/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigAutoConfigurationTests.java
@@ -47,9 +47,9 @@ public class NacosConfigAutoConfigurationTests {
 				NacosConfigBootstrapConfiguration.class,
 				NacosConfigAutoConfiguration.class, TestConfiguration.class)
 						.web(WebApplicationType.NONE)
-						.run("--spring.application.name=myapp",
+						.run("--spring.cloud.nacos.config.name=myapp",
 								"--spring.cloud.config.enabled=true",
-								"--spring.cloud.nacos.config.server-addr=127.0.0.1:8080",
+								"--spring.cloud.nacos.config.server-addr=127.0.0.1:8848",
 								"--spring.cloud.nacos.config.prefix=test");
 	}
 
diff --git a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfigurationTests.java b/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfigurationTests.java
index 73cc98803..3d273f2ab 100644
--- a/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfigurationTests.java
+++ b/spring-cloud-alibaba-nacos-config/src/test/java/org/springframework/cloud/alibaba/nacos/NacosConfigBootstrapConfigurationTests.java
@@ -43,9 +43,9 @@ public class NacosConfigBootstrapConfigurationTests {
 	public void setUp() throws Exception {
 		this.context = new SpringApplicationBuilder(
 				NacosConfigBootstrapConfiguration.class).web(WebApplicationType.NONE).run(
-						"--spring.application.name=myapp",
+						"--spring.cloud.nacos.config.name=myapp",
 						"--spring.cloud.config.enabled=true",
-						"--spring.cloud.nacos.config.server-addr=127.0.0.1:8080",
+						"--spring.cloud.nacos.config.server-addr=127.0.0.1:8848",
 						"--spring.cloud.nacos.config.prefix=test");
 	}
 

From b6a7bf0ee6f804a8a3b46947ac460e2fb0cf6e40 Mon Sep 17 00:00:00 2001
From: flystar32 <flystar32@163.com>
Date: Wed, 19 Dec 2018 22:31:07 +0800
Subject: [PATCH 2/2] update nacos version

---
 spring-cloud-alibaba-dependencies/pom.xml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/spring-cloud-alibaba-dependencies/pom.xml b/spring-cloud-alibaba-dependencies/pom.xml
index 2d65d9d60..1087f0dee 100644
--- a/spring-cloud-alibaba-dependencies/pom.xml
+++ b/spring-cloud-alibaba-dependencies/pom.xml
@@ -19,7 +19,8 @@
     <properties>
         <sentinel.version>1.4.0</sentinel.version>
         <oss.version>3.1.0</oss.version>
-        <nacos.version>0.6.1</nacos.version>
+        <nacos.client.version>0.6.2</nacos.client.version>
+        <nacos.config.version>0.6.1</nacos.config.version>
         <acm.version>1.0.8</acm.version>
         <ans.version>1.0.1</ans.version>
         <aliyun.sdk.version>4.0.1</aliyun.sdk.version>
@@ -74,13 +75,13 @@
             <dependency>
                 <groupId>com.alibaba.nacos</groupId>
                 <artifactId>nacos-client</artifactId>
-                <version>${nacos.version}</version>
+                <version>${nacos.client.version}</version>
             </dependency>
 
             <dependency>
                 <groupId>com.alibaba.nacos</groupId>
                 <artifactId>nacos-config</artifactId>
-                <version>${nacos.version}</version>
+                <version>${nacos.config.version}</version>
             </dependency>
 
             <!-- Apache RocketMQ -->