From f719e16d38f8edf6e066f63e9f46e3e4b718f903 Mon Sep 17 00:00:00 2001
From: mercyblitz <mercyblitz@gmail.com>
Date: Tue, 26 Feb 2019 16:54:36 +0800
Subject: [PATCH] Polish : /spring-cloud-incubator/spring-cloud-alibaba#386 :
 Supports all Spring Cloud Registries and default is Nacos

---
 .../spring-cloud-alibaba-dubbo-examples/pom.xml        | 10 +++-------
 .../bootstrap/DubboSpringCloudConsumerBootstrap.java   |  2 +-
 .../src/main/resources/bootstrap.yaml                  |  9 ++++++++-
 .../bootstrap/DubboSpringCloudProviderBootstrap.java   |  2 +-
 4 files changed, 13 insertions(+), 10 deletions(-)

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 6a1f3ce1..93f33466 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
@@ -103,6 +103,9 @@
         <!-- Nacos -->
         <profile>
             <id>nacos</id>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
             <dependencies>
                 <!-- Nacos Service Discovery -->
                 <dependency>
@@ -119,7 +122,6 @@
                 <dependency>
                     <groupId>org.springframework.cloud</groupId>
                     <artifactId>spring-cloud-starter-netflix-eureka-client</artifactId>
-                    <optional>true</optional>
                 </dependency>
             </dependencies>
         </profile>
@@ -133,7 +135,6 @@
                     <groupId>org.springframework.cloud</groupId>
                     <artifactId>spring-cloud-starter-zookeeper-discovery</artifactId>
                     <version>${spring-cloud-zookeeper.version}</version>
-                    <optional>true</optional>
                     <exclusions>
                         <exclusion>
                             <groupId>org.apache.zookeeper</groupId>
@@ -159,23 +160,18 @@
                     <groupId>org.apache.curator</groupId>
                     <artifactId>curator-framework</artifactId>
                     <version>${curator.version}</version>
-                    <optional>true</optional>
                 </dependency>
             </dependencies>
         </profile>
 
         <profile>
             <id>consul</id>
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
             <dependencies>
                 <!-- Spring Cloud Consul -->
                 <dependency>
                     <groupId>org.springframework.cloud</groupId>
                     <artifactId>spring-cloud-starter-consul-discovery</artifactId>
                     <version>${spring-cloud-consul.version}</version>
-                    <optional>true</optional>
                 </dependency>
             </dependencies>
         </profile>
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 b5dea081..2d72b79f 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
@@ -209,7 +209,7 @@ public class DubboSpringCloudConsumerBootstrap {
 
     public static void main(String[] args) {
         new SpringApplicationBuilder(DubboSpringCloudConsumerBootstrap.class)
-                .profiles("consul")
+                .profiles("nacos")
                 .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 5f5ed8d1..1d25940c 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
@@ -4,6 +4,7 @@ spring:
   main:
     allow-bean-definition-overriding: true
 
+
   # default disable all
   cloud:
     nacos:
@@ -19,11 +20,14 @@ eureka:
   client:
     enabled: false
 
+ribbon:
+  nacos:
+    enabled: false
+
 provider:
   application:
     name: spring-cloud-alibaba-dubbo-provider
 
-
 ---
 spring:
   profiles: nacos
@@ -35,6 +39,9 @@ spring:
         register-enabled: true
         server-addr: 127.0.0.1:8848
 
+ribbon:
+  nacos:
+    enabled: true
 
 ---
 spring:
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 748511c6..4fbf8ea8 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,7 +29,7 @@ public class DubboSpringCloudProviderBootstrap {
 
     public static void main(String[] args) {
         new SpringApplicationBuilder(DubboSpringCloudProviderBootstrap.class)
-                .profiles("consul")
+                .profiles("nacos")
                 .run(args);
     }
 }