From 2917d335bc3fd1f6dfb57cbad6d73ba48bc5f9d7 Mon Sep 17 00:00:00 2001
From: konbai <1527468660@qq.com>
Date: 星期六, 19 二月 2022 16:15:44 +0800
Subject: [PATCH] update 优化 是否为管理员的判断
---
ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java | 43 ++++++++++++++++++++-----------------------
1 files changed, 20 insertions(+), 23 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 9c91f22..c4252b4 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
@@ -8,54 +8,51 @@
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.utils.LoginUtils;
+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;
+import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import java.util.concurrent.TimeUnit;
/**
* 鐢ㄦ埛琛屼负 渚﹀惉鍣ㄧ殑瀹炵幇
+ *
+ * @author Lion Li
*/
+@RequiredArgsConstructor
@Component
@Slf4j
public class UserActionListener implements SaTokenListener {
- @Autowired
- private SaTokenConfig saTokenConfig;
+ private final SaTokenConfig tokenConfig;
/**
* 姣忔鐧诲綍鏃惰Е鍙�
*/
@Override
public void doLogin(String loginType, Object loginId, SaLoginModel loginModel) {
- UserType userType = LoginUtils.getUserType(loginId);
+ UserType userType = UserType.getUserType(loginId.toString());
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(LoginUtils.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());
- }
- RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, userOnlineDTO, saTokenConfig.getTimeout(), TimeUnit.SECONDS);
+ LoginUser user = LoginHelper.getLoginUser();
+ String tokenValue = StpUtil.getTokenValueByLoginId(loginId);
+ UserOnlineDTO dto = new UserOnlineDTO();
+ dto.setIpaddr(ip);
+ dto.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
+ dto.setBrowser(userAgent.getBrowser().getName());
+ dto.setOs(userAgent.getOs().getName());
+ dto.setLoginTime(System.currentTimeMillis());
+ dto.setTokenId(tokenValue);
+ dto.setUserName(user.getUsername());
+ dto.setDeptName(user.getDeptName());
+ 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