refactor: 扁平化 IM WebSocket 通知推送 API

- 将 WebSocket 推送入口统一为 userId/userIds + conversationType + contentType + payload - 移除业务侧 ImNotificationWebSocketDTO 构造和无会话专用发送入口 - 收敛私聊、群聊、频道、好友、加群申请、RTC 通知调用路径 - 精简 ImNotificationWebSocketDTO，仅保留统一外壳字段 - 保留群消息 payload 的 receiptStatus、readCount、receiverUserIds - 更新相关单元测试，覆盖群消息通知 payload 字段

refactor: 扁平化 IM WebSocket 通知推送 API
- 将 WebSocket 推送入口统一为 userId/userIds + conversationType + contentType + payload - 移除业务侧 ImNotificationWebSocketDTO 构造和无会话专用发送入口 - 收敛私聊、群聊、频道、好友、加群申请、RTC 通知调用路径 - 精简 ImNotificationWebSocketDTO，仅保留统一外壳字段 - 保留群消息 payload 的 receiptStatus、readCount、receiverUserIds - 更新相关单元测试，覆盖群消息通知 payload 字段
YunaiV
1 parent 210a8d5a
Showing 101 changed files with 576 additions and 614 deletions
sql/mysql/ruoyi-vue-pro.sql
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/message/vo/channel/ImChannelMessageRespVO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/message/vo/group/ImGroupMessageManagerPageReqVO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/message/vo/group/ImGroupMessageManagerRespVO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/message/vo/privates/ImPrivateMessageManagerPageReqVO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/message/vo/privates/ImPrivateMessageManagerRespVO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/statistics/ImStatisticsManagerController.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/manager/statistics/vo/ImStatisticsManagerMessageTypeRespVO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/message/vo/group/ImGroupMessageSendReqVO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/controller/admin/message/vo/privates/ImPrivateMessageSendReqVO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/dataobject/message/ImChannelMessageDO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/dataobject/message/ImGroupMessageDO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/dataobject/message/ImPrivateMessageDO.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/dal/mysql/statistics/ImStatisticsManagerMapper.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/enums/message/ImMessageTypeEnum.java → yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/enums/ImContentTypeEnum.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/enums/ImConversationTypeEnum.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/friend/ImFriendRequestServiceImpl.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupRequestServiceImpl.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/group/ImGroupServiceImpl.java
yudao-module-im/src/main/java/cn/iocoder/yudao/module/im/service/message/ImChannelMessageServiceImpl.java
@@ -1396,39 +1396,39 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3559, 1, '等待验证', '0', 'im_friend_request_handle_result', 0, 'warning', '', NULL, '1', '2026-05-04 02:43:41', '1', '2026-05-04 02:43:41', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3560, 2, '已添加', '1', 'im_friend_request_handle_result', 0, 'success', '', NULL, '1', '2026-05-04 02:43:41', '1', '2026-05-04 02:43:41', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3561, 3, '已拒绝', '2', 'im_friend_request_handle_result', 0, 'info', '', NULL, '1', '2026-05-04 02:43:41', '1', '2026-05-04 02:43:41', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3562, 101, '文本', '101', 'im_message_type', 0, '', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3563, 102, '图片', '102', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3564, 103, '语音', '103', 'im_message_type', 0, 'warning', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3565, 104, '视频', '104', 'im_message_type', 0, 'warning', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3566, 105, '文件', '105', 'im_message_type', 0, 'info', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3568, 2101, '撤回', '2101', 'im_message_type', 0, 'danger', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3569, 2200, '回执', '2200', 'im_message_type', 0, 'warning', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3570, 2201, '已读', '2201', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3571, 1501, '群创建', '1501', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3572, 1502, '群信息变更', '1502', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3573, 1503, '入群申请', '1503', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3574, 1504, '成员退群', '1504', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3575, 1505, '入群申请通过', '1505', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3576, 1506, '入群申请拒绝', '1506', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3577, 1507, '群主转让', '1507', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3578, 1508, '成员被移出', '1508', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3579, 1509, '成员加入', '1509', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3580, 1510, '自由进群', '1510', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3581, 1511, '群解散', '1511', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3582, 1512, '成员禁言', '1512', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3583, 1513, '成员取消禁言', '1513', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3584, 1514, '全群禁言', '1514', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3585, 1515, '全群取消禁言', '1515', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3586, 1516, '成员昵称变更', '1516', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3587, 1517, '添加管理员', '1517', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3588, 1518, '撤销管理员', '1518', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3589, 1519, '群公告变更', '1519', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3590, 1520, '群名变更', '1520', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3591, 1531, '群消息置顶', '1531', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3592, 1532, '群消息取消置顶', '1532', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3593, 1533, '群封禁变更', '1533', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3594, 1204, '新增好友', '1204', 'im_message_type', 0, 'success', '', NULL, 'admin', '2026-05-05 13:26:53', 'admin', '2026-05-05 13:26:53', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3595, 1205, '好友被删除', '1205', 'im_message_type', 0, 'warning', '', NULL, 'admin', '2026-05-05 13:26:53', 'admin', '2026-05-05 13:26:53', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3562, 101, '文本', '101', 'im_content_type', 0, '', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3563, 102, '图片', '102', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3564, 103, '语音', '103', 'im_content_type', 0, 'warning', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3565, 104, '视频', '104', 'im_content_type', 0, 'warning', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3566, 105, '文件', '105', 'im_content_type', 0, 'info', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3568, 2101, '撤回', '2101', 'im_content_type', 0, 'danger', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3569, 2200, '回执', '2200', 'im_content_type', 0, 'warning', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3570, 2201, '已读', '2201', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3571, 1501, '群创建', '1501', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3572, 1502, '群信息变更', '1502', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3573, 1503, '入群申请', '1503', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3574, 1504, '成员退群', '1504', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3575, 1505, '入群申请通过', '1505', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3576, 1506, '入群申请拒绝', '1506', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3577, 1507, '群主转让', '1507', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3578, 1508, '成员被移出', '1508', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3579, 1509, '成员加入', '1509', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3580, 1510, '自由进群', '1510', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3581, 1511, '群解散', '1511', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3582, 1512, '成员禁言', '1512', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3583, 1513, '成员取消禁言', '1513', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3584, 1514, '全群禁言', '1514', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3585, 1515, '全群取消禁言', '1515', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3586, 1516, '成员昵称变更', '1516', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3587, 1517, '添加管理员', '1517', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3588, 1518, '撤销管理员', '1518', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3589, 1519, '群公告变更', '1519', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3590, 1520, '群名变更', '1520', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3591, 1531, '群消息置顶', '1531', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3592, 1532, '群消息取消置顶', '1532', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3593, 1533, '群封禁变更', '1533', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 11:52:30', 'admin', '2026-05-05 11:52:30', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3594, 1204, '新增好友', '1204', 'im_content_type', 0, 'success', '', NULL, 'admin', '2026-05-05 13:26:53', 'admin', '2026-05-05 13:26:53', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3595, 1205, '好友被删除', '1205', 'im_content_type', 0, 'warning', '', NULL, 'admin', '2026-05-05 13:26:53', 'admin', '2026-05-05 13:26:53', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3596, 1, '搜索', '1', 'im_group_add_source', 0, '', '', NULL, '', '2026-05-06 09:26:36', '', '2026-05-06 09:26:36', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3597, 2, '邀请', '2', 'im_group_add_source', 0, '', '', NULL, '', '2026-05-06 09:26:36', '', '2026-05-06 09:26:36', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (3598, 3, '扫码', '3', 'im_group_add_source', 0, '', '', NULL, '', '2026-05-06 09:26:36', '', '2026-05-06 09:26:36', b'0');
@@ -1474,9 +1474,9 @@ INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `st
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1061114, 3, '已拒绝', '30', 'im_rtc_participant_status', 0, 'warning', '', '接通前点拒接', 'admin', '2026-05-18 03:36:12', 'admin', '2026-05-18 03:36:12', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1061115, 4, '未应答', '40', 'im_rtc_participant_status', 0, 'info', '', '通话已结束仍未应答', 'admin', '2026-05-18 03:36:12', 'admin', '2026-05-18 03:36:12', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1061116, 5, '已离开', '50', 'im_rtc_participant_status', 0, 'success', '', '接通后挂断 / 离开', 'admin', '2026-05-18 03:36:12', 'admin', '2026-05-18 03:36:12', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1061117, 1610, '通话开始', '1610', 'im_message_type', 0, 'info', '', '入消息流；私聊定向通知，群聊全员广播', 'admin', '2026-05-18 03:36:12', 'admin', '2026-05-18 03:36:12', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1061118, 1611, '通话结束', '1611', 'im_message_type', 0, 'info', '', '入消息流；私聊准气泡，群聊系统 tip', 'admin', '2026-05-18 03:36:12', 'admin', '2026-05-18 03:36:12', b'0');
-INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1061119, 125, '素材', '125', 'im_message_type', 0, 'success', '', '频道运营推送的图文卡片消息', '1', '2026-05-18 13:14:34', '1', '2026-05-18 13:14:34', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1061117, 1610, '通话开始', '1610', 'im_content_type', 0, 'info', '', '入消息流；私聊定向通知，群聊全员广播', 'admin', '2026-05-18 03:36:12', 'admin', '2026-05-18 03:36:12', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1061118, 1611, '通话结束', '1611', 'im_content_type', 0, 'info', '', '入消息流；私聊准气泡，群聊系统 tip', 'admin', '2026-05-18 03:36:12', 'admin', '2026-05-18 03:36:12', b'0');
+INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1061119, 125, '素材', '125', 'im_content_type', 0, 'success', '', '频道运营推送的图文卡片消息', '1', '2026-05-18 13:14:34', '1', '2026-05-18 13:14:34', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1061120, 1, '富文本', '1', 'im_channel_material_type', 0, 'primary', '', '', '1', '2026-05-19 14:09:25', '1', '2026-05-19 14:09:25', b'0');
 INSERT INTO `system_dict_data` (`id`, `sort`, `label`, `value`, `dict_type`, `status`, `color_type`, `css_class`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`) VALUES (1061121, 2, '外链', '2', 'im_channel_material_type', 0, 'info', '', '', '1', '2026-05-19 14:09:25', '1', '2026-05-19 14:09:25', b'0');
 COMMIT;
@@ -1689,7 +1689,7 @@ INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creat
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (2133, 'MES 销售退货单状态', 'mes_wm_return_sales_status', 0, 'MES 销售退货单状态枚举', '1', '2026-04-03 17:20:25', '1', '2026-04-05 15:05:39', b'0', NULL);
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (2135, 'MES 上下工状态类型', 'mes_pro_work_record_type', 0, 'MES 上下工状态类型', '1', '2026-04-05 14:07:27', '1', '2026-04-05 14:07:27', b'0', NULL);
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (2138, 'MES 生产入库单状态', 'mes_wm_product_produce_status', 0, 'MES 生产入库单状态', '1', '2026-04-05 15:53:46', '1', '2026-04-05 15:53:46', b'0', '1970-01-01 00:00:00');
-INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (2200, 'IM 消息类型', 'im_message_type', 0, '对应 ImMessageTypeEnum', 'admin', '2026-04-30 11:35:07', 'admin', '2026-04-30 11:35:07', b'0', NULL);
+INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (2200, 'IM 内容类型', 'im_content_type', 0, '对应 ImContentTypeEnum', 'admin', '2026-04-30 11:35:07', 'admin', '2026-04-30 11:35:07', b'0', NULL);
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (2202, 'IM 消息回执状态', 'im_message_receipt_status', 0, '对应 ImMessageReceiptStatusEnum', 'admin', '2026-04-30 11:35:07', 'admin', '2026-04-30 11:35:07', b'0', NULL);
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (2203, 'IM 好友状态', 'im_friend_status', 0, '0=正常 / 1=已删除', 'admin', '2026-04-30 11:35:07', 'admin', '2026-04-30 11:35:07', b'0', NULL);
 INSERT INTO `system_dict_type` (`id`, `name`, `type`, `status`, `remark`, `creator`, `create_time`, `updater`, `update_time`, `deleted`, `deleted_time`) VALUES (2204, 'IM 群状态', 'im_group_status', 0, '0=正常 / 1=已解散', 'admin', '2026-04-30 11:35:07', 'admin', '2026-04-30 11:35:07', b'0', NULL);
