admin/lx-admin-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 优化 多账号体系用户行为监听逻辑

Browse Source
This commit is contained in:
疯狂的狮子li 2021-10-19 17:23:14 +08:00
parent 1f1d4e2def
commit 1ae369855b
2 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
ruoyi-framework/src/main/java/com/ruoyi/framework/satoken/MySaTokenListener.java → ruoyi-framework/src/main/java/com/ruoyi/framework/listener/UserActionListener.java
View File

@ -1,4 +1,4 @@
package com.ruoyi.framework.satoken; package com.ruoyi.framework.listener;
import cn.dev33.satoken.listener.SaTokenListener; import cn.dev33.satoken.listener.SaTokenListener;
import cn.dev33.satoken.stp.SaLoginModel; import cn.dev33.satoken.stp.SaLoginModel;
@ -8,43 +8,46 @@ import cn.hutool.http.useragent.UserAgentUtil;
import com.ruoyi.common.constant.Constants; import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.dto.UserOnlineDTO; import com.ruoyi.common.core.domain.dto.UserOnlineDTO;
import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.RedisUtils; import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.utils.SecurityUtils; import com.ruoyi.common.utils.*;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.ip.AddressUtils; import com.ruoyi.common.utils.ip.AddressUtils;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
/** /**
* 自定义侦听器的实现 * 用户行为 侦听器的实现
*/ */
@Component @Component
@Slf4j @Slf4j
public class MySaTokenListener implements SaTokenListener { public class UserActionListener implements SaTokenListener {
/** /**
* 每次登录时触发 * 每次登录时触发
*/ */
@Override @Override
public void doLogin(String loginType, Object loginId, SaLoginModel loginModel) { public void doLogin(String loginType, Object loginId, SaLoginModel loginModel) {
UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent")); UserType userType = LoginUtils.getUserType(loginId);
String ip = ServletUtils.getClientIP(); if (userType == UserType.SYS_USER) {
SysUser user = SecurityUtils.getUser(); UserAgent userAgent = UserAgentUtil.parse(ServletUtils.getRequest().getHeader("User-Agent"));
String tokenValue = StpUtil.getTokenValue(); String ip = ServletUtils.getClientIP();
UserOnlineDTO userOnlineDTO = new UserOnlineDTO() SysUser user = SecurityUtils.getUser();
.setIpaddr(ip) String tokenValue = StpUtil.getTokenValue();
.setLoginLocation(AddressUtils.getRealAddressByIP(ip)) UserOnlineDTO userOnlineDTO = new UserOnlineDTO()
.setBrowser(userAgent.getBrowser().getName()) .setIpaddr(ip)
.setOs(userAgent.getOs().getName()) .setLoginLocation(AddressUtils.getRealAddressByIP(ip))
.setLoginTime(System.currentTimeMillis()) .setBrowser(userAgent.getBrowser().getName())
.setTokenId(tokenValue) .setOs(userAgent.getOs().getName())
.setUserName(user.getUserName()); .setLoginTime(System.currentTimeMillis())
if (StringUtils.isNotNull(user.getDept())) { .setTokenId(tokenValue)
userOnlineDTO.setDeptName(user.getDept().getDeptName()); .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);
} else if (userType == UserType.APP_USER) {
// app端 自行根据业务编写
} }
RedisUtils.setCacheObject(Constants.ONLINE_TOKEN_KEY + tokenValue, userOnlineDTO);
log.info("user doLogin, useId:{}, token:{}", loginId, tokenValue);
} }
/** /**

1
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SaInterfaceImpl.java
View File

@ -28,7 +28,6 @@ public class SaInterfaceImpl implements StpInterface {
Long userId = LoginUtils.getUserId(); Long userId = LoginUtils.getUserId();
SysUser user = iSysUserService.getById(userId); SysUser user = iSysUserService.getById(userId);
Set<String> menuPermission = sysPermissionService.getMenuPermission(user); Set<String> menuPermission = sysPermissionService.getMenuPermission(user);
//采用的是用户里自带的权限，实现一次性访问reids,进行判断是否可以访问
return new ArrayList<>(menuPermission); return new ArrayList<>(menuPermission);
} else if (userType == UserType.APP_USER) { } else if (userType == UserType.APP_USER) {
// app端权限返回 自行根据业务编写 // app端权限返回 自行根据业务编写