!134 修复几个小bug

Merge pull request !134 from blue/v_3.0.0

im-platform/src/main/java/com/bx/implatform/service/impl/GroupServiceImpl.java

@@ -70,11 +70,8 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         member.setRemarkGroupName(vo.getRemarkGroupName());
         groupMemberService.save(member);
         // 返回
-        vo.setId(group.getId());
-        vo.setShowNickName(member.getShowNickName());
-        vo.setShowGroupName(StrUtil.blankToDefault(member.getRemarkGroupName(), group.getName()));
         log.info("创建群聊，群聊id:{},群聊名称:{}", group.getId(), group.getName());
-        return vo;
+        return findById(group.getId());
     }
 
     @CacheEvict(key = "#vo.getId()")
@@ -97,10 +94,8 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
             group = BeanUtils.copyProperties(vo, Group.class);
             this.updateById(group);
         }
-        vo.setShowNickName(member.getShowNickName());
-        vo.setShowGroupName(StrUtil.blankToDefault(member.getRemarkGroupName(), group.getName()));
         log.info("修改群聊，群聊id:{},群聊名称:{}", group.getId(), group.getName());
-        return vo;
+        return convert(group,member);
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -175,13 +170,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         if (Objects.isNull(member)) {
             throw new GlobalException("您未加入群聊");
         }
-        GroupVO vo = BeanUtils.copyProperties(group, GroupVO.class);
-        vo.setRemarkGroupName(member.getRemarkGroupName());
-        vo.setRemarkNickName(member.getRemarkNickName());
-        vo.setShowNickName(member.getShowNickName());
-        vo.setShowGroupName(StrUtil.blankToDefault(member.getRemarkGroupName(), group.getName()));
-        vo.setQuit(member.getQuit());
-        return vo;
+        return convert(group,member);
     }
 
     @Cacheable(key = "#groupId")
@@ -217,13 +206,9 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         List<Group> groups = this.list(groupWrapper);
         // 转vo
         return groups.stream().map(group -> {
-            GroupVO vo = BeanUtils.copyProperties(group, GroupVO.class);
             GroupMember member =
                 groupMembers.stream().filter(m -> group.getId().equals(m.getGroupId())).findFirst().get();
-            vo.setShowNickName(StrUtil.blankToDefault(member.getRemarkNickName(), session.getNickName()));
-            vo.setShowGroupName(StrUtil.blankToDefault(member.getRemarkGroupName(), group.getName()));
-            vo.setQuit(member.getQuit());
-            return vo;
+            return convert(group, member);
         }).collect(Collectors.toList());
     }
 
@@ -244,8 +229,7 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         // 找出好友信息
         List<Friend> friends = friendsService.findFriendByUserId(session.getUserId());
         List<Friend> friendsList = vo.getFriendIds().stream()
-            .map(id -> friends.stream().filter(f -> f.getFriendId().equals(id)).findFirst().get())
-            .toList();
+            .map(id -> friends.stream().filter(f -> f.getFriendId().equals(id)).findFirst().get()).toList();
         if (friendsList.size() != vo.getFriendIds().size()) {
             throw new GlobalException("部分用户不是您的好友，邀请失败");
         }
@@ -318,4 +302,14 @@ public class GroupServiceImpl extends ServiceImpl<GroupMapper, Group> implements
         sendMessage.setSendToSelf(false);
         imClient.sendGroupMessage(sendMessage);
     }
+
+    private GroupVO convert(Group group, GroupMember member) {
+        GroupVO vo = BeanUtils.copyProperties(group, GroupVO.class);
+        vo.setRemarkGroupName(member.getRemarkGroupName());
+        vo.setRemarkNickName(member.getRemarkNickName());
+        vo.setShowNickName(member.getShowNickName());
+        vo.setShowGroupName(StrUtil.blankToDefault(member.getRemarkGroupName(), group.getName()));
+        vo.setQuit(member.getQuit());
+        return vo;
+    }
 }

im-server/src/main/java/com/bx/imserver/netty/processor/HeartbeatProcessor.java

@@ -45,7 +45,7 @@ public class HeartbeatProcessor extends AbstractMessageProcessor<IMHeartbeatInfo
         }
         AttributeKey<Long> userIdAttr = AttributeKey.valueOf(ChannelAttrKey.USER_ID);
         Long userId = ctx.channel().attr(userIdAttr).get();
-        log.info("心跳,userId:{},{}",userId,ctx.channel().id().asLongText());
+        log.debug("心跳,userId:{},{}",userId,ctx.channel().id().asLongText());
     }
 
     @Override

im-uniapp/main.js

@@ -18,9 +18,10 @@ import barGroup from '@/components/bar/bar-group'
 import arrowBar from '@/components/bar/arrow-bar'
 import btnBar from '@/components/bar/btn-bar'
 import switchBar from '@/components/bar/switch-bar'
-
-//import VConsole from 'vconsole'
-//new VConsole();
+// #ifdef H5
+// import VConsole from 'vconsole'
+// new VConsole();
+// #endif
 
 // #ifdef H5
 import * as recorder from './common/recorder-h5';

im-uniapp/pages/chat/chat-box.vue

@@ -588,10 +588,12 @@ export default {
 			this.isEmpty = e.detail.html == '<p><br></p>'
 		},
 		onEditorReady() {
-			const query = uni.createSelectorQuery().in(this);
-			query.select('#editor').context((res) => {
-				this.editorCtx = res.context
-			}).exec()
+			this.$nextTick(()=>{
+				const query = uni.createSelectorQuery().in(this);
+				query.select('#editor').context((res) => {
+					this.editorCtx = res.context
+				}).exec()
+			})
 		},
 		onEditorFocus(e) {
 			this.isFocus = true;
@@ -739,11 +741,9 @@ export default {
 		},
 		listenKeyBoard() {
 			// #ifdef H5	
-			const userAgent = navigator.userAgent;
-			const regex = /(macintosh|windows)/i;
-			if (regex.test(userAgent)) {
+			if (navigator.platform == "Win32" || navigator.platform == "MacIntel" ) {
 				// 电脑端不需要弹出键盘
-				console.log("userAgent:", userAgent)
+				console.log("navigator.platform:", navigator.platform)
 				return;
 			}
 			if (uni.getSystemInfoSync().platform == 'ios') {