Merge pull request #116 from chuntaojun/feature_remote_first

Feature remote first
nacos-group · Mar 17, 2020 · e9290b8 · e9290b8
2 parents f4a6216 + 9e20b30
commit e9290b8
Show file tree

Hide file tree

Showing 16 changed files with 38 additions and 15 deletions.
diff --git a/nacos-config-spring-boot-actuator/pom.xml b/nacos-config-spring-boot-actuator/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>nacos-spring-boot-parent</artifactId>
         <groupId>com.alibaba.boot</groupId>
-        <version>0.2.6</version>
+        <version>0.2.7</version>
         <relativePath>../nacos-spring-boot-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/nacos-config-spring-boot-autoconfigure/pom.xml b/nacos-config-spring-boot-autoconfigure/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.boot</groupId>
         <artifactId>nacos-spring-boot-parent</artifactId>
-        <version>0.2.6</version>
+        <version>0.2.7</version>
         <relativePath>../nacos-spring-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...nfigure/src/main/java/com/alibaba/boot/nacos/config/properties/NacosConfigProperties.java b/...nfigure/src/main/java/com/alibaba/boot/nacos/config/properties/NacosConfigProperties.java
@@ -74,6 +74,8 @@ public class NacosConfigProperties {
 
 	private String password;
 
+	private boolean remoteFirst = false;
+
 	@JSONField(serialize = false)
 	private List<Config> extConfig = new ArrayList<>();
 
@@ -233,6 +235,14 @@ public void setEnableRemoteSyncConfig(boolean enableRemoteSyncConfig) {
 		this.enableRemoteSyncConfig = enableRemoteSyncConfig;
 	}
 
+	public boolean isRemoteFirst() {
+		return remoteFirst;
+	}
+
+	public void setRemoteFirst(boolean remoteFirst) {
+		this.remoteFirst = remoteFirst;
+	}
+
 	public List<Config> getExtConfig() {
 		return extConfig;
 	}

diff --git a/...oot-autoconfigure/src/main/java/com/alibaba/boot/nacos/config/util/NacosConfigLoader.java b/...oot-autoconfigure/src/main/java/com/alibaba/boot/nacos/config/util/NacosConfigLoader.java
@@ -20,6 +20,7 @@
 import java.util.Arrays;
 import java.util.LinkedList;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Properties;
 import java.util.function.Function;
 
@@ -34,6 +35,7 @@
 
 import org.springframework.core.env.ConfigurableEnvironment;
 import org.springframework.core.env.MutablePropertySources;
+import org.springframework.core.env.StandardEnvironment;
 import org.springframework.util.StringUtils;
 
 import static com.alibaba.nacos.spring.util.NacosUtils.buildDefaultPropertySourceName;
@@ -69,8 +71,15 @@ public void loadConfig() {
 					globalProperties, config.getType());
 			sources.addAll(elements);
 		}
-		for (NacosPropertySource propertySource : sources) {
-			mutablePropertySources.addLast(propertySource);
+		if (nacosConfigProperties.isRemoteFirst()) {
+			for (ListIterator<NacosPropertySource> itr = sources.listIterator(sources.size()); itr.hasPrevious();) {
+				mutablePropertySources.addAfter(
+						StandardEnvironment.SYSTEM_ENVIRONMENT_PROPERTY_SOURCE_NAME, itr.previous());
+			}
+		} else {
+			for (NacosPropertySource propertySource : sources) {
+				mutablePropertySources.addLast(propertySource);
+			}
 		}
 	}
 

diff --git a/nacos-config-spring-boot-starter/pom.xml b/nacos-config-spring-boot-starter/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.boot</groupId>
         <artifactId>nacos-spring-boot-parent</artifactId>
-        <version>0.2.6</version>
+        <version>0.2.7</version>
         <relativePath>../nacos-spring-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/nacos-discovery-spring-boot-actuator/pom.xml b/nacos-discovery-spring-boot-actuator/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>nacos-spring-boot-parent</artifactId>
         <groupId>com.alibaba.boot</groupId>
