Merge pull request #1044 from alibaba/develop

Develop
alibaba · Apr 10, 2019 · 3041f0a · 3041f0a
2 parents 20a6a3b + 3b470fa
commit 3041f0a
Show file tree

Hide file tree

Showing 19 changed files with 136 additions and 42 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 1.0.0-RC2(Mar 22, 2019)
+## 1.0.0-RC4(Mar 22, 2019)
 * [#923] Nacos 1.0.0 compatible with nacos-client 0.6.2
 * [#938] Client beat processor task lost
 * [#946] Change default server mode to AP

diff --git a/api/pom.xml b/api/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/api/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java b/api/src/main/java/com/alibaba/nacos/api/PropertyKeyConst.java
@@ -22,6 +22,8 @@
  */
 public class PropertyKeyConst {
 
+    public final static String IS_USE_ENDPOINT_PARSING_RULE = "isUseEndpointParsingRule";
+
     public final static String ENDPOINT = "endpoint";
 
     public final static String ENDPOINT_PORT = "endpointPort";

diff --git a/client/pom.xml b/client/pom.xml
@@ -16,7 +16,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
@@ -113,6 +113,7 @@
         </dependency>
 
     </dependencies>
+
     <build>
         <plugins>
             <plugin>

diff --git a/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java b/client/src/main/java/com/alibaba/nacos/client/config/NacosConfigService.java
@@ -82,7 +82,7 @@ public NacosConfigService(Properties properties) throws NacosException {
     }
 
     private void initNamespace(Properties properties) {
-        String namespaceTmp = properties.getProperty(PropertyKeyConst.NAMESPACE);
+        String namespaceTmp = null;
 
         namespaceTmp = TemplateUtils.stringBlankAndThenExecute(namespaceTmp, new Callable<String>() {
             @Override
@@ -98,6 +98,10 @@ public String call() {
                 return StringUtils.isNotBlank(namespace) ? namespace : "";
             }
         });
+
+        if (StringUtils.isBlank(namespaceTmp)) {
+            namespaceTmp = properties.getProperty(PropertyKeyConst.NAMESPACE);
+        }
         namespace = namespaceTmp;
         properties.put(PropertyKeyConst.NAMESPACE, namespace);
     }

diff --git a/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java b/client/src/main/java/com/alibaba/nacos/client/config/impl/ServerListManager.java
@@ -85,7 +85,9 @@ public ServerListManager(String endpoint) throws NacosException {
     public ServerListManager(String endpoint, String namespace) throws NacosException {
         isFixed = false;
         isStarted = false;
-        endpoint = initEndpoint(endpoint);
+        Properties properties = new Properties();
+        properties.setProperty(PropertyKeyConst.ENDPOINT, endpoint);
+        endpoint = initEndpoint(properties);
 
         if (StringUtils.isBlank(endpoint)) {
             throw new NacosException(NacosException.CLIENT_INVALID_PARAM, "endpoint is blank");
@@ -108,7 +110,7 @@ public ServerListManager(String endpoint, String namespace) throws NacosExceptio
 
     public ServerListManager(Properties properties) throws NacosException {
         isStarted = false;
-        String serverAddrsStr = properties.getProperty(PropertyKeyConst.SERVER_ADDR);
+        serverAddrsStr = properties.getProperty(PropertyKeyConst.SERVER_ADDR);
         String namespace = properties.getProperty(PropertyKeyConst.NAMESPACE);
         initParam(properties);
         if (StringUtils.isNotEmpty(serverAddrsStr)) {
@@ -152,7 +154,7 @@ public ServerListManager(Properties properties) throws NacosException {
     }
 
     private void initParam(Properties properties) {
-        endpoint = initEndpoint(properties.getProperty(PropertyKeyConst.ENDPOINT));
+        endpoint = initEndpoint(properties);
 
         String contentPathTmp = properties.getProperty(PropertyKeyConst.CONTEXT_PATH);
         if (!StringUtils.isBlank(contentPathTmp)) {
@@ -164,19 +166,29 @@ private void initParam(Properties properties) {
         }
     }
 
-    private String initEndpoint(String endpointTmp) {
-        String endpointPortTmp = System.getenv(PropertyKeyConst.SystemEnv.ALIBABA_ALIWARE_ENDPOINT_PORT);
-        if (StringUtils.isNotBlank(endpointPortTmp)) {
-            endpointPort = Integer.parseInt(endpointPortTmp);
-        }
+    private String initEndpoint(final Properties properties) {
 
-        return TemplateUtils.stringBlankAndThenExecute(endpointTmp, new Callable<String>() {
+        String endpointPortTmp = TemplateUtils.stringEmptyAndThenExecute(System.getenv(PropertyKeyConst.SystemEnv.ALIBABA_ALIWARE_ENDPOINT_PORT), new Callable<String>() {
             @Override
             public String call() {
-                String endpointUrl = System.getenv(PropertyKeyConst.SystemEnv.ALIBABA_ALIWARE_ENDPOINT_URL);
-                return StringUtils.isNotBlank(endpointUrl) ? endpointUrl : "";
+                return properties.getProperty(PropertyKeyConst.ENDPOINT_PORT);
             }
         });
+
+        if (StringUtils.isNotBlank(endpointPortTmp)) {
+            endpointPort = Integer.parseInt(endpointPortTmp);
+        }
+
+        String endpointTmp = properties.getProperty(PropertyKeyConst.ENDPOINT);
+        if (Boolean.valueOf(properties.getProperty(PropertyKeyConst.IS_USE_ENDPOINT_PARSING_RULE, ParamUtil.USE_ENDPOINT_PARSING_RULE_DEFAULT_VALUE))) {
+            String endpointUrl = ParamUtil.parsingEndpointRule(endpointPortTmp);
+            if (StringUtils.isNotBlank(endpointUrl)) {
+                serverAddrsStr = "";
+            }
+            return endpointUrl;
+        }
+
+        return StringUtils.isNotBlank(endpointTmp) ? endpointTmp : "";
     }
 
     public synchronized void start() throws NacosException {
@@ -368,6 +380,7 @@ public String getTenant() {
 
     public String addressServerUrl;
 
+    private String serverAddrsStr;
 }
 
 /**

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java b/client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
@@ -34,9 +34,10 @@
 import com.alibaba.nacos.client.naming.core.HostReactor;
 import com.alibaba.nacos.client.naming.net.NamingProxy;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
-import com.alibaba.nacos.client.naming.utils.StringUtils;
 import com.alibaba.nacos.client.naming.utils.UtilAndComs;
 import com.alibaba.nacos.client.utils.LogUtils;
+import com.alibaba.nacos.client.utils.ParamUtil;
+import com.alibaba.nacos.client.utils.StringUtils;
 import com.alibaba.nacos.client.utils.TemplateUtils;
 import org.apache.commons.lang3.BooleanUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -86,9 +87,7 @@ public NacosNamingService(Properties properties) {
     }
 
     private void init(Properties properties) {
-
         serverList = properties.getProperty(PropertyKeyConst.SERVER_ADDR);
-
         initNamespace(properties);
         initEndpoint(properties);
         initWebRootContext();
@@ -150,30 +149,35 @@ private void initCacheDir() {
         }
     }
 
-    private void initEndpoint(Properties properties) {
+    private void initEndpoint(final Properties properties) {
         if (properties == null) {
 
             return;
         }
-
-        String endpointUrl = TemplateUtils.stringEmptyAndThenExecute(properties.getProperty(PropertyKeyConst.ENDPOINT), new Callable<String>() {
-            @Override
-            public String call() {
-                return System.getenv(PropertyKeyConst.SystemEnv.ALIBABA_ALIWARE_ENDPOINT_URL);
+        //这里通过 dubbo/sca 侧来初始化默认传入的是 true
+        boolean isUseEndpointParsingRule = Boolean.valueOf(properties.getProperty(PropertyKeyConst.IS_USE_ENDPOINT_PARSING_RULE, ParamUtil.USE_ENDPOINT_PARSING_RULE_DEFAULT_VALUE));
+        String endpointUrl;
+        if (isUseEndpointParsingRule) {
+            endpointUrl = ParamUtil.parsingEndpointRule(properties.getProperty(PropertyKeyConst.ENDPOINT));
+            if (com.alibaba.nacos.client.utils.StringUtils.isNotBlank(endpointUrl)) {
+                serverList = "";
             }
-        });
+        } else {
+            endpointUrl = properties.getProperty(PropertyKeyConst.ENDPOINT);
+        }
 
-        if (com.alibaba.nacos.client.utils.StringUtils.isBlank(endpointUrl)) {
+        if (StringUtils.isBlank(endpointUrl)) {
             return;
         }
 
-        String endpointPort = TemplateUtils.stringEmptyAndThenExecute(properties.getProperty(PropertyKeyConst.ENDPOINT_PORT), new Callable<String>() {
+        String endpointPort = TemplateUtils.stringEmptyAndThenExecute(System.getenv(PropertyKeyConst.SystemEnv.ALIBABA_ALIWARE_ENDPOINT_PORT), new Callable<String>() {
             @Override
             public String call() {
 
-                return System.getenv(PropertyKeyConst.SystemEnv.ALIBABA_ALIWARE_ENDPOINT_PORT);
+                return properties.getProperty(PropertyKeyConst.ENDPOINT_PORT);
             }
         });
+
         endpointPort = TemplateUtils.stringEmptyAndThenExecute(endpointPort, new Callable<String>() {
             @Override
             public String call() {
@@ -187,10 +191,6 @@ public String call() {
     private void initNamespace(Properties properties) {
         String tmpNamespace = null;
 
-        if (properties != null) {
-            tmpNamespace = properties.getProperty(PropertyKeyConst.NAMESPACE);
-        }
-
         tmpNamespace = TemplateUtils.stringEmptyAndThenExecute(tmpNamespace, new Callable<String>() {
             @Override
             public String call() {
@@ -219,6 +219,10 @@ public String call() {
             }
         });
 
+        if (StringUtils.isEmpty(tmpNamespace) && properties != null) {
+            tmpNamespace = properties.getProperty(PropertyKeyConst.NAMESPACE);
+        }
+
         tmpNamespace = TemplateUtils.stringEmptyAndThenExecute(tmpNamespace, new Callable<String>() {
             @Override
             public String call() {

diff --git a/client/src/main/java/com/alibaba/nacos/client/utils/ParamUtil.java b/client/src/main/java/com/alibaba/nacos/client/utils/ParamUtil.java
@@ -15,20 +15,27 @@
  */
 package com.alibaba.nacos.client.utils;
 
+import com.alibaba.nacos.api.PropertyKeyConst;
 import com.alibaba.nacos.client.config.impl.HttpSimpleClient;
 import org.slf4j.Logger;
 
 import java.io.InputStream;
 import java.util.Properties;
+import java.util.concurrent.Callable;
+import java.util.regex.Pattern;
 
 /**
  * manage param tool
  *
  * @author nacos
  */
 public class ParamUtil {
+
     private final static Logger LOGGER = LogUtils.logger(ParamUtil.class);
 
+    public final static String USE_ENDPOINT_PARSING_RULE_DEFAULT_VALUE = "false";
+
+    private static final Pattern PATTERN = Pattern.compile("\\$\\{[^}]+\\}");
     private static String defaultContextPath = "nacos";
     private static String defaultNodesPath = "serverlist";
     private static String appKey;
@@ -143,4 +150,46 @@ public static void setDefaultNodesPath(String defaultNodesPath) {
         ParamUtil.defaultNodesPath = defaultNodesPath;
     }
 
+
+    public static String parsingEndpointRule(String endpointUrl) {
+        // 配置文件中输入的话，以 ENV 中的优先，
+        if (endpointUrl == null
+            || !PATTERN.matcher(endpointUrl).find()) {
+            // skip retrieve from system property and retrieve directly from system env
+            String endpointUrlSource = System.getenv(PropertyKeyConst.SystemEnv.ALIBABA_ALIWARE_ENDPOINT_URL);
+            if (com.alibaba.nacos.client.utils.StringUtils.isNotBlank(endpointUrlSource)) {
+                endpointUrl = endpointUrlSource;
+            }
+
+            return StringUtils.isNotBlank(endpointUrl) ? endpointUrl : "";
+        }
+
+        endpointUrl = endpointUrl.substring(endpointUrl.indexOf("${") + 2,
+            endpointUrl.lastIndexOf("}"));
+        int defStartOf = endpointUrl.indexOf(":");
+        String defaultEndpointUrl = null;
+        if (defStartOf != -1) {
+            defaultEndpointUrl = endpointUrl.substring(defStartOf + 1);
+            endpointUrl = endpointUrl.substring(0, defStartOf);
+        }
+
+        String endpointUrlSource = TemplateUtils.stringBlankAndThenExecute(System.getProperty(endpointUrl,
+            System.getenv(endpointUrl)), new Callable<String>() {
+            @Override
+            public String call() {
+                return System.getenv(PropertyKeyConst.SystemEnv.ALIBABA_ALIWARE_ENDPOINT_URL);
+            }
+        });
+
+
+        if (com.alibaba.nacos.client.utils.StringUtils.isBlank(endpointUrlSource)) {
+            if (com.alibaba.nacos.client.utils.StringUtils.isNotBlank(defaultEndpointUrl)) {
+                endpointUrl = defaultEndpointUrl;
+            }
+        } else {
+            endpointUrl = endpointUrlSource;
+        }
+
+        return StringUtils.isNotBlank(endpointUrl) ? endpointUrl : "";
+    }
 }
diff --git a/client/src/main/java/com/alibaba/nacos/client/utils/StringUtils.java b/client/src/main/java/com/alibaba/nacos/client/utils/StringUtils.java
@@ -15,6 +15,8 @@
  */
 package com.alibaba.nacos.client.utils;
 
+import java.util.Collection;
+
 /**
  * string util
  *
@@ -71,4 +73,23 @@ public static String substringBetween(String str, String open, String close) {
         }
         return null;
     }
+
+    public static String join(Collection collection, String separator) {
+        if (collection == null) {
+            return null;
+        }
+
+        StringBuilder stringBuilder = new StringBuilder();
+        Object[] objects = collection.toArray();
+
+        for (int i = 0; i < collection.size() - 1; i++) {
+            stringBuilder.append(objects[i].toString()).append(separator);
+        }
+
+        if (collection.size() > 0) {
+            stringBuilder.append(objects[collection.size() - 1]);
+        }
+
+        return stringBuilder.toString();
+    }
 }
diff --git a/cmdb/pom.xml b/cmdb/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <artifactId>nacos-all</artifactId>
         <groupId>com.alibaba.nacos</groupId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/common/pom.xml b/common/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/config/pom.xml b/config/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/console/pom.xml b/console/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0</version>
     </parent>
     <artifactId>nacos-console</artifactId>
     <!--<packaging>war</packaging>-->

diff --git a/core/pom.xml b/core/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/example/pom.xml b/example/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>1.0.0-RC3</version>
+        <version>1.0.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>