From ad41ba96ea0ac874f39feb0312b74be0085d61fc Mon Sep 17 00:00:00 2001 From: "13522412531@163.com" <133814250@qq.com> Date: Thu, 2 Jun 2022 10:39:22 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E5=AE=9E=E4=BE=8B?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=94=AF=E6=8C=81=E8=87=AA=E5=AE=9A=E4=B9=89?= =?UTF-8?q?groupName=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/alibaba/nacos/NamingClient.php | 8 +++---- .../request/naming/ListInstanceNaming.php | 22 +++++++++++++++++++ .../request/naming/ListInstanceNamingTest.php | 1 + 3 files changed, 26 insertions(+), 5 deletions(-) diff --git a/src/alibaba/nacos/NamingClient.php b/src/alibaba/nacos/NamingClient.php index c5af6ac..5ab3dd0 100644 --- a/src/alibaba/nacos/NamingClient.php +++ b/src/alibaba/nacos/NamingClient.php @@ -122,19 +122,17 @@ public static function update($serviceName, $ip, $port, $weight = "", $namespace * @param bool $healthyOnly * @param string $namespaceId * @param string $clusters + * @param string $groupName * @return model\InstanceList - * @throws ReflectionException - * @throws RequestUriRequiredException - * @throws RequestVerbRequiredException - * @throws ResponseCodeErrorException */ - public static function listInstances($serviceName, $healthyOnly = false, $namespaceId = "", $clusters = "") + public static function listInstances($serviceName, $healthyOnly = false, $namespaceId = "", $clusters = "", $groupName = "") { try { $listInstanceDiscovery = new ListInstanceNaming(); $listInstanceDiscovery->setServiceName($serviceName); $listInstanceDiscovery->setNamespaceId($namespaceId); $listInstanceDiscovery->setClusters($clusters); + $listInstanceDiscovery->setGroupName($groupName); $listInstanceDiscovery->setHealthyOnly($healthyOnly); $response = $listInstanceDiscovery->doRequest(); diff --git a/src/alibaba/nacos/request/naming/ListInstanceNaming.php b/src/alibaba/nacos/request/naming/ListInstanceNaming.php index 5473129..8fde928 100644 --- a/src/alibaba/nacos/request/naming/ListInstanceNaming.php +++ b/src/alibaba/nacos/request/naming/ListInstanceNaming.php @@ -27,6 +27,12 @@ class ListInstanceNaming extends NamingRequest */ private $clusters; + /** + * 分组名 + * @var + */ + private $groupName; + /** * 是否只返回健康实例 * @@ -82,6 +88,22 @@ public function setClusters($clusters) $this->clusters = $clusters; } + /** + * @return mixed + */ + public function getGroupName() + { + return $this->groupName; + } + + /** + * @param mixed $groupName + */ + public function setGroupName($groupName) + { + $this->groupName = $groupName; + } + /** * @return mixed */ diff --git a/tests/request/naming/ListInstanceNamingTest.php b/tests/request/naming/ListInstanceNamingTest.php index 21bcd51..4781679 100644 --- a/tests/request/naming/ListInstanceNamingTest.php +++ b/tests/request/naming/ListInstanceNamingTest.php @@ -25,6 +25,7 @@ public function testDoRequest() $listInstanceDiscovery->setServiceName("nacos.test.1"); $listInstanceDiscovery->setNamespaceId(""); $listInstanceDiscovery->setClusters(""); + $listInstanceDiscovery->setGroupName("DEFAULT_GROUP"); $listInstanceDiscovery->setHealthyOnly(false); $response = $listInstanceDiscovery->doRequest(); From 4a530801d7ce42ee89e47221e4e289b18fb9017a Mon Sep 17 00:00:00 2001 From: "13522412531@163.com" <133814250@qq.com> Date: Thu, 2 Jun 2022 10:48:09 +0800 Subject: [PATCH 2/6] Added support for custom groupName parameter to query instance list --- tests/request/naming/ListInstanceNamingTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/request/naming/ListInstanceNamingTest.php b/tests/request/naming/ListInstanceNamingTest.php index 4781679..b784b8f 100644 --- a/tests/request/naming/ListInstanceNamingTest.php +++ b/tests/request/naming/ListInstanceNamingTest.php @@ -25,7 +25,7 @@ public function testDoRequest() $listInstanceDiscovery->setServiceName("nacos.test.1"); $listInstanceDiscovery->setNamespaceId(""); $listInstanceDiscovery->setClusters(""); - $listInstanceDiscovery->setGroupName("DEFAULT_GROUP"); + $listInstanceDiscovery->setGroupName(""); $listInstanceDiscovery->setHealthyOnly(false); $response = $listInstanceDiscovery->doRequest(); From 326bf7c296a3b6d71ca56bb71663db392cae3512 Mon Sep 17 00:00:00 2001 From: "13522412531@163.com" <133814250@qq.com> Date: Thu, 2 Jun 2022 10:52:38 +0800 Subject: [PATCH 3/6] Added support for custom groupName parameter to query instance list --- composer.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/composer.json b/composer.json index 43f72b9..42094c3 100644 --- a/composer.json +++ b/composer.json @@ -1,12 +1,12 @@ { - "name": "alibaba/nacos", + "name": "bufanyun/nacos", "description": "阿里巴巴nacos配置中心php客户端", "type": "library", "license": "MIT", "authors": [ { - "name": "suxiaolin", - "email": "dear.lin@live.com" + "name": "mengshuai", + "email": "133814250@qq.com" } ], "require": { From 3c78f9182d79819b3bb887cbcdfd83389fea7ef1 Mon Sep 17 00:00:00 2001 From: "13522412531@163.com" <133814250@qq.com> Date: Thu, 2 Jun 2022 11:08:56 +0800 Subject: [PATCH 4/6] Added support for custom groupName parameter to query instance list --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 42094c3..b3584c2 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "bufanyun/nacos", - "description": "阿里巴巴nacos配置中心php客户端", + "description": "阿里巴巴nacos配置中心php客户端.", "type": "library", "license": "MIT", "authors": [ From 33b99057fac401353c9d2e1d10120ddbb9bc821f Mon Sep 17 00:00:00 2001 From: "13522412531@163.com" <133814250@qq.com> Date: Thu, 2 Jun 2022 11:09:49 +0800 Subject: [PATCH 5/6] Added support for custom groupName parameter to query instance list --- README.md | 2 +- composer.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 3a0bb7f..a1aec01 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# 阿里巴巴nacos配置中心-PHP客户端 +# 阿里巴巴nacos配置中心-PHP客户端. [Nacos配置中心](https://github.com/alibaba/nacos)的PHP客户端，更多关于Nacos配置中心的介绍，可以查看[Nacos配置中心Wiki](https://github.com/alibaba/nacos/wiki)。 diff --git a/composer.json b/composer.json index b3584c2..42094c3 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,6 @@ { "name": "bufanyun/nacos", - "description": "阿里巴巴nacos配置中心php客户端.", + "description": "阿里巴巴nacos配置中心php客户端", "type": "library", "license": "MIT", "authors": [ From 2ada93fb45efb0a2c9e45084687bcc2fa3af89ca Mon Sep 17 00:00:00 2001 From: "13522412531@163.com" <133814250@qq.com> Date: Thu, 2 Jun 2022 11:11:19 +0800 Subject: [PATCH 6/6] Added support for custom groupName parameter to query instance list --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index a1aec01..efa6f14 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,9 @@ # 阿里巴巴nacos配置中心-PHP客户端. +### 更新 + +1. 查询实例列表支持自定义groupName参数 + [Nacos配置中心](https://github.com/alibaba/nacos)的PHP客户端，更多关于Nacos配置中心的介绍，可以查看[Nacos配置中心Wiki](https://github.com/alibaba/nacos/wiki)。 ### 特性