You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by al...@apache.org on 2021/07/30 02:34:37 UTC
[dubbo] branch 3.0 updated: Compatible with nacos grouping via
group (#8320)
This is an automated email from the ASF dual-hosted git repository.
albumenj pushed a commit to branch 3.0
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/3.0 by this push:
new e5aaeff Compatible with nacos grouping via group (#8320)
e5aaeff is described below
commit e5aaeffbe317b083e966235855c8e17e91efa759
Author: 肖恒 <20...@qq.com>
AuthorDate: Fri Jul 30 10:34:21 2021 +0800
Compatible with nacos grouping via group (#8320)
* Compatible with nacos grouping via group
* move nacos.group to dubbo.registry.nacos module
---
.../apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
index eebf3b4..e9467cf 100644
--- a/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
+++ b/dubbo-registry/dubbo-registry-nacos/src/main/java/org/apache/dubbo/registry/nacos/util/NacosNamingServiceUtils.java
@@ -38,6 +38,7 @@ import static com.alibaba.nacos.api.PropertyKeyConst.NAMING_LOAD_CACHE_AT_START;
import static com.alibaba.nacos.api.PropertyKeyConst.SERVER_ADDR;
import static com.alibaba.nacos.api.common.Constants.DEFAULT_GROUP;
import static com.alibaba.nacos.client.naming.utils.UtilAndComs.NACOS_NAMING_LOG_NAME;
+import static org.apache.dubbo.common.constants.CommonConstants.GROUP_KEY;
import static org.apache.dubbo.common.constants.RemotingConstants.BACKUP_KEY;
import static org.apache.dubbo.common.utils.StringConstantFieldValuePredicate.of;
@@ -49,6 +50,7 @@ import static org.apache.dubbo.common.utils.StringConstantFieldValuePredicate.of
public class NacosNamingServiceUtils {
private static final Logger logger = LoggerFactory.getLogger(NacosNamingServiceUtils.class);
+ private static String NACOS_GROUP_KEY = "nacos.group";
/**
* Convert the {@link ServiceInstance} to {@link Instance}
@@ -91,7 +93,9 @@ public class NacosNamingServiceUtils {
* @since 2.7.5
*/
public static String getGroup(URL connectionURL) {
- return connectionURL.getParameter("nacos.group", DEFAULT_GROUP);
+ // Compatible with nacos grouping via group.
+ String group = connectionURL.getParameter(GROUP_KEY, DEFAULT_GROUP);
+ return connectionURL.getParameter(NACOS_GROUP_KEY, group);
}
/**