From 15ee1ccf04991618e7e9a086252d2be72d207f7b Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 7 Jul 2020 10:07:15 +0800
Subject: [PATCH] =?UTF-8?q?resigroup+1=20=E5=B0=8F=E7=BB=84=E9=82=80?=
 =?UTF-8?q?=E8=AF=B7=E6=97=A5=E5=BF=97=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resi-group-server/deploy/docker-compose-dev.yml          | 2 +-
 .../resi-group-server/deploy/docker-compose-prod.yml         | 2 +-
 .../resi-group-server/deploy/docker-compose-test.yml         | 2 +-
 epmet-module/resi-group/resi-group-server/pom.xml            | 2 +-
 .../invitation/service/impl/GroupInvitationServiceImpl.java  | 5 +++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
index 3158252c9a..6371e3b3fe 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-dev.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-dev
-    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.59
+    image: 192.168.1.130:10080/epmet-cloud-dev/resi-group-server:0.3.60
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
index 217573f818..bcd8e5754a 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-prod.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-prod
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.59
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-master/resi-group-server:0.3.60
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
index 5c1fad1c28..03b8267679 100644
--- a/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
+++ b/epmet-module/resi-group/resi-group-server/deploy/docker-compose-test.yml
@@ -2,7 +2,7 @@ version: "3.7"
 services:
   resi-group-server:
     container_name: resi-group-server-test
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.59
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud-release/resi-group-server:0.3.60
     ports:
       - "8095:8095"
     network_mode: host # 使用现有网络
diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index 8d4035f014..87b437d55d 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -2,7 +2,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
-    <version>0.3.59</version>
+    <version>0.3.60</version>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>resi-group</artifactId>
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
index 0e1f784bed..120e09d831 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
@@ -199,6 +199,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 **/
 	@Override
 	public LinkGroupInfoResultDTO getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) {
+		logger.info(String.format("用户(userId=%s)点击群邀请链接(invitationId=%)",formDTO.getUserId(),formDTO.getInvitationId()));
 		//0、校验是否存在该邀请连接（判断是会否被删除连接、是否失效、群状态）
 		GroupInvitationDTO groupInvitationDTO=this.checkLinkValid(formDTO.getInvitationId());
 		LinkGroupInfoResultDTO linkGroupInfoResultDTO = new LinkGroupInfoResultDTO();
@@ -253,7 +254,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		if (!result.success()) {
 			logger.error("人员邀请关系记录失败" + result.getMsg());
 		} else {
-			logger.error("人员邀请关系记录成功");
+			logger.info(String.format("人员邀请关系记录成功%s", JSON.toJSONString(userInvitationFormDTO)));
 		}
 		return result;
 	}
@@ -274,7 +275,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		}
 		ResiGroupMemberDTO groupMemberDTO = resiGroupDao.selectGroupLeader(groupId);
 		if (null == groupMemberDTO) {
-			logger.error("查询小组组长信息为空,groupId=%s",groupId);
+			logger.error("查询小组组长信息为空,selectGroupLeader入参groupId=%s",groupId);
 			return new Result<>();
 		}
 		UserResiInfoFormDTO resiUserInfoFormDTO = new UserResiInfoFormDTO();