From 0da30f462392664ba7a76d47de7e67560046d486 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 26 一月 2022 20:58:05 +0800
Subject: [PATCH] update 优化 查询登录用户数据 统一走缓存

---
 ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java |    8 +++-----
 1 files changed, 3 insertions(+), 5 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 609c0ac..bf5625f 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
@@ -9,14 +9,12 @@
 import cn.hutool.http.useragent.UserAgentUtil;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
-import com.ruoyi.common.core.domain.entity.SysUser;
-import com.ruoyi.common.core.service.UserService;
+import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.UserType;
 import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.common.utils.ServletUtils;
 import com.ruoyi.common.utils.ip.AddressUtils;
 import com.ruoyi.common.utils.redis.RedisUtils;
-import com.ruoyi.common.utils.spring.SpringUtils;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -44,7 +42,7 @@
         if (userType == UserType.SYS_USER) {
             UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
             String ip = ServletUtils.getClientIP();
-            SysUser user = SpringUtils.getBean(UserService.class).selectUserById(LoginHelper.getUserId());
+            LoginUser user = LoginHelper.getLoginUser();
             String tokenValue = StpUtil.getTokenValue();
             UserOnlineDTO dto = UserOnlineDTO.builder()
                 .ipaddr(ip)
@@ -53,7 +51,7 @@
                 .os(userAgent.getOs().getName())
                 .loginTime(System.currentTimeMillis())
                 .tokenId(tokenValue)
-                .userName(user.getUserName())
+                .userName(user.getUsername())
                 .build();
             if (ObjectUtil.isNotNull(user.getDept())) {
                 dto.setDeptName(user.getDept().getDeptName());

--
Gitblit v1.9.3