From f124fbd6aa4d305948a676339cefcd4720e41b97 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期三, 07 八月 2024 09:57:20 +0800
Subject: [PATCH] fix 修复 关闭应用sse销毁报错问题
---
ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java
index 57c7c1e..91413f1 100644
--- a/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java
+++ b/ruoyi-common/ruoyi-common-sse/src/main/java/org/dromara/common/sse/controller/SseController.java
@@ -1,11 +1,14 @@
package org.dromara.common.sse.controller;
+import cn.dev33.satoken.annotation.SaIgnore;
import cn.dev33.satoken.stp.StpUtil;
import lombok.RequiredArgsConstructor;
import org.dromara.common.core.domain.R;
import org.dromara.common.satoken.utils.LoginHelper;
import org.dromara.common.sse.core.SseEmitterManager;
import org.dromara.common.sse.dto.SseMessageDto;
+import org.springframework.beans.factory.DisposableBean;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -14,8 +17,9 @@
import java.util.List;
@RestController
+@ConditionalOnProperty(value = "sse.enabled", havingValue = "true")
@RequiredArgsConstructor
-public class SseController {
+public class SseController implements DisposableBean {
private final SseEmitterManager sseEmitterManager;
@@ -26,6 +30,7 @@
return sseEmitterManager.connect(userId, tokenValue);
}
+ @SaIgnore
@GetMapping(value = "${sse.path}/close")
public R<Void> close() {
String tokenValue = StpUtil.getTokenValue();
@@ -49,4 +54,9 @@
return R.ok();
}
+ @Override
+ public void destroy() throws Exception {
+ // 閿�姣佹椂涓嶉渶瑕佸仛浠�涔� 姝ゆ柟娉曢伩鍏嶆棤鐢ㄦ搷浣滄姤閿�
+ }
+
}
--
Gitblit v1.9.3