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/08/12 11:02:55 UTC
[dubbo-admin] branch develop updated: fix get url from config
center (#796)
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 14c368b fix get url from config center (#796)
14c368b is described below
commit 14c368ba112563c04c4036d9689c66ab8978c624
Author: haoyann <10...@qq.com>
AuthorDate: Thu Aug 12 19:02:48 2021 +0800
fix get url from config center (#796)
---
.../java/org/apache/dubbo/admin/config/ConfigCenter.java | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
diff --git a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
index bedd84d..befc7a7 100644
--- a/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
+++ b/dubbo-admin-server/src/main/java/org/apache/dubbo/admin/config/ConfigCenter.java
@@ -103,11 +103,11 @@ public class ConfigCenter {
if (StringUtils.isNotEmpty(config)) {
Arrays.stream(config.split("\n")).forEach( s -> {
- if(s.startsWith(Constants.REGISTRY_ADDRESS)) {
- String registryAddress = s.split("=")[1].trim();
+ if (s.startsWith(Constants.REGISTRY_ADDRESS)) {
+ String registryAddress = removerConfigKey(s);
registryUrl = formUrl(registryAddress, registryGroup, registryNameSpace, username, password);
} else if (s.startsWith(Constants.METADATA_ADDRESS)) {
- metadataUrl = formUrl(s.split("=")[1].trim(), metadataGroup, metadataGroupNameSpace, username, password);
+ metadataUrl = formUrl(removerConfigKey(s), metadataGroup, metadataGroupNameSpace, username, password);
}
});
}
@@ -168,6 +168,13 @@ public class ConfigCenter {
return metaDataCollector;
}
+ public static String removerConfigKey(String properties) {
+ String[] split = properties.split("=");
+ String[] address = new String[split.length - 1];
+ System.arraycopy(split, 1, address, 0, split.length - 1);
+ return String.join("=", address).trim();
+ }
+
private URL formUrl(String config, String group, String nameSpace, String username, String password) {
URL url = URL.valueOf(config);
if (StringUtils.isEmpty(url.getParameter(Constants.GROUP_KEY)) && StringUtils.isNotEmpty(group)) {