From 3cc615d38ac525d5e68682db0e373054e7bb075c Mon Sep 17 00:00:00 2001 From: Hanserwei Date: Thu, 2 Oct 2025 22:05:32 +0800 Subject: [PATCH] =?UTF-8?q?feat(auth):=20=E5=AE=9E=E7=8E=B0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E9=80=80=E5=87=BA=E7=99=BB=E5=BD=95=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在网关过滤器中增加对未登录异常的处理 - 完善用户登出接口，调用 Sa-Token 的登出方法 - 新增 UserService 中的 logout 方法实现 - 优化获取用户 ID 的逻辑并增强异常处理 - 清理 Sa-Token 上下文避免内存泄漏 --- .../auth/controller/UserController.java | 5 ++--- .../hannote/auth/service/UserService.java | 6 ++++++ .../auth/service/impl/UserServiceImpl.java | 6 ++++++ .../filter/AddUserId2HeaderFilter.java | 19 +++++++++++++------ 4 files changed, 27 insertions(+), 9 deletions(-) diff --git a/han-note-auth/src/main/java/com/hanserwei/hannote/auth/controller/UserController.java b/han-note-auth/src/main/java/com/hanserwei/hannote/auth/controller/UserController.java index 934d0f0..de68b86 100644 --- a/han-note-auth/src/main/java/com/hanserwei/hannote/auth/controller/UserController.java +++ b/han-note-auth/src/main/java/com/hanserwei/hannote/auth/controller/UserController.java @@ -29,8 +29,7 @@ public class UserController { @ApiOperationLog(description = "账号登出") public Response logout(@RequestHeader("userId") String userId) { log.info("==> 网关透传过来的用户 ID: {}", userId); - // todo 账号退出登录逻辑待实现 - - return Response.success(); + Long userIdLong = Long.parseLong(userId); + return userService.logout(userIdLong); } } diff --git a/han-note-auth/src/main/java/com/hanserwei/hannote/auth/service/UserService.java b/han-note-auth/src/main/java/com/hanserwei/hannote/auth/service/UserService.java index b06c0f9..b0e3b9c 100644 --- a/han-note-auth/src/main/java/com/hanserwei/hannote/auth/service/UserService.java +++ b/han-note-auth/src/main/java/com/hanserwei/hannote/auth/service/UserService.java @@ -14,4 +14,10 @@ public interface UserService extends IService { * @return 响应结果 */ Response loginAndRegister(UserLoginReqVO reqVO); + + /** + * 退出登录 + * @return 响应结果 + */ + Response logout(Long userId); } diff --git a/han-note-auth/src/main/java/com/hanserwei/hannote/auth/service/impl/UserServiceImpl.java b/han-note-auth/src/main/java/com/hanserwei/hannote/auth/service/impl/UserServiceImpl.java index 3de62f4..f5a80ec 100644 --- a/han-note-auth/src/main/java/com/hanserwei/hannote/auth/service/impl/UserServiceImpl.java +++ b/han-note-auth/src/main/java/com/hanserwei/hannote/auth/service/impl/UserServiceImpl.java @@ -142,4 +142,10 @@ public class UserServiceImpl extends ServiceImpl implement } }); } + + @Override + public Response logout(Long userId) { + StpUtil.logout(userId); + return Response.success(); + } } diff --git a/han-note-gateway/src/main/java/com/hanserwei/hannote/gateway/filter/AddUserId2HeaderFilter.java b/han-note-gateway/src/main/java/com/hanserwei/hannote/gateway/filter/AddUserId2HeaderFilter.java index c0714fe..2bc86d7 100644 --- a/han-note-gateway/src/main/java/com/hanserwei/hannote/gateway/filter/AddUserId2HeaderFilter.java +++ b/han-note-gateway/src/main/java/com/hanserwei/hannote/gateway/filter/AddUserId2HeaderFilter.java @@ -1,5 +1,7 @@ package com.hanserwei.hannote.gateway.filter; +import cn.dev33.satoken.exception.NotLoginException; +import cn.dev33.satoken.reactor.context.SaReactorSyncHolder; import cn.dev33.satoken.stp.StpUtil; import lombok.extern.slf4j.Slf4j; import org.springframework.cloud.gateway.filter.GatewayFilterChain; @@ -19,20 +21,25 @@ public class AddUserId2HeaderFilter implements GlobalFilter { public Mono filter(ServerWebExchange exchange, GatewayFilterChain chain) { log.info("==================> TokenConvertFilter"); // 用户 ID - Long userId = null; + Long userId; + SaReactorSyncHolder.setContext(exchange); try { // 获取当前登录用户的 ID userId = StpUtil.getLoginIdAsLong(); - } catch (Exception e) { - log.error("==> 用户未登录, 获取用户 ID 失败: ", e); - // 若没有登录，则直接放行 + } catch (NotLoginException e) { + log.debug("==> 用户未登录, 不追加 userId 请求头"); return chain.filter(exchange); + } catch (Exception e) { + log.error("==> 获取用户 ID 失败", e); + return chain.filter(exchange); + } finally { + SaReactorSyncHolder.clearContext(); } log.info("## 当前登录的用户 ID: {}", userId); - Long finalUserId = userId; + ServerWebExchange newExchange = exchange.mutate() - .request(builder -> builder.header(HEADER_USER_ID, String.valueOf(finalUserId))) // 将用户 ID 设置到请求头中 + .request(builder -> builder.headers(headers -> headers.set(HEADER_USER_ID, String.valueOf(userId)))) // 将用户 ID 设置到请求头中 .build(); return chain.filter(newExchange); }