Merge remote-tracking branch 'upstream/master'

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 -->

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;
 	}

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");
 	}
 

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");
 	}