From c0f3dff0f66553f9e9eedd1e4dd6149ce74ceb20 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:27:09 +0800
Subject: [PATCH] update 合并 satoken 解决不兼容不分
---
ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java | 40 ++++++++++++++++++++++++++--------------
1 files changed, 26 insertions(+), 14 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 f407774..15b04d8 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
@@ -1,5 +1,6 @@
package com.ruoyi.framework.listener;
+import cn.dev33.satoken.config.SaTokenConfig;
import cn.dev33.satoken.listener.SaTokenListener;
import cn.dev33.satoken.stp.SaLoginModel;
import cn.dev33.satoken.stp.StpUtil;
@@ -8,11 +9,19 @@
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.enums.UserType;
-import com.ruoyi.common.utils.*;
+import com.ruoyi.common.utils.LoginUtils;
+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.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+
+import java.util.concurrent.TimeUnit;
/**
* 鐢ㄦ埛琛屼负 渚﹀惉鍣ㄧ殑瀹炵幇
@@ -20,6 +29,9 @@
@Component
@Slf4j
public class UserActionListener implements SaTokenListener {
+
+ @Autowired
+ private SaTokenConfig saTokenConfig;
/**
* 姣忔鐧诲綍鏃惰Е鍙�
@@ -30,21 +42,21 @@
if (userType == UserType.SYS_USER) {
UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
String ip = ServletUtils.getClientIP();
- SysUser user = SecurityUtils.getUser();
+ 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());
+ .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);
- log.info("user doLogin, useId:{}, token:{}", loginId, tokenValue);
+ RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, userOnlineDTO, saTokenConfig.getTimeout(), TimeUnit.SECONDS);
+ log.info("user doLogin, useId:{}, token:{}" , loginId, tokenValue);
} else if (userType == UserType.APP_USER) {
// app绔� 鑷鏍规嵁涓氬姟缂栧啓
}
@@ -56,7 +68,7 @@
@Override
public void doLogout(String loginType, Object loginId, String tokenValue) {
RedisUtils.deleteObject(Constants.ONLINE_TOKEN_KEY + tokenValue);
- log.info("user doLogout, useId:{}, token:{}", loginId, tokenValue);
+ log.info("user doLogout, useId:{}, token:{}" , loginId, tokenValue);
}
/**
@@ -65,7 +77,7 @@
@Override
public void doKickout(String loginType, Object loginId, String tokenValue) {
RedisUtils.deleteObject(Constants.ONLINE_TOKEN_KEY + tokenValue);
- log.info("user doLogoutByLoginId, useId:{}, token:{}", loginId, tokenValue);
+ log.info("user doLogoutByLoginId, useId:{}, token:{}" , loginId, tokenValue);
}
/**
@@ -74,7 +86,7 @@
@Override
public void doReplaced(String loginType, Object loginId, String tokenValue) {
RedisUtils.deleteObject(Constants.ONLINE_TOKEN_KEY + tokenValue);
- log.info("user doReplaced, useId:{}, token:{}", loginId, tokenValue);
+ log.info("user doReplaced, useId:{}, token:{}" , loginId, tokenValue);
}
/**
--
Gitblit v1.9.3