You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by wu...@apache.org on 2018/04/20 07:55:45 UTC
[incubator-servicecomb-java-chassis] 01/05: [SCB-498] Configuration
Center ip address need to config default port
This is an automated email from the ASF dual-hosted git repository.
wujimin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git
commit 63b00f5592c0554ab1a0dc99764c5346d3d1d454
Author: weichao666 <we...@huawei.com>
AuthorDate: Tue Apr 17 17:30:36 2018 +0800
[SCB-498] Configuration Center ip address need to config default port
---
.../apache/servicecomb/config/client/ConfigCenterConfig.java | 12 +++++++++++-
.../servicecomb/config/client/TestConfigCenterConfig.java | 2 ++
.../config-cc/src/test/resources/microservice.yaml | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
index c38f252..42b1c28 100644
--- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
+++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterConfig.java
@@ -175,11 +175,21 @@ public final class ConfigCenterConfig {
String[] result = finalConfig.getStringArray(SERVER_URL_KEY);
List<String> configCenterUris = new ArrayList<>(result.length);
for (int i = 0; i < result.length; i++) {
- configCenterUris.add(result[i]);
+ if (!result[i].substring(result[i].indexOf(":") + 1, result[i].length()).contains(":")) {
+ configCenterUris.add(useDefaultPort(result[i]));
+ } else {
+ configCenterUris.add(result[i]);
+ }
}
return configCenterUris;
}
+ private String useDefaultPort(String result) {
+ if (result.startsWith("https"))
+ return new StringBuffer(result).append(":443").toString();
+ return new StringBuffer(result).append(":80").toString();
+ }
+
public boolean getAutoDiscoveryEnabled() {
return finalConfig.getBoolean(AUTO_DISCOVERY_ENABLED, false);
}
diff --git a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
index 1624f5a..d09e4af 100644
--- a/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
+++ b/dynamic-config/config-cc/src/test/java/org/apache/servicecomb/config/client/TestConfigCenterConfig.java
@@ -35,6 +35,8 @@ public class TestConfigCenterConfig {
List<String> servers = ConfigCenterConfig.INSTANCE.getServerUri();
Assert.assertEquals("https://172.16.8.7:30103", servers.get(0));
Assert.assertEquals("https://172.16.8.7:30103", servers.get(1));
+ Assert.assertEquals("http://172.16.8.7:80", servers.get(2));
+ Assert.assertEquals("https://172.16.8.7:443", servers.get(3));
}
@Test
diff --git a/dynamic-config/config-cc/src/test/resources/microservice.yaml b/dynamic-config/config-cc/src/test/resources/microservice.yaml
index 445cfa6..4452250 100644
--- a/dynamic-config/config-cc/src/test/resources/microservice.yaml
+++ b/dynamic-config/config-cc/src/test/resources/microservice.yaml
@@ -46,7 +46,7 @@ cse:
config:
client:
serviceName: testDemo
- serverUri: https://172.16.8.7:30103,https://${host.name}:30103
+ serverUri: https://172.16.8.7:30103,https://${host.name}:30103,http://172.16.8.7,https://172.16.8.7
tenantName: csetest
refreshMode: 1
refresh_interval: 10000
--
To stop receiving notification emails like this one, please contact
wujimin@apache.org.