From 3b49aff5a4fe4165ca2f2df792c391f899d5b00e Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 12 Apr 2020 20:36:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=86=20search=20=E6=A8=A1=E5=9D=97?=
 =?UTF-8?q?=E6=8E=A5=E5=85=A5=20SCA=20Dubbo=20=E5=92=8C=20Nacos=20Discover?=
 =?UTF-8?q?y=20=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 search/pom.xml                                | 13 +++++++++++
 search/search-service-impl/pom.xml            | 20 ++++-------------
 .../main/resources/config/application.yaml    | 22 ++++++++++++++-----
 3 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/search/pom.xml b/search/pom.xml
index 31c62ad3..250fc31c 100644
--- a/search/pom.xml
+++ b/search/pom.xml
@@ -16,4 +16,17 @@
         <module>search-service-api</module>
         <module>search-service-impl</module>
     </modules>
+
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>cn.iocoder.mall</groupId>
+                <artifactId>common-dependencies</artifactId>
+                <version>1.0-SNAPSHOT</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
 </project>
diff --git a/search/search-service-impl/pom.xml b/search/search-service-impl/pom.xml
index c428d048..a5ef51c2 100644
--- a/search/search-service-impl/pom.xml
+++ b/search/search-service-impl/pom.xml
@@ -42,22 +42,14 @@
 
         <!-- RPC 相关 -->
         <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.dubbo</groupId>
-            <artifactId>dubbo-spring-boot-starter</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-dubbo</artifactId>
         </dependency>
 
         <!-- Registry 和 Config 相关 -->
         <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-framework</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-recipes</artifactId>
+            <groupId>com.alibaba.cloud</groupId>
+            <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>
         </dependency>
 
         <!-- MQ 相关 -->
@@ -78,10 +70,6 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId> <!-- 引入该包，为了写单元测试用 -->
-            <artifactId>curator-framework</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>  <!-- 引入该包，为了写单元测试用 -->
             <artifactId>spring-boot-starter-web</artifactId>
diff --git a/search/search-service-impl/src/main/resources/config/application.yaml b/search/search-service-impl/src/main/resources/config/application.yaml
index e58d6f5f..c00f9525 100644
--- a/search/search-service-impl/src/main/resources/config/application.yaml
+++ b/search/search-service-impl/src/main/resources/config/application.yaml
@@ -7,17 +7,29 @@ spring:
       repositories:
         enable: true
 
-# dubbo
+  # Spring Cloud 配置项
+  cloud:
+    nacos:
+      # Spring Cloud Nacos Discovery 配置项
+      discovery:
+        server-addr: 127.0.0.1:8848 # Nacos 服务器地址
+
+# Dubbo 配置项
 dubbo:
-  application:
-    name: search-service
+  # Dubbo 注册中心
   registry:
-    address: zookeeper://127.0.0.1:2181
+    address: spring-cloud://127.0.0.1:8848 # 指定 Dubbo 服务注册中心的地址
+  # Spring Cloud Alibaba Dubbo 专属配置
+  cloud:
+    subscribed-services: admin-application, order-application, product-application # 设置订阅的应用列表，默认为 * 订阅所有应用
+  # Dubbo 提供者的协议
   protocol:
-    port: -1
     name: dubbo
+    port: -1
+  # Dubbo 提供服务的扫描基础包
   scan:
     base-packages: cn.iocoder.mall.search.biz.service
+  # Dubbo 服务提供者的配置
   provider:
     filter: -exception
     ProductSearchService: