Fix register instance with customized cluster name failed bug.

sk163 · Oct 25, 2018 · abdc48f · abdc48f
1 parent 855037c
commit abdc48f
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
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>0.2.0-SM-SNAPSHOT</version>
+		<version>0.3.0-RC1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java b/api/src/main/java/com/alibaba/nacos/api/naming/pojo/Cluster.java
@@ -33,7 +33,7 @@ public class Cluster {
     /**
      * Name of cluster
      */
-    private String name = Constants.NAMING_DEFAULT_CLUSTER_NAME;
+    private String name;
 
     /**
      * Health check config of this cluster

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>0.2.0-SM-SNAPSHOT</version>
+        <version>0.3.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

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>0.2.0-SM-SNAPSHOT</version>
+        <version>0.3.0-RC1</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>0.2.0-SM-SNAPSHOT</version>
+		<version>0.3.0-RC1</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>0.2.0-SM-SNAPSHOT</version>
+		<version>0.3.0-RC1</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>0.2.0-SM-SNAPSHOT</version>
+        <version>0.3.0-RC1</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>0.2.0-SM-SNAPSHOT</version>
+		<version>0.3.0-RC1</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>0.2.0-SM-SNAPSHOT</version>
+		<version>0.3.0-RC1</version>
 		<relativePath>../pom.xml</relativePath>
 	</parent>
 

diff --git a/naming/pom.xml b/naming/pom.xml
@@ -18,7 +18,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>0.2.0-SM-SNAPSHOT</version>
+        <version>0.3.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/core/IpAddress.java b/naming/src/main/java/com/alibaba/nacos/naming/core/IpAddress.java
@@ -305,7 +305,7 @@ public void setTenant(String tenant) {
     }
 
     public String generateInstanceId() {
-        return getIp() + "#" + getPort() + "#" + getCluster().getName() + "#" + getService().getName();
+        return getIp() + "#" + getPort() + "#" + getClusterName() + "#" + getService().getName();
     }
 
     @Override

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java b/naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
@@ -1203,7 +1203,6 @@ public JSONObject srvIPXT(HttpServletRequest request) throws Exception {
                 ipObj.put("metadata", ip.getMetadata());
                 ipObj.put("enabled", ip.isEnabled());
                 ipObj.put("weight", ip.getWeight());
-
                 hosts.add(ipObj);
 
             }
@@ -1216,6 +1215,7 @@ public JSONObject srvIPXT(HttpServletRequest request) throws Exception {
         result.put("lastRefTime", System.currentTimeMillis());
         result.put("checksum", domObj.getChecksum() + System.currentTimeMillis());
         result.put("useSpecifiedURL", false);
+        result.put("clusters", clusters);
         result.put("env", env);
         result.put("metadata",domObj.getMetadata());
         return result;

diff --git a/pom.xml b/pom.xml
@@ -21,7 +21,7 @@
     <inceptionYear>2018</inceptionYear>
     <groupId>com.alibaba.nacos</groupId>
     <artifactId>nacos-all</artifactId>
-    <version>0.2.0-SM-SNAPSHOT</version>
+    <version>0.3.0-RC1</version>
     <packaging>pom</packaging>
 
     <name>Alibaba NACOS ${project.version}</name>

diff --git a/test/pom.xml b/test/pom.xml
@@ -17,7 +17,7 @@
     <parent>
         <groupId>com.alibaba.nacos</groupId>
         <artifactId>nacos-all</artifactId>
-        <version>0.2.0-SM-SNAPSHOT</version>
+        <version>0.3.0-RC1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>