diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml index 65bc560f..6a1f3ce1 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/pom.xml @@ -26,6 +26,7 @@ 0.2.1.RELEASE 0.0.2 2.1.0.RELEASE + 2.1.0.RELEASE 4.0.1 @@ -88,53 +89,6 @@ spring-cloud-context - - - org.springframework.cloud - spring-cloud-starter-alibaba-nacos-discovery - - - - - org.springframework.cloud - spring-cloud-starter-netflix-eureka-client - true - - - - - org.springframework.cloud - spring-cloud-starter-zookeeper-discovery - ${spring-cloud-zookeeper.version} - true - - - org.apache.zookeeper - zookeeper - - - - - - org.apache.zookeeper - zookeeper - 3.4.12 - true - - - org.slf4j - slf4j-log4j12 - - - - - - org.apache.curator - curator-framework - ${curator.version} - true - - org.springframework.cloud @@ -149,18 +103,24 @@ nacos - - true - - + + + org.springframework.cloud + spring-cloud-starter-alibaba-nacos-discovery + eureka - + + + org.springframework.cloud + spring-cloud-starter-netflix-eureka-client + true + @@ -168,7 +128,55 @@ zookeeper + + + org.springframework.cloud + spring-cloud-starter-zookeeper-discovery + ${spring-cloud-zookeeper.version} + true + + + org.apache.zookeeper + zookeeper + + + + + org.apache.zookeeper + zookeeper + 3.4.12 + true + + + org.slf4j + slf4j-log4j12 + + + + + + org.apache.curator + curator-framework + ${curator.version} + true + + + + + + consul + + true + + + + + org.springframework.cloud + spring-cloud-starter-consul-discovery + ${spring-cloud-consul.version} + true + diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java index 5933a281..b5dea081 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudConsumerBootstrap.java @@ -130,12 +130,12 @@ public class DubboSpringCloudConsumerBootstrap { // To call /param callParam(); -// -// // To call /params -// callParams(); -// -// // To call /request/body/map -// callRequestBodyMap(); + + // To call /params + callParams(); + + // To call /request/body/map + callRequestBodyMap(); }; } @@ -209,6 +209,7 @@ public class DubboSpringCloudConsumerBootstrap { public static void main(String[] args) { new SpringApplicationBuilder(DubboSpringCloudConsumerBootstrap.class) + .profiles("consul") .run(args); } } diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/bootstrap.yaml index d4db17e6..5f5ed8d1 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/bootstrap.yaml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-consumer-sample/src/main/resources/bootstrap.yaml @@ -1,17 +1,19 @@ spring: application: name: spring-cloud-alibaba-dubbo-consumer + main: + allow-bean-definition-overriding: true + + # default disable all cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 - config: - server-addr: 127.0.0.1:8848 + enabled: false + register-enabled: false zookeeper: enabled: false - - main: - allow-bean-definition-overriding: true + consul: + enabled: false eureka: client: @@ -21,31 +23,45 @@ provider: application: name: spring-cloud-alibaba-dubbo-provider + --- spring: - profiles: eureka + profiles: nacos + cloud: nacos: discovery: - enabled: false - register-enabled: false + enabled: true + register-enabled: true + server-addr: 127.0.0.1:8848 + + +--- +spring: + profiles: eureka eureka: client: enabled: true service-url: - defaultZone: http://localhost:9090/eureka/ + defaultZone: http://127.0.0.1:9090/eureka/ + --- spring: profiles: zookeeper - cloud: - nacos: - discovery: - enabled: false - register-enabled: false - zookeeper: enabled: true - connect-string: localhost:2181 \ No newline at end of file + connect-string: 127.0.0.1:2181 + + +--- +spring: + profiles: consul + + cloud: + consul: + enabled: true + host: 127.0.0.1 + port: 8500 \ No newline at end of file diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java index 03e24633..748511c6 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/java/org/springframework/cloud/alibaba/dubbo/bootstrap/DubboSpringCloudProviderBootstrap.java @@ -29,6 +29,7 @@ public class DubboSpringCloudProviderBootstrap { public static void main(String[] args) { new SpringApplicationBuilder(DubboSpringCloudProviderBootstrap.class) + .profiles("consul") .run(args); } } diff --git a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/bootstrap.yaml b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/bootstrap.yaml index 0cee4797..c845d8ca 100644 --- a/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/bootstrap.yaml +++ b/spring-cloud-alibaba-examples/spring-cloud-alibaba-dubbo-examples/spring-cloud-dubbo-provider-sample/src/main/resources/bootstrap.yaml @@ -1,47 +1,63 @@ spring: application: name: spring-cloud-alibaba-dubbo-provider + main: + allow-bean-definition-overriding: true + + # default disable all cloud: nacos: discovery: - server-addr: 127.0.0.1:8848 - config: - server-addr: 127.0.0.1:8848 + enabled: false + register-enabled: false zookeeper: enabled: false - - main: - allow-bean-definition-overriding: true + consul: + enabled: false eureka: client: enabled: false + --- spring: - profiles: eureka + profiles: nacos + cloud: nacos: discovery: - enabled: false - register-enabled: false + enabled: true + register-enabled: true + server-addr: 127.0.0.1:8848 + + +--- +spring: + profiles: eureka eureka: client: enabled: true service-url: - defaultZone: http://localhost:9090/eureka/ + defaultZone: http://127.0.0.1:9090/eureka/ + --- spring: profiles: zookeeper - cloud: - nacos: - discovery: - enabled: false - register-enabled: false - zookeeper: enabled: true - connect-string: localhost:2181 \ No newline at end of file + connect-string: 127.0.0.1:2181 + + +--- +spring: + profiles: consul + + cloud: + consul: + enabled: true + host: 127.0.0.1 + port: 8500 \ No newline at end of file