From e6dbe1a06d818da6a5e65284b72488465f8043b0 Mon Sep 17 00:00:00 2001 From: Charles7c Date: Sat, 15 Jun 2024 11:40:15 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E4=BD=BF=E7=94=A8=20Token=20?= =?UTF-8?q?=E4=BD=9C=E4=B8=BA=20WebSocket=20Session=20Key?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/websocket/CurrentUserProviderImpl.java | 3 +-- .../admin/auth/service/impl/LoginServiceImpl.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/CurrentUserProviderImpl.java b/continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/CurrentUserProviderImpl.java index 59e43608..3a941dc4 100644 --- a/continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/CurrentUserProviderImpl.java +++ b/continew-admin-common/src/main/java/top/continew/admin/common/config/websocket/CurrentUserProviderImpl.java @@ -16,7 +16,6 @@ package top.continew.admin.common.config.websocket; -import cn.hutool.core.convert.Convert; import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.stereotype.Component; @@ -40,7 +39,7 @@ public class CurrentUserProviderImpl implements CurrentUserProvider { String token = servletRequest.getParameter("token"); LoginUser loginUser = LoginHelper.getLoginUser(token); CurrentUser currentUser = new CurrentUser(); - currentUser.setUserId(Convert.toStr(loginUser.getId())); + currentUser.setUserId(loginUser.getToken()); return currentUser; } } diff --git a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java b/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java index 6b46495c..c7728e98 100644 --- a/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java +++ b/continew-admin-system/src/main/java/top/continew/admin/auth/service/impl/LoginServiceImpl.java @@ -16,11 +16,15 @@ package top.continew.admin.auth.service.impl; +import cn.dev33.satoken.stp.StpUtil; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.lang.tree.TreeNodeConfig; -import cn.hutool.core.util.*; +import cn.hutool.core.util.IdUtil; +import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.RandomUtil; +import cn.hutool.core.util.ReUtil; import cn.hutool.extra.servlet.JakartaServletUtil; import cn.hutool.json.JSONUtil; import jakarta.servlet.http.HttpServletRequest; @@ -255,6 +259,9 @@ public class LoginServiceImpl implements LoginService { req.setContent(socialRegister.getContent().formatted(user.getNickname())); req.setType(MessageTypeEnum.SECURITY); messageService.add(req, CollUtil.toList(user.getId())); - WebSocketUtils.sendMessage(user.getId().toString(), "1"); + List tokenList = StpUtil.getTokenValueListByLoginId(user.getId()); + for (String token : tokenList) { + WebSocketUtils.sendMessage(token, "1"); + } } }