From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java | 43 ++++++++++++++++++++++++++++---------------
1 files changed, 28 insertions(+), 15 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 fadb9aa..90003ef 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
@@ -2,6 +2,7 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import cn.dev33.satoken.exception.NotLoginException;
+import cn.dev33.satoken.stp.StpLogic;
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.bean.BeanUtil;
import com.ruoyi.common.annotation.Log;
@@ -11,14 +12,16 @@
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.redis.RedisUtils;
import com.ruoyi.common.utils.StringUtils;
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;
-import java.util.Collection;
import java.util.Collections;
import java.util.List;
import java.util.stream.Collectors;
@@ -26,49 +29,59 @@
/**
* 鍦ㄧ嚎鐢ㄦ埛鐩戞帶
*
- * @author ruoyi
+ * @author Lion Li
*/
+@Api(value = "鍦ㄧ嚎鐢ㄦ埛鐩戞帶", tags = {"鍦ㄧ嚎鐢ㄦ埛鐩戞帶绠＄悊"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/monitor/online")
public class SysUserOnlineController extends BaseController {
+ @ApiOperation("鍦ㄧ嚎鐢ㄦ埛鍒楄〃")
@SaCheckPermission("monitor:online:list")
@GetMapping("/list")
- public TableDataInfo list(String ipaddr, String userName) {
- Collection<String> keys = RedisUtils.keys(Constants.ONLINE_TOKEN_KEY + "*");
+ public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
+ // 鑾峰彇鎵�鏈夋湭杩囨湡鐨� token
+ List<String> keys = StpUtil.searchTokenValue("", -1, 0);
List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
for (String key : keys) {
- userOnlineDTOList.add(RedisUtils.getCacheObject(key));
+ 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 ->
- StringUtils.equals(ipaddr, userOnline.getIpaddr()) &&
- StringUtils.equals(userName, userOnline.getUserName())
+ StringUtils.equals(ipaddr, userOnline.getIpaddr()) &&
+ StringUtils.equals(userName, userOnline.getUserName())
).collect(Collectors.toList());
} else if (StringUtils.isNotEmpty(ipaddr)) {
userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
- StringUtils.equals(ipaddr, userOnline.getIpaddr()))
- .collect(Collectors.toList());
+ StringUtils.equals(ipaddr, userOnline.getIpaddr()))
+ .collect(Collectors.toList());
} else if (StringUtils.isNotEmpty(userName)) {
userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
- StringUtils.equals(userName, userOnline.getUserName())
+ StringUtils.equals(userName, userOnline.getUserName())
).collect(Collectors.toList());
}
Collections.reverse(userOnlineDTOList);
userOnlineDTOList.removeAll(Collections.singleton(null));
List<SysUserOnline> userOnlineList = BeanUtil.copyToList(userOnlineDTOList, SysUserOnline.class);
- return PageUtils.buildDataInfo(userOnlineList);
+ return TableDataInfo.build(userOnlineList);
}
/**
* 寮洪��鐢ㄦ埛
*/
+ @ApiOperation("寮洪��鐢ㄦ埛")
@SaCheckPermission("monitor:online:forceLogout")
@Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}")
- public AjaxResult forceLogout(@PathVariable String tokenId) {
+ public AjaxResult<Void> forceLogout(@PathVariable String tokenId) {
try {
- StpUtil.logoutByTokenValue(tokenId);
+ StpUtil.kickoutByTokenValue(tokenId);
} catch (NotLoginException e) {
}
return AjaxResult.success();
--
Gitblit v1.9.3