From c06fa4cff9dcf5c52cebd777a9934a4787e7bd50 Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Wed, 14 Jul 2021 17:33:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=8A=BD=E5=8F=96ro?=
 =?UTF-8?q?cketmq=E4=B8=BB=E8=A6=81=E6=B3=A8=E5=86=8C=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=88=B0rocketmq=E9=80=9A=E7=94=A8=E6=A8=A1=E5=9D=97=EF=BC=8C?=
 =?UTF-8?q?=E5=90=84=E6=9C=8D=E5=8A=A1=E5=8F=AA=E5=81=9A=E6=9C=80=E7=AE=80?=
 =?UTF-8?q?=E5=8D=95=E7=9A=84=E8=B0=83=E7=94=A8=E5=8D=B3=E5=8F=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-module/gov-org/gov-org-server/pom.xml   |  4 ++++
 .../epmet/mq/RocketMQConsumerRegister.java    | 23 +++++++++++--------
 .../src/main/resources/bootstrap.yml          |  2 +-
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/epmet-module/gov-org/gov-org-server/pom.xml b/epmet-module/gov-org/gov-org-server/pom.xml
index 9c353b0f90..180922a33d 100644
--- a/epmet-module/gov-org/gov-org-server/pom.xml
+++ b/epmet-module/gov-org/gov-org-server/pom.xml
@@ -170,6 +170,7 @@
                 </dingTalk.robot.secret>
 
                 <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
                 <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
@@ -212,6 +213,7 @@
                 </dingTalk.robot.secret>
 
                 <!--rocketmq-->
+                <rocketmq.enable>false</rocketmq.enable>
                 <rocketmq.nameserver>192.168.1.140:9876;192.168.1.141:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
@@ -255,6 +257,7 @@
                 </dingTalk.robot.secret>
 
                 <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
                 <rocketmq.nameserver>192.168.10.161:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
@@ -295,6 +298,7 @@
                 </dingTalk.robot.secret>
 
                 <!--rocketmq-->
+                <rocketmq.enable>true</rocketmq.enable>
                 <rocketmq.nameserver>192.168.11.187:9876;192.168.11.184:9876</rocketmq.nameserver>
                 <rocketmq.producer.group>epmet_message</rocketmq.producer.group>
             </properties>
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
index c607cf5929..ea2474714b 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/RocketMQConsumerRegister.java
@@ -19,16 +19,19 @@ public class RocketMQConsumerRegister extends MQAbstractRegister {
 
     @Override
     public void registerAllListeners(String env, MQConsumerProperties consumerProperties) {
-        if (!EnvEnum.LOCAL.getCode().equals(env)) {
-            // 客户初始化监听器注册
-            register(consumerProperties,
-                    ConsomerGroupConstants.INIT_CUSTOMER_ORG_ROLES_GROUP,
-                    MessageModel.CLUSTERING,
-                    TopicConstants.INIT_CUSTOMER,
-                    "*",
-                    new InitCustomerOrgRolesListener());
+        //判断逻辑，放到了了Pom.xml中，local不开启即可
+        //if (!EnvEnum.LOCAL.getCode().equals(env)) {
+            //...
+        //}
 
-            // ...其他监听器类似
-        }
+        // 客户初始化监听器注册
+        register(consumerProperties,
+                ConsomerGroupConstants.INIT_CUSTOMER_ORG_ROLES_GROUP,
+                MessageModel.CLUSTERING,
+                TopicConstants.INIT_CUSTOMER,
+                "*",
+                new InitCustomerOrgRolesListener());
+
+        // ...其他监听器类似
     }
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
index e7b5020a88..324ed0a5ca 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
+++ b/epmet-module/gov-org/gov-org-server/src/main/resources/bootstrap.yml
@@ -146,7 +146,7 @@ shutdown:
 
 rocketmq:
   #  是否开启mq
-  enable: true
+  enable: @rocketmq.enable@
   name-server: @rocketmq.nameserver@
 #  consume-thread-min: 2
 #  consume-thread-max: 2