From 95c01301f65379e7634e4619bf4c49186aa5be41 Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期五, 07 二月 2025 14:19:28 +0800 Subject: [PATCH] !644 同步修复一些问题 Merge pull request !644 from 疯狂的狮子Li/dev --- ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java | 60 ++++++++++++++++++++++++++++++++++++++++-------------------- 1 files changed, 40 insertions(+), 20 deletions(-) diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java index a53583f..8b1cc5d 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java +++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/handler/PlusWebSocketHandler.java @@ -1,5 +1,6 @@ package org.dromara.common.websocket.handler; +import cn.hutool.core.util.ObjectUtil; import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.domain.model.LoginUser; import org.dromara.common.websocket.dto.WebSocketMessageDto; @@ -8,6 +9,7 @@ import org.springframework.web.socket.*; import org.springframework.web.socket.handler.AbstractWebSocketHandler; +import java.io.IOException; import java.util.List; import static org.dromara.common.websocket.constant.WebSocketConstants.LOGIN_USER_KEY; @@ -24,40 +26,54 @@ * 杩炴帴鎴愬姛鍚� */ @Override - public void afterConnectionEstablished(WebSocketSession session) { + public void afterConnectionEstablished(WebSocketSession session) throws IOException { LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY); + if (ObjectUtil.isNull(loginUser)) { + session.close(CloseStatus.BAD_DATA); + log.info("[connect] invalid token received. sessionId: {}", session.getId()); + return; + } WebSocketSessionHolder.addSession(loginUser.getUserId(), session); log.info("[connect] sessionId: {},userId:{},userType:{}", session.getId(), loginUser.getUserId(), loginUser.getUserType()); } /** - * 澶勭悊鍙戦�佹潵鐨勬枃鏈秷鎭� + * 澶勭悊鎺ユ敹鍒扮殑鏂囨湰娑堟伅 * - * @param session - * @param message - * @throws Exception + * @param session WebSocket浼氳瘽 + * @param message 鎺ユ敹鍒扮殑鏂囨湰娑堟伅 + * @throws Exception 澶勭悊娑堟伅杩囩▼涓彲鑳芥姏鍑虹殑寮傚父 */ @Override protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception { + // 浠嶹ebSocket浼氳瘽涓幏鍙栫櫥褰曠敤鎴蜂俊鎭� LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY); - List<Long> userIds = List.of(loginUser.getUserId()); + + // 鍒涘缓WebSocket娑堟伅DTO瀵硅薄 WebSocketMessageDto webSocketMessageDto = new WebSocketMessageDto(); - webSocketMessageDto.setSessionKeys(userIds); + webSocketMessageDto.setSessionKeys(List.of(loginUser.getUserId())); webSocketMessageDto.setMessage(message.getPayload()); WebSocketUtils.publishMessage(webSocketMessageDto); } + /** + * 澶勭悊鎺ユ敹鍒扮殑浜岃繘鍒舵秷鎭� + * + * @param session WebSocket浼氳瘽 + * @param message 鎺ユ敹鍒扮殑浜岃繘鍒舵秷鎭� + * @throws Exception 澶勭悊娑堟伅杩囩▼涓彲鑳芥姏鍑虹殑寮傚父 + */ @Override protected void handleBinaryMessage(WebSocketSession session, BinaryMessage message) throws Exception { super.handleBinaryMessage(session, message); } /** - * 蹇冭烦鐩戞祴鐨勫洖澶� + * 澶勭悊鎺ユ敹鍒扮殑Pong娑堟伅锛堝績璺崇洃娴嬶級 * - * @param session - * @param message - * @throws Exception + * @param session WebSocket浼氳瘽 + * @param message 鎺ユ敹鍒扮殑Pong娑堟伅 + * @throws Exception 澶勭悊娑堟伅杩囩▼涓彲鑳芥姏鍑虹殑寮傚父 */ @Override protected void handlePongMessage(WebSocketSession session, PongMessage message) throws Exception { @@ -65,11 +81,11 @@ } /** - * 杩炴帴鍑洪敊鏃� + * 澶勭悊WebSocket浼犺緭閿欒 * - * @param session - * @param exception - * @throws Exception + * @param session WebSocket浼氳瘽 + * @param exception 鍙戠敓鐨勫紓甯� + * @throws Exception 澶勭悊杩囩▼涓彲鑳芥姏鍑虹殑寮傚父 */ @Override public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception { @@ -77,22 +93,26 @@ } /** - * 杩炴帴鍏抽棴鍚� + * 鍦╓ebSocket杩炴帴鍏抽棴鍚庢墽琛屾竻鐞嗘搷浣� * - * @param session - * @param status + * @param session WebSocket浼氳瘽 + * @param status 鍏抽棴鐘舵�佷俊鎭� */ @Override public void afterConnectionClosed(WebSocketSession session, CloseStatus status) { LoginUser loginUser = (LoginUser) session.getAttributes().get(LOGIN_USER_KEY); + if (ObjectUtil.isNull(loginUser)) { + log.info("[disconnect] invalid token received. sessionId: {}", session.getId()); + return; + } WebSocketSessionHolder.removeSession(loginUser.getUserId()); log.info("[disconnect] sessionId: {},userId:{},userType:{}", session.getId(), loginUser.getUserId(), loginUser.getUserType()); } /** - * 鏄惁鏀寔鍒嗙墖娑堟伅 + * 鎸囩ず澶勭悊绋嬪簭鏄惁鏀寔鎺ユ敹閮ㄥ垎娑堟伅 * - * @return + * @return 濡傛灉鏀寔鎺ユ敹閮ㄥ垎娑堟伅锛屽垯杩斿洖true锛涘惁鍒欒繑鍥瀎alse */ @Override public boolean supportsPartialMessages() { -- Gitblit v1.9.3