From 55854b9864646466d10c10038cb4df6b7629155b Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Sun, 25 Apr 2021 20:13:34 +0800
Subject: [PATCH 1/2] =?UTF-8?q?Revert=20"=E6=8A=8A=E4=BA=8B=E5=8A=A1?=
 =?UTF-8?q?=E6=9A=82=E6=97=B6=E5=8E=BB=E6=8E=89"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 232459d0
---
 .../epmet/modules/topic/service/impl/ResiTopicServiceImpl.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
index dea7fb3a22..dcffc24d99 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java
@@ -1604,7 +1604,7 @@ public class ResiTopicServiceImpl extends BaseServiceImpl<ResiTopicDao, ResiTopi
      * @date 2020.11.20 10:26
      */
     @Override
-    //TODO @Transactional
+    @Transactional
     public FirstTopicShiftedToIssueApplicationResultDTO shiftIssueV2(ResiTopicTurnIssueFromDTO topicTurnIssueFromDTO) {
 
 

From 2329526958766d3334c4924e1198b9795db5e799 Mon Sep 17 00:00:00 2001
From: jianjun <liujianjun@git.elinkit.com.cn>
Date: Sun, 25 Apr 2021 20:22:54 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E7=B1=BB=EF=BC=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/epmet/commons/tools/utils/SendMqMsgUtils.java     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 6b1310f5bd..e1b96f7eed 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
@@ -53,8 +53,9 @@ public class SendMqMsgUtils {
             Result<String> result = null;
             log.info("sendMsg url:{},param:{}", msg.getRequestUrl(), JSON.toJSONString(msg));
             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()) {