From 922b733b4d3fc6e7785d0ad9dbf35a145c13f86b Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Fri, 29 May 2020 14:08:05 +0800
Subject: [PATCH] =?UTF-8?q?custom=20=E5=8F=91=E5=B8=83=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epdc-custom/epdc-custom-server/pom.xml           | 12 ++++++++++++
 .../src/main/resources/application.yml               |  2 ++
 .../src/main/resources/registry.conf                 |  4 ++--
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml
index 04266180..dd3b161f 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/pom.xml
@@ -170,6 +170,12 @@
 
                 <nacos.register-enabled>true</nacos.register-enabled>
                 <nacos.server-addr>47.104.224.45:8848</nacos.server-addr>
+                <nacos.ip>47.104.224.45</nacos.ip>
+                <nacos.namespace>fa5bf520-09c1-410c-a876-28e98c0534d3</nacos.namespace>
+                <!--RocketMQ-->
+                <rocketmq.name.server>47.104.85.99:9876;114.215.125.123:9876</rocketmq.name.server>
+                <rocketmq.producer.group>jinshui-pointsGroup</rocketmq.producer.group>
+                <rocketmq.consumer.points.group>jinshui-pointsGroup</rocketmq.consumer.points.group>
             </properties>
         </profile>
 
@@ -195,6 +201,12 @@
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epdc</spring.datasource.druid.username>
                 <spring.datasource.druid.password>Elink@833066</spring.datasource.druid.password>
+
+                <!--RocketMQ-->
+                <rocketmq.name.server>172.16.0.7:9876;172.16.0.8:9876</rocketmq.name.server>
+                <rocketmq.consumer.group>jinshui-organizationGroup</rocketmq.consumer.group>
+                <rocketmq.producer.group>jinshui-pointsGroup</rocketmq.producer.group>
+                <rocketmq.consumer.points.group>jinshui-pointsGroup</rocketmq.consumer.points.group>
             </properties>
         </profile>
     </profiles>
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml
index 4b486376..b309ded2 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/application.yml
@@ -28,6 +28,8 @@ spring:
       discovery:
         server-addr: @nacos.server-addr@
         register-enabled: @nacos.register-enabled@
+        ip: @nacos.ip@
+        namespace: @nacos.namespace@
     alibaba:
       seata:
         tx-service-group: epdc-custom-server-fescar-service-group
diff --git a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/registry.conf b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/registry.conf
index fb64abd7..b5f08984 100644
--- a/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/registry.conf
+++ b/esua-epdc/epdc-module/epdc-custom/epdc-custom-server/src/main/resources/registry.conf
@@ -4,7 +4,7 @@ registry {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }
@@ -15,7 +15,7 @@ config {
 
   nacos {
     serverAddr = "@nacos.server-addr@"
-    namespace = "public"
+    namespace = "@nacos.namespace@"
     cluster = "default"
   }
 }