diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/GroupCreateRequest.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/GroupCreateRequest.java index 28f9635..bda3e7b 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/GroupCreateRequest.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/GroupCreateRequest.java @@ -72,7 +72,7 @@ public class GroupCreateRequest { } @JsonIgnore @JSONField(serialize = false, deserialize = false) - public Set getOwnerAndMembers() { + public Set getPeople() { Set ownerAndMembers = new HashSet<>(members); ownerAndMembers.add(owner); return ownerAndMembers; diff --git a/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java b/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java index 2cf015c..845916f 100644 --- a/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java +++ b/im-center-server/src/main/java/cn/axzo/im/group/GroupManager.java @@ -63,14 +63,14 @@ public class GroupManager { @Transactional public GroupCreateResponse createGroup(GroupCreateRequest request) { - BizAssertions.assertTrue(request.getOwnerAndMembers().size() > 1, "群成员数量(含群主)不能少于2"); + BizAssertions.assertTrue(request.getPeople().size() > 1, "群成员数量(含群主)不能少于2"); groupSupport.log(0L, "create-group:preparing", request); - ImAccounts imAccounts = accountService.getOrCreateImAccounts(request.getOwnerAndMembers()); + ImAccounts imAccounts = accountService.getOrCreateImAccounts(request.getPeople()); String owner = imAccounts.findAccount(request.getOwner()).orElse(null); BizAssertions.assertNotNull(owner, "群主没有IM账号, 无法创建群. {}", request.getOwner()); Group group = groupSupport.buildNewGroup(request, imAccounts); BizAssertions.assertTrue(group.addMoreMembers( - request.getOwnerAndMembers().size()), "无法创建群, 群成员数量超过上限" + group.getMemberLimit()); + request.getPeople().size()), "无法创建群, 群成员数量超过上限" + group.getMemberLimit()); try { groupDao.save(group); } catch (DuplicateKeyException e) { diff --git a/im-center-server/src/main/java/cn/axzo/im/group/GroupSupport.java b/im-center-server/src/main/java/cn/axzo/im/group/GroupSupport.java index 7940ed5..7570f67 100644 --- a/im-center-server/src/main/java/cn/axzo/im/group/GroupSupport.java +++ b/im-center-server/src/main/java/cn/axzo/im/group/GroupSupport.java @@ -38,7 +38,7 @@ public class GroupSupport { group.setType(request.getGroupType()); group.setBizGroupInfo(request.bizGroupInfoOrEmpty()); group.setAvatar(request.getAvatar()); - group.setMemberCount((long) request.getOwnerAndMembers().size()); + group.setMemberCount((long) request.getPeople().size()); Long memberLimit = request.getMemberLimit(); if (memberLimit == null) memberLimit = (long) groupProps.getDefaultMemberLimit();