From 3a409fdf5d6d009f8c1eecf495bf793bb290a03a Mon Sep 17 00:00:00 2001
From: wxz <wangxianzhang1992@163.com>
Date: Mon, 1 Mar 2021 22:01:01 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9rocketmq=EF=BC=8C=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E5=88=9D=E5=A7=8B=E5=8C=96=E7=9A=84topic=E5=92=8C?=
 =?UTF-8?q?=E6=B6=88=E8=B4=B9=E8=80=85=E7=BB=84=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 epmet-commons/epmet-commons-rocketmq/pom.xml                  | 2 +-
 .../commons/rocketmq/constants/ConsomerGroupConstants.java    | 4 ++--
 .../com/epmet/commons/rocketmq/constants/TopicConstants.java  | 2 +-
 .../java/com/epmet/mq/listener/InitCustomerOrgListener.java   | 2 +-
 .../com/epmet/mq/listener/InitCustomerCustomizeListener.java  | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/epmet-commons/epmet-commons-rocketmq/pom.xml b/epmet-commons/epmet-commons-rocketmq/pom.xml
index 41ee2e97e1..a3761c000f 100644
--- a/epmet-commons/epmet-commons-rocketmq/pom.xml
+++ b/epmet-commons/epmet-commons-rocketmq/pom.xml
@@ -15,7 +15,7 @@
         <dependency>
             <groupId>org.apache.rocketmq</groupId>
             <artifactId>rocketmq-spring-boot-starter</artifactId>
-            <version>2.1.1</version>
+            <version>2.0.1</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
index 0bcf7d4aa6..9c332a6626 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/ConsomerGroupConstants.java
@@ -12,10 +12,10 @@ public interface ConsomerGroupConstants {
     /**
      * 初始化客户自定义消费者组
      */
-    String INIT_CUSTOMER_CUSTOMIZE_GROUP = "init_customer_customize_group";
+    String INIT_CUSTOMER_COMPONENTS_GROUP = "init_customer_components_group";
     /**
      * 初始化客户组织机构信息分组
      */
-    String INIT_CUSTOMER_ORG_GROUP = "init_customer_org_group";
+    String INIT_CUSTOMER_ORG_ROLES_GROUP = "init_customer_org_roles_group";
 
 }
diff --git a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
index d95a829b8f..7687136498 100644
--- a/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
+++ b/epmet-commons/epmet-commons-rocketmq/src/main/java/com/epmet/commons/rocketmq/constants/TopicConstants.java
@@ -1,5 +1,5 @@
 package com.epmet.commons.rocketmq.constants;
 
 public interface TopicConstants {
-    String INIT_CUSTOMER = "init_customer_topic";
+    String INIT_CUSTOMER = "init_customer";
 }
diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/InitCustomerOrgListener.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/InitCustomerOrgListener.java
index 1308d09a36..e5eb8dabd6 100644
--- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/InitCustomerOrgListener.java
+++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/mq/listener/InitCustomerOrgListener.java
@@ -24,7 +24,7 @@ import org.springframework.stereotype.Component;
  * 监听初始化客户动作，为客户初始化角色列表
  */
 @RocketMQMessageListener(topic = TopicConstants.INIT_CUSTOMER,
-        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_ORG_GROUP,
+        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_ORG_ROLES_GROUP,
         messageModel = MessageModel.CLUSTERING,
         selectorExpression = "*")
 @Component
diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/listener/InitCustomerCustomizeListener.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/listener/InitCustomerCustomizeListener.java
index df2fea0902..882db74489 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/listener/InitCustomerCustomizeListener.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/mq/listener/InitCustomerCustomizeListener.java
@@ -21,7 +21,7 @@ import org.springframework.stereotype.Component;
  * 监听初始化客户动作，为客户初始化角色列表
  */
 @RocketMQMessageListener(topic = TopicConstants.INIT_CUSTOMER,
-        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_CUSTOMIZE_GROUP,
+        consumerGroup = ConsomerGroupConstants.INIT_CUSTOMER_COMPONENTS_GROUP,
         messageModel = MessageModel.CLUSTERING,
         selectorExpression = "*")
 @Component