diff --git a/module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/enums/ClientSocketTypeEnum.java b/module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/enums/ClientSocketTypeEnum.java index 61859fbc..ba19e209 100644 --- a/module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/enums/ClientSocketTypeEnum.java +++ b/module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/enums/ClientSocketTypeEnum.java @@ -12,25 +12,31 @@ package ink.wgink.module.instantmessage.websocket.enums; */ public enum ClientSocketTypeEnum { - REGISTER(100, "注册消息,body 为 RegisterBody 的 JSON 字符串"), - MESSAGE(101, "文本消息"), - GROUP_MESSAGE(102, "群发文本消息"), - SYSTEM_MESSAGE(103, "系统消息"), - SYSTEM_GROUP_MESSAGE(104, "系统群发问呢消息"), - SYSTEM_TARGET_MESSAGE(105, "系统目标消息"), - LAYIM_HREF_MESSAGE(106, "LAYIM 连接消息"), - LAYIM_IMAGE_MESSAGE(107, "LAYIM 图片消息"), - LAYIM_FILE_MESSAGE(108, "LAYIM 文件消息"), - LAYIM_AUDIO_MESSAGE(109, "LAYIM 音频消息"), - LAYIM_VIDEO_MESSAGE(110, "LAYIM 视频消息"), - NOTICE(106, "通知"), - NOTICE_GROUP_MESSAGE(107, "群通知"), - NOTICE_TARGET_MESSAGE(108, "目标通知,用于APP打开特定页面"), - UPDATE_SERVICE_HANDLE_STATUS(501, "更新业务的处理状态"), - SEARCH_ONLINE_USER(600, "查询全部在线用户,body 为查询用户的 userId"), - SEARCH_ONLINE_USER_FRIEND(601, "查询朋友在线用户,body 为查询用户的 userId"), - SEARCH_COUNT_NEED_TO_DEALT_WITH(602, "查询全部待办总数"), - SEND_STATUS(1100, "发送状态,body 为 BaseResult 的 JSON 字符串"), + REGISTER(1000, "注册消息,body 为 RegisterBody 的 JSON 字符串"), + + MESSAGE(2001, "文本消息"), + GROUP_MESSAGE(2002, "群发文本消息"), + + SYSTEM_MESSAGE(3001, "系统消息"), + SYSTEM_GROUP_MESSAGE(3002, "系统群发问呢消息"), + SYSTEM_TARGET_MESSAGE(3003, "系统目标消息"), + + LAYIM_HREF_MESSAGE(4001, "LAYIM 连接消息"), + LAYIM_IMAGE_MESSAGE(4002, "LAYIM 图片消息"), + LAYIM_FILE_MESSAGE(4003, "LAYIM 文件消息"), + LAYIM_AUDIO_MESSAGE(4004, "LAYIM 音频消息"), + LAYIM_VIDEO_MESSAGE(4005, "LAYIM 视频消息"), + + NOTICE(5001, "通知"), + NOTICE_GROUP_MESSAGE(5002, "群通知"), + NOTICE_TARGET_MESSAGE(5003, "目标通知,用于APP打开特定页面"), + UPDATE_SERVICE_HANDLE_STATUS(5004, "更新业务的处理状态"), + + SEARCH_ONLINE_USER(6001, "查询全部在线用户,body 为查询用户的 userId"), + SEARCH_ONLINE_USER_FRIEND(6002, "查询朋友在线用户,body 为查询用户的 userId"), + SEARCH_COUNT_NEED_TO_DEALT_WITH(6003, "查询全部待办总数"), + + SEND_STATUS(1100, "消息发送状态,body 为 BaseResult 的 JSON 字符串"), SEND_STATUS_ONLINE(1101, "发送在线状态,body 为 在线用户的ID JSONArray 字符串"), SEND_STATUS_OFFLINE(1102, "发送离线状态,body 为 离线用户的ID JSONArray 字符串"); diff --git a/module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/enums/SendStatusEnum.java b/module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/enums/SendStatusEnum.java index 4812a5be..137c635c 100644 --- a/module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/enums/SendStatusEnum.java +++ b/module-instant-message/src/main/java/ink/wgink/module/instantmessage/websocket/enums/SendStatusEnum.java @@ -11,54 +11,30 @@ package ink.wgink.module.instantmessage.websocket.enums; * @Version: 1.0 */ public enum SendStatusEnum { - /** - * 成功 - */ - SUCCESS(200), - /** - * 失败 - */ - FAILED(300), - /** - * 消息错误 - */ - MESSAGE_ERROR(400), - /** - * 会话错误 - */ - SESSION_ERROR(402), - /** - * APP会话错误 - */ - APP_SESSION_ERROR(403), - /** - * 用户会话错误 - */ - USER_SESSION_ERROR(404), - /** - * 类型错误 - */ - TYPE_ERROR(405), - /** - * 消息体错误 - */ - BODY_ERROR(406), - /** - * 来源错误 - */ - FROM_ERROR(407), - /** - * 接受用户错误 - */ - TO_ERROR(408); + SUCCESS(200, "成功"), + FAILED(400, "失败"), + MESSAGE_ERROR(401, "消息错误"), + SESSION_ERROR(402, "会话错误"), + CLIENT_SESSION_ERROR(403, "客户端会话错误"), + TYPE_ERROR(405, "类型错误"), + BODY_ERROR(406, "消息体错误"), + FROM_ERROR(407, "来源错误"), + TO_ERROR(408, "接受用户错误"); + private int value; + private String summary; - SendStatusEnum(int value) { + SendStatusEnum(int value, String summary) { this.value = value; + this.summary = summary; } public int getValue() { return value; } + + public String getSummary() { + return summary == null ? "" : summary.trim(); + } } diff --git a/module-instant-message/src/main/resources/templates/chat-demo.html b/module-instant-message/src/main/resources/templates/chat-demo.html index 515bdf16..dc995ade 100644 --- a/module-instant-message/src/main/resources/templates/chat-demo.html +++ b/module-instant-message/src/main/resources/templates/chat-demo.html @@ -6,15 +6,16 @@