diff --git a/epmet-module/resi-group/resi-group-server/pom.xml b/epmet-module/resi-group/resi-group-server/pom.xml
index cd2971d2e1..421b05c346 100644
--- a/epmet-module/resi-group/resi-group-server/pom.xml
+++ b/epmet-module/resi-group/resi-group-server/pom.xml
@@ -159,6 +159,13 @@
false
+
+
+ https://epmet-dev.elinkservice.cn/estos/
+ producerService/producer/sendMsg
+ 202007161443499985fa2d397436d10356542134c8f008c48
+ 52d9d9b0e7d0eb5b8b81c205b579e07c
+
https://epmet-dev.elinkservice.cn/api/epmetscan/api
5
@@ -204,6 +211,13 @@
false
+
+
+ https://epmet-dev.elinkservice.cn/estos/
+ producerService/producer/sendMsg
+ 202007161443499985fa2d397436d10356542134c8f008c48
+ 52d9d9b0e7d0eb5b8b81c205b579e07c
+
https://epmet-dev.elinkservice.cn/api/epmetscan/api
5
@@ -248,6 +262,13 @@
false
true
+
+
+ https://epmet-dev.elinkservice.cn/estos/
+ producerService/producer/sendMsg
+ 20200804181646184507453a2e9aab76edc550405f80920af
+ 96d788191a10ff57a125157183413004
+
https://epmet-dev.elinkservice.cn/api/epmetscan/api
5
@@ -289,6 +310,13 @@
false
true
+
+
+ https://estos.elinkservice.cn:7519/estos/
+ producerService/producer/sendMsg
+ 202008141820598348026098a1b5dd0bc63a1e2418e275d1b
+ 7ce17f65826539ff3e8616dccd4b70fc
+
https://epmet-open.elinkservice.cn/api/epmetscan/api
5
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
index 7af4963df3..e1943d8920 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java
@@ -195,8 +195,9 @@ public class ResiGroupMemberController {
* @date 2020.12.22 10:36
*/
@PostMapping("applyenterbylink")
- public Result applyEnterByLink(@RequestBody JoinGroupByShareLinkFormDTO param){
- ValidatorUtils.validateEntity(param);
+ public Result applyEnterByLink(@LoginUser TokenDto token,@RequestBody JoinGroupByShareLinkFormDTO param){
+ param.setUserId(token.getUserId());
+ ValidatorUtils.validateEntity(param);
return new Result().ok(operationService.applyEnterByLink(param));
}
}
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 283b6cbf82..d47c94c552 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
@@ -70,6 +70,7 @@ import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
@@ -207,6 +208,7 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl visitRecordResult = issueOpenFeignClient.visitRecord(param.getShareLinkId(), param.getUserId());
if(!visitRecordResult.success() || null == visitRecordResult.getData()){
- log.error("【%s】该用户入组方式为议题分享链接入组，但未查询到链接访问记录，链接Id【%s】",param.getUserId(),param.getShareLinkId());
+ log.error("【{}】该用户入组方式为议题分享链接入组，但未查询到链接访问记录，链接Id【{}】",param.getUserId(),param.getShareLinkId());
throw new RenException("未找到链接访问记录");
}
if(!visitRecordResult.getData().getIfJoinGroup()){
- log.error("【%s】该用户入组方式为议题分享链接入组，但并不是通过该链接发起的入群申请，链接Id【%s】",param.getUserId(),param.getShareLinkId());
+ log.error("【{}】该用户入组方式为议题分享链接入组，但并不是通过该链接发起的入群申请，链接Id【{}】",param.getUserId(),param.getShareLinkId());
throw new RenException("用户并非通过当前链接申请入组");
}
if(NumConstant.ZERO == visitRecordResult.getData().getIsInviteRegister()) isNew = true;
@@ -321,12 +326,13 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl response = issueClient.visitRecord(groupMemeberOperationDTO.getGroupInvitationId(), groupMemeberOperationDTO.getCustomerUserId());
if(response.success() && null != response){
if(!response.getData().getIfJoinGroup()){
- logger.error("【%s】该用户入组方式为议题分享链接入组，但并不是通过该链接发起的入群申请，链接Id【%s】",groupMemeberOperationDTO.getCustomerUserId(),groupMemeberOperationDTO.getGroupInvitationId());
+ logger.error("【{}】该用户入组方式为议题分享链接入组，但并不是通过该链接发起的入群申请，链接Id【{}】",groupMemeberOperationDTO.getCustomerUserId(),groupMemeberOperationDTO.getGroupInvitationId());
return;
}
if(NumConstant.ZERO == response.getData().getIsInviteRegister()) isNew = true;
inviter = response.getData().getShareUserId();
}else{
- logger.error("【%s】该用户入组方式为议题分享链接入组，但未查询到链接访问记录，链接Id【%s】",groupMemeberOperationDTO.getCustomerUserId(),groupMemeberOperationDTO.getGroupInvitationId());
+ logger.error("【{}】该用户入组方式为议题分享链接入组，但未查询到链接访问记录，链接Id【{}】",groupMemeberOperationDTO.getCustomerUserId(),groupMemeberOperationDTO.getGroupInvitationId());
return;
}
}
@@ -538,7 +538,7 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl