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 | 66 +++++++++++++++++++--------------
1 files changed, 38 insertions(+), 28 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 6c96564..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
@@ -1,27 +1,30 @@
package com.ruoyi.web.controller.monitor;
+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;
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.model.LoginUser;
+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.redis.RedisUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.system.domain.SysUserOnline;
-import com.ruoyi.system.service.ISysUserOnlineService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
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;
/**
* 鍦ㄧ嚎鐢ㄦ埛鐩戞帶
@@ -34,34 +37,38 @@
@RequestMapping("/monitor/online")
public class SysUserOnlineController extends BaseController {
- private final ISysUserOnlineService userOnlineService;
-
@ApiOperation("鍦ㄧ嚎鐢ㄦ埛鍒楄〃")
- @PreAuthorize("@ss.hasPermi('monitor:online:list')")
+ @SaCheckPermission("monitor:online:list")
@GetMapping("/list")
public TableDataInfo<SysUserOnline> list(String ipaddr, String userName) {
- Collection<String> keys = RedisUtils.keys(Constants.LOGIN_TOKEN_KEY + "*");
- List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
+ // 鑾峰彇鎵�鏈夋湭杩囨湡鐨� token
+ List<String> keys = StpUtil.searchTokenValue("", -1, 0);
+ List<UserOnlineDTO> userOnlineDTOList = new ArrayList<>();
for (String key : keys) {
- LoginUser user = RedisUtils.getCacheObject(key);
- if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
- if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername())) {
- userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
- }
- } else if (StringUtils.isNotEmpty(ipaddr)) {
- if (StringUtils.equals(ipaddr, user.getIpaddr())) {
- userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
- }
- } else if (StringUtils.isNotEmpty(userName)) {
- if (StringUtils.equals(userName, user.getUsername())) {
- userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
- }
- } else {
- userOnlineList.add(userOnlineService.loginUserToUserOnline(user));
+ String token = key.replace(Constants.LOGIN_TOKEN_KEY, "");
+ // 濡傛灉宸茬粡杩囨湡鍒欒涪涓嬬嚎
+ if (StpUtil.stpLogic.getTokenActivityTimeoutByToken(token) < 0) {
+ continue;
}
+ userOnlineDTOList.add(RedisUtils.getCacheObject(Constants.ONLINE_TOKEN_KEY + token));
}
- Collections.reverse(userOnlineList);
- userOnlineList.removeAll(Collections.singleton(null));
+ if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName)) {
+ userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
+ 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());
+ } else if (StringUtils.isNotEmpty(userName)) {
+ userOnlineDTOList = userOnlineDTOList.stream().filter(userOnline ->
+ 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 TableDataInfo.build(userOnlineList);
}
@@ -69,11 +76,14 @@
* 寮洪��鐢ㄦ埛
*/
@ApiOperation("寮洪��鐢ㄦ埛")
- @PreAuthorize("@ss.hasPermi('monitor:online:forceLogout')")
+ @SaCheckPermission("monitor:online:forceLogout")
@Log(title = "鍦ㄧ嚎鐢ㄦ埛", businessType = BusinessType.FORCE)
@DeleteMapping("/{tokenId}")
public AjaxResult<Void> forceLogout(@PathVariable String tokenId) {
- RedisUtils.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
+ try {
+ StpUtil.kickoutByTokenValue(tokenId);
+ } catch (NotLoginException e) {
+ }
return AjaxResult.success();
}
}
--
Gitblit v1.9.3