diff --git a/lib/registry/zk/data_client.js b/lib/registry/zk/data_client.js index 0763ce5..a65718e 100644 --- a/lib/registry/zk/data_client.js +++ b/lib/registry/zk/data_client.js @@ -158,8 +158,8 @@ class ZookeeperRegistry extends Base { } const consumerGroup = consumer.group; const consumerVersion = consumer.version; - const providerGroup = providerInfo.get('group'); - const providerVersion = providerInfo.get('version'); + const providerGroup = providerInfo.get('group') || providerInfo.get('default.group'); + const providerVersion = providerInfo.get('version') || providerInfo.get('default.version'); return (!consumerGroup || consumerGroup === providerGroup) && (!consumerVersion || consumerVersion === providerVersion); } diff --git a/test/registry/index.test.js b/test/registry/index.test.js index f480b51..6ef516c 100644 --- a/test/registry/index.test.js +++ b/test/registry/index.test.js @@ -195,7 +195,7 @@ describe('test/registry/index.test.js', () => { interfaceName: 'org.apache.dubbo.demo.DemoService', version: '1.0.0', group: 'HSF', - url: 'dubbo://127.0.0.1:12200/org.apache.dubbo.demo.DemoService?accepts=100000&appName=&application=demo-consumer&check=false&dubbo=2.0.2&dynamic=true&group=HSF&interface=org.apache.dubbo.demo.DemoService&language=nodejs&methods=sayHello&pid=45510&qos.port=33333®ister.ip=192.168.1.13&revision=1.0.0&rpcVer=50400&serialization=hessian2&side=consumer&startTime=1540925808939&timeout=3000×tamp=1540925836963&uniqueId=&version=1.0.0&weight=100', + url: 'dubbo://127.0.0.1:12200/org.apache.dubbo.demo.DemoService?accepts=100000&appName=&application=demo-consumer&check=false&dubbo=2.0.2&dynamic=true&default.group=HSF&interface=org.apache.dubbo.demo.DemoService&language=nodejs&methods=sayHello&pid=45510&qos.port=33333®ister.ip=192.168.1.13&revision=1.0.0&rpcVer=50400&serialization=hessian2&side=consumer&startTime=1540925808939&timeout=3000×tamp=1540925836963&uniqueId=&default.version=1.0.0&weight=100', }; const reg2 = { interfaceName: 'org.apache.dubbo.demo.DemoService',