From 68aeb581cc899f1fa284e6e353e0eb67cb244005 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Wed, 15 Apr 2026 13:13:26 +0800
Subject: [PATCH] 修复脱敏不生效问题
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
index b90c800..beb8615 100644
--- a/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
+++ b/ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java
@@ -1,16 +1,21 @@
package com.ruoyi.auth.controller;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.auth.form.LoginBody;
+import com.ruoyi.auth.form.RegisterBody;
+import com.ruoyi.auth.form.UnLockBody;
import com.ruoyi.auth.service.SysLoginService;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.JwtUtils;
import com.ruoyi.common.core.utils.StringUtils;
+import com.ruoyi.common.security.auth.AuthUtil;
import com.ruoyi.common.security.service.TokenService;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.system.api.model.LoginUser;
/**
@@ -39,12 +44,12 @@
@DeleteMapping("logout")
public R<?> logout(HttpServletRequest request)
{
- LoginUser loginUser = tokenService.getLoginUser(request);
- if (StringUtils.isNotNull(loginUser))
+ String token = SecurityUtils.getToken(request);
+ if (StringUtils.isNotEmpty(token))
{
- String username = loginUser.getUsername();
+ String username = JwtUtils.getUserName(token);
// 删除用户缓存记录
- tokenService.delLoginUser(loginUser.getToken());
+ AuthUtil.logoutByToken(token);
// 记录用户退出日志
sysLoginService.logout(username);
}
@@ -63,4 +68,22 @@
}
return R.ok();
}
+
+ @PostMapping("register")
+ public R<?> register(@RequestBody RegisterBody registerBody)
+ {
+ // 用户注册
+ sysLoginService.register(registerBody.getUsername(), registerBody.getPassword());
+ return R.ok();
+ }
+
+ /**
+ * 解锁屏幕
+ */
+ @PostMapping("/unlockscreen")
+ public R<?> unlockScreen(@RequestBody UnLockBody unLockBody)
+ {
+ sysLoginService.unlock(unLockBody.getPassword());
+ return R.ok();
+ }
}
--
Gitblit v1.9.3