You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by ni...@apache.org on 2019/04/15 02:27:29 UTC
[servicecomb-pack] branch master updated: SCB-1247 Set default
value 0.0.0.0:8080 in alpha.cluster.address on omega side
This is an automated email from the ASF dual-hosted git repository.
ningjiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
The following commit(s) were added to refs/heads/master by this push:
new 2274eb9 SCB-1247 Set default value 0.0.0.0:8080 in alpha.cluster.address on omega side
2274eb9 is described below
commit 2274eb96151b2cfc1f69ca204d5f3ddc0cf2fe20
Author: 张磊 <co...@gmail.com>
AuthorDate: Wed Apr 10 09:36:48 2019 +0800
SCB-1247 Set default value 0.0.0.0:8080 in alpha.cluster.address on omega side
---
.../servicecomb/pack/omega/spring/cloud/OmegaSpringConsulConfig.java | 2 +-
.../servicecomb/pack/omega/spring/cloud/OmegaSpringEurekaConfig.java | 2 +-
.../org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/omega/omega-spring-cloud-consul-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringConsulConfig.java b/omega/omega-spring-cloud-consul-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringConsulConfig.java
index 6c0935a..868bd4f 100644
--- a/omega/omega-spring-cloud-consul-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringConsulConfig.java
+++ b/omega/omega-spring-cloud-consul-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringConsulConfig.java
@@ -55,7 +55,7 @@ class OmegaSpringConsulConfig {
@Bean
AlphaClusterDiscovery alphaClusterAddress(
@Value("${alpha.cluster.serviceId:servicecomb-alpha-server}") String serviceId,
- @Value("${alpha.cluster.address:localhost:8080}") String[] addresses) {
+ @Value("${alpha.cluster.address:0.0.0.0:8080}") String[] addresses) {
StringBuffer eurekaServiceUrls = new StringBuffer();
String[] alphaAddresses = this.getAlphaAddress(serviceId);
diff --git a/omega/omega-spring-cloud-eureka-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringEurekaConfig.java b/omega/omega-spring-cloud-eureka-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringEurekaConfig.java
index 114dcf0..f9d7d32 100644
--- a/omega/omega-spring-cloud-eureka-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringEurekaConfig.java
+++ b/omega/omega-spring-cloud-eureka-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/cloud/OmegaSpringEurekaConfig.java
@@ -56,7 +56,7 @@ class OmegaSpringEurekaConfig {
@Bean
AlphaClusterDiscovery alphaClusterAddress(
@Value("${alpha.cluster.serviceId:servicecomb-alpha-server}") String serviceId,
- @Value("${alpha.cluster.address:localhost:8080}") String[] addresses) {
+ @Value("${alpha.cluster.address:0.0.0.0:8080}") String[] addresses) {
StringBuffer eurekaServiceUrls = new StringBuffer();
String[] zones = eurekaClientConfig.getAvailabilityZones(eurekaClientConfig.getRegion());
for (String zone : zones) {
diff --git a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
index ba34927..ac16ba0 100644
--- a/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
+++ b/omega/omega-spring-starter/src/main/java/org/apache/servicecomb/pack/omega/spring/OmegaSpringConfig.java
@@ -51,7 +51,6 @@ import org.springframework.context.annotation.Lazy;
import java.lang.invoke.MethodHandles;
@Configuration
-@ConditionalOnProperty(value = {"alpha.cluster.address"})
class OmegaSpringConfig {
private static final Logger LOG = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@@ -88,7 +87,7 @@ class OmegaSpringConfig {
@Bean
@ConditionalOnProperty(name = "alpha.cluster.register.type", havingValue = "default", matchIfMissing = true)
- AlphaClusterDiscovery alphaClusterAddress(@Value("${alpha.cluster.address:localhost:8080}") String[] addresses){
+ AlphaClusterDiscovery alphaClusterAddress(@Value("${alpha.cluster.address:0.0.0.0:8080}") String[] addresses){
return AlphaClusterDiscovery.builder().addresses(addresses).build();
}