wangli/im-center
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "REQ-3345: 解决查询不到账号的问题"

Browse Source 
This reverts commit 88ab9bcc65.
This commit is contained in:
yanglin 2025-02-18 16:26:04 +08:00
parent 88ab9bcc65
commit 3e30c85a5c
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java
View File

@ -116,8 +116,7 @@ public class GroupManager {
}
public GroupAddMembersResponse addMembers(GroupAddMembersRequest request) {
Group group = groupDao.findByTid(request.getTid(), false).orElse(null);
//noinspection DataFlowIssue
Group group = getGroupForUpdateOrThrow(request.getTid());
BizAssertions.assertFalse(group.isDismissed(), "群已经解散");
groupSupport.log(group.getTid(), "add-members", request);
// sync members 1
@ -129,20 +128,19 @@ public class GroupManager {
.collect(toSet());
if (addPersons.isEmpty())
return new GroupAddMembersResponse();
ImAccounts imAccounts = accountService.getOrCreateImAccounts(addPersons);
BizAssertions.assertTrue(group.addMoreMembers(prePersons.size() + addPersons.size()),
"群聊人数上限{}人, 请删除部分已选人员", group.getMemberLimit());
if (imAccounts.isAccountEmpty()) {
notification.send("添加群成员[{},{}], 有效群成员IM账号列表为空. 请求成员信息: {}",
group.getTid(), group.getName(), JSON.toJSONString(request.getMembers()));
return new GroupAddMembersResponse();
}
NimGroupAddMembersRequest nimRequest = groupSupport
.buildAddMembersRequest(group, group.getOwnerAccount(), imAccounts);
// add members
rateLimiter.requireAddMember();
ImAccounts imAccounts = accountService.getOrCreateImAccounts(addPersons);
return transactionTemplate.execute(unused -> {
getGroupForUpdateOrThrow(group.getTid());
if (imAccounts.isAccountEmpty()) {
notification.send("添加群成员[{},{}], 有效群成员IM账号列表为空. 请求成员信息: {}",
group.getTid(), group.getName(), JSON.toJSONString(request.getMembers()));
return new GroupAddMembersResponse();
}
NimGroupAddMembersRequest nimRequest = groupSupport
.buildAddMembersRequest(group, group.getOwnerAccount(), imAccounts);
// add members
rateLimiter.requireAddMember();
NimGroupAddMembersResponse nimResponse = nimClient.addGroupMembers(nimRequest);
log.info("添加群成员, request={}, response={}", nimRequest, nimResponse);
BizAssertions.assertTrue(nimResponse.isSuccess(), "添加群成员失败: {}", nimResponse.getDesc());