解决冲突

common/src/main/java/com/wecloud/im/netty/core/WsReadHandler.java

 package com.wecloud.im.netty.core;
 package com.wecloud.im.netty.core;
 
 
 import cn.hutool.core.thread.ThreadFactoryBuilder;
 import cn.hutool.core.thread.ThreadFactoryBuilder;
+import com.wecloud.im.executor.BusinessThreadPool;
 import com.wecloud.im.ws.model.WsConstants;
 import com.wecloud.im.ws.model.WsConstants;
 import com.wecloud.im.ws.receive.ReadWsData;
 import com.wecloud.im.ws.receive.ReadWsData;
 import com.wecloud.im.ws.service.MangerChannelService;
 import com.wecloud.im.ws.service.MangerChannelService;
@@ -153,7 +154,7 @@ public class WsReadHandler extends SimpleChannelInboundHandler<TextWebSocketFram
 
 
     @Override
     @Override
     public void handlerAdded(ChannelHandlerContext ctx) {
     public void handlerAdded(ChannelHandlerContext ctx) {
-        String userIdByChannel = mangerChannelService.getInfoByChannel(ctx);
+        String userIdByChannel = mangerChannelService.getStringInfoByChannel(ctx);
         log.info("连接WS成功handlerAdded,uid:" + userIdByChannel + "，" + ",channelId:" + ctx.channel().id().asLongText());
         log.info("连接WS成功handlerAdded,uid:" + userIdByChannel + "，" + ",channelId:" + ctx.channel().id().asLongText());
 
 
     }
     }
@@ -179,11 +180,10 @@ public class WsReadHandler extends SimpleChannelInboundHandler<TextWebSocketFram
         String appKey = ctx.channel().attr(MangerChannelService.APP_KEY).get();
         String appKey = ctx.channel().attr(MangerChannelService.APP_KEY).get();
         String clientId = ctx.channel().attr(MangerChannelService.CLIENT_ID).get();
         String clientId = ctx.channel().attr(MangerChannelService.CLIENT_ID).get();
 
 
-        String userIdByChannel = mangerChannelService.getInfoByChannel(ctx);
+        String userIdByChannel = mangerChannelService.getStringInfoByChannel(ctx);
         log.info("uid:" + userIdByChannel + "," + "handlerRemoved" + ",channelId:" + ctx.channel().id().asLongText());
         log.info("uid:" + userIdByChannel + "," + "handlerRemoved" + ",channelId:" + ctx.channel().id().asLongText());
         // 关掉连接
         // 关掉连接
         mangerChannelService.offline(ctx);
         mangerChannelService.offline(ctx);
-        ctx.close();
 
 
         // rtc清空缓存
         // rtc清空缓存
         rtcService.clientOffline(appKey, clientId);
         rtcService.clientOffline(appKey, clientId);

common/src/main/java/com/wecloud/im/ws/strategy/concrete/ImChatConcrete.java

@@ -139,8 +139,6 @@ public class ImChatConcrete extends ImCmdAbstract {
         // 生成消息id
         // 生成消息id
         long messageId = SnowflakeUtil.getId();
         long messageId = SnowflakeUtil.getId();
         // 入库  保存消息至消息表
         // 入库  保存消息至消息表
-        ImMessage imMessage = saveImMessage(imApplication, imClientSender, toConversationId, messageId, content);
-        //  保存消息至消息表
         ImMessage imMessage = imMessageService.saveImMessage(imApplication, imClientSender, toConversationId, messageId, content);
         ImMessage imMessage = imMessageService.saveImMessage(imApplication, imClientSender, toConversationId, messageId, content);
 
 
         // 封装响应的实体
         // 封装响应的实体