sync & commit in edgware

spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme-zh.md

@@ -15,7 +15,7 @@
 1. 首先，修改 pom.xml 文件，引入 Nacos Config Starter。
 
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 	
@@ -43,12 +43,10 @@
 	1. 直接下载：[Nacos Server 下载页](https://github.com/alibaba/nacos/releases) 
 	2. 源码构建：进入 Nacos [Github 项目页面](https://github.com/alibaba/nacos)，将代码 git clone 到本地自行编译打包，[参考此文档](https://nacos.io/zh-cn/docs/quick-start.html)。
 	
-
-
 2. 启动 Server，进入下载到本地并解压完成后的文件夹(使用源码构建的方式则进入编译打包好的文件夹)，再进去其相对文件夹 nacos/bin，并对照操作系统实际情况执行如下命令。[详情参考此文档](https://nacos.io/zh-cn/docs/quick-start.html)。
 	
 	1. Linux/Unix/Mac 操作系统，执行命令 `sh startup.sh -m standalone`
-	1. Windows 操作系统，执行命令 `cmd startup.cmd`
+	2. Windows 操作系统，执行命令 `cmd startup.cmd`
 
 3. 在命令行执行如下命令，向 Nacos Server 中添加一条配置。
 	
@@ -113,11 +111,11 @@ Nacos Client 从 Nacos Server 端获取数据时，调用的是此接口 `Config
 
 在 Nacos Config Starter 中，dataId 的拼接格式如下
 
-	${prefix} - ${spring.active.profile} . ${file-extension}
+	${prefix} - ${spring.profiles.active} . ${file-extension}
 
 * `prefix` 默认为 `spring.application.name` 的值，也可以通过配置项 `spring.cloud.nacos.config.prefix`来配置。
 
-* `spring.active.profile` 即为当前环境对应的 profile，详情可以参考 [Spring Boot文档](https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-profiles.html#boot-features-profiles)
+* `spring.profiles.active` 即为当前环境对应的 profile，详情可以参考 [Spring Boot文档](https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-profiles.html#boot-features-profiles)
 
 	**注意，当 activeprofile 为空时，对应的连接符 `-` 也将不存在，dataId 的拼接格式变成 `${prefix}`.`${file-extension}`**
 

spring-cloud-alibaba-examples/nacos-example/nacos-config-example/readme.md

@@ -15,7 +15,7 @@ Before we start the demo, let's learn how to connect Nacos Config to a Spring Cl
 1. Add dependency spring-cloud-starter-alibaba-nacos-config in the pom.xml file in your Spring Cloud project.
 
 	    <dependency>
-            <groupId>org.springframework.cloud</groupId>
+            <groupId>com.alibaba.cloud</groupId>
             <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>
         </dependency>
 	
@@ -42,12 +42,10 @@ Before we start the demo, let's learn how to connect Nacos Config to a Spring Cl
 	1. Download: Download Nacos Server [download page](https://github.com/alibaba/nacos/releases) 
 	2. Build from source code: Get source code by git clone git@github.com:alibaba/Nacos.git from Github Nacos and build your code. See [build reference](https://nacos.io/en-us/docs/quick-start.html) for details.
 	
-
-
 2. Unzip the downloaded file and go to the nacos/bin folder(), And according to the actual situation of the operating system, execute the following command。[see reference for more detail](https://nacos.io/en-us/docs/quick-start.html)。
 	
 	1. Linux/Unix/Mac , execute `sh startup.sh -m standalone`
-	1. Windows , execute `cmd startup.cmd`
+	2. Windows , execute `cmd startup.cmd`
 
 3. Execute the following command to add a configuration to Nacos Server.
 	
@@ -114,11 +112,11 @@ Nacos Client gets data from Nacos Server through this method. `ConfigService.get
 
 In Nacos Config Starter, the splicing format of dataId is as follows
 
-	${prefix} - ${spring.active.profile} . ${file-extension}
+	${prefix} - ${spring.profiles.active} . ${file-extension}
 
 * `prefix` default value is `spring.application.name` value, which can also be configured via the configuration item `spring.cloud.nacos.config.prefix`.
 
-* `spring.active.profile` is the profile corresponding to the current environment. For details, please refer to [Spring Boot Doc](https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-profiles.html#boot-features-profiles)
+* `spring.profiles.active` is the profile corresponding to the current environment. For details, please refer to [Spring Boot Doc](https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-profiles.html#boot-features-profiles)
 
 	**Note: when the activeprofile is empty, the corresponding connector `-` will also not exist, and the splicing format of the dataId becomes `${prefix}`.`${file-extension}`**
 

spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/java/com/alibaba/cloud/examples/Application.java

@@ -1,5 +1,14 @@
 package com.alibaba.cloud.examples;
 
+import java.io.IOException;
+import java.io.StringReader;
+import java.util.Properties;
+import java.util.concurrent.Executor;
+
+import com.alibaba.cloud.nacos.NacosConfigManager;
+import com.alibaba.nacos.api.config.listener.Listener;
+
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
@@ -11,11 +20,10 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * @author xiaojing
+ * @author xiaojing, Jianwei Mao
  */
 @SpringBootApplication
 public class Application {
-
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
 	}
@@ -27,13 +35,47 @@ class SampleRunner implements ApplicationRunner {
 	@Value("${user.name}")
 	String userName;
 
-	@Value("${user.age}")
+	@Value("${user.age:25}")
 	int userAge;
 
+	@Autowired
+	private NacosConfigManager nacosConfigManager;
+
 	@Override
 	public void run(ApplicationArguments args) throws Exception {
-		System.out.println(userName);
-		System.out.println(userAge);
+		System.out.println(
+				String.format("Initial username=%s, userAge=%d", userName, userAge));
+
+		nacosConfigManager.getConfigService().addListener(
+				"nacos-config-example.properties", "DEFAULT_GROUP", new Listener() {
+
+					/**
+					 * Callback with latest config data.
+					 *
+					 * For example, config data in Nacos is:
+					 *
+					 * user.name=Nacos user.age=25
+					 *
+					 * @param configInfo latest config data for specific dataId in Nacos
+					 *     server
+					 */
+					@Override
+					public void receiveConfigInfo(String configInfo) {
+						Properties properties = new Properties();
+						try {
+							properties.load(new StringReader(configInfo));
+						}
+						catch (IOException e) {
+							e.printStackTrace();
+						}
+						System.out.println("config changed: " + properties);
+					}
+
+					@Override
+					public Executor getExecutor() {
+						return null;
+					}
+				});
 	}
 }
 
@@ -44,7 +86,7 @@ class SampleController {
 	@Value("${user.name}")
 	String userName;
 
-	@Value("${user.age}")
+	@Value("${user.age:25}")
 	int age;
 
 	@RequestMapping("/user")