From b54a0a9b9dce21cf028ead3ef1765a1755cccd8e Mon Sep 17 00:00:00 2001 From: nkorange Date: Fri, 21 Sep 2018 16:46:49 +0800 Subject: [PATCH 1/4] Update version to 0.2.2-SNAPSHOT --- api/pom.xml | 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- config/pom.xml | 2 +- console/pom.xml | 2 +- core/pom.xml | 2 +- example/pom.xml | 2 +- naming/pom.xml | 2 +- pom.xml | 2 +- test/pom.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 5ed66125f20..bb466d1ad5b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -3,7 +3,7 @@ com.alibaba.nacos nacos-all - 0.2.1-RC1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/client/pom.xml b/client/pom.xml index 7d4158e9284..dc5d06f4f23 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -3,7 +3,7 @@ com.alibaba.nacos nacos-all - 0.2.1-RC1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 24d56b4995e..fdb22b48638 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -5,7 +5,7 @@ com.alibaba.nacos nacos-all - 0.2.1-RC1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/config/pom.xml b/config/pom.xml index 603c5c267c0..a760a351ab2 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -4,7 +4,7 @@ com.alibaba.nacos nacos-all - 0.2.1-RC1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/console/pom.xml b/console/pom.xml index 22f3b0b2c16..dca05d108a7 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -5,7 +5,7 @@ com.alibaba.nacos nacos-all - 0.2.1-RC1 + 0.2.2-SNAPSHOT nacos-console diff --git a/core/pom.xml b/core/pom.xml index 0404e420bf4..4b3bc759d7d 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ com.alibaba.nacos nacos-all - 0.2.1-RC1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/example/pom.xml b/example/pom.xml index db4f177c697..e2b4f975eee 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -5,7 +5,7 @@ com.alibaba.nacos nacos-all - 0.2.1-RC1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/naming/pom.xml b/naming/pom.xml index 0fae983ce47..f5c2a6cb595 100644 --- a/naming/pom.xml +++ b/naming/pom.xml @@ -5,7 +5,7 @@ com.alibaba.nacos nacos-all - 0.2.1-RC1 + 0.2.2-SNAPSHOT 4.0.0 diff --git a/pom.xml b/pom.xml index 13ad7a931fd..17025bbec5f 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ 2018 com.alibaba.nacos nacos-all - 0.2.1-RC1 + 0.2.2-SNAPSHOT pom Alibaba NACOS ${project.version} diff --git a/test/pom.xml b/test/pom.xml index 38c6412e67d..775bc6181d4 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -4,7 +4,7 @@ com.alibaba.nacos nacos-all - 0.2.1-RC1 + 0.2.2-SNAPSHOT 4.0.0 From f1c5dac508654df2483f7e8f4950d095ad3bd650 Mon Sep 17 00:00:00 2001 From: nkorange Date: Wed, 26 Sep 2018 17:38:25 +0800 Subject: [PATCH 2/4] Fix #78 --- .../java/com/alibaba/nacos/client/naming/net/NamingProxy.java | 2 +- .../alibaba/nacos/naming/controllers/InstanceController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 index cffde4400b2..7d0471239a5 100644 --- 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 params) throws Exception { 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 index c1412d046f1..1d13d4bfbd9 100644 --- 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 params = new HashMap<>(request.getParameterMap()); From 37f826094015e1d904cb438fd711a3e8582d385f Mon Sep 17 00:00:00 2001 From: nkorange Date: Thu, 27 Sep 2018 12:33:54 +0800 Subject: [PATCH 3/4] Fix version error --- distribution/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/distribution/pom.xml b/distribution/pom.xml index b6622f5ccf4..7d42c622d80 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.1-RC1 + 0.2.2-SNAPSHOT 4.0.0 From 44cf03db2d6993e5b4bbed90a015282463d1c987 Mon Sep 17 00:00:00 2001 From: nkorange Date: Thu, 27 Sep 2018 14:22:19 +0800 Subject: [PATCH 4/4] Update version to 0.2.1 --- api/pom.xml | 2 +- client/pom.xml | 2 +- common/pom.xml | 2 +- config/pom.xml | 2 +- console/pom.xml | 2 +- core/pom.xml | 2 +- distribution/pom.xml | 2 +- example/pom.xml | 2 +- naming/pom.xml | 2 +- pom.xml | 2 +- test/pom.xml | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 28f6ff2b5ff..6bec845826b 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -16,7 +16,7 @@ com.alibaba.nacos nacos-all - 0.2.2-SNAPSHOT + 0.2.1 4.0.0 diff --git a/client/pom.xml b/client/pom.xml index 9c9f368c006..dcf7bcc870c 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -16,7 +16,7 @@ com.alibaba.nacos nacos-all - 0.2.2-SNAPSHOT + 0.2.1 4.0.0 diff --git a/common/pom.xml b/common/pom.xml index 2a89ef3d55c..27684516cd8 100644 --- a/common/pom.xml +++ b/common/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.2-SNAPSHOT + 0.2.1 4.0.0 diff --git a/config/pom.xml b/config/pom.xml index d2b5033c5b6..7085dcb9178 100644 --- a/config/pom.xml +++ b/config/pom.xml @@ -17,7 +17,7 @@ com.alibaba.nacos nacos-all - 0.2.2-SNAPSHOT + 0.2.1 4.0.0 diff --git a/console/pom.xml b/console/pom.xml index dceefbcf4f0..3b96e6e77eb 100644 --- a/console/pom.xml +++ b/console/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.2-SNAPSHOT + 0.2.1 nacos-console diff --git a/core/pom.xml b/core/pom.xml index 25ae61ec97d..07948176547 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.2-SNAPSHOT + 0.2.1 4.0.0 diff --git a/distribution/pom.xml b/distribution/pom.xml index 7d42c622d80..b780cae4952 100644 --- a/distribution/pom.xml +++ b/distribution/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.2-SNAPSHOT + 0.2.1 4.0.0 diff --git a/example/pom.xml b/example/pom.xml index 84e6b29712d..fe588b550f6 100644 --- a/example/pom.xml +++ b/example/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.2-SNAPSHOT + 0.2.1 4.0.0 diff --git a/naming/pom.xml b/naming/pom.xml index d750d27ec8c..946f7b9c2b4 100644 --- a/naming/pom.xml +++ b/naming/pom.xml @@ -18,7 +18,7 @@ com.alibaba.nacos nacos-all - 0.2.2-SNAPSHOT + 0.2.1 4.0.0 diff --git a/pom.xml b/pom.xml index 400115c463f..ad9e6cb986d 100644 --- a/pom.xml +++ b/pom.xml @@ -21,7 +21,7 @@ 2018 com.alibaba.nacos nacos-all - 0.2.2-SNAPSHOT + 0.2.1 pom Alibaba NACOS ${project.version} diff --git a/test/pom.xml b/test/pom.xml index 9e255cfce11..cd1a7f6b53e 100644 --- a/test/pom.xml +++ b/test/pom.xml @@ -17,7 +17,7 @@ com.alibaba.nacos nacos-all - 0.2.2-SNAPSHOT + 0.2.1 4.0.0