From c0d749b1e2ae840b5cadc66febb07aa0f9572ab5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 26 一月 2022 18:30:57 +0800
Subject: [PATCH] fix 修复 数据权限 缓存方法名错误问题
---
ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java | 25 +++++++++++++------------
1 files changed, 13 insertions(+), 12 deletions(-)
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
index 0b41e45..609c0ac 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
@@ -4,6 +4,7 @@
import cn.dev33.satoken.listener.SaTokenListener;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
import com.ruoyi.common.constant.Constants;
@@ -13,7 +14,6 @@
import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.helper.LoginHelper;
import com.ruoyi.common.utils.ServletUtils;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.ip.AddressUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
@@ -46,18 +46,19 @@
String ip = ServletUtils.getClientIP();
SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginHelper.getUserId());
String tokenValue = StpUtil.getTokenValue();
- UserOnlineDTO userOnlineDTO = new UserOnlineDTO()
- .setIpaddr(ip)
- .setLoginLocation(AddressUtils.getRealAddressByIP(ip))
- .setBrowser(userAgent.getBrowser().getName())
- .setOs(userAgent.getOs().getName())
- .setLoginTime(System.currentTimeMillis())
- .setTokenId(tokenValue)
- .setUserName(user.getUserName());
- if (StringUtils.isNotNull(user.getDept())) {
- userOnlineDTO.setDeptName(user.getDept().getDeptName());
+ UserOnlineDTO dto = UserOnlineDTO.builder()
+ .ipaddr(ip)
+ .loginLocation(AddressUtils.getRealAddressByIP(ip))
+ .browser(userAgent.getBrowser().getName())
+ .os(userAgent.getOs().getName())
+ .loginTime(System.currentTimeMillis())
+ .tokenId(tokenValue)
+ .userName(user.getUserName())
+ .build();
+ if (ObjectUtil.isNotNull(user.getDept())) {
+ dto.setDeptName(user.getDept().getDeptName());
}
- RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, userOnlineDTO, tokenConfig.getTimeout(), TimeUnit.SECONDS);
+ RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, dto, tokenConfig.getTimeout(), TimeUnit.SECONDS);
log.info("user doLogin, useId:{}, token:{}", loginId, tokenValue);
} else if (userType == UserType.APP_USER) {
// app绔� 鑷鏍规嵁涓氬姟缂栧啓
--
Gitblit v1.9.3