From a33898c2a0374c249862a2b996e33352e30c8caf Mon Sep 17 00:00:00 2001
From: KonBAI <1527468660@qq.com>
Date: 星期六, 02 四月 2022 13:02:56 +0800
Subject: [PATCH] !167 update 修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型 * fix 修改 postgres sql脚本，处理角色表字段类型错误问题。 * fix 修复postgreSQL新增或更新角色信息报错。修改角色"菜单树选择项"和"部门树选择项"是否关联显示字段为Boolean类型。
---
ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java | 38 ++++++++++++++++----------------------
1 files changed, 16 insertions(+), 22 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..75277c2 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,19 +4,16 @@
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;
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,22 +41,19 @@
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());
- String tokenValue = StpUtil.getTokenValue();
- 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());
- }
+ 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);
+ log.info("user doLogin, userId:{}, token:{}", loginId, tokenValue);
} else if (userType == UserType.APP_USER) {
// app绔� 鑷鏍规嵁涓氬姟缂栧啓
}
@@ -71,7 +65,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, userId:{}, token:{}", loginId, tokenValue);
}
/**
@@ -80,7 +74,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, userId:{}, token:{}", loginId, tokenValue);
}
/**
@@ -89,7 +83,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, userId:{}, token:{}", loginId, tokenValue);
}
/**
--
Gitblit v1.9.3