You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dubbo.apache.org by li...@apache.org on 2019/12/07 05:49:39 UTC
[dubbo] branch master updated: Complement the missed items when
initing the Apollo config-center (#5366)
This is an automated email from the ASF dual-hosted git repository.
liujun pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/dubbo.git
The following commit(s) were added to refs/heads/master by this push:
new 05d3765 Complement the missed items when initing the Apollo config-center (#5366)
05d3765 is described below
commit 05d37651f3916cee0c8ad1e5ea80025943d0aae9
Author: 张远征hd <ho...@163.com>
AuthorDate: Sat Dec 7 13:49:26 2019 +0800
Complement the missed items when initing the Apollo config-center (#5366)
---
.../support/apollo/ApolloDynamicConfiguration.java | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
index 0e5be2d..f191178 100644
--- a/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
+++ b/dubbo-configcenter/dubbo-configcenter-apollo/src/main/java/org/apache/dubbo/configcenter/support/apollo/ApolloDynamicConfiguration.java
@@ -69,6 +69,7 @@ public class ApolloDynamicConfiguration implements DynamicConfiguration {
private static final String APOLLO_CLUSTER_KEY = "apollo.cluster";
private static final String APOLLO_PROTOCOL_PREFIX = "http://";
private static final String APOLLO_APPLICATION_KEY = "application";
+ private static final String APOLLO_APPID_KEY = "app.id";
private URL url;
private Config dubboConfig;
@@ -81,15 +82,19 @@ public class ApolloDynamicConfiguration implements DynamicConfiguration {
String configEnv = url.getParameter(APOLLO_ENV_KEY);
String configAddr = getAddressWithProtocolPrefix(url);
String configCluster = url.getParameter(CLUSTER_KEY);
- if (configEnv != null) {
+ String configAppId = url.getParameter(APOLLO_APPID_KEY);
+ if (StringUtils.isEmpty(System.getProperty(APOLLO_ENV_KEY)) && configEnv != null) {
System.setProperty(APOLLO_ENV_KEY, configEnv);
}
- if (StringUtils.isEmpty(System.getProperty(APOLLO_ENV_KEY)) && !ANYHOST_VALUE.equals(configAddr)) {
+ if (StringUtils.isEmpty(System.getProperty(APOLLO_ADDR_KEY)) && !ANYHOST_VALUE.equals(url.getHost())) {
System.setProperty(APOLLO_ADDR_KEY, configAddr);
}
- if (configCluster != null) {
+ if (StringUtils.isEmpty(System.getProperty(APOLLO_CLUSTER_KEY)) && configCluster != null) {
System.setProperty(APOLLO_CLUSTER_KEY, configCluster);
}
+ if (StringUtils.isEmpty(System.getProperty(APOLLO_APPID_KEY)) && configAppId != null) {
+ System.setProperty(APOLLO_APPID_KEY, configAppId);
+ }
String namespace = url.getParameter(CONFIG_NAMESPACE_KEY, DEFAULT_GROUP);
String apolloNamespace = StringUtils.isEmpty(namespace) ? url.getParameter(GROUP_KEY, DEFAULT_GROUP) : namespace;