diff --git a/README.md b/README.md index 3a0bb7f..efa6f14 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ -# 阿里巴巴nacos配置中心-PHP客户端 +# 阿里巴巴nacos配置中心-PHP客户端. + +### 更新 + +1. 查询实例列表支持自定义groupName参数 [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 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": { 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..b784b8f 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(""); $listInstanceDiscovery->setHealthyOnly(false); $response = $listInstanceDiscovery->doRequest();