From f1208474f771a1c233d7425c8ed13fbaa0d521ac Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期三, 12 三月 2025 09:35:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/5.X' into 5.X
---
ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java | 45 ++++++++++++++++++++-------------------------
1 files changed, 20 insertions(+), 25 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java
index 1d37a27..64dfcff 100644
--- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java
+++ b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java
@@ -1,14 +1,12 @@
package org.dromara.common.sse.core;
-import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.map.MapUtil;
import lombok.extern.slf4j.Slf4j;
import org.dromara.common.redis.utils.RedisUtils;
import org.dromara.common.sse.dto.SseMessageDto;
import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import java.util.function.Consumer;
@@ -67,13 +65,20 @@
* @param token 鐢ㄦ埛鐨勫敮涓�浠ょ墝锛岀敤浜庤瘑鍒叿浣撶殑杩炴帴
*/
public void disconnect(Long userId, String token) {
+ if (userId == null || token == null) {
+ return;
+ }
Map<String, SseEmitter> emitters = USER_TOKEN_EMITTERS.get(userId);
- if (emitters != null) {
+ if (MapUtil.isNotEmpty(emitters)) {
try {
- emitters.get(token).send(SseEmitter.event().comment("disconnected"));
+ SseEmitter sseEmitter = emitters.get(token);
+ sseEmitter.send(SseEmitter.event().comment("disconnected"));
+ sseEmitter.complete();
} catch (Exception ignore) {
}
emitters.remove(token);
+ } else {
+ USER_TOKEN_EMITTERS.remove(userId);
}
}
@@ -94,7 +99,7 @@
*/
public void sendMessage(Long userId, String message) {
Map<String, SseEmitter> emitters = USER_TOKEN_EMITTERS.get(userId);
- if (emitters != null) {
+ if (MapUtil.isNotEmpty(emitters)) {
for (Map.Entry<String, SseEmitter> entry : emitters.entrySet()) {
try {
entry.getValue().send(SseEmitter.event()
@@ -104,6 +109,8 @@
emitters.remove(entry.getKey());
}
}
+ } else {
+ USER_TOKEN_EMITTERS.remove(userId);
}
}
@@ -124,25 +131,13 @@
* @param sseMessageDto 瑕佸彂甯冪殑SSE娑堟伅瀵硅薄
*/
public void publishMessage(SseMessageDto sseMessageDto) {
- List<Long> unsentUserIds = new ArrayList<>();
- // 褰撳墠鏈嶅姟鍐呯敤鎴�,鐩存帴鍙戦�佹秷鎭�
- for (Long userId : sseMessageDto.getUserIds()) {
- if (USER_TOKEN_EMITTERS.containsKey(userId)) {
- sendMessage(userId, sseMessageDto.getMessage());
- continue;
- }
- unsentUserIds.add(userId);
- }
- // 涓嶅湪褰撳墠鏈嶅姟鍐呯敤鎴�,鍙戝竷璁㈤槄娑堟伅
- if (CollUtil.isNotEmpty(unsentUserIds)) {
- SseMessageDto broadcastMessage = new SseMessageDto();
- broadcastMessage.setMessage(sseMessageDto.getMessage());
- broadcastMessage.setUserIds(unsentUserIds);
- RedisUtils.publish(SSE_TOPIC, broadcastMessage, consumer -> {
- log.info("SSE鍙戦�佷富棰樿闃呮秷鎭痶opic:{} session keys:{} message:{}",
- SSE_TOPIC, unsentUserIds, sseMessageDto.getMessage());
- });
- }
+ SseMessageDto broadcastMessage = new SseMessageDto();
+ broadcastMessage.setMessage(sseMessageDto.getMessage());
+ broadcastMessage.setUserIds(sseMessageDto.getUserIds());
+ RedisUtils.publish(SSE_TOPIC, broadcastMessage, consumer -> {
+ log.info("SSE鍙戦�佷富棰樿闃呮秷鎭痶opic:{} session keys:{} message:{}",
+ SSE_TOPIC, sseMessageDto.getUserIds(), sseMessageDto.getMessage());
+ });
}
/**
--
Gitblit v1.9.3