From 210570c0056c46c35bdd349a2fac558441f86f3b Mon Sep 17 00:00:00 2001 From: 疯狂的狮子li <15040126243@163.com> Date: 星期四, 30 三月 2023 17:36:09 +0800 Subject: [PATCH] update 优化 !pr317 代码结构 --- ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/utils/WebSocketUtils.java | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/utils/WebSocketUtils.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/utils/WebSocketUtils.java index b92ebc4..00a26d5 100644 --- a/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/utils/WebSocketUtils.java +++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/com/ruoyi/common/websocket/utils/WebSocketUtils.java @@ -2,9 +2,7 @@ import cn.hutool.core.collection.CollUtil; import com.ruoyi.common.core.domain.model.LoginUser; -import com.ruoyi.common.json.utils.JsonUtils; import com.ruoyi.common.redis.utils.RedisUtils; -import com.ruoyi.common.satoken.utils.LoginHelper; import com.ruoyi.common.websocket.dto.WebSocketMessageDto; import com.ruoyi.common.websocket.holder.WebSocketSessionHolder; import lombok.AccessLevel; @@ -34,8 +32,9 @@ /** * 鍙戦�佹秷鎭� - * @param sessionKey - * @param message + * + * @param sessionKey session涓婚敭 涓�鑸负鐢ㄦ埛id + * @param message 娑堟伅鏂囨湰 */ public static void sendMessage(Long sessionKey, String message) { WebSocketSession session = WebSocketSessionHolder.getSessions(sessionKey); @@ -45,7 +44,7 @@ /** * 璁㈤槄娑堟伅 * - * @param consumer + * @param consumer 鑷畾涔夊鐞� */ public static void subscribeMessage(Consumer<WebSocketMessageDto> consumer) { RedisUtils.subscribe(WEB_SOCKET_TOPIC, WebSocketMessageDto.class, consumer); @@ -54,12 +53,12 @@ /** * 鍙戝竷璁㈤槄鐨勬秷鎭� * - * @param webSocketMessage + * @param webSocketMessage 娑堟伅瀵硅薄 */ public static void publishMessage(WebSocketMessageDto webSocketMessage) { List<Long> unsentSessionKeys = new ArrayList<>(); // 褰撳墠鏈嶅姟鍐卻ession,鐩存帴鍙戦�佹秷鎭� - for (Long sessionKey: webSocketMessage.getSessionKeys()) { + for (Long sessionKey : webSocketMessage.getSessionKeys()) { if (WebSocketSessionHolder.existSession(sessionKey)) { WebSocketUtils.sendMessage(sessionKey, webSocketMessage.getMessage()); continue; @@ -70,7 +69,7 @@ if (CollUtil.isNotEmpty(unsentSessionKeys)) { WebSocketMessageDto broadcastMessage = WebSocketMessageDto.builder() .message(webSocketMessage.getMessage()).sessionKeys(unsentSessionKeys).build(); - RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { + RedisUtils.publish(WEB_SOCKET_TOPIC, broadcastMessage, consumer -> { log.info(" WebSocket鍙戦�佷富棰樿闃呮秷鎭痶opic:{} session keys:{} message:{}", WEB_SOCKET_TOPIC, unsentSessionKeys, webSocketMessage.getMessage()); }); -- Gitblit v1.9.3