From 99e417f6cc8823dc781a861631a814da7842c923 Mon Sep 17 00:00:00 2001
From: wangchao <crystal_jupiter@163.com>
Date: Wed, 23 Dec 2020 11:18:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E4=BA=8B=E4=BB=B6=E6=8B=BC=E6=8E=A5?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=EF=BC=8C=E7=94=A8=E4=BA=8E=E7=A7=AF=E5=88=86?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E7=9A=84=E6=98=BE=E7=A4=BA=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/epmet/feign/GovIssueOpenFeignClient.java    | 4 ++--
 .../member/service/impl/GroupMemeberOperationServiceImpl.java | 2 ++
 .../member/service/impl/ResiGroupMemberServiceImpl.java       | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
index 8f04ff87b0..c6ca216343 100644
--- a/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
+++ b/epmet-module/gov-issue/gov-issue-client/src/main/java/com/epmet/feign/GovIssueOpenFeignClient.java
@@ -32,8 +32,8 @@ import java.util.Map;
  * @author yinzuomei@elink-cn.com
  * @date 2020/6/4 13:37
  */
-@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class)
-//@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class,url = "localhost:8101")
+//@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.GOV_ISSUE_SERVER, fallback = GovIssueOpenFeignClientFallBack.class,url = "localhost:8101")
 public interface GovIssueOpenFeignClient {
 
     /**
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
index 26e241c71e..e6d76290f0 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/GroupMemeberOperationServiceImpl.java
@@ -328,6 +328,8 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl<GroupMemeb
             pointEventMsg.setIsCommon(false);
             pointEventMsg.setTargetDate(current);
             pointEventMsg.setEventTag(mqBaseMsgDTO.getEventTag());
+            pointEventMsg.setRemark("通过".concat(StringUtils.equals(param.getShareLinkType(),"topic")
+					? "话题":"议题").concat("分享链接邀请").concat(isNew ? "新" : "").concat("用户进组"));
             pointEventMsgList.add(pointEventMsg);
 
             mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
index aff924f544..0597db2951 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
@@ -535,6 +535,8 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 			pointEventMsg.setIsCommon(false);
 			pointEventMsg.setTargetDate(groupMemeberOperationDTO.getCreatedTime());
 			pointEventMsg.setEventTag(mqBaseMsgDTO.getEventTag());
+			pointEventMsg.setRemark("通过".concat(StringUtils.equals(groupMemeberOperationDTO.getEnterGroupType(),ModuleConstant.ENTER_GROUP_TYPE_TOPIC_LINK)
+			? "话题":"议题").concat("分享链接邀请").concat(isNew ? "新" : "").concat("用户进组"));
 			pointEventMsgList.add(pointEventMsg);
 
 			mqBaseMsgDTO.setMsg(JSON.toJSONString(pointEventMsgList));