Merge pull request #81 from alibaba/0.2.2

0.2.2
alibaba · Sep 27, 2018 · 0b5add2 · 0b5add2
2 parents b98fb2c + 44cf03d
commit 0b5add2
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 13 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.1-RC1</version>
+		<version>0.2.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

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.1-RC1</version>
+		<version>0.2.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java b/client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
@@ -193,7 +193,7 @@ public String queryList(String serviceName, String clusters, boolean healthyOnly
         params.put("clusters", clusters);
         params.put("healthyOnly", String.valueOf(healthyOnly));
 
-        return reqAPI(UtilAndComs.NACOS_URL_BASE + "/instances", params, "GET");
+        return reqAPI(UtilAndComs.NACOS_URL_BASE + "/instance/list", params, "GET");
     }
 
     private String doRegDom(Map<String, String> params) throws Exception {

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.1-RC1</version>
+		<version>0.2.1</version>
 	</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.1-RC1</version>
+		<version>0.2.1</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.1-RC1</version>
+		<version>0.2.1</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.1-RC1</version>
+		<version>0.2.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

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.1-RC1</version>
+		<version>0.2.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

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.1-RC1</version>
+		<version>0.2.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

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.1-RC1</version>
+        <version>0.2.1</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

diff --git a/naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java b/naming/src/main/java/com/alibaba/nacos/naming/controllers/InstanceController.java
@@ -120,7 +120,7 @@ public String update(HttpServletRequest request) throws Exception {
         return addIP4Dom(request);
     }
 
-    @RequestMapping(value = "/instances", method = RequestMethod.GET)
+    @RequestMapping(value = {"/instances", "/instance/list"}, method = RequestMethod.GET)
     public JSONObject queryList(HttpServletRequest request) throws Exception {
 
         Map<String, String[]> params = new HashMap<>(request.getParameterMap());

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.1-RC1</version>
+	<version>0.2.1</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.1-RC1</version>
+		<version>0.2.1</version>
 	</parent>
 	<modelVersion>4.0.0</modelVersion>