@@ -29,7 +29,7 @@ public class ImChannelMessageRespVO {
     private String materialCoverUrl;
     @Schema(description = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "125")
-    private Integer type; // 参见 ImMessageTypeEnum 枚举类
+    private Integer type; // 参见 ImContentTypeEnum 枚举类
     @Schema(description = "消息内容；payload JSON 快照")
     private String content;
@@ -22,7 +22,7 @@ public class ImGroupMessageManagerPageReqVO extends PageParam {
     private Long senderId;
     @Schema(description = "消息类型", example = "1")
-    private Integer type; // 参见 ImMessageTypeEnum 枚举类
+    private Integer type; // 参见 ImContentTypeEnum 枚举类
     @Schema(description = "消息内容", example = "你好")
     private String content;
@@ -29,7 +29,7 @@ public class ImGroupMessageManagerRespVO {
     private String senderNickname;
     @Schema(description = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer type; // 参见 ImMessageTypeEnum 枚举类
+    private Integer type; // 参见 ImContentTypeEnum 枚举类
     @Schema(description = "消息内容（JSON 格式）", requiredMode = Schema.RequiredMode.REQUIRED)
     private String content;
@@ -22,7 +22,7 @@ public class ImPrivateMessageManagerPageReqVO extends PageParam {
     private Long receiverId;
     @Schema(description = "消息类型", example = "1")
-    private Integer type; // 参见 ImMessageTypeEnum 枚举类
+    private Integer type; // 参见 ImContentTypeEnum 枚举类
     @Schema(description = "消息内容", example = "你好")
     private String content;
@@ -28,7 +28,7 @@ public class ImPrivateMessageManagerRespVO {
     private String receiverNickname;
     @Schema(description = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
-    private Integer type; // 参见 ImMessageTypeEnum 枚举类
+    private Integer type; // 参见 ImContentTypeEnum 枚举类
     @Schema(description = "消息内容（JSON 格式）", requiredMode = Schema.RequiredMode.REQUIRED)
     private String content;
@@ -112,7 +112,7 @@ public class ImStatisticsManagerController {
     }
     @GetMapping("/message-type-distribution")
-    @Operation(summary = "获得消息类型分布（最近 30 天）")
+    @Operation(summary = "获得内容类型分布（最近 30 天）")
     @PreAuthorize("@ss.hasPermission('im:manager:statistics:query')")
     public CommonResult<List<ImStatisticsManagerMessageTypeRespVO>> getMessageTypeDistribution() {
         LocalDateTime endTime = LocalDate.now().plusDays(1).atStartOfDay();
@@ -3,12 +3,12 @@ package cn.iocoder.yudao.module.im.controller.admin.manager.statistics.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
-@Schema(description = "管理后台 - IM 数据看板消息类型分布项 Response VO")
+@Schema(description = "管理后台 - IM 数据看板内容类型分布项 Response VO")
 @Data
 public class ImStatisticsManagerMessageTypeRespVO {
     @Schema(description = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
-    private Integer type; // 参见 ImMessageTypeEnum 枚举类
+    private Integer type; // 参见 ImContentTypeEnum 枚举类
     @Schema(description = "消息数", requiredMode = Schema.RequiredMode.REQUIRED, example = "8000")
     private Long value;
 package cn.iocoder.yudao.module.im.controller.admin.message.vo.group;
 import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.AssertTrue;
@@ -28,7 +28,7 @@ public class ImGroupMessageSendReqVO {
     @Schema(description = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
     @NotNull(message = "消息类型不能为空")
-    @InEnum(ImMessageTypeEnum.class)
+    @InEnum(ImContentTypeEnum.class)
     private Integer type;
     @Schema(description = "消息内容，JSON 格式", requiredMode = Schema.RequiredMode.REQUIRED, example = "{\"content\":\"你好\"}")
@@ -47,7 +47,7 @@ public class ImGroupMessageSendReqVO {
     @AssertTrue(message = "消息类型不允许")
     @JsonIgnore
     public boolean isTypeNormal() {
-        return type == null || ImMessageTypeEnum.validate(type).isNormal();
+        return type == null || ImContentTypeEnum.validate(type).isNormal();
     }
 }
 package cn.iocoder.yudao.module.im.controller.admin.message.vo.privates;
 import cn.iocoder.yudao.framework.common.validation.InEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.AssertTrue;
@@ -26,7 +26,7 @@ public class ImPrivateMessageSendReqVO {
     @Schema(description = "消息类型", requiredMode = Schema.RequiredMode.REQUIRED, example = "0")
     @NotNull(message = "消息类型不能为空")
-    @InEnum(ImMessageTypeEnum.class)
+    @InEnum(ImContentTypeEnum.class)
     private Integer type;
     @Schema(description = "消息内容，JSON 格式", requiredMode = Schema.RequiredMode.REQUIRED, example = "{\"content\":\"你好\"}")
@@ -42,7 +42,7 @@ public class ImPrivateMessageSendReqVO {
     @AssertTrue(message = "消息类型不允许")
     @JsonIgnore
     public boolean isTypeNormal() {
-        return type == null || ImMessageTypeEnum.validate(type).isNormal();
+        return type == null || ImContentTypeEnum.validate(type).isNormal();
     }
 }
@@ -4,7 +4,7 @@ import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler;
 import cn.iocoder.yudao.module.im.dal.dataobject.channel.ImChannelDO;
 import cn.iocoder.yudao.module.im.dal.dataobject.channel.ImChannelMaterialDO;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -54,7 +54,7 @@ public class ImChannelMessageDO extends BaseDO {
     /**
      * 消息类型
      * <p>
-     * 枚举 {@link ImMessageTypeEnum}
+     * 枚举 {@link ImContentTypeEnum}
      */
     private Integer type;
     /**
@@ -5,7 +5,7 @@ import cn.iocoder.yudao.framework.mybatis.core.type.LongListTypeHandler;
 import cn.iocoder.yudao.module.im.dal.dataobject.group.ImGroupDO;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageReceiptStatusEnum;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageStatusEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -54,7 +54,7 @@ public class ImGroupMessageDO extends BaseDO {
     /**
      * 消息类型
      * <p>
-     * 枚举 {@link ImMessageTypeEnum}
+     * 枚举 {@link ImContentTypeEnum}
      */
     private Integer type;
     /**
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.module.im.dal.dataobject.message;
 import cn.iocoder.yudao.framework.mybatis.core.dataobject.BaseDO;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageReceiptStatusEnum;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageStatusEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -50,7 +50,7 @@ public class ImPrivateMessageDO extends BaseDO {
     /**
      * 消息类型
      * <p>
-     * 枚举 {@link ImMessageTypeEnum}
+     * 枚举 {@link ImContentTypeEnum}
      */
     private Integer type;
     /**
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
 import cn.iocoder.yudao.module.im.enums.ImConversationTypeEnum;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -6,7 +6,7 @@ import lombok.experimental.Accessors;
 /**
  * 频道素材消息 payload
  * <p>
- * 对应 {@link cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum#MATERIAL}（type=125）。
+ * 对应 {@link cn.iocoder.yudao.module.im.enums.ImContentTypeEnum#MATERIAL}（type=125）。
  * 客户端按本字段集渲染图文卡片；
  * 富文本正文不在本 payload 中传递，点击详情时另调 /im/channel/material/get-content?id= 按需拉取。
  */
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import lombok.Data;
 import java.util.List;
@@ -47,7 +47,7 @@ public class MergeMessage {
         /**
          * 消息类型
          * <p>
-         * 枚举 {@link ImMessageTypeEnum}
+         * 枚举 {@link ImContentTypeEnum}
          */
         private Integer type;
         /**
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
@@ -39,7 +39,7 @@ public class QuoteMessage {
     /**
      * 被引用消息类型
      * <p>
-     * 枚举 {@link ImMessageTypeEnum}
+     * 枚举 {@link ImContentTypeEnum}
      */
     private Integer type;
     /**
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
 import lombok.Data;
 import lombok.experimental.Accessors;
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.message;
+package cn.iocoder.yudao.module.im.dal.dataobject.message.content;
 import lombok.Data;
@@ -154,7 +154,7 @@ public interface ImStatisticsManagerMapper {
                                                            @Param("endTime") LocalDateTime endTime);
     /**
-     * 区间内消息类型分布（私聊+群聊合并）
+     * 区间内内容类型分布（私聊+群聊合并）
      *
      * @return [{type: 0, count: 123}, ...]
      */
-package cn.iocoder.yudao.module.im.enums.message;
+package cn.iocoder.yudao.module.im.enums;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.lang.Assert;
@@ -11,13 +11,13 @@ import java.util.Arrays;
 import java.util.Set;
 /**
- * IM 消息类型枚举
+ * IM 内容类型枚举
  *
  * @author 芋道源码
  */
 @Getter
 @RequiredArgsConstructor
-public enum ImMessageTypeEnum implements ArrayValuable<Integer> {
+public enum ImContentTypeEnum implements ArrayValuable<Integer> {
     // ========== 用户聊天消息（101-105 直接复用 OpenIM 段位编号） ==========
     /**
@@ -335,7 +335,7 @@ public enum ImMessageTypeEnum implements ArrayValuable&lt;Integer&gt; {
      */
     GROUP_BANNED(1533, "群封禁变更", true, false);
-    public static final Integer[] ARRAYS = Arrays.stream(values()).map(ImMessageTypeEnum::getType).toArray(Integer[]::new);
+    public static final Integer[] ARRAYS = Arrays.stream(values()).map(ImContentTypeEnum::getType).toArray(Integer[]::new);
     private static final Set<Integer> FRIEND_NOTIFICATION_TYPES = CollUtil.newHashSet(
             FRIEND_REQUEST_APPROVED.type,
@@ -392,8 +392,8 @@ public enum ImMessageTypeEnum implements ArrayValuable&lt;Integer&gt; {
      * @param type 消息类型
      * @return 枚举实例
      */
-    public static ImMessageTypeEnum validate(Integer type) {
-        ImMessageTypeEnum result = ArrayUtil.firstMatch(item -> item.type.equals(type), values());
+    public static ImContentTypeEnum validate(Integer type) {
+        ImContentTypeEnum result = ArrayUtil.firstMatch(item -> item.type.equals(type), values());
         Assert.notNull(result, "未注册的消息类型 type={}", type);
         return result;
     }
@@ -16,6 +16,7 @@ import java.util.Objects;
 @Getter
 public enum ImConversationTypeEnum implements ArrayValuable<Integer> {
+    NONE(0, "无会话"), // 无会话
     PRIVATE(1, "私聊"), // 私聊
     GROUP(2, "群聊"), // 群聊
     CHANNEL(3, "频道"); // 频道 / 公众号
@@ -36,6 +37,10 @@ public enum ImConversationTypeEnum implements ArrayValuable&lt;Integer&gt; {
         return ARRAYS;
     }
+    public static boolean isNone(Integer type) {
+        return Objects.equals(NONE.type, type);
+    }
+
     public static boolean isPrivate(Integer type) {
         return Objects.equals(PRIVATE.type, type);
     }
@@ -17,10 +17,9 @@ import cn.iocoder.yudao.module.im.enums.friend.ImFriendStateEnum;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
 import cn.iocoder.yudao.module.im.framework.config.ImProperties;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend.FriendRequestApprovedNotification;
-import cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend.FriendRequestNotification;
-import cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend.FriendRequestRejectedNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.friend.FriendRequestApprovedNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.friend.FriendRequestNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.friend.FriendRequestRejectedNotification;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import jakarta.annotation.Resource;
@@ -17,11 +17,10 @@ import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
 import cn.iocoder.yudao.module.im.service.message.ImGroupMessageService;
 import cn.iocoder.yudao.module.im.service.message.dto.ImGroupMessageSendDTO;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.notification.group.BaseGroupNotification;
-import cn.iocoder.yudao.module.im.service.websocket.dto.notification.group.GroupRequestApprovedNotification;
-import cn.iocoder.yudao.module.im.service.websocket.dto.notification.group.GroupRequestReceivedNotification;
-import cn.iocoder.yudao.module.im.service.websocket.dto.notification.group.GroupRequestRejectedNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.group.BaseGroupNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.group.GroupRequestApprovedNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.group.GroupRequestReceivedNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.group.GroupRequestRejectedNotification;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import jakarta.annotation.Resource;
@@ -97,7 +96,7 @@ public class ImGroupRequestServiceImpl implements ImGroupRequestService {
         // 3. 情况二：群开启了审批，创建或复用一条主动申请记录
         ImGroupRequestDO request = createOrResetApplyRequest(groupId, userId, reqVO);
-        // 4. 1503 私聊定向推群主 + 全部管理员（多端同步）；payload 携带申请方昵称 / 头像
+        // 4. 1503 定向推群主 + 全部管理员（多端同步）；payload 携带申请方昵称 / 头像
         AdminUserRespDTO applyUser = adminUserApi.getUser(userId);
         GroupRequestReceivedNotification payload = buildRequestNotification(group, request, applyUser);
         for (Long receiverUserId : getGroupMemberListByOwnerAndAdminUserIds(group)) {
@@ -139,12 +138,12 @@ public class ImGroupRequestServiceImpl implements ImGroupRequestService {
         groupMemberService.addGroupMember(request.getGroupId(), request.getUserId(),
                 ImGroupMemberRoleEnum.NORMAL.getRole(), request.getAddSource(), request.getInviterUserId());
-        // 5.1 1505 私聊推送给申请人 + 群主 + 全部管理员（每端单推）
+        // 5.1 1505 定向推送给申请人 + 群主 + 全部管理员（每端单推）
         GroupRequestApprovedNotification payload = (GroupRequestApprovedNotification) new GroupRequestApprovedNotification()
                 .setRequestId(request.getId()).setGroupId(request.getGroupId()).setUserId(request.getUserId())
                 .setOperatorUserId(userId);
         broadcastToOwnerAdminsAndApplicant(request.getGroupId(), request.getUserId(), payload,
-                ImMessageTypeEnum.GROUP_REQUEST_APPROVED.getType(), userId);
+                ImContentTypeEnum.GROUP_REQUEST_APPROVED.getType(), userId);
         // 5.2 群事件：主动申请 → 1510 自由进群；被邀请 → 1509 成员加入
         if (request.getInviterUserId() == null) {
             groupMessageService.sendGroupMessage(userId,
@@ -174,12 +173,12 @@ public class ImGroupRequestServiceImpl implements ImGroupRequestService {
             throw exception(GROUP_REQUEST_HANDLED);
         }
-        // 3. 1506 私聊推送给申请人 + 群主 + 全部管理员
+        // 3. 1506 定向推送给申请人 + 群主 + 全部管理员
         GroupRequestRejectedNotification payload = (GroupRequestRejectedNotification) new GroupRequestRejectedNotification()
                 .setRequestId(request.getId()).setGroupId(request.getGroupId()).setUserId(request.getUserId())
                 .setHandleContent(handleContent).setOperatorUserId(userId);
         broadcastToOwnerAdminsAndApplicant(request.getGroupId(), request.getUserId(), payload,
-                ImMessageTypeEnum.GROUP_REQUEST_REJECTED.getType(), userId);
+                ImContentTypeEnum.GROUP_REQUEST_REJECTED.getType(), userId);
     }
     @Override
@@ -395,7 +394,7 @@ public class ImGroupRequestServiceImpl implements ImGroupRequestService {
     }
     /**
-     * 1505 / 1506 受众：申请人 + 群主 + 全部管理员；每端单独推一帧，前端按 receiver 是否申请人区分文案
+     * 1505 / 1506 受众：申请人 + 群主 + 全部管理员
      */
     private void broadcastToOwnerAdminsAndApplicant(Long groupId, Long applicantUserId, BaseGroupNotification payload,
                                                     Integer messageType, Long operatorUserId) {
@@ -30,7 +30,7 @@ import cn.iocoder.yudao.module.im.dal.mysql.group.ImGroupMapper;
 import cn.iocoder.yudao.module.im.enums.group.ImGroupAddSourceEnum;
 import cn.iocoder.yudao.module.im.enums.group.ImGroupMemberRoleEnum;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageStatusEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import cn.iocoder.yudao.module.im.framework.config.ImProperties;
 import cn.iocoder.yudao.module.im.service.friend.ImFriendService;
 import cn.iocoder.yudao.module.im.service.message.ImGroupMessageService;
@@ -436,7 +436,7 @@ public class ImGroupServiceImpl implements ImGroupService {
         if (message == null || ObjUtil.notEqual(message.getGroupId(), groupId)) {
             throw exception(MESSAGE_NOT_IN_GROUP);
         }
-        if (!ImMessageTypeEnum.validate(message.getType()).isNormal()
+        if (!ImContentTypeEnum.validate(message.getType()).isNormal()
                 || ImMessageStatusEnum.RECALL.getStatus().equals(message.getStatus())) {
             throw exception(MESSAGE_NOT_IN_GROUP);
         }
@@ -13,12 +13,13 @@ import cn.iocoder.yudao.module.im.dal.dataobject.channel.ImChannelMaterialDO;
 import cn.iocoder.yudao.module.im.dal.dataobject.message.ImChannelMessageDO;
 import cn.iocoder.yudao.module.im.dal.mysql.message.ImChannelMessageMapper;
 import cn.iocoder.yudao.module.im.enums.ImConversationTypeEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import cn.iocoder.yudao.module.im.service.channel.ImChannelMaterialService;
 import cn.iocoder.yudao.module.im.service.conversation.ImConversationReadService;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImChannelMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.message.MaterialMessage;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImChannelMessageNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImMessageReadNotification;
+import cn.iocoder.yudao.module.im.dal.dataobject.message.content.MaterialMessage;
 import jakarta.annotation.Resource;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -116,7 +117,7 @@ public class ImChannelMessageServiceImpl implements ImChannelMessageService {
         String payloadJson = JsonUtils.toJsonString(payload);
         // 2.2 落库 1 行 message；reqVO 同名字段（materialId / receiverUserIds）自动拷贝，剩余字段补 set
         ImChannelMessageDO message = BeanUtils.toBean(reqVO, ImChannelMessageDO.class).setChannelId(material.getChannelId())
-                .setType(ImMessageTypeEnum.MATERIAL.getType()).setContent(payloadJson).setSendTime(LocalDateTime.now());
+                .setType(ImContentTypeEnum.MATERIAL.getType()).setContent(payloadJson).setSendTime(LocalDateTime.now());
         channelMessageMapper.insert(message);
         // 3. 异步推 WebSocket：指定用户走点对点；全员（receiverUserIds 为空）走广播
@@ -20,7 +20,7 @@ import cn.iocoder.yudao.module.im.enums.ImConversationTypeEnum;
 import cn.iocoder.yudao.module.im.enums.group.ImGroupMemberRoleEnum;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageReceiptStatusEnum;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageStatusEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import cn.iocoder.yudao.module.im.framework.config.ImProperties;
 import cn.iocoder.yudao.module.im.service.conversation.ImConversationReadService;
 import cn.iocoder.yudao.module.im.service.group.ImGroupMemberService;
@@ -28,9 +28,11 @@ import cn.iocoder.yudao.module.im.service.group.ImGroupService;
 import cn.iocoder.yudao.module.im.service.message.dto.ImGroupMessageSendDTO;
 import cn.iocoder.yudao.module.im.service.sensitiveword.ImSensitiveWordService;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImGroupMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.message.QuoteMessage;
-import cn.iocoder.yudao.module.im.service.websocket.dto.message.RecallMessage;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImGroupMessageNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImMessageReadNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImMessageReceiptNotification;
+import cn.iocoder.yudao.module.im.dal.dataobject.message.content.QuoteMessage;
+import cn.iocoder.yudao.module.im.dal.dataobject.message.content.RecallMessage;
 import cn.iocoder.yudao.module.im.util.ImMessageUtils;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -93,7 +95,7 @@ public class ImGroupMessageServiceImpl implements ImGroupMessageService {
         // 1.4 禁言校验
         validateMuteStatus(group, senderMember);
         // 1.5 文本消息敏感词过滤
-        if (ImMessageTypeEnum.TEXT.getType().equals(reqVO.getType())) {
+        if (ImContentTypeEnum.TEXT.getType().equals(reqVO.getType())) {
             sensitiveWordService.validateText(reqVO.getContent());
         }
@@ -142,7 +144,7 @@ public class ImGroupMessageServiceImpl implements ImGroupMessageService {
                 .setAtUserIds(dto.getAtUserIds()).setReceiverUserIds(new ArrayList<>(receiverUserIds))
                 .setReceiptStatus(resolveReceiptStatus(dto.getReceipt()));
         // 1.3 按 type.persistent 决定是否入库
-        if (ImMessageTypeEnum.validate(dto.getType()).isPersistent()) {
+        if (ImContentTypeEnum.validate(dto.getType()).isPersistent()) {
             groupMessageMapper.insert(message);
         }
@@ -181,7 +183,7 @@ public class ImGroupMessageServiceImpl implements ImGroupMessageService {
         // 3. 发送撤回事件
         return sendGroupMessage(userId, new ImGroupMessageSendDTO().setGroupId(message.getGroupId())
-                .setType(ImMessageTypeEnum.RECALL.getType())
+                .setType(ImContentTypeEnum.RECALL.getType())
                 .setReceiverUserIds(message.getReceiverUserIds())
                 .setContent(new RecallMessage().setMessageId(messageId)));
     }
@@ -15,16 +15,18 @@ import cn.iocoder.yudao.module.im.dal.mysql.message.ImPrivateMessageMapper;
 import cn.iocoder.yudao.module.im.enums.ImConversationTypeEnum;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageReceiptStatusEnum;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageStatusEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import cn.iocoder.yudao.module.im.framework.config.ImProperties;
 import cn.iocoder.yudao.module.im.service.conversation.ImConversationReadService;
 import cn.iocoder.yudao.module.im.service.friend.ImFriendService;
 import cn.iocoder.yudao.module.im.service.message.dto.ImPrivateMessageSendDTO;
 import cn.iocoder.yudao.module.im.service.sensitiveword.ImSensitiveWordService;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.message.QuoteMessage;
-import cn.iocoder.yudao.module.im.service.websocket.dto.message.RecallMessage;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImMessageReadNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImMessageReceiptNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImPrivateMessageNotification;
+import cn.iocoder.yudao.module.im.dal.dataobject.message.content.QuoteMessage;
+import cn.iocoder.yudao.module.im.dal.dataobject.message.content.RecallMessage;
 import cn.iocoder.yudao.module.im.util.ImMessageUtils;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -80,7 +82,7 @@ public class ImPrivateMessageServiceImpl implements ImPrivateMessageService {
         // 1.3 好友校验
         friendService.validateFriend(senderId, reqVO.getReceiverId());
         // 1.4 文本消息敏感词过滤
-        if (ImMessageTypeEnum.TEXT.getType().equals(reqVO.getType())) {
+        if (ImContentTypeEnum.TEXT.getType().equals(reqVO.getType())) {
             sensitiveWordService.validateText(reqVO.getContent());
         }
@@ -123,7 +125,7 @@ public class ImPrivateMessageServiceImpl implements ImPrivateMessageService {
         // 1.3 决定是否持久化：dto.persistent 优先；为 null 时按 type 默认
         boolean persistent = dto.getPersistent() != null
                 ? dto.getPersistent()
-                : ImMessageTypeEnum.validate(dto.getType()).isPersistent();
+                : ImContentTypeEnum.validate(dto.getType()).isPersistent();
         if (persistent) {
             privateMessageMapper.insert(message);
         }
@@ -177,7 +179,7 @@ public class ImPrivateMessageServiceImpl implements ImPrivateMessageService {
         // 3. 发送撤回事件
         return sendPrivateMessage(userId, new ImPrivateMessageSendDTO().setReceiverId(message.getReceiverId())
-                .setType(ImMessageTypeEnum.RECALL.getType()).setContent(new RecallMessage().setMessageId(messageId)));
+                .setType(ImContentTypeEnum.RECALL.getType()).setContent(new RecallMessage().setMessageId(messageId)));
     }
     /**
 package cn.iocoder.yudao.module.im.service.message.dto;
 import cn.iocoder.yudao.module.im.dal.dataobject.message.ImGroupMessageDO;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
-import cn.iocoder.yudao.module.im.service.websocket.dto.notification.group.*;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
+import cn.iocoder.yudao.module.im.service.websocket.notification.group.*;
 import jakarta.validation.constraints.NotNull;
 import lombok.Data;
@@ -26,7 +26,7 @@ public class ImGroupMessageSendDTO {
     /**
      * 消息类型
      * <p>
-     * 枚举 {@link ImMessageTypeEnum}
+     * 枚举 {@link ImContentTypeEnum}
      */
     @NotNull(message = "消息类型不能为空")
     private Integer type;
@@ -53,14 +53,14 @@ public class ImGroupMessageSendDTO {
      */
     private Boolean receipt;
-    // ========== 群广播事件静态工厂（对应 ImMessageTypeEnum 群事件） ==========
+    // ========== 群广播事件静态工厂（对应 ImContentTypeEnum 群事件） ==========
     public static ImGroupMessageSendDTO ofGroupCreate(Long groupId, Long operatorUserId, Collection<Long> memberUserIds) {
         GroupCreateNotification notification = new GroupCreateNotification();
         notification.setOperatorUserId(operatorUserId);
         notification.setMemberUserIds(new ArrayList<>(memberUserIds));
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_CREATE.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_CREATE.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupInfoUpdate(Long groupId, Long operatorUserId, String oldAvatar, String newAvatar) {
@@ -69,14 +69,14 @@ public class ImGroupMessageSendDTO {
         notification.setOldAvatar(oldAvatar);
         notification.setNewAvatar(newAvatar);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_INFO_UPDATE.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_INFO_UPDATE.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupMemberQuit(Long groupId, Long operatorUserId) {
         GroupMemberQuitNotification notification = new GroupMemberQuitNotification();
         notification.setOperatorUserId(operatorUserId);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_MEMBER_QUIT.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_MEMBER_QUIT.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupOwnerTransfer(Long groupId, Long operatorUserId, Long newOwnerUserId) {
@@ -84,7 +84,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setNewOwnerUserId(newOwnerUserId);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_OWNER_TRANSFER.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_OWNER_TRANSFER.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupMemberKick(Long groupId, Long operatorUserId, Collection<Long> memberUserIds) {
@@ -92,7 +92,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setMemberUserIds(new ArrayList<>(memberUserIds));
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_MEMBER_KICK.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_MEMBER_KICK.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupMemberInvite(Long groupId, Long operatorUserId, Collection<Long> memberUserIds) {
@@ -100,7 +100,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setMemberUserIds(new ArrayList<>(memberUserIds));
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_MEMBER_INVITE.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_MEMBER_INVITE.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupMemberEnter(Long groupId, Long entrantUserId, Integer addSource) {
@@ -109,14 +109,14 @@ public class ImGroupMessageSendDTO {
         notification.setEntrantUserId(entrantUserId);
         notification.setAddSource(addSource);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_MEMBER_ENTER.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_MEMBER_ENTER.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupDissolve(Long groupId, Long operatorUserId) {
         GroupDissolveNotification notification = new GroupDissolveNotification();
         notification.setOperatorUserId(operatorUserId);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_DISSOLVE.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_DISSOLVE.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupMemberNicknameUpdate(Long groupId, Long operatorUserId, String displayUserName) {
@@ -124,7 +124,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setDisplayUserName(displayUserName);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_MEMBER_NICKNAME_UPDATE.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_MEMBER_NICKNAME_UPDATE.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupAdminAdd(Long groupId, Long operatorUserId, Collection<Long> memberUserIds) {
@@ -132,7 +132,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setMemberUserIds(new ArrayList<>(memberUserIds));
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_ADMIN_ADD.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_ADMIN_ADD.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupAdminRemove(Long groupId, Long operatorUserId, Collection<Long> memberUserIds) {
@@ -140,7 +140,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setMemberUserIds(new ArrayList<>(memberUserIds));
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_ADMIN_REMOVE.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_ADMIN_REMOVE.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupNoticeUpdate(Long groupId, Long operatorUserId, String oldNotice, String newNotice) {
@@ -148,7 +148,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setOldNotice(oldNotice).setNewNotice(newNotice);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_NOTICE_UPDATE.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_NOTICE_UPDATE.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupNameUpdate(Long groupId, Long operatorUserId, String oldName, String newName) {
@@ -156,7 +156,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setOldName(oldName).setNewName(newName);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_NAME_UPDATE.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_NAME_UPDATE.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupMemberSettingUpdate(Long groupId, Long operatorUserId, Boolean silent, String groupRemark) {
@@ -164,7 +164,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setSilent(silent).setGroupRemark(groupRemark);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_MEMBER_SETTING_UPDATE.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_MEMBER_SETTING_UPDATE.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupMessagePin(Long groupId, Long operatorUserId, ImGroupMessageDO message) {
@@ -176,7 +176,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setMessageId(message.getId()).setMessage(pinnedMessage);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_MESSAGE_PIN.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_MESSAGE_PIN.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupMessageUnpin(Long groupId, Long operatorUserId, Long messageId) {
@@ -184,7 +184,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setMessageId(messageId);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_MESSAGE_UNPIN.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_MESSAGE_UNPIN.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupMemberMuted(Long groupId, Long operatorUserId,
@@ -195,7 +195,7 @@ public class ImGroupMessageSendDTO {
         notification.setMutedUserId(mutedUserId);
         notification.setMuteEndTime(muteEndTime);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_MEMBER_MUTED.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_MEMBER_MUTED.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupMemberCancelMuted(Long groupId, Long operatorUserId, Long mutedUserId) {
@@ -203,21 +203,21 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setMutedUserId(mutedUserId);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_MEMBER_CANCEL_MUTED.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_MEMBER_CANCEL_MUTED.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupMuted(Long groupId, Long operatorUserId) {
         GroupMutedNotification notification = new GroupMutedNotification();
         notification.setOperatorUserId(operatorUserId);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_MUTED.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_MUTED.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupCancelMuted(Long groupId, Long operatorUserId) {
         GroupCancelMutedNotification notification = new GroupCancelMutedNotification();
         notification.setOperatorUserId(operatorUserId);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_CANCEL_MUTED.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_CANCEL_MUTED.getType()).setContent(notification);
     }
     public static ImGroupMessageSendDTO ofGroupBanned(Long groupId, Long operatorUserId, boolean banned) {
@@ -225,7 +225,7 @@ public class ImGroupMessageSendDTO {
         notification.setOperatorUserId(operatorUserId);
         notification.setBanned(banned);
         return new ImGroupMessageSendDTO().setGroupId(groupId)
-                .setType(ImMessageTypeEnum.GROUP_BANNED.getType()).setContent(notification);
+                .setType(ImContentTypeEnum.GROUP_BANNED.getType()).setContent(notification);
     }
 }
 package cn.iocoder.yudao.module.im.service.message.dto;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import lombok.Data;
 /**
@@ -18,7 +18,7 @@ public class ImPrivateMessageSendDTO {
     /**
      * 消息类型
      * <p>
-     * 枚举 {@link ImMessageTypeEnum}
+     * 枚举 {@link ImContentTypeEnum}
      */
     private Integer type;
     /**
@@ -30,7 +30,7 @@ public class ImPrivateMessageSendDTO {
     /**
      * 是否持久化 + 推送给接收方（单边语义开关）
      * <p>
-     * null：默认按 {@link ImMessageTypeEnum#isPersistent()} 决定是否入库 + 双向 WS 推送（保持原行为）<br>
+     * null：默认按 {@link ImContentTypeEnum#isPersistent()} 决定是否入库 + 双向 WS 推送（保持原行为）<br>
      * false：覆盖为单边——不入库、仅推 sender 多端，对方不感知（如「你已删除 XXX」这类仅自己可见的 TIP）<br>
      * true：覆盖为双向 + 入库
      */
@@ -15,7 +15,7 @@ import cn.iocoder.yudao.module.im.dal.mysql.rtc.ImRtcCallMapper;
 import cn.iocoder.yudao.module.im.dal.mysql.rtc.ImRtcParticipantMapper;
 import cn.iocoder.yudao.module.im.dal.redis.rtc.ImRtcCallLockRedisDAO;
 import cn.iocoder.yudao.module.im.enums.ImConversationTypeEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import cn.iocoder.yudao.module.im.enums.rtc.ImRtcCallEndReasonEnum;
 import cn.iocoder.yudao.module.im.enums.rtc.ImRtcCallStatusEnum;
 import cn.iocoder.yudao.module.im.enums.rtc.ImRtcParticipantRoleEnum;
@@ -30,8 +30,7 @@ import cn.iocoder.yudao.module.im.service.message.ImPrivateMessageService;
 import cn.iocoder.yudao.module.im.service.message.dto.ImGroupMessageSendDTO;
 import cn.iocoder.yudao.module.im.service.message.dto.ImPrivateMessageSendDTO;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.notification.rtc.*;
+import cn.iocoder.yudao.module.im.service.websocket.notification.rtc.*;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import jakarta.annotation.Resource;
@@ -1047,7 +1046,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService {
      * @param userId  加入的参与者用户编号
      */
     private void pushParticipantConnectedNotification(ImRtcCallDO call, Long userId) {
-        pushParticipantNotification(call, ImMessageTypeEnum.RTC_PARTICIPANT_CONNECTED.getType(), userId,
+        pushParticipantNotification(call, ImContentTypeEnum.RTC_PARTICIPANT_CONNECTED.getType(), userId,
                 ImRtcParticipantConnectedNotification.of(call, userId));
     }
@@ -1058,7 +1057,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService {
      * @param userId  离开的参与者用户编号
      */
     private void pushParticipantDisconnectedNotification(ImRtcCallDO call, Long userId) {
-        pushParticipantNotification(call, ImMessageTypeEnum.RTC_PARTICIPANT_DISCONNECTED.getType(), userId,
+        pushParticipantNotification(call, ImContentTypeEnum.RTC_PARTICIPANT_DISCONNECTED.getType(), userId,
                 ImRtcParticipantDisconnectedNotification.of(call, userId));
     }
@@ -1091,7 +1090,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService {
     private void pushCallStartNotification(ImRtcCallDO call, AdminUserRespDTO inviter, Set<Long> invitees) {
         ImRtcCallStartNotification payload = ImRtcCallStartNotification.of(call, inviter);
         Long peerUserId = ImConversationTypeEnum.isGroup(call.getConversationType()) ? null : CollUtil.getFirst(invitees);
-        pushCallChatMessage(call, ImMessageTypeEnum.RTC_CALL_START, payload, peerUserId);
+        pushCallChatMessage(call, ImContentTypeEnum.RTC_CALL_START, payload, peerUserId);
     }
     /**
@@ -1115,7 +1114,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService {
                     p -> ObjUtil.notEqual(p.getUserId(), call.getInviterUserId()));
             peerUserId = peer != null ? peer.getUserId() : null;
         }
-        pushCallChatMessage(call, ImMessageTypeEnum.RTC_CALL_END, payload, peerUserId);
+        pushCallChatMessage(call, ImContentTypeEnum.RTC_CALL_END, payload, peerUserId);
     }
     /**
@@ -1128,7 +1127,7 @@ public class ImRtcCallServiceImpl implements ImRtcCallService {
      * @param payload    推送 payload
      * @param peerUserId 私聊对端用户编号；群聊忽略，私聊缺失时回退为 senderId
      */
-    private void pushCallChatMessage(ImRtcCallDO call, ImMessageTypeEnum type, Object payload, Long peerUserId) {
+    private void pushCallChatMessage(ImRtcCallDO call, ImContentTypeEnum type, Object payload, Long peerUserId) {
         Long senderId = call.getInviterUserId();
         if (ImConversationTypeEnum.isGroup(call.getConversationType())) {
             ImGroupMessageSendDTO dto = new ImGroupMessageSendDTO().setGroupId(call.getGroupId())
@@ -80,7 +80,7 @@ public interface ImStatisticsManagerService {
     Map<LocalDateTime, Long> getGroupMessageDailyCountMap(LocalDateTime beginTime, LocalDateTime endTime);
     /**
-     * 获取区间内消息类型分布 Map（key 为消息类型）
+     * 获取区间内内容类型分布 Map（key 为消息类型）
      */
     Map<Integer, Long> getMessageTypeCountMap(LocalDateTime beginTime, LocalDateTime endTime);
 package cn.iocoder.yudao.module.im.service.websocket;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImChannelMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImGroupMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO;
-
 import java.util.Collection;
 import java.util.Collections;
 /**
  * IM WebSocket 推送 Service 接口
  * <p>
- * 统一封装 WebSocket 消息推送，事务内调用时提交后异步执行。
+ * 统一封装 WebSocket 通知推送，事务内调用时提交后异步执行。
  *
  * @author 芋道源码
  */
 public interface ImWebSocketService {
     /**
-     * 异步推送私聊消息给指定用户
-     *
-     * @param userId 目标用户编号
-     * @param dto    私聊消息 DTO
-     */
-    default void sendPrivateMessageAsync(Long userId, ImPrivateMessageDTO dto) {
-        sendPrivateMessageAsync(Collections.singleton(userId), dto);
-    }
-
-    /**
-     * 异步批量推送私聊消息给多个用户；用于同一份 DTO 扇出到多个收件人
-     * <p>
-     * 相比逐个发送，仅注册一次 afterCommit 回调和异步任务。
-     *
-     * @param userIds 目标用户编号列表
-     * @param dto     私聊消息 DTO
-     */
-    void sendPrivateMessageAsync(Collection<Long> userIds, ImPrivateMessageDTO dto);
-
-    /**
-     * 异步推送群聊消息给指定用户
-     *
-     * @param userId 目标用户编号
-     * @param dto    群聊消息 DTO
-     */
-    default void sendGroupMessageAsync(Long userId, ImGroupMessageDTO dto) {
-        sendGroupMessageAsync(Collections.singleton(userId), dto);
-    }
-
-    /**
-     * 异步批量推送群聊消息给多个用户
-     *
-     * @param userIds 目标用户编号列表
-     * @param dto     群聊消息 DTO
-     */
-    void sendGroupMessageAsync(Collection<Long> userIds, ImGroupMessageDTO dto);
-
-    /**
-     * 异步推送频道消息给指定用户
+     * 异步推送 WebSocket 通知给指定用户
      *
-     * @param userId 目标用户编号
-     * @param dto    频道消息 DTO
+     * @param userId           目标用户编号
+     * @param conversationType 会话类型，参见 ImConversationTypeEnum 枚举类
+     * @param contentType      内容类型，参见 ImContentTypeEnum 枚举类
+     * @param payload          通知 payload
      */
-    default void sendChannelMessageAsync(Long userId, ImChannelMessageDTO dto) {
-        sendChannelMessageAsync(Collections.singleton(userId), dto);
+    default void sendNotificationAsync(Long userId, Integer conversationType, Integer contentType, Object payload) {
+        sendNotificationAsync(Collections.singleton(userId), conversationType, contentType, payload);
     }
     /**
-     * 异步批量推送频道消息给多个用户
+     * 异步批量推送 WebSocket 通知给多个用户
      *
-     * @param userIds 目标用户编号列表
-     * @param dto     频道消息 DTO
+     * @param userIds          目标用户编号列表
+     * @param conversationType 会话类型，参见 ImConversationTypeEnum 枚举类
+     * @param contentType      内容类型，参见 ImContentTypeEnum 枚举类
+     * @param payload          通知 payload
      */
-    void sendChannelMessageAsync(Collection<Long> userIds, ImChannelMessageDTO dto);
+    void sendNotificationAsync(Collection<Long> userIds, Integer conversationType, Integer contentType, Object payload);
     /**
-     * 异步广播频道消息给当前所有在线管理端用户；用于全员推送
+     * 异步广播 WebSocket 通知给当前所有在线管理端用户
      *
-     * @param dto 频道消息 DTO
+     * @param conversationType 会话类型，参见 ImConversationTypeEnum 枚举类
+     * @param contentType      内容类型，参见 ImContentTypeEnum 枚举类
+     * @param payload          通知 payload
      */
-    void broadcastChannelMessageAsync(ImChannelMessageDTO dto);
+    void broadcastNotificationAsync(Integer conversationType, Integer contentType, Object payload);
 }
@@ -2,9 +2,7 @@ package cn.iocoder.yudao.module.im.service.websocket;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImChannelMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImGroupMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO;
+import cn.iocoder.yudao.module.im.service.websocket.notification.ImNotificationWebSocketDTO;
 import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi;
 import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
@@ -88,31 +86,30 @@ public class ImWebSocketServiceImpl implements ImWebSocketService {
     }
     /**
-     * 异步发送频道 WebSocket 消息
+     * 异步发送 WebSocket 通知
      */
     @Async
-    public void doSendChannelMessage(Collection<Long> userIds, ImChannelMessageDTO dto) {
+    public void doSendNotification(Collection<Long> userIds, ImNotificationWebSocketDTO notification) {
         for (Long userId : getDistinctUserIds(userIds)) {
             try {
                 webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(), userId,
-                        ImChannelMessageDTO.TYPE, dto);
+                        ImNotificationWebSocketDTO.TYPE, notification);
             } catch (Exception e) {
-                log.error("[doSendChannelMessage][userId({}) dto({}) 发送失败]", userId, dto, e);
+                log.error("[doSendNotification][userId({}) notification({}) 发送失败]", userId, notification, e);
             }
         }
     }
     /**
-     * 异步广播频道 WebSocket 消息给当前所有在线管理端用户；
-     * 依赖 infra WebSocketSenderApi 按 UserType 广播能力，离线用户由客户端上线 pull 兜底
+     * 异步广播 WebSocket 通知
      */
     @Async
-    public void doBroadcastChannelMessage(ImChannelMessageDTO dto) {
+    public void doBroadcastNotification(ImNotificationWebSocketDTO notification) {
         try {
             webSocketSenderApi.sendObject(UserTypeEnum.ADMIN.getValue(),
-                    ImChannelMessageDTO.TYPE, dto);
+                    ImNotificationWebSocketDTO.TYPE, notification);
         } catch (Exception e) {
-            log.error("[doBroadcastChannelMessage][dto({}) 广播失败]", dto, e);
+            log.error("[doBroadcastNotification][notification({}) 广播失败]", notification, e);
         }
     }
@@ -121,19 +118,15 @@ public class ImWebSocketServiceImpl implements ImWebSocketService {
     }
     /**
-     * 事务感知的任务调度：
-     * - 有事务：注册 afterCommit 回调，事务提交后再执行，防止客户端拿到消息去查库时数据还没落盘
-     * - 无事务：直接执行（如非 @Transactional 方法中的调用）
+     * 事务感知的任务调度
      *
-     * @param task 待执行的推送任务（内部通过 getSelf() 走 @Async 异步执行）
+     * @param task 待执行的推送任务
      */
     private void executeAfterTransaction(Runnable task) {
-        // 情况一：没有事务，直接执行
         if (!TransactionSynchronizationManager.isSynchronizationActive()) {
             task.run();
             return;
         }
-        // 情况二：有事务，注册 afterCommit 事件，在事务提交后执行
         TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() {
             @Override
-package cn.iocoder.yudao.module.im.service.websocket.dto;
-
-import cn.hutool.core.lang.Assert;
-import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.im.dal.dataobject.message.ImPrivateMessageDO;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
-import cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend.BaseFriendNotification;
-import cn.iocoder.yudao.module.im.service.websocket.dto.notification.group.BaseGroupNotification;
-import lombok.Data;
-import lombok.experimental.Accessors;
-
-import java.time.LocalDateTime;
-
-/**
- * IM 私聊消息 WebSocket 统一推送 DTO
- * <p>
- * 发送、已读、回执、撤回都通过 {@link #type} 字段区分，
- * 并统一复用 {@link #id} 字段表达目标消息或已读位置。
- *
- * @author 芋道源码
- */
-@Data
-@Accessors(chain = true)
-public class ImPrivateMessageDTO {
-
-    public static final String TYPE = "im-private-message";
-
-    /**
-     * 消息编号
-     * <p>
-     * 普通消息：当前消息 id
-     * READ：已读位置（我已读到这条消息）
-     * RECEIPT：已读位置（对方已读到这条消息）
-     * RECALL：被撤回的原消息 id
-     */
-    private Long id;
-    /**
-     * 客户端消息编号
-     */
-    private String clientMessageId;
-    /**
-     * 发送人编号
-     */
-    private Long senderId;
-    /**
-     * 接收人编号
-     */
-    private Long receiverId;
-    /**
-     * 消息类型
-     */
-    private Integer type;
-    /**
-     * 消息内容
-     */
-    private String content;
-    /**
-     * 消息状态
-     */
-    private Integer status;
-    /**
-     * 回执状态
-     */
-    private Integer receiptStatus;
-    /**
-     * 发送时间
-     */
-    private LocalDateTime sendTime;
-
-    // ========== 静态工厂方法 ==========
-
-    /**
-     * 构建发送消息 DTO
-     *
-     * @param message 私聊消息 DO
-     * @return 私聊 DTO
-     */
-    public static ImPrivateMessageDTO ofSend(ImPrivateMessageDO message) {
-        return BeanUtils.toBean(message, ImPrivateMessageDTO.class);
-    }
-
-    /**
-     * 构建已读同步 DTO（多端同步：通知自己的其他终端"我已经读了某个会话"）
-     *
-     * @param senderId   当前用户编号
-     * @param receiverId 对方用户编号
-     * @param readId     已读位置（最大已读消息编号）
-     * @return 私聊 DTO
-     */
-    public static ImPrivateMessageDTO ofRead(Long senderId, Long receiverId, Long readId) {
-        return new ImPrivateMessageDTO()
-                .setId(readId).setType(ImMessageTypeEnum.READ.getType())
-                .setSenderId(senderId).setReceiverId(receiverId);
-    }
-
-    /**
-     * 构建已读回执 DTO（通知对方"我已读了你的消息"）
-     *
-     * @param senderId   已读方的用户编号
-     * @param receiverId 对方用户编号
-     * @param readId     已读位置（最大已读消息编号）
-     * @return 私聊 DTO
-     */
-    public static ImPrivateMessageDTO ofReceipt(Long senderId, Long receiverId, Long readId) {
-        return new ImPrivateMessageDTO()
-                .setId(readId).setType(ImMessageTypeEnum.RECEIPT.getType())
-                .setSenderId(senderId).setReceiverId(receiverId);
-    }
-
-    // ==================== 好友变更相关 ====================
-
-    /**
-     * 构建好友通知推送 DTO（统一入口）
-     *
-     * @param type            消息类型；取自 {@link ImMessageTypeEnum} 中的 FRIEND_* 段
-     * @param operatorUserId  操作人用户编号；同时作为帧的 senderId 用于定位接收端 friendUserId
-     * @param receiverUserId  推送目标用户编号
-     * @param payload         好友通知 payload（继承 {@link BaseFriendNotification}）
-     * @return 私聊 DTO
-     */
-    public static ImPrivateMessageDTO ofFriendNotification(Integer type, Long operatorUserId,
-                                                           Long receiverUserId, BaseFriendNotification payload) {
-        validateNotification(type, payload, ImMessageTypeEnum.isFriendNotification(type));
-        return new ImPrivateMessageDTO().setType(type)
-                .setSenderId(operatorUserId).setReceiverId(receiverUserId)
-                .setContent(JsonUtils.toJsonString(payload)).setSendTime(LocalDateTime.now());
-    }
-
-    // ==================== 群定向私聊通知 ====================
-
-    // TODO DONE @AI：群申请定向通知继续走私聊通道
-    /**
-     * 构建群通知推送 DTO（走私聊通道定向推送，不入群消息流）
-     * <p>
-     * 用于 GROUP_REQUEST_RECEIVED / GROUP_REQUEST_APPROVED / GROUP_REQUEST_REJECTED 段位；
-     * 与 {@link cn.iocoder.yudao.module.im.service.message.dto.ImGroupMessageSendDTO} 走 sendGroupMessage 群广播路径不同
-     *
-     * @param type           消息类型；取自 {@link ImMessageTypeEnum} 中的 GROUP_REQUEST_* 段
-     * @param operatorUserId 操作人用户编号；同时作为帧的 senderId
-     * @param receiverUserId 推送目标用户编号
-     * @param payload        群事件 payload（继承 {@link BaseGroupNotification}）
-     * @return 私聊 DTO
-     */
-    public static ImPrivateMessageDTO ofGroupNotification(Integer type, Long operatorUserId,
-                                                          Long receiverUserId, BaseGroupNotification payload) {
-        validateNotification(type, payload, ImMessageTypeEnum.isGroupRequestNotification(type));
-        return new ImPrivateMessageDTO().setType(type)
-                .setSenderId(operatorUserId).setReceiverId(receiverUserId)
-                .setContent(JsonUtils.toJsonString(payload)).setSendTime(LocalDateTime.now());
-    }
-
-    // ==================== 实时通话信令 ====================
-
-    /**
-     * 构建通话信令推送 DTO（走私聊通道仅推参与方，不入消息流）
-     * <p>
-     * 用于 RTC_CALL（INVITE / REJECT 等）/ RTC_PARTICIPANT_CONNECTED / RTC_PARTICIPANT_DISCONNECTED
-     *
-     * @param type           消息类型；取自 {@link ImMessageTypeEnum} 中的 RTC_* 段
-     * @param senderId       发送人编号；INVITE 时为发起人，REJECT 时为拒绝者，参与者事件时为加入 / 离开者
-     * @param receiverUserId 推送目标用户编号
-     * @param payload        通话事件 payload（任意 RTC 通知 DTO）
-     * @return 私聊 DTO
-     */
-    public static ImPrivateMessageDTO ofRtcNotification(Integer type, Long senderId,
-                                                        Long receiverUserId, Object payload) {
-        validateNotification(type, payload, ImMessageTypeEnum.isRtcNotification(type));
-        return new ImPrivateMessageDTO().setType(type)
-                .setSenderId(senderId).setReceiverId(receiverUserId)
-                .setContent(JsonUtils.toJsonString(payload)).setSendTime(LocalDateTime.now());
-    }
-
-    private static void validateNotification(Integer type, Object payload, boolean supported) {
-        Assert.notNull(type, "消息类型不能为空");
-        Assert.notNull(payload, "消息内容不能为空");
-        Assert.isTrue(supported, "消息类型不匹配 type={}", type);
-    }
-
-}
+package cn.iocoder.yudao.module.im.service.websocket.notification;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * IM WebSocket 在线通知外壳
+ * <p>
+ * conversationType 定位会话维度；contentType 定位业务内容；payload 承载对应通知对象。
+ * 会进入聊天流的私聊、群聊、频道事件走 message 子包；不进入聊天流的好友、加群申请、通话信令走 NONE 会话。
+ *
+ * @author 芋道源码
+ */
+@Data
+@Accessors(chain = true)
+public class ImNotificationWebSocketDTO {
+
+    public static final String TYPE = "im-notification";
+
+    /**
+     * 会话类型，参见 ImConversationTypeEnum 枚举类
+     */
+    private Integer conversationType;
+    /**
+     * 内容类型，参见 ImContentTypeEnum 枚举类
+     */
+    private Integer contentType;
+    /**
+     * 负载数据
+     */
+    private Object payload;
+
+}
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend;
+package cn.iocoder.yudao.module.im.service.websocket.notification.friend;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend;
+package cn.iocoder.yudao.module.im.service.websocket.notification.friend;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend;
+package cn.iocoder.yudao.module.im.service.websocket.notification.friend;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend;
+package cn.iocoder.yudao.module.im.service.websocket.notification.friend;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend;
+package cn.iocoder.yudao.module.im.service.websocket.notification.friend;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend;
+package cn.iocoder.yudao.module.im.service.websocket.notification.friend;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend;
+package cn.iocoder.yudao.module.im.service.websocket.notification.friend;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend;
+package cn.iocoder.yudao.module.im.service.websocket.notification.friend;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend;
+package cn.iocoder.yudao.module.im.service.websocket.notification.friend;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.friend;
+package cn.iocoder.yudao.module.im.service.websocket.notification.friend;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 /**
  * 添加管理员事件通知（memberUserIds 为被设管理员的成员）
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 /**
  * 撤销管理员事件通知（memberUserIds 为被撤销管理员的成员）
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 /**
  * 群创建事件通知（memberUserIds 含创建者 + 初始邀请成员）
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 /**
  * 群解散事件通知
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 /**
  * 成员加入事件通知（memberUserIds 为被邀请人）
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 /**
  * 成员被移出事件通知（memberUserIds 为被移出成员）
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 /**
  * 成员退群事件通知
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 /**
  * 入群申请被同意通知
  * <p>
- * 走私聊通道定向推送给申请人 + 群主 + 全部管理员；admin 侧据此把 unhandledCount 减 1 并从未处理列表移除
+ * 定向推送给申请人 + 群主 + 全部管理员；admin 侧据此把 unhandledCount 减 1 并从未处理列表移除
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 /**
  * 收到新的入群申请通知
  * <p>
- * 走私聊通道定向推送给群主 + 全部管理员（多端同步）；payload 已携带申请方昵称 / 头像，前端按 requestId 直接 push 进列表
+ * 定向推送给群主 + 全部管理员（多端同步）；payload 已携带申请方昵称 / 头像，前端按 requestId 直接 push 进列表
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.group;
+package cn.iocoder.yudao.module.im.service.websocket.notification.group;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -6,7 +6,7 @@ import lombok.EqualsAndHashCode;
 /**
  * 入群申请被拒绝通知
  * <p>
- * 走私聊通道定向推送给申请人 + 群主 + 全部管理员；admin 侧据此把 unhandledCount 减 1 并从未处理列表移除
+ * 定向推送给申请人 + 群主 + 全部管理员；admin 侧据此把 unhandledCount 减 1 并从未处理列表移除
  */
 @EqualsAndHashCode(callSuper = true)
 @Data
-package cn.iocoder.yudao.module.im.service.websocket.dto;
+package cn.iocoder.yudao.module.im.service.websocket.notification.message;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.im.dal.dataobject.message.ImChannelMessageDO;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
 import lombok.Data;
 import lombok.experimental.Accessors;
 import java.time.LocalDateTime;
 /**
- * IM 频道消息 WebSocket 推送 DTO
+ * IM 频道消息 WebSocket 推送通知
  * <p>
  * 单向：服务端运营推送 → C 端用户；C 端不能向频道发消息。
  * 字段分层：顶层是消息元数据 + 检索维度，content 是 MaterialMessage payload 的 JSON 串。
@@ -18,9 +17,7 @@ import java.time.LocalDateTime;
  */
 @Data
 @Accessors(chain = true)
-public class ImChannelMessageDTO {
-
-    public static final String TYPE = "im-channel-message";
+public class ImChannelMessageNotification {
     /**
      * 消息编号
@@ -48,23 +45,10 @@ public class ImChannelMessageDTO {
     private LocalDateTime sendTime;
     /**
-     * 由频道消息 DO 构建推送 DTO
-     */
-    public static ImChannelMessageDTO ofSend(ImChannelMessageDO message) {
-        return BeanUtils.toBean(message, ImChannelMessageDTO.class);
-    }
-
-    /**
-     * 构建已读同步 DTO；多端同步：通知自己的其他终端「我已经读了某频道」
-     *
-     * @param channelId 频道编号
-     * @param readId    已读位置（最大已读消息编号）
-     * @return 频道 DTO
+     * 由频道消息 DO 构建推送通知
      */
-    public static ImChannelMessageDTO ofRead(Long channelId, Long readId) {
-        return new ImChannelMessageDTO()
-                .setId(readId).setType(ImMessageTypeEnum.READ.getType())
-                .setChannelId(channelId);
+    public static ImChannelMessageNotification ofSend(ImChannelMessageDO message) {
+        return BeanUtils.toBean(message, ImChannelMessageNotification.class);
     }
 }
-package cn.iocoder.yudao.module.im.service.websocket.dto;
+package cn.iocoder.yudao.module.im.service.websocket.notification.message;
 import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
 import cn.iocoder.yudao.module.im.dal.dataobject.message.ImGroupMessageDO;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
 import lombok.Data;
 import java.time.LocalDateTime;
 import java.util.List;
 /**
- * IM 群聊消息 WebSocket 统一推送 DTO
- * <p>
- * 发送、已读、回执都通过 {@link #type} 字段区分，
- * 并统一复用 {@link #id} 字段表达目标消息或已读位置。
+ * IM 群聊消息 WebSocket 统一推送通知
  *
  * @author 芋道源码
  */
 @Data
-public class ImGroupMessageDTO {
-
-    public static final String TYPE = "im-group-message";
+public class ImGroupMessageNotification {
     /**
      * 消息编号
-     * <p>
-     * 普通消息：当前消息 id
-     * READ：无（群已读不需要）
-     * RECEIPT：需要回执的目标消息 id
      */
     private Long id;
     /**
@@ -54,6 +44,14 @@ public class ImGroupMessageDTO {
      */
     private Integer status;
     /**
+     * 回执状态
+     */
+    private Integer receiptStatus;
+    /**
+     * 已读人数
+     */
+    private Integer readCount;
+    /**
      * 发送时间
      */
     private LocalDateTime sendTime;
@@ -66,58 +64,14 @@ public class ImGroupMessageDTO {
      */
     private List<Long> receiverUserIds;
     /**
-     * 群回执状态
-     */
-    private Integer receiptStatus;
-    /**
-     * 群回执已读人数
-     */
-    private Integer readCount;
-    /**
-     * 已读位置
-     */
-    private Long readId;
-
-    // ========== 静态工厂方法 ==========
-
-    /**
-     * 构建发送消息 DTO
+     * 构建发送消息通知
      *
      * @param message 群聊消息 DO
-     * @return 群聊 DTO
-     */
-    public static ImGroupMessageDTO ofSend(ImGroupMessageDO message) {
-        return BeanUtils.toBean(message, ImGroupMessageDTO.class).setReceiverUserIds(null);
-    }
-
-    /**
-     * 构建已读同步 DTO（多端同步：通知自己的其他终端"我已经读了某个群"）
-     *
-     * @param senderId 当前用户编号
-     * @param groupId  群编号
-     * @param readId   已读位置（最大已读消息编号）
-     * @return 群聊 DTO
-     */
-    public static ImGroupMessageDTO ofRead(Long senderId, Long groupId, Long readId) {
-        return new ImGroupMessageDTO()
-                .setId(readId).setReadId(readId).setType(ImMessageTypeEnum.READ.getType())
-                .setSenderId(senderId).setGroupId(groupId);
-    }
-
-    /**
-     * 构建群回执 DTO（广播回执状态和已读人数）
-     *
-     * @param messageId     消息编号
-     * @param groupId       群编号
-     * @param readCount     已读人数
-     * @param receiptStatus 回执状态
-     * @return 群聊 DTO
+     * @return 群聊通知
      */
-    public static ImGroupMessageDTO ofReceipt(Long messageId, Long groupId,
-                                              Integer readCount, Integer receiptStatus) {
-        return new ImGroupMessageDTO()
-                .setId(messageId).setType(ImMessageTypeEnum.RECEIPT.getType())
-                .setGroupId(groupId).setReadCount(readCount).setReceiptStatus(receiptStatus);
+    public static ImGroupMessageNotification ofSend(ImGroupMessageDO message) {
+        return BeanUtils.toBean(message, ImGroupMessageNotification.class)
+                .setReadCount(message.getReadCount() != null ? message.getReadCount() : 0);
     }
 }
+package cn.iocoder.yudao.module.im.service.websocket.notification.message;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * IM 消息已读同步通知
+ *
+ * @author 芋道源码
+ */
+@Data
+@Accessors(chain = true)
+public class ImMessageReadNotification {
+
+    /**
+     * 已读位置（最大已读消息编号）
+     */
+    private Long id;
+    /**
+     * 发送人编号
+     */
+    private Long senderId;
+    /**
+     * 私聊接收人编号
+     */
+    private Long receiverId;
+    /**
+     * 群编号
+     */
+    private Long groupId;
+    /**
+     * 频道编号
+     */
+    private Long channelId;
+    /**
+     * 已读位置（最大已读消息编号）
+     */
+    private Long readId;
+
+    public static ImMessageReadNotification ofPrivate(Long senderId, Long receiverId, Long readId) {
+        return new ImMessageReadNotification()
+                .setId(readId).setReadId(readId)
+                .setSenderId(senderId).setReceiverId(receiverId);
+    }
+
+    public static ImMessageReadNotification ofGroup(Long senderId, Long groupId, Long readId) {
+        return new ImMessageReadNotification()
+                .setId(readId).setReadId(readId)
+                .setSenderId(senderId).setGroupId(groupId);
+    }
+
+    public static ImMessageReadNotification ofChannel(Long channelId, Long readId) {
+        return new ImMessageReadNotification()
+                .setId(readId).setReadId(readId)
+                .setChannelId(channelId);
+    }
+
+}
+package cn.iocoder.yudao.module.im.service.websocket.notification.message;
+
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+/**
+ * IM 消息回执通知
+ *
+ * @author 芋道源码
+ */
+@Data
+@Accessors(chain = true)
+public class ImMessageReceiptNotification {
+
+    /**
+     * 消息编号
+     */
+    private Long id;
+    /**
+     * 已读方的用户编号
+     */
+    private Long senderId;
+    /**
+     * 私聊接收人编号
+     */
+    private Long receiverId;
+    /**
+     * 群编号
+     */
+    private Long groupId;
+    /**
+     * 已读人数
+     */
+    private Integer readCount;
+    /**
+     * 回执状态
+     */
+    private Integer receiptStatus;
+
+    public static ImMessageReceiptNotification ofPrivate(Long senderId, Long receiverId, Long readId) {
+        return new ImMessageReceiptNotification()
+                .setId(readId).setSenderId(senderId).setReceiverId(receiverId);
+    }
+
+    public static ImMessageReceiptNotification ofGroup(Long messageId, Long groupId,
+                                                       Integer readCount, Integer receiptStatus) {
+        return new ImMessageReceiptNotification()
+                .setId(messageId).setGroupId(groupId)
+                .setReadCount(readCount).setReceiptStatus(receiptStatus);
+    }
+
+}
+package cn.iocoder.yudao.module.im.service.websocket.notification.message;
+
+import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.im.dal.dataobject.message.ImPrivateMessageDO;
+import lombok.Data;
+import lombok.experimental.Accessors;
+
+import java.time.LocalDateTime;
+
+/**
+ * IM 私聊消息 WebSocket 统一推送通知
+ *
+ * @author 芋道源码
+ */
+@Data
+@Accessors(chain = true)
+public class ImPrivateMessageNotification {
+
+    /**
+     * 消息编号
+     */
+    private Long id;
+    /**
+     * 客户端消息编号
+     */
+    private String clientMessageId;
+    /**
+     * 发送人编号
+     */
+    private Long senderId;
+    /**
+     * 接收人编号
+     */
+    private Long receiverId;
+    /**
+     * 消息类型
+     */
+    private Integer type;
+    /**
+     * 消息内容
+     */
+    private String content;
+    /**
+     * 消息状态
+     */
+    private Integer status;
+    /**
+     * 回执状态
+     */
+    private Integer receiptStatus;
+    /**
+     * 发送时间
+     */
+    private LocalDateTime sendTime;
+
+    // ========== 静态工厂方法 ==========
+
+    /**
+     * 构建发送消息通知
+     *
+     * @param message 私聊消息 DO
+     * @return 私聊通知
+     */
+    public static ImPrivateMessageNotification ofSend(ImPrivateMessageDO message) {
+        return BeanUtils.toBean(message, ImPrivateMessageNotification.class);
+    }
+
+}
+/**
+ * IM WebSocket 在线通知对象。
+ *
+ * <p>
+ * 本包只放 WebSocket 外层通知对象，固定使用 im-notification 作为推送 type。
+ * 具体业务 payload 放在子包中：
+ * <ul>
+ *     <li>{@code message}：私聊、群聊、频道消息通知，以及消息内容结构；</li>
+ *     <li>{@code friend}：好友关系和好友申请通知；</li>
+ *     <li>{@code group}：群资料、群成员、加群申请通知；</li>
+ *     <li>{@code rtc}：实时通话通知。</li>
+ * </ul>
+ */
+package cn.iocoder.yudao.module.im.service.websocket.notification;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.rtc;
+package cn.iocoder.yudao.module.im.service.websocket.notification.rtc;
 import cn.iocoder.yudao.module.im.dal.dataobject.rtc.ImRtcCallDO;
 import cn.iocoder.yudao.module.im.enums.rtc.ImRtcCallEndReasonEnum;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.rtc;
+package cn.iocoder.yudao.module.im.service.websocket.notification.rtc;
 import cn.iocoder.yudao.module.im.dal.dataobject.rtc.ImRtcCallDO;
 import cn.iocoder.yudao.module.im.enums.rtc.ImRtcParticipantStatusEnum;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.rtc;
+package cn.iocoder.yudao.module.im.service.websocket.notification.rtc;
 import cn.iocoder.yudao.module.im.dal.dataobject.rtc.ImRtcCallDO;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.rtc;
+package cn.iocoder.yudao.module.im.service.websocket.notification.rtc;
 import cn.iocoder.yudao.module.im.dal.dataobject.rtc.ImRtcCallDO;
 import lombok.Data;
-package cn.iocoder.yudao.module.im.service.websocket.dto.notification.rtc;
+package cn.iocoder.yudao.module.im.service.websocket.notification.rtc;
 import cn.iocoder.yudao.module.im.dal.dataobject.rtc.ImRtcCallDO;
 import lombok.Data;
@@ -4,8 +4,8 @@ import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.util.json.JsonUtils;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
-import cn.iocoder.yudao.module.im.service.websocket.dto.message.QuoteMessage;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
+import cn.iocoder.yudao.module.im.dal.dataobject.message.content.QuoteMessage;
 import java.util.Collection;
 import java.util.LinkedHashMap;
@@ -39,9 +39,9 @@ public class ImMessageUtils {
      * @param content 消息内容
      */
     public static void validateUserMessageContent(Integer type, String content) {
-        ImMessageTypeEnum messageType;
+        ImContentTypeEnum messageType;
         try {
-            messageType = ImMessageTypeEnum.validate(type);
+            messageType = ImContentTypeEnum.validate(type);
         } catch (IllegalArgumentException e) {
             throw exception(MESSAGE_CONTENT_INVALID);
         }
@@ -52,23 +52,23 @@ public class ImMessageUtils {
         if (map == null) {
             throw exception(MESSAGE_CONTENT_INVALID);
         }
-        if (ImMessageTypeEnum.TEXT == messageType) {
+        if (ImContentTypeEnum.TEXT == messageType) {
             validateTextContent(map);
-        } else if (ImMessageTypeEnum.IMAGE == messageType || ImMessageTypeEnum.FACE == messageType) {
+        } else if (ImContentTypeEnum.IMAGE == messageType || ImContentTypeEnum.FACE == messageType) {
             validateUrl(getString(map, "url"));
-        } else if (ImMessageTypeEnum.VOICE == messageType) {
+        } else if (ImContentTypeEnum.VOICE == messageType) {
             validateUrl(getString(map, "url"));
             validatePositiveNumber(map.get("duration"));
-        } else if (ImMessageTypeEnum.VIDEO == messageType) {
+        } else if (ImContentTypeEnum.VIDEO == messageType) {
             validateUrl(getString(map, "url"));
-        } else if (ImMessageTypeEnum.FILE == messageType) {
+        } else if (ImContentTypeEnum.FILE == messageType) {
             validateUrl(getString(map, "url"));
             validateNotBlank(getString(map, "name"));
-        } else if (ImMessageTypeEnum.CARD == messageType) {
+        } else if (ImContentTypeEnum.CARD == messageType) {
             validateCardContent(map);
-        } else if (ImMessageTypeEnum.MERGE == messageType) {
+        } else if (ImContentTypeEnum.MERGE == messageType) {
             validateMergeContent(map);
-        } else if (ImMessageTypeEnum.MATERIAL == messageType) {
+        } else if (ImContentTypeEnum.MATERIAL == messageType) {
             validateMaterialContent(map);
         }
     }
@@ -11,7 +11,7 @@ import cn.iocoder.yudao.module.im.dal.mysql.group.ImGroupMemberMapper;
 import cn.iocoder.yudao.module.im.dal.mysql.message.ImGroupMessageMapper;
 import cn.iocoder.yudao.module.im.dal.mysql.message.ImPrivateMessageMapper;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageStatusEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import jakarta.annotation.Resource;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -194,10 +194,10 @@ public class ImStatisticsManagerMapperTest extends BaseDbUnitTest {
     @Test
     public void testSelectMessageTypeDistribution_mergePrivateAndGroup() {
         // 准备：私聊 type=0 ×1，群聊 type=0 ×2、type=1 ×1
-        privateMessageMapper.insert(buildPrivate(1L, 2L, WINDOW_BEGIN.plusDays(1)).setType(ImMessageTypeEnum.TEXT.getType()));
-        groupMessageMapper.insert(buildGroupMessage(1L, 100L, WINDOW_BEGIN.plusDays(1)).setType(ImMessageTypeEnum.TEXT.getType()));
-        groupMessageMapper.insert(buildGroupMessage(1L, 100L, WINDOW_BEGIN.plusDays(1)).setType(ImMessageTypeEnum.TEXT.getType()));
-        groupMessageMapper.insert(buildGroupMessage(1L, 100L, WINDOW_BEGIN.plusDays(1)).setType(ImMessageTypeEnum.IMAGE.getType()));
+        privateMessageMapper.insert(buildPrivate(1L, 2L, WINDOW_BEGIN.plusDays(1)).setType(ImContentTypeEnum.TEXT.getType()));
+        groupMessageMapper.insert(buildGroupMessage(1L, 100L, WINDOW_BEGIN.plusDays(1)).setType(ImContentTypeEnum.TEXT.getType()));
+        groupMessageMapper.insert(buildGroupMessage(1L, 100L, WINDOW_BEGIN.plusDays(1)).setType(ImContentTypeEnum.TEXT.getType()));
+        groupMessageMapper.insert(buildGroupMessage(1L, 100L, WINDOW_BEGIN.plusDays(1)).setType(ImContentTypeEnum.IMAGE.getType()));
         // 调用
         List<Map<String, Object>> dist = mapper.selectMessageTypeDistribution(WINDOW_BEGIN, WINDOW_END);
@@ -205,8 +205,8 @@ public class ImStatisticsManagerMapperTest extends BaseDbUnitTest {
         // 断言：type=TEXT(0) → 3；type=IMAGE(1) → 1
         Map<Object, Long> byType = dist.stream().collect(java.util.stream.Collectors.toMap(
                 m -> ((Number) m.get("type")).intValue(), m -> ((Number) m.get("count")).longValue()));
-        assertEquals(3L, byType.get(ImMessageTypeEnum.TEXT.getType()));
-        assertEquals(1L, byType.get(ImMessageTypeEnum.IMAGE.getType()));
+        assertEquals(3L, byType.get(ImContentTypeEnum.TEXT.getType()));
+        assertEquals(1L, byType.get(ImContentTypeEnum.IMAGE.getType()));
     }
     @Test
@@ -243,7 +243,7 @@ public class ImStatisticsManagerMapperTest extends BaseDbUnitTest {
         return ImPrivateMessageDO.builder()
                 .clientMessageId("uuid-" + System.nanoTime())
                 .senderId(senderId).receiverId(receiverId)
-                .type(ImMessageTypeEnum.TEXT.getType())
+                .type(ImContentTypeEnum.TEXT.getType())
                 .content("{}")
                 .status(ImMessageStatusEnum.NORMAL.getStatus())
                 .sendTime(sendTime).build();
@@ -253,7 +253,7 @@ public class ImStatisticsManagerMapperTest extends BaseDbUnitTest {
         return new ImGroupMessageDO()
                 .setClientMessageId("uuid-" + System.nanoTime())
                 .setSenderId(senderId).setGroupId(groupId)
-                .setType(ImMessageTypeEnum.TEXT.getType())
+                .setType(ImContentTypeEnum.TEXT.getType())
                 .setContent("{}")
                 .setStatus(ImMessageStatusEnum.NORMAL.getStatus())
                 .setSendTime(sendTime);
@@ -12,7 +12,6 @@ import cn.iocoder.yudao.module.im.enums.friend.ImFriendRequestHandleResultEnum;
 import cn.iocoder.yudao.module.im.enums.friend.ImFriendStateEnum;
 import cn.iocoder.yudao.module.im.framework.config.ImProperties;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.junit.jupiter.api.Test;
@@ -10,7 +10,6 @@ import cn.iocoder.yudao.module.im.dal.mysql.friend.ImFriendMapper;
 import cn.iocoder.yudao.module.im.service.message.ImPrivateMessageService;
 import cn.iocoder.yudao.module.im.service.message.dto.ImPrivateMessageSendDTO;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
@@ -158,7 +157,7 @@ public class ImFriendServiceImplTest extends BaseMockitoUnitTest {
         verify(imFriendMapper, never()).insert(any(ImFriendDO.class));
         verify(imFriendMapper, never()).updateById(any(ImFriendDO.class));
         verify(imFriendMapper, never()).updateReAddFields(anyLong(), anyInt(), any(LocalDateTime.class),
-                anyBoolean(), anyBoolean(), anyBoolean(), any(), any());
+                any(LocalDateTime.class), anyBoolean(), anyBoolean(), anyBoolean(), any(), any());
     }
     @Test
@@ -173,7 +172,7 @@ public class ImFriendServiceImplTest extends BaseMockitoUnitTest {
         // 断言：恢复 ENABLE，并清空 deleteTime
         verify(imFriendMapper).updateReAddFields(eq(10L), eq(CommonStatusEnum.ENABLE.getStatus()),
-                any(LocalDateTime.class), eq(false), eq(false), eq(false), isNull(), isNull());
+                any(LocalDateTime.class), any(LocalDateTime.class), eq(false), eq(false), eq(false), isNull(), isNull());
         verify(imFriendMapper, never()).insert(any(ImFriendDO.class));
     }
@@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.im.dal.dataobject.group.ImGroupMemberDO;
 import cn.iocoder.yudao.module.im.dal.mysql.group.ImGroupMemberMapper;
 import cn.iocoder.yudao.module.im.enums.group.ImGroupMemberRoleEnum;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImGroupMessageDTO;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImGroupMessageNotification;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
@@ -13,11 +13,10 @@ import cn.iocoder.yudao.module.im.dal.mysql.group.ImGroupRequestMapper;
 import cn.iocoder.yudao.module.im.enums.group.ImGroupAddSourceEnum;
 import cn.iocoder.yudao.module.im.enums.group.ImGroupMemberRoleEnum;
 import cn.iocoder.yudao.module.im.enums.group.ImGroupRequestHandleResultEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import cn.iocoder.yudao.module.im.service.message.ImGroupMessageService;
 import cn.iocoder.yudao.module.im.service.message.dto.ImGroupMessageSendDTO;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.junit.jupiter.api.Test;
@@ -84,7 +83,7 @@ public class ImGroupRequestServiceImplTest extends BaseMockitoUnitTest {
         // 推 1510 自由进群
         ArgumentCaptor<ImGroupMessageSendDTO> dtoCaptor = ArgumentCaptor.forClass(ImGroupMessageSendDTO.class);
         verify(groupMessageService).sendGroupMessage(eq(1L), dtoCaptor.capture());
-        assertEquals(ImMessageTypeEnum.GROUP_MEMBER_ENTER.getType(), dtoCaptor.getValue().getType());
+        assertEquals(ImContentTypeEnum.GROUP_MEMBER_ENTER.getType(), dtoCaptor.getValue().getType());
     }
     @Test
@@ -207,7 +206,7 @@ public class ImGroupRequestServiceImplTest extends BaseMockitoUnitTest {
                 eq(ImGroupAddSourceEnum.SEARCH.getSource()), isNull());
         ArgumentCaptor<ImGroupMessageSendDTO> dtoCaptor = ArgumentCaptor.forClass(ImGroupMessageSendDTO.class);
         verify(groupMessageService).sendGroupMessage(eq(1L), dtoCaptor.capture());
-        assertEquals(ImMessageTypeEnum.GROUP_MEMBER_ENTER.getType(), dtoCaptor.getValue().getType());
+        assertEquals(ImContentTypeEnum.GROUP_MEMBER_ENTER.getType(), dtoCaptor.getValue().getType());
         // 1505 推送给申请人 + owner，去重后两条
         verify(websocketService, times(2)).sendPrivateMessageAsync(anyLong(), any(ImPrivateMessageDTO.class));
     }
@@ -19,13 +19,13 @@ import cn.iocoder.yudao.module.im.dal.dataobject.group.ImGroupMemberDO;
 import cn.iocoder.yudao.module.im.dal.mysql.group.ImGroupMapper;
 import cn.iocoder.yudao.module.im.enums.group.ImGroupAddSourceEnum;
 import cn.iocoder.yudao.module.im.enums.group.ImGroupMemberRoleEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import cn.iocoder.yudao.module.im.framework.config.ImProperties;
 import cn.iocoder.yudao.module.im.service.friend.ImFriendService;
 import cn.iocoder.yudao.module.im.service.message.ImGroupMessageService;
 import cn.iocoder.yudao.module.im.service.message.dto.ImGroupMessageSendDTO;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImGroupMessageDTO;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImGroupMessageNotification;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.junit.jupiter.api.Test;
@@ -100,7 +100,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest {
         // 验证：推送 GROUP_CREATE 通知（payload memberUserIds 含创建者自己）
         ArgumentCaptor<ImGroupMessageSendDTO> dtoCaptor = ArgumentCaptor.forClass(ImGroupMessageSendDTO.class);
         verify(groupMessageService).sendGroupMessage(eq(1L), anyCollection(), dtoCaptor.capture());
-        assertEquals(ImMessageTypeEnum.GROUP_CREATE.getType(), dtoCaptor.getValue().getType());
+        assertEquals(ImContentTypeEnum.GROUP_CREATE.getType(), dtoCaptor.getValue().getType());
     }
     @Test
@@ -132,7 +132,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest {
         // 验证：推送 GROUP_CREATE 通知，payload memberUserIds 含全员（创建者 + 邀请）
         ArgumentCaptor<ImGroupMessageSendDTO> dtoCaptor = ArgumentCaptor.forClass(ImGroupMessageSendDTO.class);
         verify(groupMessageService).sendGroupMessage(eq(1L), anyCollection(), dtoCaptor.capture());
-        assertEquals(ImMessageTypeEnum.GROUP_CREATE.getType(), dtoCaptor.getValue().getType());
+        assertEquals(ImContentTypeEnum.GROUP_CREATE.getType(), dtoCaptor.getValue().getType());
     }
     @Test
@@ -205,7 +205,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest {
             // 推送 GROUP_NAME_UPDATE 通知给全员
             ArgumentCaptor<ImGroupMessageSendDTO> dtoCaptor = ArgumentCaptor.forClass(ImGroupMessageSendDTO.class);
             verify(groupMessageService).sendGroupMessage(eq(1L), anyCollection(), dtoCaptor.capture());
-            assertEquals(ImMessageTypeEnum.GROUP_NAME_UPDATE.getType(), dtoCaptor.getValue().getType());
+            assertEquals(ImContentTypeEnum.GROUP_NAME_UPDATE.getType(), dtoCaptor.getValue().getType());
         }
     }
@@ -234,7 +234,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest {
             // 推送 GROUP_DISSOLVE 通知（send-before-remove，sendGroupMessage 内部查 active 自动覆盖全员，含群主多端同步）
             ArgumentCaptor<ImGroupMessageSendDTO> dtoCaptor = ArgumentCaptor.forClass(ImGroupMessageSendDTO.class);
             verify(groupMessageService).sendGroupMessage(eq(1L), dtoCaptor.capture());
-            assertEquals(ImMessageTypeEnum.GROUP_DISSOLVE.getType(), dtoCaptor.getValue().getType());
+            assertEquals(ImContentTypeEnum.GROUP_DISSOLVE.getType(), dtoCaptor.getValue().getType());
         }
     }
@@ -276,7 +276,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest {
             // 断言：使用管理员编号发通知并完成清理
             ArgumentCaptor<ImGroupMessageSendDTO> dtoCaptor = ArgumentCaptor.forClass(ImGroupMessageSendDTO.class);
             verify(groupMessageService).sendGroupMessage(eq(99L), dtoCaptor.capture());
-            assertEquals(ImMessageTypeEnum.GROUP_DISSOLVE.getType(), dtoCaptor.getValue().getType());
+            assertEquals(ImContentTypeEnum.GROUP_DISSOLVE.getType(), dtoCaptor.getValue().getType());
             verify(groupMemberService).removeGroupMembersByGroupId(10L);
         }
     }
@@ -345,7 +345,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest {
             verify(webSocketService, never()).sendGroupMessageAsync(anyCollection(), any(ImGroupMessageDTO.class));
             ArgumentCaptor<ImGroupMessageSendDTO> dtoCaptor = ArgumentCaptor.forClass(ImGroupMessageSendDTO.class);
             verify(groupMessageService).sendGroupMessage(eq(1L), anyCollection(), dtoCaptor.capture());
-            assertEquals(ImMessageTypeEnum.GROUP_MEMBER_INVITE.getType(), dtoCaptor.getValue().getType());
+            assertEquals(ImContentTypeEnum.GROUP_MEMBER_INVITE.getType(), dtoCaptor.getValue().getType());
         }
     }
@@ -429,7 +429,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest {
                     eq(ImGroupAddSourceEnum.INVITE.getSource()), eq(1L));
             ArgumentCaptor<ImGroupMessageSendDTO> dtoCaptor = ArgumentCaptor.forClass(ImGroupMessageSendDTO.class);
             verify(groupMessageService).sendGroupMessage(eq(1L), anyCollection(), dtoCaptor.capture());
-            assertEquals(ImMessageTypeEnum.GROUP_MEMBER_INVITE.getType(), dtoCaptor.getValue().getType());
+            assertEquals(ImContentTypeEnum.GROUP_MEMBER_INVITE.getType(), dtoCaptor.getValue().getType());
         }
     }
@@ -564,7 +564,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest {
             // 推送 GROUP_MEMBER_QUIT 通知给全员（含 quitter，前端自判清群）
             ArgumentCaptor<ImGroupMessageSendDTO> dtoCaptor = ArgumentCaptor.forClass(ImGroupMessageSendDTO.class);
             verify(groupMessageService).sendGroupMessage(eq(1L), dtoCaptor.capture());
-            assertEquals(ImMessageTypeEnum.GROUP_MEMBER_QUIT.getType(), dtoCaptor.getValue().getType());
+            assertEquals(ImContentTypeEnum.GROUP_MEMBER_QUIT.getType(), dtoCaptor.getValue().getType());
         }
     }
@@ -642,7 +642,7 @@ public class ImGroupServiceImplTest extends BaseMockitoUnitTest {
             // 推送 GROUP_MEMBER_KICK 通知给全员（含被踢者，前端自判清群）
             ArgumentCaptor<ImGroupMessageSendDTO> dtoCaptor = ArgumentCaptor.forClass(ImGroupMessageSendDTO.class);
             verify(groupMessageService).sendGroupMessage(eq(1L), dtoCaptor.capture());
-            assertEquals(ImMessageTypeEnum.GROUP_MEMBER_KICK.getType(), dtoCaptor.getValue().getType());
+            assertEquals(ImContentTypeEnum.GROUP_MEMBER_KICK.getType(), dtoCaptor.getValue().getType());
         }
     }
@@ -14,7 +14,7 @@ import cn.iocoder.yudao.module.im.enums.ImConversationTypeEnum;
 import cn.iocoder.yudao.module.im.enums.group.ImGroupMemberRoleEnum;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageReceiptStatusEnum;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageStatusEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import cn.iocoder.yudao.module.im.framework.config.ImProperties;
 import cn.iocoder.yudao.module.im.service.conversation.ImConversationReadService;
 import cn.iocoder.yudao.module.im.service.group.ImGroupMemberService;
@@ -22,8 +22,8 @@ import cn.iocoder.yudao.module.im.service.group.ImGroupService;
 import cn.iocoder.yudao.module.im.service.message.dto.ImGroupMessageSendDTO;
 import cn.iocoder.yudao.module.im.service.sensitiveword.ImSensitiveWordService;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImGroupMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.message.RecallMessage;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImGroupMessageNotification;
+import cn.iocoder.yudao.module.im.dal.dataobject.message.content.RecallMessage;
 import org.junit.jupiter.api.Test;
 import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
@@ -70,7 +70,7 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
         ImGroupMessageSendReqVO reqVO = new ImGroupMessageSendReqVO();
         reqVO.setClientMessageId("test-uuid-group-001");
         reqVO.setGroupId(10L);
-        reqVO.setType(ImMessageTypeEnum.TEXT.getType());
+        reqVO.setType(ImContentTypeEnum.TEXT.getType());
         reqVO.setContent("{\"content\":\"群聊你好\"}");
         return reqVO;
     }
@@ -85,6 +85,7 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
             // 准备
             ImGroupMessageSendReqVO reqVO = buildSendReqVO();
+            reqVO.setReceipt(true);
             when(groupMessageMapper.selectBySenderIdAndClientMessageId(1L, "test-uuid-group-001"))
                     .thenReturn(null);
             ImGroupDO group = new ImGroupDO();
@@ -112,7 +113,7 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
             assertEquals(1L, result.getSenderId());
             assertEquals(10L, result.getGroupId());
             assertEquals(ImMessageStatusEnum.NORMAL.getStatus(), result.getStatus());
-            assertEquals(ImMessageReceiptStatusEnum.NO_RECEIPT.getStatus(), result.getReceiptStatus());
+            assertEquals(ImMessageReceiptStatusEnum.PENDING.getStatus(), result.getReceiptStatus());
             // 验证推送给 3 个群成员（含发送者自己，用于多端同步）
             verify(imWebSocketService).sendGroupMessageAsync(argThat((Collection<Long> ids) ->
@@ -889,7 +890,7 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
     public void testSendGroupMessage_dto_persistsAndSerializesPojoContent() {
         // 准备：persistent=true 类型 + POJO content
         ImGroupMessageSendDTO dto = new ImGroupMessageSendDTO()
-                .setGroupId(10L).setType(ImMessageTypeEnum.RECALL.getType())
+                .setGroupId(10L).setType(ImContentTypeEnum.RECALL.getType())
                 .setContent(new RecallMessage().setMessageId(50L));
         when(groupMemberService.getActiveGroupMemberUserIdsByGroupId(10L)).thenReturn(List.of(1L));
@@ -901,7 +902,7 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
         ImGroupMessageDO message = captor.getValue();
         assertEquals(1L, message.getSenderId());
         assertEquals(10L, message.getGroupId());
-        assertEquals(ImMessageTypeEnum.RECALL.getType(), message.getType());
+        assertEquals(ImContentTypeEnum.RECALL.getType(), message.getType());
         assertEquals("{\"messageId\":50}", message.getContent());
         assertEquals(ImMessageStatusEnum.NORMAL.getStatus(), message.getStatus());
         assertEquals(ImMessageReceiptStatusEnum.NO_RECEIPT.getStatus(), message.getReceiptStatus());
@@ -913,7 +914,7 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
     public void testSendGroupMessage_dto_receiptPending() {
         // 准备：dto.receipt=true → receiptStatus=PENDING
         ImGroupMessageSendDTO dto = new ImGroupMessageSendDTO()
-                .setGroupId(10L).setType(ImMessageTypeEnum.RECALL.getType())
+                .setGroupId(10L).setType(ImContentTypeEnum.RECALL.getType())
                 .setContent("{\"messageId\":50}").setReceipt(true);
         when(groupMemberService.getActiveGroupMemberUserIdsByGroupId(10L)).thenReturn(List.of(1L));
@@ -928,7 +929,7 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
     public void testSendGroupMessage_dto_nonPersistentTypeNotInserted() {
         // 准备：persistent=false 类型（RECEIPT 回执）→ 不入库，仅推送
         ImGroupMessageSendDTO dto = new ImGroupMessageSendDTO()
-                .setGroupId(10L).setType(ImMessageTypeEnum.RECEIPT.getType());
+                .setGroupId(10L).setType(ImContentTypeEnum.RECEIPT.getType());
         when(groupMemberService.getActiveGroupMemberUserIdsByGroupId(10L)).thenReturn(List.of(1L, 2L));
         groupMessageService.sendGroupMessage(1L, dto);
@@ -942,7 +943,7 @@ public class ImGroupMessageServiceImplTest extends BaseMockitoUnitTest {
         // 准备：调用方传入显式 targets（解散场景成员已被批量 DISABLE，必须按移除前快照推送）
         Set<Long> targets = Set.of(1L, 2L, 3L);
         ImGroupMessageSendDTO dto = new ImGroupMessageSendDTO()
-                .setGroupId(10L).setType(ImMessageTypeEnum.GROUP_DISSOLVE.getType()).setContent("{}");
+                .setGroupId(10L).setType(ImContentTypeEnum.GROUP_DISSOLVE.getType()).setContent("{}");
         groupMessageService.sendGroupMessage(1L, targets, dto);
@@ -9,7 +9,7 @@ import cn.iocoder.yudao.module.im.dal.dataobject.message.ImPrivateMessageDO;
 import cn.iocoder.yudao.module.im.dal.mysql.message.ImPrivateMessageMapper;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageReceiptStatusEnum;
 import cn.iocoder.yudao.module.im.enums.message.ImMessageStatusEnum;
-import cn.iocoder.yudao.module.im.enums.message.ImMessageTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
 import cn.iocoder.yudao.module.im.framework.config.ImProperties;
 import cn.iocoder.yudao.module.im.service.conversation.ImConversationReadService;
 import cn.iocoder.yudao.module.im.service.friend.ImFriendService;
@@ -380,7 +380,7 @@ public class ImPrivateMessageServiceImplTest extends BaseMockitoUnitTest {
     public void testSendPrivateMessage_dto_persistsAndSerializesPojoContent() {
         // 准备：persistent=true 类型 + POJO content
         ImPrivateMessageSendDTO dto = new ImPrivateMessageSendDTO()
-                .setReceiverId(2L).setType(ImMessageTypeEnum.RECALL.getType())
+                .setReceiverId(2L).setType(ImContentTypeEnum.RECALL.getType())
                 .setContent(new RecallMessage().setMessageId(50L));
         privateMessageService.sendPrivateMessage(1L, dto);
@@ -391,7 +391,7 @@ public class ImPrivateMessageServiceImplTest extends BaseMockitoUnitTest {
         ImPrivateMessageDO message = captor.getValue();
         assertEquals(1L, message.getSenderId());
         assertEquals(2L, message.getReceiverId());
-        assertEquals(ImMessageTypeEnum.RECALL.getType(), message.getType());
+        assertEquals(ImContentTypeEnum.RECALL.getType(), message.getType());
         assertEquals("{\"messageId\":50}", message.getContent());
         assertEquals(ImMessageStatusEnum.NORMAL.getStatus(), message.getStatus());
         assertNotNull(message.getClientMessageId());
@@ -405,7 +405,7 @@ public class ImPrivateMessageServiceImplTest extends BaseMockitoUnitTest {
     public void testSendPrivateMessage_dto_nonPersistentTypeNotInserted() {
         // 准备：persistent=false 类型（FRIEND_DELETE 通知）→ 不入库；仅推 sender 多端，receiver 不感知
         ImPrivateMessageSendDTO dto = new ImPrivateMessageSendDTO()
-                .setReceiverId(2L).setType(ImMessageTypeEnum.FRIEND_DELETE.getType());
+                .setReceiverId(2L).setType(ImContentTypeEnum.FRIEND_DELETE.getType());
         privateMessageService.sendPrivateMessage(1L, dto);
@@ -20,7 +20,6 @@ import cn.iocoder.yudao.module.im.enums.rtc.ImRtcParticipantStatusEnum;
 import cn.iocoder.yudao.module.im.framework.config.ImProperties;
 import cn.iocoder.yudao.module.im.service.group.ImGroupMemberService;
 import cn.iocoder.yudao.module.im.service.websocket.ImWebSocketService;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO;
 import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
 import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
 import org.junit.jupiter.api.Test;
@@ -4,8 +4,11 @@ import cn.hutool.core.collection.ListUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.test.core.ut.BaseMockitoUnitTest;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImGroupMessageDTO;
-import cn.iocoder.yudao.module.im.service.websocket.dto.ImPrivateMessageDTO;
+import cn.iocoder.yudao.module.im.enums.ImContentTypeEnum;
+import cn.iocoder.yudao.module.im.enums.ImConversationTypeEnum;
+import cn.iocoder.yudao.module.im.service.websocket.notification.ImNotificationWebSocketDTO;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImGroupMessageNotification;
+import cn.iocoder.yudao.module.im.service.websocket.notification.message.ImPrivateMessageNotification;
 import cn.iocoder.yudao.module.infra.api.websocket.WebSocketSenderApi;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.Test;
@@ -21,6 +24,7 @@ import java.util.List;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.argThat;
 import static org.mockito.Mockito.*;
 /**
@@ -44,10 +48,10 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest {
         }
     }
-    // ========== sendPrivateMessageAsync ==========
+    // ========== sendNotificationAsync ==========
     @Test
-    public void testSendPrivateMessageAsync_noTransactionSendsImmediately() {
+    public void testSendNotificationAsync_private_noTransactionSendsImmediately() {
         try (MockedStatic<SpringUtil> springUtilMockedStatic = mockStatic(SpringUtil.class)) {
             springUtilMockedStatic.when(() -> SpringUtil.getBean(eq(ImWebSocketServiceImpl.class)))
                     .thenReturn(imWebSocketService);
@@ -60,12 +64,14 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest {
             // 断言
             verify(webSocketSenderApi).sendObject(
-                    eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImPrivateMessageDTO.TYPE), eq(dto));
+                    eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImNotificationWebSocketDTO.TYPE),
+                    argThat(actual -> isNotification(actual, ImConversationTypeEnum.PRIVATE,
+                            ImContentTypeEnum.TEXT, dto)));
         }
     }
     @Test
-    public void testSendPrivateMessageAsync_inTransactionDeferredUntilCommit() {
+    public void testSendNotificationAsync_private_inTransactionDeferredUntilCommit() {
         try (MockedStatic<SpringUtil> springUtilMockedStatic = mockStatic(SpringUtil.class)) {
             springUtilMockedStatic.when(() -> SpringUtil.getBean(eq(ImWebSocketServiceImpl.class)))
                     .thenReturn(imWebSocketService);
@@ -89,43 +95,51 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest {
                 // 断言：提交后推送
                 verify(webSocketSenderApi).sendObject(
-                        eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImPrivateMessageDTO.TYPE), eq(dto));
+                        eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImNotificationWebSocketDTO.TYPE),
+                        argThat(actual -> isNotification(actual, ImConversationTypeEnum.PRIVATE,
+                                ImContentTypeEnum.TEXT, dto)));
             } finally {
                 TransactionSynchronizationManager.clear();
             }
         }
     }
-    // ========== sendGroupMessageAsync ==========
+    // ========== sendNotificationAsync ==========
     @Test
-    public void testSendGroupMessageAsync_fanOutToAllUsers() {
+    public void testSendNotificationAsync_group_fanOutToAllUsers() {
         try (MockedStatic<SpringUtil> springUtilMockedStatic = mockStatic(SpringUtil.class)) {
             springUtilMockedStatic.when(() -> SpringUtil.getBean(eq(ImWebSocketServiceImpl.class)))
                     .thenReturn(imWebSocketService);
-            ImGroupMessageDTO dto = new ImGroupMessageDTO();
+            ImGroupMessageNotification dto = new ImGroupMessageNotification();
             dto.setGroupId(10L);
             dto.setSenderId(1L);
             imWebSocketService.sendGroupMessageAsync(ListUtil.of(1L, 2L, 3L), dto);
             verify(webSocketSenderApi).sendObject(
-                    eq(UserTypeEnum.ADMIN.getValue()), eq(1L), eq(ImGroupMessageDTO.TYPE), eq(dto));
+                    eq(UserTypeEnum.ADMIN.getValue()), eq(1L), eq(ImNotificationWebSocketDTO.TYPE),
+                    argThat(actual -> isNotification(actual, ImConversationTypeEnum.GROUP,
+                            ImContentTypeEnum.TEXT, dto)));
             verify(webSocketSenderApi).sendObject(
-                    eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImGroupMessageDTO.TYPE), eq(dto));
+                    eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImNotificationWebSocketDTO.TYPE),
+                    argThat(actual -> isNotification(actual, ImConversationTypeEnum.GROUP,
+                            ImContentTypeEnum.TEXT, dto)));
             verify(webSocketSenderApi).sendObject(
-                    eq(UserTypeEnum.ADMIN.getValue()), eq(3L), eq(ImGroupMessageDTO.TYPE), eq(dto));
+                    eq(UserTypeEnum.ADMIN.getValue()), eq(3L), eq(ImNotificationWebSocketDTO.TYPE),
+                    argThat(actual -> isNotification(actual, ImConversationTypeEnum.GROUP,
+                            ImContentTypeEnum.TEXT, dto)));
         }
     }
     @Test
-    public void testSendGroupMessageAsync_senderExceptionDoesNotBreakOthers() {
+    public void testSendNotificationAsync_group_senderExceptionDoesNotBreakOthers() {
         try (MockedStatic<SpringUtil> springUtilMockedStatic = mockStatic(SpringUtil.class)) {
             springUtilMockedStatic.when(() -> SpringUtil.getBean(eq(ImWebSocketServiceImpl.class)))
                     .thenReturn(imWebSocketService);
-            ImGroupMessageDTO dto = new ImGroupMessageDTO();
+            ImGroupMessageNotification dto = new ImGroupMessageNotification();
             dto.setGroupId(10L);
             // 给 1 号用户推送时抛异常，不能影响 2/3 号
             doThrow(new RuntimeException("user offline"))
@@ -143,8 +157,8 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest {
     public void testDoSendGroupMessage_emptyUserIds_noSend() {
         ImGroupMessageDTO dto = new ImGroupMessageDTO().setGroupId(10L);
-        imWebSocketService.doSendGroupMessage(Collections.emptyList(), dto);
-        imWebSocketService.doSendGroupMessage(null, dto);
+        imWebSocketService.doSendNotification(Collections.emptyList(), notification);
+        imWebSocketService.doSendNotification(null, notification);
         verifyNoInteractions(webSocketSenderApi);
     }
@@ -153,17 +167,21 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest {
     public void testDoSendGroupMessage_distinctUserIds() {
         ImGroupMessageDTO dto = new ImGroupMessageDTO().setGroupId(10L);
-        imWebSocketService.doSendGroupMessage(Arrays.asList(1L, 2L, 1L, null), dto);
+        imWebSocketService.doSendNotification(Arrays.asList(1L, 2L, 1L, null), notification);
         verify(webSocketSenderApi).sendObject(
-                eq(UserTypeEnum.ADMIN.getValue()), eq(1L), eq(ImGroupMessageDTO.TYPE), eq(dto));
+                eq(UserTypeEnum.ADMIN.getValue()), eq(1L), eq(ImNotificationWebSocketDTO.TYPE),
+                argThat(actual -> isNotification(actual, ImConversationTypeEnum.GROUP,
+                        ImContentTypeEnum.TEXT, dto)));
         verify(webSocketSenderApi).sendObject(
-                eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImGroupMessageDTO.TYPE), eq(dto));
+                eq(UserTypeEnum.ADMIN.getValue()), eq(2L), eq(ImNotificationWebSocketDTO.TYPE),
+                argThat(actual -> isNotification(actual, ImConversationTypeEnum.GROUP,
+                        ImContentTypeEnum.TEXT, dto)));
         verifyNoMoreInteractions(webSocketSenderApi);
     }
     @Test
-    public void testSendPrivateMessageAsync_exceptionSwallowed() {
+    public void testSendNotificationAsync_private_exceptionSwallowed() {
         try (MockedStatic<SpringUtil> springUtilMockedStatic = mockStatic(SpringUtil.class)) {
             springUtilMockedStatic.when(() -> SpringUtil.getBean(eq(ImWebSocketServiceImpl.class)))
                     .thenReturn(imWebSocketService);
@@ -181,12 +199,12 @@ public class ImWebSocketServiceImplTest extends BaseMockitoUnitTest {
     }
     @Test
-    public void testSendGroupMessageAsync_singleUserDefaultOverload() {
+    public void testSendNotificationAsync_group_singleUserDefaultOverload() {
         try (MockedStatic<SpringUtil> springUtilMockedStatic = mockStatic(SpringUtil.class)) {
             springUtilMockedStatic.when(() -> SpringUtil.getBean(eq(ImWebSocketServiceImpl.class)))
                     .thenReturn(imWebSocketService);
-            ImGroupMessageDTO dto = new ImGroupMessageDTO();
+            ImGroupMessageNotification dto = new ImGroupMessageNotification();
             dto.setGroupId(10L);
             imWebSocketService.sendGroupMessageAsync(42L, dto);