From b9931cda30d13a02c29194bbf387f87b0a9d368b Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期四, 30 六月 2022 15:25:22 +0800
Subject: [PATCH] !192 优化登出方法 Merge pull request !192 from zendwang/dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
index 529d5e7..2ad51e3 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java
@@ -7,18 +7,16 @@
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.PageUtils;
-import com.ruoyi.common.utils.RedisUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.system.domain.SysUserOnline;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import java.util.ArrayList;
@@ -32,7 +30,7 @@
* @author Lion Li
*/
@Api(value = "鍦ㄧ嚎鐢ㄦ埛鐩戞帶", tags = {"鍦ㄧ嚎鐢ㄦ埛鐩戞帶绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/monitor/online")
public class SysUserOnlineController extends BaseController {
@@ -45,8 +43,12 @@
List<String> keys = StpUtil.searchTokenValue("", -1, 0);
List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
for (String key : keys) {
- String onlineKey = key.replace(Constants.LOGIN_TOKEN_KEY, Constants.ONLINE_TOKEN_KEY);
- userOnlineDTOList.add(RedisUtils.getCacheObject(onlineKey));
+ String token = key.replace(Constants.LOGIN_TOKEN_KEY, "");
+ // 濡傛灉宸茬粡杩囨湡鍒欒涪涓嬬嚎
+ if (StpUtil.stpLogic.getTokenActivityTimeoutByToken(token) < 0) {
+ continue;
+ }
+ userOnlineDTOList.add(RedisUtils.getCacheObject(Constants.ONLINE_TOKEN_KEY + token));
}
if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
@@ -55,7 +57,7 @@
).collect(Collectors.toList());
} else if (StringUtils.isNotEmpty(ipaddr)) {
userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
- StringUtils.equals(ipaddr, userOnline.getIpaddr()))
+ StringUtils.equals(ipaddr, userOnline.getIpaddr()))
.collect(Collectors.toList());
} else if (StringUtils.isNotEmpty(userName)) {
userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
@@ -65,7 +67,7 @@
Collections.reverse(userOnlineDTOList);
userOnlineDTOList.removeAll(Collections.singleton(null));
List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
- return PageUtils.buildDataInfo(userOnlineList);
+ return TableDataInfo.build(userOnlineList);
}
/**
@@ -75,11 +77,11 @@
@SaCheckPermission("monitor:online:forceLogout")
@Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}")
- public AjaxResult<Void> forceLogout(@PathVariable String tokenId) {
+ public R<Void> forceLogout(@PathVariable String tokenId) {
try {
- StpUtil.logoutByTokenValue(tokenId);
+ StpUtil.kickoutByTokenValue(tokenId);
} catch (NotLoginException e) {
}
- return AjaxResult.success();
+ return R.ok();
}
}
--
Gitblit v1.9.3