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-sse/src/main/java/org/dromara/common/sse/core/SseEmitterManager.java | 24 ++++++++++++++++--------
1 files changed, 16 insertions(+), 8 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 fd22db6..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,5 +1,6 @@
package org.dromara.common.sse.core;
+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;
@@ -64,8 +65,11 @@
* @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 {
SseEmitter sseEmitter = emitters.get(token);
sseEmitter.send(SseEmitter.event().comment("disconnected"));
@@ -73,6 +77,8 @@
} catch (Exception ignore) {
}
emitters.remove(token);
+ } else {
+ USER_TOKEN_EMITTERS.remove(userId);
}
}
@@ -93,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()
@@ -103,6 +109,8 @@
emitters.remove(entry.getKey());
}
}
+ } else {
+ USER_TOKEN_EMITTERS.remove(userId);
}
}
@@ -126,10 +134,10 @@
SseMessageDto broadcastMessage = new SseMessageDto();
broadcastMessage.setMessage(sseMessageDto.getMessage());
broadcastMessage.setUserIds(sseMessageDto.getUserIds());
- RedisUtils.publish(SSE_TOPIC, broadcastMessage, consumer ->
+ RedisUtils.publish(SSE_TOPIC, broadcastMessage, consumer -> {
log.info("SSE鍙戦�佷富棰樿闃呮秷鎭痶opic:{} session keys:{} message:{}",
- SSE_TOPIC, sseMessageDto.getUserIds(), sseMessageDto.getMessage())
- );
+ SSE_TOPIC, sseMessageDto.getUserIds(), sseMessageDto.getMessage());
+ });
}
/**
@@ -140,8 +148,8 @@
public void publishAll(String message) {
SseMessageDto broadcastMessage = new SseMessageDto();
broadcastMessage.setMessage(message);
- RedisUtils.publish(SSE_TOPIC, broadcastMessage, consumer ->
- log.info("SSE鍙戦�佷富棰樿闃呮秷鎭痶opic:{} message:{}", SSE_TOPIC, message)
- );
+ RedisUtils.publish(SSE_TOPIC, broadcastMessage, consumer -> {
+ log.info("SSE鍙戦�佷富棰樿闃呮秷鎭痶opic:{} message:{}", SSE_TOPIC, message);
+ });
}
}
--
Gitblit v1.9.3