diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomFriendCache.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomFriendCache.java index 5e48a82..16b9ebb 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomFriendCache.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/cache/RoomFriendCache.java @@ -24,7 +24,7 @@ public class RoomFriendCache extends AbstractRedisStringCache @Override protected String getKey(Long groupId) { - return RedisKey.getKey(RedisKey.GROUP_INFO_STRING, groupId); + return RedisKey.getKey(RedisKey.GROUP_FRIEND_STRING, groupId); } @Override diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomAppServiceImpl.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomAppServiceImpl.java index 6249bf9..a6dbd02 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomAppServiceImpl.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/chat/service/impl/RoomAppServiceImpl.java @@ -11,7 +11,8 @@ import com.abin.mallchat.common.chat.domain.enums.GroupRoleAPPEnum; import com.abin.mallchat.common.chat.domain.enums.GroupRoleEnum; import com.abin.mallchat.common.chat.domain.enums.HotFlagEnum; import com.abin.mallchat.common.chat.domain.enums.RoomTypeEnum; -import com.abin.mallchat.common.chat.domain.vo.request.*; +import com.abin.mallchat.common.chat.domain.vo.request.ChatMessageMemberReq; +import com.abin.mallchat.common.chat.domain.vo.request.GroupAddReq; import com.abin.mallchat.common.chat.domain.vo.request.member.MemberAddReq; import com.abin.mallchat.common.chat.domain.vo.request.member.MemberDelReq; import com.abin.mallchat.common.chat.domain.vo.request.member.MemberReq; @@ -121,6 +122,9 @@ public class RoomAppServiceImpl implements RoomAppService { List roomIds = roomCursorPage.getList().stream().map(Pair::getKey).collect(Collectors.toList()); page = CursorPageBaseResp.init(roomCursorPage, roomIds); } + if (CollectionUtil.isEmpty(page.getList())) { + return CursorPageBaseResp.empty(); + } // 最后组装会话信息(名称,头像,未读数等) List result = buildContactResp(uid, page.getList()); return CursorPageBaseResp.init(page, result); diff --git a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/constant/RedisKey.java b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/constant/RedisKey.java index ce3bf8b..1815d17 100644 --- a/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/constant/RedisKey.java +++ b/mallchat-chat-server/src/main/java/com/abin/mallchat/common/common/constant/RedisKey.java @@ -36,6 +36,11 @@ public class RedisKey { */ public static final String GROUP_INFO_STRING = "groupInfo:roomId_%d"; + /** + * 群组详情 + */ + public static final String GROUP_FRIEND_STRING = "groupFriend:roomId_%d"; + /** * 用户token存放 */