From cbb0c98f987a69ed3d23d30d65799f1b426e32d2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 11 十月 2021 17:59:27 +0800
Subject: [PATCH] add [重磅更新] 增加分布式日志框架 TLog
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysUserOnlineController.java | 28 ++++++++++++----------------
1 files changed, 12 insertions(+), 16 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 fe630a9..9c83609 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,16 +1,15 @@
package com.ruoyi.web.controller.monitor;
-import cn.hutool.core.lang.Validator;
-import cn.hutool.core.util.StrUtil;
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.page.TableDataInfo;
-import com.ruoyi.common.core.redis.RedisCache;
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.system.domain.SysUserOnline;
import com.ruoyi.system.service.ISysUserOnlineService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +23,7 @@
/**
* 鍦ㄧ嚎鐢ㄦ埛鐩戞帶
- *
+ *
* @author ruoyi
*/
@RestController
@@ -34,35 +33,32 @@
@Autowired
private ISysUserOnlineService userOnlineService;
- @Autowired
- private RedisCache redisCache;
-
@PreAuthorize("@ss.hasPermi('monitor:online:list')")
@GetMapping("/list")
public TableDataInfo list(String ipaddr, String userName)
{
- Collection<String> keys = redisCache.keys(Constants.LOGIN_TOKEN_KEY + "*");
+ Collection<String> keys = RedisUtils.keys(Constants.LOGIN_TOKEN_KEY + "*");
List<SysUserOnline> userOnlineList = new ArrayList<SysUserOnline>();
for (String key : keys)
{
- LoginUser user = redisCache.getCacheObject(key);
- if (Validator.isNotEmpty(ipaddr) && Validator.isNotEmpty(userName))
+ LoginUser user = RedisUtils.getCacheObject(key);
+ if (StringUtils.isNotEmpty(ipaddr) && StringUtils.isNotEmpty(userName))
{
- if (StrUtil.equals(ipaddr, user.getIpaddr()) && StrUtil.equals(userName, user.getUsername()))
+ if (StringUtils.equals(ipaddr, user.getIpaddr()) && StringUtils.equals(userName, user.getUsername()))
{
userOnlineList.add(userOnlineService.selectOnlineByInfo(ipaddr, userName, user));
}
}
- else if (Validator.isNotEmpty(ipaddr))
+ else if (StringUtils.isNotEmpty(ipaddr))
{
- if (StrUtil.equals(ipaddr, user.getIpaddr()))
+ if (StringUtils.equals(ipaddr, user.getIpaddr()))
{
userOnlineList.add(userOnlineService.selectOnlineByIpaddr(ipaddr, user));
}
}
- else if (Validator.isNotEmpty(userName) && Validator.isNotNull(user.getUser()))
+ else if (StringUtils.isNotEmpty(userName) && StringUtils.isNotNull(user.getUser()))
{
- if (StrUtil.equals(userName, user.getUsername()))
+ if (StringUtils.equals(userName, user.getUsername()))
{
userOnlineList.add(userOnlineService.selectOnlineByUserName(userName, user));
}
@@ -85,7 +81,7 @@
@DeleteMapping("/{tokenId}")
public AjaxResult forceLogout(@PathVariable String tokenId)
{
- redisCache.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
+ RedisUtils.deleteObject(Constants.LOGIN_TOKEN_KEY + tokenId);
return AjaxResult.success();
}
}
--
Gitblit v1.9.3