diff --git a/db/im-platfrom.sql b/db/im-platfrom.sql index a146c98..f30c96f 100644 --- a/db/im-platfrom.sql +++ b/db/im-platfrom.sql @@ -57,9 +57,10 @@ create table `im_group_member`( `id` bigint not null auto_increment primary key comment 'id', `group_id` bigint not null comment '群id', `user_id` bigint not null comment '用户id', - `alias_name` varchar(255) DEFAULT '' comment '组内显示名称', + `user_nick_name` varchar(255) DEFAULT '' comment '用户昵称', + `remark_nick_name` varchar(255) DEFAULT '' comment '显示昵称备注', `head_image` varchar(255) DEFAULT '' comment '用户头像', - `remark` varchar(255) DEFAULT '' comment '备注', + `remark_group_name` varchar(255) DEFAULT '' comment '显示群名备注', `quit` tinyint(1) DEFAULT 0 comment '是否已退出', `quit_time` datetime DEFAULT NULL comment '退出时间', `created_time` datetime DEFAULT CURRENT_TIMESTAMP comment '创建时间', diff --git a/im-platform/src/main/java/com/bx/implatform/entity/GroupMember.java b/im-platform/src/main/java/com/bx/implatform/entity/GroupMember.java index ef6d7a3..38a8e07 100644 --- a/im-platform/src/main/java/com/bx/implatform/entity/GroupMember.java +++ b/im-platform/src/main/java/com/bx/implatform/entity/GroupMember.java @@ -1,5 +1,6 @@ package com.bx.implatform.entity; +import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -38,9 +39,14 @@ public class GroupMember extends Model { private Long userId; /** - * 组内显示名称 + * 用户昵称 */ - private String aliasName; + private String userNickName; + + /** + * 显示昵称备注 + */ + private String remarkNickName; /** * 用户头像 @@ -48,9 +54,9 @@ public class GroupMember extends Model { private String headImage; /** - * 备注 + * 显示群名备注 */ - private String remark; + private String remarkGroupName; /** * 是否已退出 @@ -67,5 +73,8 @@ public class GroupMember extends Model { */ private Date quitTime; + public String getShowNickName() { + return StrUtil.isEmpty(remarkNickName) ? userNickName : remarkNickName; + } } diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java index b29ec6b..5338a26 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupMessageServiceImpl.java @@ -71,7 +71,7 @@ public class GroupMessageServiceImpl extends ServiceImpl !session.getUserId().equals(uid)).collect(Collectors.toList()); GroupMessageVO msgInfo = BeanUtils.copyProperties(msg, GroupMessageVO.class); msgInfo.setType(MessageType.RECALL.code()); - String content = String.format("'%s'撤回了一条消息", member.getAliasName()); + String content = String.format("'%s'撤回了一条消息", member.getShowNickName()); msgInfo.setContent(content); msgInfo.setSendTime(new Date()); diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java index 46d50e2..955ab54 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java @@ -30,7 +30,6 @@ import com.bx.implatform.vo.GroupMessageVO; import com.bx.implatform.vo.GroupVO; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.apache.commons.lang3.StringUtils; import org.springframework.cache.annotation.CacheConfig; import org.springframework.cache.annotation.CacheEvict; import org.springframework.cache.annotation.Cacheable; @@ -62,17 +61,17 @@ public class GroupServiceImpl extends ServiceImpl implements group.setOwnerId(user.getId()); this.save(group); // 把群主加入群 - GroupMember groupMember = new GroupMember(); - groupMember.setGroupId(group.getId()); - groupMember.setUserId(user.getId()); - groupMember.setHeadImage(user.getHeadImageThumb()); - groupMember.setAliasName(StringUtils.isEmpty(vo.getAliasName()) ? session.getNickName() : vo.getAliasName()); - groupMember.setRemark(StringUtils.isEmpty(vo.getRemark()) ? group.getName() : vo.getRemark()); - groupMemberService.save(groupMember); - + GroupMember member = new GroupMember(); + member.setGroupId(group.getId()); + member.setUserId(user.getId()); + member.setHeadImage(user.getHeadImageThumb()); + member.setRemarkNickName(vo.getRemarkNickName()); + member.setRemarkGroupName(vo.getRemarkGroupName()); + groupMemberService.save(member); + // 返回 vo.setId(group.getId()); - vo.setAliasName(groupMember.getAliasName()); - vo.setRemark(groupMember.getRemark()); + vo.setShowNickName(StrUtil.isEmpty(vo.getRemarkNickName()) ? member.getUserNickName() : vo.getRemarkNickName()); + vo.setShowGroupName(StrUtil.isEmpty(vo.getRemarkGroupName()) ? group.getName() : vo.getRemarkGroupName()); log.info("创建群聊，群聊id:{},群聊名称:{}", group.getId(), group.getName()); return vo; } @@ -84,19 +83,21 @@ public class GroupServiceImpl extends ServiceImpl implements UserSession session = SessionContext.getSession(); // 校验是不是群主，只有群主能改信息 Group group = this.getAndCheckById(vo.getId()); - // 群主有权修改群基本信息 - if (group.getOwnerId().equals(session.getUserId())) { - group = BeanUtils.copyProperties(vo, Group.class); - this.updateById(group); - } // 更新成员信息 GroupMember member = groupMemberService.findByGroupAndUserId(vo.getId(), session.getUserId()); if (Objects.isNull(member) || member.getQuit()) { - throw new GlobalException( "您不是群聊的成员"); + throw new GlobalException("您不是群聊的成员"); } - member.setAliasName(StringUtils.isEmpty(vo.getAliasName()) ? session.getNickName() : vo.getAliasName()); - member.setRemark(StringUtils.isEmpty(vo.getRemark()) ? Objects.requireNonNull(group).getName() : vo.getRemark()); + member.setRemarkNickName(vo.getRemarkNickName()); + member.setRemarkGroupName(vo.getRemarkGroupName()); groupMemberService.updateById(member); + // 群主有权修改群基本信息 + if (group.getOwnerId().equals(session.getUserId())) { + group = BeanUtils.copyProperties(vo, Group.class); + this.updateById(group); + } + vo.setShowNickName(StrUtil.isEmpty(vo.getRemarkNickName()) ? member.getUserNickName() : vo.getRemarkNickName()); + vo.setShowGroupName(StrUtil.isEmpty(vo.getRemarkGroupName()) ? group.getName() : vo.getRemarkGroupName()); log.info("修改群聊，群聊id:{},群聊名称:{}", group.getId(), group.getName()); return vo; } @@ -121,7 +122,7 @@ public class GroupServiceImpl extends ServiceImpl implements String key = StrUtil.join(":", RedisKey.IM_GROUP_READED_POSITION, groupId); redisTemplate.delete(key); // 推送解散群聊提示 - this.sendTipMessage(groupId,userIds,String.format("'%s'解散了群聊",session.getNickName())); + this.sendTipMessage(groupId, userIds, String.format("'%s'解散了群聊", session.getNickName())); log.info("删除群聊，群聊id:{},群聊名称:{}", group.getId(), group.getName()); } @@ -130,15 +131,15 @@ public class GroupServiceImpl extends ServiceImpl implements Long userId = SessionContext.getSession().getUserId(); Group group = this.getById(groupId); if (group.getOwnerId().equals(userId)) { - throw new GlobalException( "您是群主，不可退出群聊"); + throw new GlobalException("您是群主，不可退出群聊"); } // 删除群聊成员 groupMemberService.removeByGroupAndUserId(groupId, userId); // 清理已读缓存 String key = StrUtil.join(":", RedisKey.IM_GROUP_READED_POSITION, groupId); - redisTemplate.opsForHash().delete(key,userId.toString()); + redisTemplate.opsForHash().delete(key, userId.toString()); // 推送退出群聊提示 - this.sendTipMessage(groupId,Arrays.asList(userId),"您已退出群聊"); + this.sendTipMessage(groupId, Arrays.asList(userId), "您已退出群聊"); log.info("退出群聊，群聊id:{},群聊名称:{},用户id:{}", group.getId(), group.getName(), userId); } @@ -147,18 +148,18 @@ public class GroupServiceImpl extends ServiceImpl implements UserSession session = SessionContext.getSession(); Group group = this.getAndCheckById(groupId); if (!group.getOwnerId().equals(session.getUserId())) { - throw new GlobalException( "您不是群主，没有权限踢人"); + throw new GlobalException("您不是群主，没有权限踢人"); } if (userId.equals(session.getUserId())) { - throw new GlobalException( "亲，不能移除自己哟"); + throw new GlobalException("亲，不能移除自己哟"); } // 删除群聊成员 groupMemberService.removeByGroupAndUserId(groupId, userId); // 清理已读缓存 String key = StrUtil.join(":", RedisKey.IM_GROUP_READED_POSITION, groupId); - redisTemplate.opsForHash().delete(key,userId.toString()); + redisTemplate.opsForHash().delete(key, userId.toString()); // 推送踢出群聊提示 - this.sendTipMessage(groupId,Arrays.asList(userId),"您已被移出群聊"); + this.sendTipMessage(groupId, Arrays.asList(userId), "您已被移出群聊"); log.info("踢出群聊，群聊id:{},群聊名称:{},用户id:{}", group.getId(), group.getName(), userId); } @@ -167,15 +168,17 @@ public class GroupServiceImpl extends ServiceImpl implements UserSession session = SessionContext.getSession(); Group group = super.getById(groupId); if (Objects.isNull(group)) { - throw new GlobalException( "群组不存在"); + throw new GlobalException("群组不存在"); } GroupMember member = groupMemberService.findByGroupAndUserId(groupId, session.getUserId()); if (Objects.isNull(member)) { - throw new GlobalException( "您未加入群聊"); + throw new GlobalException("您未加入群聊"); } GroupVO vo = BeanUtils.copyProperties(group, GroupVO.class); - vo.setAliasName(member.getAliasName()); - vo.setRemark(member.getRemark()); + vo.setRemarkGroupName(member.getRemarkGroupName()); + vo.setRemarkNickName(member.getRemarkNickName()); + vo.setShowNickName(member.getShowNickName()); + vo.setShowGroupName(StrUtil.isEmpty(vo.getRemarkGroupName()) ? group.getName() : vo.getRemarkGroupName()); vo.setQuit(member.getQuit()); return vo; } @@ -185,13 +188,13 @@ public class GroupServiceImpl extends ServiceImpl implements public Group getAndCheckById(Long groupId) { Group group = super.getById(groupId); if (Objects.isNull(group)) { - throw new GlobalException( "群组不存在"); + throw new GlobalException("群组不存在"); } if (group.getDeleted()) { - throw new GlobalException( "群组'" + group.getName() + "'已解散"); + throw new GlobalException("群组'" + group.getName() + "'已解散"); } if (group.getIsBanned()) { - throw new GlobalException( "群组'" + group.getName() + "'已被封禁,原因:"+group.getReason()); + throw new GlobalException("群组'" + group.getName() + "'已被封禁,原因:" + group.getReason()); } return group; } @@ -215,8 +218,9 @@ public class GroupServiceImpl extends ServiceImpl implements return groups.stream().map(g -> { GroupVO vo = BeanUtils.copyProperties(g, GroupVO.class); GroupMember member = groupMembers.stream().filter(m -> g.getId().equals(m.getGroupId())).findFirst().get(); - vo.setAliasName(member.getAliasName()); - vo.setRemark(member.getRemark()); + vo.setShowNickName( + StrUtil.isEmpty(vo.getRemarkNickName()) ? session.getNickName() : vo.getRemarkNickName()); + vo.setShowGroupName(StrUtil.isEmpty(vo.getRemarkGroupName()) ? g.getName() : vo.getRemarkGroupName()); vo.setQuit(member.getQuit()); return vo; }).collect(Collectors.toList()); @@ -238,19 +242,20 @@ public class GroupServiceImpl extends ServiceImpl implements } // 找出好友信息 List friends = friendsService.findFriendByUserId(session.getUserId()); - List friendsList = vo.getFriendIds().stream().map(id -> friends.stream().filter(f -> f.getFriendId().equals(id)).findFirst().get()) - .collect(Collectors.toList()); + List friendsList = vo.getFriendIds().stream() + .map(id -> friends.stream().filter(f -> f.getFriendId().equals(id)).findFirst().get()) + .collect(Collectors.toList()); if (friendsList.size() != vo.getFriendIds().size()) { - throw new GlobalException( "部分用户不是您的好友，邀请失败"); + throw new GlobalException("部分用户不是您的好友，邀请失败"); } // 批量保存成员数据 List groupMembers = friendsList.stream().map(f -> { - Optional optional = members.stream().filter(m -> m.getUserId().equals(f.getFriendId())).findFirst(); + Optional optional = + members.stream().filter(m -> m.getUserId().equals(f.getFriendId())).findFirst(); GroupMember groupMember = optional.orElseGet(GroupMember::new); groupMember.setGroupId(vo.getGroupId()); groupMember.setUserId(f.getFriendId()); - groupMember.setAliasName(f.getFriendNickName()); - groupMember.setRemark(group.getName()); + groupMember.setUserNickName(f.getFriendNickName()); groupMember.setHeadImage(f.getFriendHeadImage()); groupMember.setCreatedTime(new Date()); groupMember.setQuit(false); @@ -261,25 +266,29 @@ public class GroupServiceImpl extends ServiceImpl implements } // 推送进入群聊消息 List userIds = groupMemberService.findUserIdsByGroupId(vo.getGroupId()); - String memberNames = groupMembers.stream().map(GroupMember::getAliasName).collect(Collectors.joining(",")); - String content = String.format("'%s'邀请'%s'加入了群聊",session.getNickName(), memberNames); - this.sendTipMessage(vo.getGroupId(),userIds,content); - log.info("邀请进入群聊，群聊id:{},群聊名称:{},被邀请用户id:{}", group.getId(), group.getName(), vo.getFriendIds()); + String memberNames = groupMembers.stream().map(GroupMember::getShowNickName).collect(Collectors.joining(",")); + String content = String.format("'%s'邀请'%s'加入了群聊", session.getNickName(), memberNames); + this.sendTipMessage(vo.getGroupId(), userIds, content); + log.info("邀请进入群聊，群聊id:{},群聊名称:{},被邀请用户id:{}", group.getId(), group.getName(), + vo.getFriendIds()); } @Override public List findGroupMembers(Long groupId) { + Group group = getAndCheckById(groupId); List members = groupMemberService.findByGroupId(groupId); List userIds = members.stream().map(GroupMember::getUserId).collect(Collectors.toList()); List onlineUserIds = imClient.getOnlineUser(userIds); return members.stream().map(m -> { GroupMemberVO vo = BeanUtils.copyProperties(m, GroupMemberVO.class); + vo.setShowNickName(m.getShowNickName()); + vo.setShowGroupName(StrUtil.isEmpty(m.getRemarkGroupName()) ? group.getName() : m.getRemarkGroupName()); vo.setOnline(onlineUserIds.contains(m.getUserId())); return vo; }).sorted((m1, m2) -> m2.getOnline().compareTo(m1.getOnline())).collect(Collectors.toList()); } - private void sendTipMessage(Long groupId,List recvIds,String content){ + private void sendTipMessage(Long groupId, List recvIds, String content) { UserSession session = SessionContext.getSession(); // 消息入库 GroupMessage message = new GroupMessage(); @@ -293,14 +302,14 @@ public class GroupServiceImpl extends ServiceImpl implements message.setRecvIds(CommaTextUtils.asText(recvIds)); groupMessageMapper.insert(message); // 推送 - GroupMessageVO msgInfo = BeanUtils.copyProperties(message,GroupMessageVO.class); + GroupMessageVO msgInfo = BeanUtils.copyProperties(message, GroupMessageVO.class); IMGroupMessage sendMessage = new IMGroupMessage<>(); sendMessage.setSender(new IMUserInfo(session.getUserId(), session.getTerminal())); - if(CollUtil.isEmpty(recvIds)){ + if (CollUtil.isEmpty(recvIds)) { // 为空表示向全体发送 List userIds = groupMemberService.findUserIdsByGroupId(groupId); sendMessage.setRecvIds(userIds); - }else{ + } else { sendMessage.setRecvIds(recvIds); } sendMessage.setData(msgInfo); diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java index 91f553f..3b4dd3c 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/UserServiceImpl.java @@ -2,7 +2,7 @@ package com.bx.implatform.service.impl; import com.alibaba.fastjson.JSON; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.bx.imclient.IMClient; @@ -147,24 +147,20 @@ public class UserServiceImpl extends ServiceImpl implements Us if (Objects.isNull(user)) { throw new GlobalException("用户不存在"); } - // 更新好友昵称和头像 + if (!user.getNickName().equals(vo.getNickName()) || !user.getHeadImageThumb().equals(vo.getHeadImageThumb())) { - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.lambda().eq(Friend::getFriendId, session.getUserId()); - List friends = friendService.list(queryWrapper); - for (Friend friend : friends) { - friend.setFriendNickName(vo.getNickName()); - friend.setFriendHeadImage(vo.getHeadImageThumb()); - } - friendService.updateBatchById(friends); - } - // 更新群聊中的头像 - if (!user.getHeadImageThumb().equals(vo.getHeadImageThumb())) { - List members = groupMemberService.findByUserId(session.getUserId()); - for (GroupMember member : members) { - member.setHeadImage(vo.getHeadImageThumb()); - } - groupMemberService.updateBatchById(members); + // 更新好友昵称和头像 + LambdaUpdateWrapper wrapper1 = Wrappers.lambdaUpdate(); + wrapper1.eq(Friend::getFriendId, session.getUserId()); + wrapper1.set(Friend::getFriendNickName,vo.getNickName()); + wrapper1.set(Friend::getFriendHeadImage,vo.getHeadImageThumb()); + friendService.update(wrapper1); + // 更新群聊中的昵称和头像 + LambdaUpdateWrapper wrapper2 = Wrappers.lambdaUpdate(); + wrapper2.eq(GroupMember::getUserId, session.getUserId()); + wrapper2.set(GroupMember::getHeadImage,vo.getHeadImageThumb()); + wrapper2.set(GroupMember::getUserNickName,vo.getNickName()); + groupMemberService.update(wrapper2); } // 更新用户信息 user.setNickName(vo.getNickName()); diff --git a/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcGroupServiceImpl.java b/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcGroupServiceImpl.java index b27190f..551e162 100644 --- a/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcGroupServiceImpl.java +++ b/im-platform/src/main/java/com/bx/implatform/service/impl/WebrtcGroupServiceImpl.java @@ -40,7 +40,7 @@ import java.util.stream.Collectors; /** * 群语音通话服务类,所有涉及修改webtcSession的方法都要挂分布式锁 * - * @author: blue + * @author: blue * @date: 2024-06-01 * @version: 1.0 */ @@ -197,7 +197,7 @@ public class WebrtcGroupServiceImpl implements WebrtcGroupService { vo.setReason(dto.getReason()); List recvIds = getRecvIds(userInfos); sendRtcMessage1(MessageType.RTC_GROUP_FAILED, dto.getGroupId(), recvIds, JSON.toJSONString(vo), false); - log.info("群通话失败,userId:{},groupId:{},原因:{}", userSession.getUserId(),dto.getGroupId(), dto.getReason()); + log.info("群通话失败,userId:{},groupId:{},原因:{}", userSession.getUserId(), dto.getGroupId(), dto.getReason()); } @OnlineCheck @@ -219,7 +219,7 @@ public class WebrtcGroupServiceImpl implements WebrtcGroupService { } WebrtcUserInfo userInfo = new WebrtcUserInfo(); userInfo.setId(userSession.getUserId()); - userInfo.setNickName(member.getAliasName()); + userInfo.setNickName(member.getShowNickName()); userInfo.setHeadImage(member.getHeadImage()); // 默认是开启麦克风，关闭摄像头 userInfo.setIsCamera(false); @@ -455,7 +455,7 @@ public class WebrtcGroupServiceImpl implements WebrtcGroupService { GroupMember member = groupMemberService.findByGroupAndUserId(groupId, hostId); host = new WebrtcUserInfo(); host.setId(hostId); - host.setNickName(member.getAliasName()); + host.setNickName(member.getShowNickName()); host.setHeadImage(member.getHeadImage()); } vo.setHost(host); diff --git a/im-platform/src/main/java/com/bx/implatform/vo/GroupMemberVO.java b/im-platform/src/main/java/com/bx/implatform/vo/GroupMemberVO.java index e5f4192..fd2a876 100644 --- a/im-platform/src/main/java/com/bx/implatform/vo/GroupMemberVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/GroupMemberVO.java @@ -11,7 +11,10 @@ public class GroupMemberVO { private Long userId; @Schema(description = "群内显示名称") - private String aliasName; + private String showNickName; + + @Schema(description = "群内昵称备注") + private String remarkNickName; @Schema(description = "头像") private String headImage; @@ -22,7 +25,10 @@ public class GroupMemberVO { @Schema(description = "是否在线") private Boolean online; - @Schema(description = "备注") - private String remark; + @Schema(description = "群名显示名称") + private String showGroupName; + + @Schema(description = "群名备注") + private String remarkGroupName; } diff --git a/im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java b/im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java index 4743b1a..002c4c4 100644 --- a/im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java +++ b/im-platform/src/main/java/com/bx/implatform/vo/GroupVO.java @@ -30,13 +30,19 @@ public class GroupVO { @Schema(description = "群公告") private String notice; - @Length(max = 20, message = "群聊显示长度不能大于20") + @Length(max = 20, message = "显示昵称长度不能大于20") @Schema(description = "用户在群显示昵称") - private String aliasName; + private String remarkNickName; - @Length(max = 20, message = "群聊显示长度不能大于20") - @Schema(description = "群聊显示备注") - private String remark; + @Schema(description = "群内显示名称") + private String showNickName; + + @Schema(description = "群名显示名称") + private String showGroupName; + + @Length(max = 20, message = "群备注长度不能大于20") + @Schema(description = "群名备注") + private String remarkGroupName; @Schema(description = "是否已删除") private Boolean deleted; diff --git a/im-ui/src/components/chat/ChatAtBox.vue b/im-ui/src/components/chat/ChatAtBox.vue index 3b07c30..7c371c9 100644 --- a/im-ui/src/components/chat/ChatAtBox.vue +++ b/im-ui/src/components/chat/ChatAtBox.vue @@ -46,11 +46,11 @@ if (this.ownerId == userId && name.startsWith(this.searchText)) { this.showMembers.push({ userId: -1, - aliasName: name + showNickName: name }) } this.members.forEach((m) => { - if (m.userId != userId && !m.quit && m.aliasName.startsWith(this.searchText)) { + if (m.userId != userId && !m.quit && m.showNickName.startsWith(this.searchText)) { this.showMembers.push(m); } }) diff --git a/im-ui/src/components/chat/ChatBox.vue b/im-ui/src/components/chat/ChatBox.vue index 1910f50..97b3678 100644 --- a/im-ui/src/components/chat/ChatBox.vue +++ b/im-ui/src/components/chat/ChatBox.vue @@ -238,7 +238,7 @@ element.className = "at" element.dataset.id = member.userId; element.contentEditable = 'false' - element.innerText = `@${member.aliasName}` + element.innerText = `@${member.showNickName}` range.insertNode(element) // 光标移动到末尾 range.collapse() @@ -495,7 +495,7 @@ members.forEach(m => { userInfos.push({ id: m.userId, - nickName: m.aliasName, + nickName: m.showNickName, headImage: m.headImage, isCamera: false, isMicroPhone: true @@ -701,7 +701,7 @@ showName(msgInfo) { if (this.chat.type == 'GROUP') { let member = this.groupMembers.find((m) => m.userId == msgInfo.sendId); - return member ? member.aliasName : ""; + return member ? member.showNickName : ""; } else { return msgInfo.sendId == this.mine.id ? this.mine.nickName : this.chat.showName } diff --git a/im-ui/src/components/chat/ChatGroupMember.vue b/im-ui/src/components/chat/ChatGroupMember.vue index 589d346..f1ae8d7 100644 --- a/im-ui/src/components/chat/ChatGroupMember.vue +++ b/im-ui/src/components/chat/ChatGroupMember.vue @@ -1,10 +1,10 @@ diff --git a/im-ui/src/components/chat/ChatGroupSide.vue b/im-ui/src/components/chat/ChatGroupSide.vue index 44e1635..a245b7b 100644 --- a/im-ui/src/components/chat/ChatGroupSide.vue +++ b/im-ui/src/components/chat/ChatGroupSide.vue @@ -16,7 +16,7 @@ @close="showAddGroupMember=false">
-
@@ -32,12 +32,12 @@ - + - + -
提交 编辑 @@ -119,7 +119,7 @@ computed: { ownerName() { let member = this.groupMembers.find((m) => m.userId == this.group.ownerId); - return member && member.aliasName; + return member && member.showNickName; }, isOwner() { return this.group.ownerId == this.$store.state.userStore.userInfo.id; diff --git a/im-ui/src/components/chat/ChatHistory.vue b/im-ui/src/components/chat/ChatHistory.vue index 3dde34c..4d89e8c 100644 --- a/im-ui/src/components/chat/ChatHistory.vue +++ b/im-ui/src/components/chat/ChatHistory.vue @@ -98,7 +98,7 @@ showName(msgInfo) { if (this.chat.type == 'GROUP') { let member = this.groupMembers.find((m) => m.userId == msgInfo.sendId); - return member ? member.aliasName : ""; + return member ? member.showNickName : ""; } else { return msgInfo.sendId == this.mine.id ? this.mine.nickName : this.chat.showName } diff --git a/im-ui/src/components/group/AddGroupMember.vue b/im-ui/src/components/group/AddGroupMember.vue index d41f815..672d187 100644 --- a/im-ui/src/components/group/AddGroupMember.vue +++ b/im-ui/src/components/group/AddGroupMember.vue @@ -8,7 +8,7 @@
-
- +
-
{{group.remark}}
+
{{group.showGroupName}}
diff --git a/im-ui/src/components/group/GroupMember.vue b/im-ui/src/components/group/GroupMember.vue index 2a5f848..21dfac8 100644 --- a/im-ui/src/components/group/GroupMember.vue +++ b/im-ui/src/components/group/GroupMember.vue @@ -1,11 +1,11 @@ diff --git a/im-ui/src/components/group/GroupMemberItem.vue b/im-ui/src/components/group/GroupMemberItem.vue index 1af7943..20e13bd 100644 --- a/im-ui/src/components/group/GroupMemberItem.vue +++ b/im-ui/src/components/group/GroupMemberItem.vue @@ -1,11 +1,11 @@ - + @@ -82,7 +82,7 @@ let chat = { type: 'GROUP', targetId: this.group.id, - showName: this.group.remark, + showName: this.group.showGroupName, headImage: this.group.headImage, }; this.$store.commit("openChat", chat); @@ -177,7 +177,7 @@ computed: { ownerName() { let member = this.groupMembers.find((m) => m.userId == this.group.ownerId); - return member && member.aliasName; + return member && member.showNickName; }, isOwner() { return this.group.ownerId == this.$store.state.userStore.userInfo.id; diff --git a/im-uniapp/pages/group/group-invite.vue b/im-uniapp/pages/group/group-invite.vue index f1a6980..700e572 100644 --- a/im-uniapp/pages/group/group-invite.vue +++ b/im-uniapp/pages/group/group-invite.vue @@ -1,11 +1,11 @@