[enhance issue #1492 ]Improved nacos configuration parsing, based on PropertySourceLoader

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

@@ -18,11 +18,13 @@ package com.alibaba.cloud.examples;
 
 import java.io.IOException;
 import java.io.StringReader;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.concurrent.Executor;
 
 import com.alibaba.cloud.nacos.NacosConfigManager;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.nacos.api.config.listener.Listener;
 
 import org.springframework.beans.factory.annotation.Autowired;
@@ -34,7 +36,9 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.cloud.context.config.annotation.RefreshScope;
 import org.springframework.context.annotation.Bean;
+import org.springframework.core.env.Environment;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -61,8 +65,10 @@ class UserConfig {
 	private int age;
 
 	private String name;
+	private String hr;
 
 	private Map<String, Object> map;
+	private List<User> users;
 
 	public int getAge() {
 		return age;
@@ -88,18 +94,77 @@ class UserConfig {
 		this.map = map;
 	}
 
-	@Override
-	public String toString() {
-		return "UserConfig{" + "age=" + age + ", name='" + name + '\'' + ", map=" + map
-				+ '}';
+	public List<User> getUsers() {
+		return users;
 	}
 
+	public void setUsers(List<User> users) {
+		this.users = users;
+	}
+
+	public String getHr() {
+		return hr;
+	}
+
+	public void setHr(String hr) {
+		this.hr = hr;
+	}
+
+	@Override
+	public String toString() {
+		return "UserConfig{" +
+				"age=" + age +
+				", name='" + name + '\'' +
+				", map=" + map +
+				", hr='" + hr + '\'' +
+				", users=" + JSON.toJSONString(users) +
+				'}';
+	}
+
+	public static class User {
+		private String name;
+		private String hr;
+		private String avg;
+
+		public String getName() {
+			return name;
+		}
+
+		public void setName(String name) {
+			this.name = name;
+		}
+
+		public String getHr() {
+			return hr;
+		}
+
+		public void setHr(String hr) {
+			this.hr = hr;
+		}
+
+		public String getAvg() {
+			return avg;
+		}
+
+		public void setAvg(String avg) {
+			this.avg = avg;
+		}
+
+		@Override
+		public String toString() {
+			return "User{" +
+					"name='" + name + '\'' +
+					", hr=" + hr +
+					", avg=" + avg +
+					'}';
+		}
+	}
 }
 
 @Component
 class SampleRunner implements ApplicationRunner {
 
-	@Value("${user.name}")
+	@Value("${user.name:zz}")
 	String userName;
 
 	@Value("${user.age:25}")
@@ -150,13 +215,17 @@ class SampleRunner implements ApplicationRunner {
 @RefreshScope
 class SampleController {
 
+
 	@Autowired
 	UserConfig userConfig;
 
 	@Autowired
 	private NacosConfigManager nacosConfigManager;
 
-	@Value("${user.name}")
+	@Autowired
+	private Environment environment;
+
+	@Value("${user.name:zz}")
 	String userName;
 
 	@Value("${user.age:25}")
@@ -168,6 +237,11 @@ class SampleController {
 				+ userConfig + "!" + nacosConfigManager.getConfigService();
 	}
 
+	@RequestMapping("/get/{name}")
+	public String getValue(@PathVariable(value = "name")String name) {
+		return String.valueOf(environment.getProperty(name));
+	}
+
 	@RequestMapping("/bool")
 	public boolean bool() {
 		return (Boolean) (userConfig.getMap().get("2"));

spring-cloud-alibaba-examples/nacos-example/nacos-config-example/src/main/resources/bootstrap.properties

@@ -5,19 +5,26 @@ spring.cloud.nacos.config.server-addr=127.0.0.1:8848
 spring.cloud.nacos.username=nacos
 spring.cloud.nacos.password=nacos
 
+#spring.cloud.nacos.config.namespace=public
+spring.cloud.nacos.config.name=test-aaa
+spring.cloud.nacos.config.file-extension=yaml
+
 #spring.cloud.nacos.config.refreshable-dataids=common.properties
 #spring.cloud.nacos.config.shared-data-ids=common.properties,base-common.properties
-spring.cloud.nacos.config.shared-configs[0]= common333.properties
-spring.cloud.nacos.config.shared-configs[1].data-id= common111.properties
-spring.cloud.nacos.config.shared-configs[1].group= GROUP_APP1
-spring.cloud.nacos.config.shared-configs[1].refresh= true
-spring.cloud.nacos.config.shared-configs[2]= common222.properties
+#spring.cloud.nacos.config.shared-configs[0]= common333.properties
+#spring.cloud.nacos.config.shared-configs[1].data-id= common111.properties
+#spring.cloud.nacos.config.shared-configs[1].group= GROUP_APP1
+#spring.cloud.nacos.config.shared-configs[1].refresh= true
+#spring.cloud.nacos.config.shared-configs[2]= common222.properties
+spring.cloud.nacos.config.shared-configs[0].data-id= test2.yaml
+spring.cloud.nacos.config.shared-configs[0].refresh=true
 
 #spring.cloud.nacos.config.ext-config[0]=ext.properties
 spring.cloud.nacos.config.extension-configs[0].data-id= extension1.properties
-spring.cloud.nacos.config.extension-configs[0].refresh= true
-spring.cloud.nacos.config.extension-configs[1]= extension2.properties
-spring.cloud.nacos.config.extension-configs[2].data-id= extension3.json
+spring.cloud.nacos.config.extension-configs[0].refresh=true
+spring.cloud.nacos.config.extension-configs[1].data-id= test1.yml
+spring.cloud.nacos.config.extension-configs[1].refresh= true
+