#429 make EnvConfig enable (#433)

Author: develpoerX

spring-cloud-huawei-common/src/main/java/com/huaweicloud/common/util/URLUtil.java

@@ -19,9 +19,14 @@
 
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 import org.apache.commons.configuration.EnvironmentConfiguration;
 import org.apache.commons.configuration.SystemConfiguration;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.StringUtils;
 
 /**
@@ -148,13 +153,32 @@ public static List<String> getEnvServerURL() {
 
   private static List<String> getEnvURL(String systemServer) {
     SystemConfiguration sysConfig = new SystemConfiguration();
+    List<Object> result = sysConfig.getList(systemServer);
+
+    if (!CollectionUtils.isEmpty(result)) {
+      return toStringList(result);
+    }
+
     EnvironmentConfiguration envConfig = new EnvironmentConfiguration();
-    String sysURL = sysConfig.getString(systemServer);
-    String envURL = envConfig.getString(systemServer);
-    if (StringUtils.isEmpty(sysURL) && StringUtils.isEmpty(envURL)) {
-      sysURL = sysConfig.getString(SYSTEM_KEY_BOTH);
-      envURL = envConfig.getString(SYSTEM_KEY_BOTH);
+    result = envConfig.getList(systemServer);
+    if (!CollectionUtils.isEmpty(result)) {
+      return toStringList(result);
+    }
+
+    result = sysConfig.getList(SYSTEM_KEY_BOTH);
+    if (!CollectionUtils.isEmpty(result)) {
+      return toStringList(result);
     }
-    return StringUtils.isEmpty(sysURL) ? dealMultiUrl(envURL) : dealMultiUrl(sysURL);
+
+    result = envConfig.getList(SYSTEM_KEY_BOTH);
+    if (!CollectionUtils.isEmpty(result)) {
+      return toStringList(result);
+    }
+
+    return Collections.emptyList();
+  }
+
+  private static List<String> toStringList(List<Object> list) {
+    return list.stream().map(obj -> Objects.toString(obj, null)).collect(Collectors.toList());
   }
 }

spring-cloud-huawei-config/src/main/java/com/huaweicloud/config/ServiceCombConfigProperties.java

@@ -17,6 +17,7 @@
 
 package com.huaweicloud.config;
 
+import com.huaweicloud.common.util.URLUtil;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.stereotype.Component;
@@ -71,7 +72,8 @@ public void setFileSource(String fileSource) {
   }
 
   public String getDiscoveryAddress() {
-    return discoveryAddress;
+    String url = org.apache.commons.lang3.StringUtils.join(URLUtil.getEnvServerURL(), ",");
+    return url.isEmpty() ? discoveryAddress : url;
   }
 
   public void setDiscoveryAddress(String discoveryAddress) {
@@ -99,7 +101,8 @@ public void setEnabled(boolean enabled) {
   }
 
   public String getServerAddr() {
-    return serverAddr;
+    String url = org.apache.commons.lang3.StringUtils.join(URLUtil.getEnvConfigUrl(), ",");
+    return url.isEmpty() ? serverAddr : url;
   }
 
   public void setServerAddr(String serverAddr) {

spring-cloud-huawei-servicecomb-discovery/src/main/java/com/huaweicloud/servicecomb/discovery/discovery/ServiceCombDiscoveryProperties.java

@@ -17,8 +17,10 @@
 
 package com.huaweicloud.servicecomb.discovery.discovery;
 
+import com.huaweicloud.common.util.URLUtil;
 import com.huaweicloud.servicecomb.discovery.client.model.DataCenter;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 
@@ -109,7 +111,8 @@ public void setAppName(String appName) {
   }
 
   public String getAddress() {
-    return address;
+    String url = StringUtils.join(URLUtil.getEnvServerURL(), ",");
+    return url.isEmpty() ? address : url;
   }
 
   public void setAddress(String address) {