diff --git a/net/src/main/java/com/zfoo/net/config/ConfigManager.java b/net/src/main/java/com/zfoo/net/config/ConfigManager.java index 8043ca81..e1c79996 100644 --- a/net/src/main/java/com/zfoo/net/config/ConfigManager.java +++ b/net/src/main/java/com/zfoo/net/config/ConfigManager.java @@ -62,11 +62,11 @@ public class ConfigManager implements IConfigManager { // 服务提供者名字Set列表 var providerSet = new HashSet(); // 检查并且替换配置文件中的ProtocolModule - for (var providerModule : providerConfig.getProviders()) { - var provider = providerModule.getProvider(); - var protocolModule = ProtocolManager.moduleByModuleName(provider); - AssertionUtils.isTrue(protocolModule != null, "provider:[{}] does not exist in the protocol manager", provider); - AssertionUtils.isTrue(providerSet.add(provider), "provider:[{}] has duplicate provider name module [provider:{}]", provider, protocolModule); + for (var provider : providerConfig.getProviders()) { + var protocolModule = provider.getProtocolModule(); + var providerName = provider.getProvider(); + AssertionUtils.isTrue(ProtocolManager.moduleByModuleName(protocolModule) != null, "provider:[{}] does not exist in the protocol manager", provider); + AssertionUtils.isTrue(providerSet.add(providerName), "provider:[{}] has duplicate provider name module [provider:{}]", provider, protocolModule); } } diff --git a/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java b/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java index 23c38908..5bd723f2 100644 --- a/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java +++ b/net/src/main/java/com/zfoo/net/consumer/registry/ZookeeperRegistry.java @@ -365,7 +365,8 @@ public class ZookeeperRegistry implements IRegistry { var localProviderVoStr = localRegisterVO.toProviderString(); var localProviderPath = PROVIDER_ROOT_PATH + StringUtils.SLASH + localProviderVoStr; - // /zfoo/provider/tankHome | 192.168.3.2:12400 | provider:[3-tankHome-tankHomeProvider] | consumer:[4-tankCache-consistent-hash-tankCacheProvider] + // /zfoo/provider + // applicationNameTest | 192.168.1.104:12400 | provider:[providerTest-myProvider1, providerTest-myProvider2] var localProviderStat = curator.checkExists().forPath(localProviderPath); if (Objects.isNull(localProviderStat)) { curator.create() @@ -396,7 +397,7 @@ public class ZookeeperRegistry implements IRegistry { * @throws Exception */ private void initConsumerCache() throws Exception { - // tankHome | 192.168.3.2:12400 | provider:[3-tankHome-tankHomeProvider] | consumer:[4-tankCache-consistent-hash-tankCacheProvider] + // applicationNameTest | 192.168.1.104:12400 | provider:[providerTest-myProvider1, providerTest-myProvider2] var localRegisterVO = NetContext.getConfigManager().getLocalConfig().toLocalRegisterVO(); // 初始化providerCacheSet // 遍历provider下注册的所有节点