From eaf93fdc3fa2269c6a89fc5b1315aa2bd8215ca2 Mon Sep 17 00:00:00 2001
From: pbting <314226532@qq.com>
Date: Wed, 16 Jan 2019 18:00:18 +0800
Subject: [PATCH 1/2] nacos config fix #277

---
 .../nacos/client/NacosPropertySourceLocator.java   | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java
index 72cdb608..5ffb7ac3 100644
--- a/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java
+++ b/spring-cloud-alibaba-nacos-config/src/main/java/org/springframework/cloud/alibaba/nacos/client/NacosPropertySourceLocator.java
@@ -16,9 +16,7 @@
 
 package org.springframework.cloud.alibaba.nacos.client;
 
-import java.util.Arrays;
-import java.util.List;
-
+import com.alibaba.nacos.api.config.ConfigService;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.springframework.cloud.alibaba.nacos.NacosConfigProperties;
@@ -31,7 +29,8 @@ import org.springframework.core.env.Environment;
 import org.springframework.core.env.PropertySource;
 import org.springframework.util.StringUtils;
 
-import com.alibaba.nacos.api.config.ConfigService;
+import java.util.Arrays;
+import java.util.List;
 
 /**
  * @author xiaojing
@@ -186,12 +185,17 @@ public class NacosPropertySourceLocator implements PropertySourceLocator {
 	private static void checkDataIdFileExtension(String[] sharedDataIdArry) {
 		StringBuilder stringBuilder = new StringBuilder();
 		for (int i = 0; i < sharedDataIdArry.length; i++) {
+			boolean isLegal = false;
 			for (String fileExtension : SUPPORT_FILE_EXTENSION) {
 				if (sharedDataIdArry[i].indexOf(fileExtension) > 0) {
+					isLegal = true;
 					break;
 				}
 			}
-			stringBuilder.append(sharedDataIdArry[i] + ",");
+			// add tips
+			if (!isLegal) {
+				stringBuilder.append(sharedDataIdArry[i] + ",");
+			}
 		}
 
 		if (stringBuilder.length() > 0) {

From 328a473da2348abc606dcb3b6abdc2e5c386fd12 Mon Sep 17 00:00:00 2001
From: pbting <314226532@qq.com>
Date: Wed, 16 Jan 2019 20:01:10 +0800
Subject: [PATCH 2/2] remote set port action

---
 .../alicloud/ans/registry/AnsRegistration.java     | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsRegistration.java b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsRegistration.java
index e28bf477..39a98b73 100644
--- a/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsRegistration.java
+++ b/spring-cloud-alicloud-ans/src/main/java/org/springframework/cloud/alicloud/ans/registry/AnsRegistration.java
@@ -16,6 +16,11 @@
 
 package org.springframework.cloud.alicloud.ans.registry;
 
+import java.net.URI;
+import java.util.Map;
+
+import javax.annotation.PostConstruct;
+
 import org.springframework.cloud.alicloud.context.ans.AnsProperties;
 import org.springframework.cloud.client.DefaultServiceInstance;
 import org.springframework.cloud.client.ServiceInstance;
@@ -25,10 +30,6 @@ import org.springframework.context.ApplicationContext;
 import org.springframework.core.env.Environment;
 import org.springframework.util.StringUtils;
 
-import javax.annotation.PostConstruct;
-import java.net.URI;
-import java.util.Map;
-
 /**
  * @author xiaolongzuo
  */
@@ -64,11 +65,6 @@ public class AnsRegistration implements Registration, ServiceInstance {
 				metadata.put(MANAGEMENT_ADDRESS, address);
 			}
 		}
-
-		String serverPort = env.getProperty("server.port");
-		if (null != serverPort) {
-			this.setPort(Integer.valueOf(serverPort));
-		}
 	}
 
 	@Override