gitee/RuoYi-Cloud-Plus
1
0
Fork 0
mirror of https://gitee.com/dromara/RuoYi-Cloud-Plus.git synced 2026-03-22 10:47:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

update 优化远程调用方法记录登录信息 ;

Browse Source
This commit is contained in:
Michelle.Chung
2023-07-25 10:44:32 +08:00
parent 054ded428f
commit 2d40202f75
8 changed files with 22 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-api/ruoyi-api-system/src/main/java/org/dromara/system/api/RemoteUserService.java
View File

@@ -66,8 +66,9 @@ public interface RemoteUserService {
/**
* 更新用户信息
*
* @param remoteUserBo 用户信息
* @param userId 用户ID
* @param ip IP地址
*/
void updateUser(RemoteUserBo remoteUserBo);
void recordLoginInfo(Long userId, String ip);
}

14
ruoyi-auth/src/main/java/org/dromara/auth/service/SysLoginService.java
View File

@@ -136,20 +136,6 @@ public class SysLoginService {
SpringUtils.context().publishEvent(logininforEvent);
}
/**
* 记录登录信息
*
* @param loginUser 用户信息
*/
public void recordLoginInfo(LoginUser loginUser) {
RemoteUserBo bo = new RemoteUserBo();
bo.setUserId(loginUser.getUserId());
bo.setUserName(loginUser.getUsername());
bo.setLoginIp(ServletUtils.getClientIP());
bo.setLoginDate(DateUtils.getNowDate());
remoteUserService.updateUser(bo);
}
/**
* 登录校验
*/

3
ruoyi-auth/src/main/java/org/dromara/auth/service/impl/EmailAuthStrategy.java
View File

@@ -14,6 +14,7 @@ import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.enums.LoginType;
import org.dromara.common.core.exception.user.CaptchaExpireException;
import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.ServletUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.core.validate.auth.EmailGroup;
@@ -64,7 +65,7 @@ public class EmailAuthStrategy implements IAuthStrategy {
LoginHelper.login(loginUser, model);
loginService.recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
loginService.recordLoginInfo(loginUser);
remoteUserService.recordLoginInfo(loginUser.getUserId(), ServletUtils.getClientIP());
LoginVo loginVo = new LoginVo();
loginVo.setAccessToken(StpUtil.getTokenValue());

4
ruoyi-auth/src/main/java/org/dromara/auth/service/impl/PasswordAuthStrategy.java
View File

@@ -6,11 +6,9 @@ import cn.dev33.satoken.stp.StpUtil;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.dubbo.config.annotation.DubboReference;
import org.apache.dubbo.rpc.RpcContext;
import org.dromara.auth.domain.vo.LoginVo;
import org.dromara.common.core.exception.CaptchaException;
import org.dromara.common.core.domain.model.LoginBody;
import org.dromara.auth.properties.CaptchaProperties;
import org.dromara.auth.service.IAuthStrategy;
import org.dromara.auth.service.SysLoginService;
import org.dromara.common.core.constant.Constants;
@@ -79,7 +77,7 @@ public class PasswordAuthStrategy implements IAuthStrategy {
LoginHelper.login(loginUser, model);
loginService.recordLogininfor(loginUser.getTenantId(), username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
loginService.recordLoginInfo(loginUser);
remoteUserService.recordLoginInfo(loginUser.getUserId(), ServletUtils.getClientIP());
LoginVo loginVo = new LoginVo();
loginVo.setAccessToken(StpUtil.getTokenValue());

3
ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SmsAuthStrategy.java
View File

@@ -14,6 +14,7 @@ import org.dromara.common.core.constant.GlobalConstants;
import org.dromara.common.core.enums.LoginType;
import org.dromara.common.core.exception.user.CaptchaExpireException;
import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.ServletUtils;
import org.dromara.common.core.utils.StringUtils;
import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.core.validate.auth.SmsGroup;
@@ -64,7 +65,7 @@ public class SmsAuthStrategy implements IAuthStrategy {
LoginHelper.login(loginUser, model);
loginService.recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
loginService.recordLoginInfo(loginUser);
remoteUserService.recordLoginInfo(loginUser.getUserId(), ServletUtils.getClientIP());
LoginVo loginVo = new LoginVo();
loginVo.setAccessToken(StpUtil.getTokenValue());

3
ruoyi-auth/src/main/java/org/dromara/auth/service/impl/SocialAuthStrategy.java
View File

@@ -19,6 +19,7 @@ import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.domain.model.LoginBody;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.ServletUtils;
import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.core.validate.auth.SocialGroup;
import org.dromara.common.satoken.utils.LoginHelper;
@@ -101,7 +102,7 @@ public class SocialAuthStrategy implements IAuthStrategy {
LoginHelper.login(loginUser, model);
loginService.recordLogininfor(loginUser.getTenantId(), socialVo.getUserName(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
loginService.recordLoginInfo(loginUser);
remoteUserService.recordLoginInfo(loginUser.getUserId(), ServletUtils.getClientIP());
LoginVo loginVo = new LoginVo();
loginVo.setAccessToken(StpUtil.getTokenValue());

3
ruoyi-auth/src/main/java/org/dromara/auth/service/impl/XcxAuthStrategy.java
View File

@@ -11,6 +11,7 @@ import org.dromara.auth.service.IAuthStrategy;
import org.dromara.auth.service.SysLoginService;
import org.dromara.common.core.constant.Constants;
import org.dromara.common.core.utils.MessageUtils;
import org.dromara.common.core.utils.ServletUtils;
import org.dromara.common.core.utils.ValidatorUtils;
import org.dromara.common.core.validate.auth.WechatGroup;
import org.dromara.common.satoken.utils.LoginHelper;
@@ -59,7 +60,7 @@ public class XcxAuthStrategy implements IAuthStrategy {
LoginHelper.login(loginUser, model);
loginService.recordLogininfor(loginUser.getTenantId(), loginUser.getUsername(), Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"));
loginService.recordLoginInfo(loginUser);
remoteUserService.recordLoginInfo(loginUser.getUserId(), ServletUtils.getClientIP());
LoginVo loginVo = new LoginVo();
loginVo.setAccessToken(StpUtil.getTokenValue());

15
ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/dubbo/RemoteUserServiceImpl.java
View File

@@ -8,6 +8,7 @@ import org.apache.dubbo.config.annotation.DubboService;
import org.dromara.common.core.enums.UserStatus;
import org.dromara.common.core.exception.ServiceException;
import org.dromara.common.core.exception.user.UserException;
import org.dromara.common.core.utils.DateUtils;
import org.dromara.common.core.utils.MapstructUtils;
import org.dromara.common.tenant.helper.TenantHelper;
import org.dromara.system.api.RemoteUserService;
@@ -161,13 +162,17 @@ public class RemoteUserServiceImpl implements RemoteUserService {
/**
* 更新用户信息
*
* @param remoteUserBo 用户信息
* @param userId 用户ID
* @param ip IP地址
*/
@Override
public void updateUser(RemoteUserBo remoteUserBo) {
SysUserBo sysUserBo = MapstructUtils.convert(remoteUserBo, SysUserBo.class);
sysUserBo.setUpdateBy(remoteUserBo.getUserId());
userService.updateUser(sysUserBo);
public void recordLoginInfo(Long userId, String ip) {
SysUser sysUser = new SysUser();
sysUser.setUserId(userId);
sysUser.setLoginIp(ip);
sysUser.setLoginDate(DateUtils.getNowDate());
sysUser.setUpdateBy(userId);
userMapper.updateById(sysUser);
}
}