You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by ra...@apache.org on 2021/03/21 05:48:16 UTC
[dubbo-admin] branch develop updated: nacos support auth (#709)
This is an automated email from the ASF dual-hosted git repository.
ranke pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/dubbo-admin.git
The following commit(s) were added to refs/heads/develop by this push:
new 719f4d3 nacos support auth (#709)
719f4d3 is described below
commit 719f4d3b38fd26a01247cbfbad06b5a4d81ace5e
Author: haoyann <10...@qq.com>
AuthorDate: Sun Mar 21 13:48:06 2021 +0800
nacos support auth (#709)
Co-authored-by: yanhao <ya...@tinman.cn>
---
.../apache/dubbo/admin/registry/config/impl/NacosConfiguration.java | 6 ++++++
.../dubbo/admin/registry/metadata/impl/NacosMetaDataCollector.java | 6 ++++++
pom.xml | 2 +-
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/registry/config/impl/NacosConfiguration.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/registry/config/impl/NacosConfiguration.java
index 7c43055..72fae60 100644
--- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/registry/config/impl/NacosConfiguration.java
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/registry/config/impl/NacosConfiguration.java
@@ -17,11 +17,14 @@
package org.apache.dubbo.admin.registry.config.impl;
+import com.alibaba.nacos.api.PropertyKeyConst;
+import java.util.Map;
import org.apache.dubbo.admin.common.util.Constants;
import org.apache.dubbo.admin.registry.config.GovernanceConfiguration;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.StringConstantFieldValuePredicate;
import com.alibaba.nacos.api.NacosFactory;
import com.alibaba.nacos.api.config.ConfigService;
@@ -63,6 +66,9 @@ public class NacosConfiguration implements GovernanceConfiguration {
Properties properties = new Properties();
setServerAddr(url, properties);
setNamespace(url, properties);
+ Map<String, String> parameters = url.getParameters(
+ StringConstantFieldValuePredicate.of(PropertyKeyConst.class));
+ properties.putAll(parameters);
return properties;
}
diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/registry/metadata/impl/NacosMetaDataCollector.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/registry/metadata/impl/NacosMetaDataCollector.java
index 96b98b0..4379eca 100644
--- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/registry/metadata/impl/NacosMetaDataCollector.java
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/registry/metadata/impl/NacosMetaDataCollector.java
@@ -17,11 +17,14 @@
package org.apache.dubbo.admin.registry.metadata.impl;
+import com.alibaba.nacos.api.PropertyKeyConst;
+import java.util.Map;
import org.apache.dubbo.admin.common.util.Constants;
import org.apache.dubbo.admin.registry.metadata.MetaDataCollector;
import org.apache.dubbo.common.URL;
import org.apache.dubbo.common.logger.Logger;
import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.utils.StringConstantFieldValuePredicate;
import org.apache.dubbo.metadata.report.identifier.KeyTypeEnum;
import org.apache.dubbo.metadata.report.identifier.MetadataIdentifier;
@@ -73,6 +76,9 @@ public class NacosMetaDataCollector implements MetaDataCollector {
Properties properties = new Properties();
setServerAddr(url, properties);
setNamespace(url, properties);
+ Map<String, String> parameters = url.getParameters(
+ StringConstantFieldValuePredicate.of(PropertyKeyConst.class));
+ properties.putAll(parameters);
return properties;
}
diff --git a/pom.xml b/pom.xml
index b579f09..ef79177 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@
<apollo-version>1.2.0</apollo-version>
<consul-version>1.4.2</consul-version>
<consul-embedded-version>2.0.0</consul-embedded-version>
- <nacos-version>1.0.0</nacos-version>
+ <nacos-version>1.2.0</nacos-version>
<guava-version>20.0</guava-version>
<snakeyaml-version>1.24</snakeyaml-version>
<maven-checkstyle-plugin-version>3.0.0</maven-checkstyle-plugin-version>