From 20a339612877e579749c89b9b5f88eec15707c3f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 17 六月 2024 10:43:37 +0800
Subject: [PATCH] fix 修复 websocket clientid 参数不走mvc拦截器 无法生效问题
---
ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java | 47 +++++++++++++++++++++++++++++++++--------------
1 files changed, 33 insertions(+), 14 deletions(-)
diff --git a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java
index 1dc4120..1ad8ad6 100644
--- a/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java
+++ b/ruoyi-common/ruoyi-common-websocket/src/main/java/org/dromara/common/websocket/interceptor/PlusWebSocketInterceptor.java
@@ -1,8 +1,12 @@
package org.dromara.common.websocket.interceptor;
-import org.dromara.common.core.domain.model.LoginUser;
-import org.dromara.common.satoken.utils.LoginHelper;
+import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpUtil;
import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.core.domain.model.LoginUser;
+import org.dromara.common.core.utils.ServletUtils;
+import org.dromara.common.core.utils.StringUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
import org.springframework.http.server.ServerHttpRequest;
import org.springframework.http.server.ServerHttpResponse;
import org.springframework.web.socket.WebSocketHandler;
@@ -21,31 +25,46 @@
public class PlusWebSocketInterceptor implements HandshakeInterceptor {
/**
- * 鎻℃墜鍓�
+ * WebSocket鎻℃墜涔嬪墠鎵ц鐨勫墠缃鐞嗘柟娉�
*
- * @param request request
- * @param response response
- * @param wsHandler wsHandler
- * @param attributes attributes
- * @return 鏄惁鎻℃墜鎴愬姛
+ * @param request WebSocket鎻℃墜璇锋眰
+ * @param response WebSocket鎻℃墜鍝嶅簲
+ * @param wsHandler WebSocket澶勭悊绋嬪簭
+ * @param attributes 涓嶹ebSocket浼氳瘽鍏宠仈鐨勫睘鎬�
+ * @return 濡傛灉鍏佽鎻℃墜缁х画杩涜锛屽垯杩斿洖true锛涘惁鍒欒繑鍥瀎alse
*/
@Override
public boolean beforeHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Map<String, Object> attributes) {
+ // 妫�鏌ユ槸鍚︾櫥褰� 鏄惁鏈塼oken
LoginUser loginUser = LoginHelper.getLoginUser();
+
+ // 瑙ｅ喅 ws 涓嶈蛋 mvc 鎷︽埅鍣ㄩ棶棰�(cloud 鐗堟湰涓嶅彈褰卞搷)
+ // 妫�鏌� header 涓� param 閲岀殑 clientid 涓� token 閲岀殑鏄惁涓�鑷�
+ String headerCid = ServletUtils.getRequest().getHeader(LoginHelper.CLIENT_KEY);
+ String paramCid = ServletUtils.getParameter(LoginHelper.CLIENT_KEY);
+ String clientId = StpUtil.getExtra(LoginHelper.CLIENT_KEY).toString();
+ if (!StringUtils.equalsAny(clientId, headerCid, paramCid)) {
+ // token 鏃犳晥
+ throw NotLoginException.newInstance(StpUtil.getLoginType(),
+ "-100", "瀹㈡埛绔疘D涓嶵oken涓嶅尮閰�",
+ StpUtil.getTokenValue());
+ }
+
attributes.put(LOGIN_USER_KEY, loginUser);
return true;
}
/**
- * 鎻℃墜鍚�
+ * WebSocket鎻℃墜鎴愬姛鍚庢墽琛岀殑鍚庣疆澶勭悊鏂规硶
*
- * @param request request
- * @param response response
- * @param wsHandler wsHandler
- * @param exception 寮傚父
+ * @param request WebSocket鎻℃墜璇锋眰
+ * @param response WebSocket鎻℃墜鍝嶅簲
+ * @param wsHandler WebSocket澶勭悊绋嬪簭
+ * @param exception 鎻℃墜杩囩▼涓彲鑳藉嚭鐜扮殑寮傚父
*/
@Override
public void afterHandshake(ServerHttpRequest request, ServerHttpResponse response, WebSocketHandler wsHandler, Exception exception) {
-
+ // 鍦ㄨ繖涓柟娉曚腑鍙互鎵ц涓�浜涙彙鎵嬫垚鍔熷悗鐨勫悗缁鐞嗛�昏緫锛屾瘮濡傝褰曟棩蹇楁垨鑰呭叾浠栨搷浣�
}
+
}
--
Gitblit v1.9.3