From cd80875c83caae61ce1371a7635a342f63bf5ed2 Mon Sep 17 00:00:00 2001
From: bynt <ningtao/19960909>
Date: Thu, 13 Oct 2022 10:58:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9pom=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/pom.xml     |  2 +-
 .../src/main/resources/config/application.yml          |  3 ++-
 .../java/com/baiye/feign/WeChatUserFeignProvider.java  |  2 +-
 cdp-tools/cdp-tool-wechat/cdp-wechat-api/pom.xml       | 10 ----------
 .../src/main/resources/config/application-dev.yml      |  2 +-
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/pom.xml b/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/pom.xml
index 392aa4c..246cf12 100644
--- a/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/pom.xml
+++ b/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/pom.xml
@@ -43,7 +43,7 @@
 
         <dependency>
             <groupId>com.baiye</groupId>
-            <artifactId>cdp-wechat-server</artifactId>
+            <artifactId>cdp-wechat-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
 
diff --git a/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/src/main/resources/config/application.yml b/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/src/main/resources/config/application.yml
index 131e3b2..a681b54 100644
--- a/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/src/main/resources/config/application.yml
+++ b/cdp-tools/cdp-tool-mq/cdp-tool-mq-producer/src/main/resources/config/application.yml
@@ -3,7 +3,8 @@ spring:
     active: dev
   application:
     name: @artifactId@
-
+  main:
+    allow-bean-definition-overriding: true
 
 server:
   port: 18000
diff --git a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/feign/WeChatUserFeignProvider.java b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/feign/WeChatUserFeignProvider.java
index 732cc8d..2820823 100644
--- a/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/feign/WeChatUserFeignProvider.java
+++ b/cdp-tools/cdp-tool-netty-disruptor/src/main/java/com/baiye/feign/WeChatUserFeignProvider.java
@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @author Enzo
  * @date : 2022/8/31
  */
-@FeignClient(name = "cdp-wechat-api")
+// @FeignClient(name = "cdp-wechat-api")
 public interface WeChatUserFeignProvider {
 
     /**
diff --git a/cdp-tools/cdp-tool-wechat/cdp-wechat-api/pom.xml b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/pom.xml
index c59c88f..72dcc56 100644
--- a/cdp-tools/cdp-tool-wechat/cdp-wechat-api/pom.xml
+++ b/cdp-tools/cdp-tool-wechat/cdp-wechat-api/pom.xml
@@ -16,16 +16,6 @@
         <maven.compiler.target>8</maven.compiler.target>
     </properties>
     <dependencies>
-        <dependency>
-            <groupId>org.springframework.cloud</groupId>
-            <artifactId>spring-cloud-starter-openfeign</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jsr305</artifactId>
-                    <groupId>com.google.code.findbugs</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
         <dependency>
             <groupId>com.baiye</groupId>
             <artifactId>cdp-common-exception</artifactId>
diff --git a/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml
index 2bb265f..c724e44 100644
--- a/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml
+++ b/cdp-tools/cdp-tool-wechat/cdp-wechat-server/src/main/resources/config/application-dev.yml
@@ -3,7 +3,7 @@ spring:
   cloud:
     nacos:
       discovery:
-        server-addr: ${NACOS_HOST:localhost}:${NACOS_PORT:8848}
+        server-addr: ${NACOS_HOST:8.130.96.163}:${NACOS_PORT:8848}
     # Spring Cloud Stream 配置项，对应 BindingServiceProperties 类
     stream:
       # Binding 配置项，对应 BindingProperties Map