public/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2026-05-13 07:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 优化 操作日志 补齐一些必要的记录数据

Browse Source
This commit is contained in:
疯狂的狮子Li
2026-04-08 13:33:13 +08:00
parent dcfeeff94a
commit 0ef78b92d7
10 changed files with 219 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ruoyi-common/ruoyi-common-satoken/src/main/java/org/dromara/common/satoken/utils/LoginHelper.java
View File

@@ -5,10 +5,16 @@ import cn.dev33.satoken.stp.StpUtil;
import cn.dev33.satoken.stp.parameter.SaLoginParameter;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.http.useragent.UserAgent;
import cn.hutool.http.useragent.UserAgentUtil;
import jakarta.servlet.http.HttpServletRequest;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;
import org.dromara.common.core.constant.SystemConstants;
import org.dromara.common.core.enums.UserType;
import org.dromara.common.core.utils.ServletUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.ip.AddressUtils;
import org.dromara.system.api.model.LoginUser;
/**
@@ -43,6 +49,7 @@ public class LoginHelper {
*/
public static void login(LoginUser loginUser, SaLoginParameter model) {
model = ObjectUtil.defaultIfNull(model, new SaLoginParameter());
fillRequestContext(loginUser, model);
StpUtil.login(loginUser.getLoginId(),
model.setExtra(USER_KEY, loginUser.getUserId())
.setExtra(USER_NAME_KEY, loginUser.getUsername())
@@ -53,6 +60,36 @@ public class LoginHelper {
StpUtil.getTokenSession().set(LOGIN_USER_KEY, loginUser);
}
/**
* 在登录时补充当前请求上下文，避免登录态中的终端信息缺失。
*
* @param loginUser 登录用户
* @param model 登录参数
*/
private static void fillRequestContext(LoginUser loginUser, SaLoginParameter model) {
HttpServletRequest request = ServletUtils.getRequest();
if (ObjectUtil.isNull(request)) {
return;
}
String ip = ServletUtils.getClientIP(request);
if (StringUtils.isBlank(loginUser.getIpaddr())) {
loginUser.setIpaddr(ip);
}
if (StringUtils.isBlank(loginUser.getLoginLocation()) && StringUtils.isNotBlank(ip)) {
loginUser.setLoginLocation(AddressUtils.getRealAddressByIP(ip));
}
UserAgent userAgent = UserAgentUtil.parse(request.getHeader("User-Agent"));
if (StringUtils.isBlank(loginUser.getBrowser())) {
loginUser.setBrowser(userAgent.getBrowser().getName());
}
if (StringUtils.isBlank(loginUser.getOs())) {
loginUser.setOs(userAgent.getOs().getName());
}
if (StringUtils.isBlank(loginUser.getDeviceType()) && StringUtils.isNotBlank(model.getDeviceType())) {
loginUser.setDeviceType(model.getDeviceType());
}
}
/**
* 获取用户(多级缓存)
*/