From aeb8875e484baf3f27d23485a153c950731e805e Mon Sep 17 00:00:00 2001
From: zhaoqifeng <cpyxrt@163.com>
Date: Sun, 25 Apr 2021 15:16:05 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E8=AE=B0=E5=BD=95=E6=95=B0=E6=8D=AE=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=EF=BC=8C=E6=B7=BB=E5=8A=A0sourceType=EF=BC=8C?=
 =?UTF-8?q?=E5=A1=AB=E5=85=85sourceId?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../epmet/modules/topic/service/impl/TopicDraftServiceImpl.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
index 65303449a2..a335ff13a5 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/TopicDraftServiceImpl.java
@@ -963,6 +963,7 @@ public class TopicDraftServiceImpl extends BaseServiceImpl<TopicDraftDao, TopicD
         actPointEventMsg.setAgencyId(agencyId);
         actPointEventMsg.setGridId(gridId);
         actPointEventMsg.setGroupId(groupId);
+        actPointEventMsg.setSourceType("topic");
         actPointEventMsg.setSourceId(topicId);
         actPointEventMsg.setUserId(userId);
         actPointEventMsg.setActionFlag(MqConstant.PLUS);

From 6f2db7991265d453d489cb21fcefa6cb90d9a150 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Sun, 25 Apr 2021 15:19:37 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=E9=87=8D?=
 =?UTF-8?q?=E8=AF=95=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/tools/utils/SendMqMsgUtils.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java
index 7d9889d77b..45493abcc8 100644
--- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java
+++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/utils/SendMqMsgUtils.java
@@ -41,7 +41,6 @@ public class SendMqMsgUtils {
         }
         log.info("sendMsg param:{}", JSON.toJSONString(msg));
         try {
-            //  TODO
             ValidatorUtils.validateEntity(msg, DefaultGroup.class);
         } catch (ValidateException e) {
             return new Result<String>().error(e.getMsg());
@@ -53,9 +52,8 @@ public class SendMqMsgUtils {
             int retryTime = 0;
             Result<String> result = null;
             do {
-                retryTime++;
                 result = HttpClientManager.getInstance().sendPostByHttps(msg.getRequestUrl(), JSON.toJSONString(msg));
-                log.info("sendMsg retryTime:{},result:{}", retryTime, JSON.toJSONString(result));
+                log.info("sendMsg retryTime:{},result:{}", retryTime++, JSON.toJSONString(result));
             } while ((!result.success()) && retryTime < 2);
 
             if (result.success()) {