diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java
index eea204e3..1f25135e 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/ChatServerHandler.java
@@ -246,7 +246,9 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
 
         if ("0".equals(type)) {
             //来自哪个用户
-            jsonObject.put("from", channelUserMap.get(ctx));
+            SysUserVo sysUserVo = sysUserService.selectUserById(Long.valueOf(channelUserMap.get(ctx)));
+            jsonObject.put("from", sysUserVo.getUserId());
+            jsonObject.put("name", sysUserVo.getNickName());
             log.info("收到客户端消息：{}", jsonObject);
             String RoomId = jsonObject.get("roomId").toString();
             //根据ID拿到房间实例
@@ -255,7 +257,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
             List<Long> ids = JSONObject.parseArray(byId.getMembers(), Long.class);
             if (ids != null && !ids.isEmpty()) {
                 //要从IDS中去掉自己ID防止发送自己消息
-                ids.remove(Long.valueOf(channelUserMap.get(ctx)));
+                ids.remove(sysUserVo.getUserId());
                 for (Long id : ids) {
                     //只要发送一条数据，就要给接收方推送所有未读消息
                     if (!userRoomCountMap.containsKey(id + "+" + RoomId)) {
@@ -285,7 +287,7 @@ public class ChatServerHandler extends SimpleChannelInboundHandler<TextWebSocket
                     ChatHistory chatHistory = new ChatHistory();
                     chatHistory.setMessageDate(new Date());
                     chatHistory.setGeterId(Long.valueOf(RoomId));
-                    chatHistory.setSenderId(Long.valueOf(channelUserMap.get(ctx)));
+                    chatHistory.setSenderId(sysUserVo.getUserId());
                     chatHistory.setIsRead("1");
                     chatHistory.setMessage(String.valueOf(jsonObject));
                     chatHistoryService.save(chatHistory);