-        <version>0.2.6</version>
+        <version>0.2.7</version>
         <relativePath>../nacos-spring-boot-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/nacos-discovery-spring-boot-autoconfigure/pom.xml b/nacos-discovery-spring-boot-autoconfigure/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.boot</groupId>
         <artifactId>nacos-spring-boot-parent</artifactId>
-        <version>0.2.6</version>
+        <version>0.2.7</version>
         <relativePath>../nacos-spring-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/nacos-discovery-spring-boot-starter/pom.xml b/nacos-discovery-spring-boot-starter/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.boot</groupId>
         <artifactId>nacos-spring-boot-parent</artifactId>
-        <version>0.2.6</version>
+        <version>0.2.7</version>
         <relativePath>../nacos-spring-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/nacos-spring-boot-base/pom.xml b/nacos-spring-boot-base/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.boot</groupId>
         <artifactId>nacos-spring-boot-parent</artifactId>
-        <version>0.2.6</version>
+        <version>0.2.7</version>
         <relativePath>../nacos-spring-boot-parent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/nacos-spring-boot-parent/pom.xml b/nacos-spring-boot-parent/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.boot</groupId>
         <artifactId>nacos-spring-boot-project</artifactId>
-        <version>0.2.6</version>
+        <version>0.2.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/nacos-spring-boot-samples/nacos-config-sample/pom.xml b/nacos-spring-boot-samples/nacos-config-sample/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.alibaba.boot</groupId>
         <artifactId>nacos-spring-boot-samples</artifactId>
-        <version>0.2.6</version>
+        <version>0.2.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/...-samples/nacos-config-sample/src/main/java/com/alibaba/boot/nacos/sample/PrintLogger.java b/...-samples/nacos-config-sample/src/main/java/com/alibaba/boot/nacos/sample/PrintLogger.java
@@ -45,7 +45,7 @@ public class PrintLogger {
 	@Autowired
 	private LoggingSystem loggingSystem;
 
-	@NacosConfigListener(dataId = "nacos.log", timeout = 5000)
+	@NacosConfigListener(dataId = "${nacos.example.listener.data-id}", timeout = 5000)
 	public void onChange(String newLog) throws Exception {
 		Properties properties = new DefaultPropertiesConfigParse().parse(newLog);
 		for (Object t : properties.keySet()) {

diff --git a/nacos-spring-boot-samples/nacos-config-sample/src/main/resources/application-dev.properties b/nacos-spring-boot-samples/nacos-config-sample/src/main/resources/application-dev.properties
@@ -1,4 +1,8 @@
+nacos.example.listener.data-id=nacos.log
+
 nacos.config.bootstrap.enable=true
+nacos.config.server-addr=127.0.0.1:9100
+nacos.config.remote-first=true
 
 nacos.config.data-ids=people,test
 nacos.config.group=DEVELOP

diff --git a/nacos-spring-boot-samples/nacos-discovery-sample/pom.xml b/nacos-spring-boot-samples/nacos-discovery-sample/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.alibaba.boot</groupId>
         <artifactId>nacos-spring-boot-samples</artifactId>
-        <version>0.2.6</version>
+        <version>0.2.7</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/nacos-spring-boot-samples/pom.xml b/nacos-spring-boot-samples/pom.xml
@@ -20,7 +20,7 @@
     <parent>
         <groupId>com.alibaba.boot</groupId>
         <artifactId>nacos-spring-boot-parent</artifactId>
-        <version>0.2.6</version>
+        <version>0.2.7</version>
         <relativePath>../nacos-spring-boot-parent/pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/pom.xml b/pom.xml
@@ -15,7 +15,7 @@
     </properties>
     <groupId>com.alibaba.boot</groupId>
     <artifactId>nacos-spring-boot-project</artifactId>
-    <version>0.2.6</version>
+    <version>0.2.7</version>
 
     <packaging>pom</packaging>