From b44e0e4de637a141181c44d5e103eb732455c26e Mon Sep 17 00:00:00 2001
From: 刘继东 <wwwliujidong@163.com>
Date: Sat, 02 Mar 2024 11:52:29 +0800
Subject: [PATCH] update ruoyi-modules/ruoyi-job/src/main/resources/mapper/job/SysJobLogMapper.xml. 任务运行日志列表增加按创建日期倒叙排序
---
ruoyi-auth/src/main/java/com/ruoyi/auth/controller/TokenController.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 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 3e2361d..3b93514 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
@@ -10,8 +10,11 @@
import com.ruoyi.auth.form.RegisterBody;
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;
/**
@@ -40,12 +43,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);
}
--
Gitblit v1.9.3