update [重磅更新] 登录流程升级 支持缓存

疯狂的狮子li

2021-12-03 e763381186c3a1f74ed416ea79767ac73b984745

 ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java

@@ -3,8 +3,11 @@
import cn.dev33.satoken.stp.StpUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.core.service.LogininforService;
import com.ruoyi.common.enums.DeviceType;
import com.ruoyi.common.enums.UserStatus;
import com.ruoyi.common.enums.UserType;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.exception.user.CaptchaException;
import com.ruoyi.common.exception.user.CaptchaExpireException;
@@ -12,7 +15,6 @@
import com.ruoyi.common.utils.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.stereotype.Service;

import javax.servlet.http.HttpServletRequest;
@@ -20,7 +22,7 @@
/**
 * 登录校验方法
 *
 * @author ruoyi
 * @author Lion Li
 */
@Slf4j
@Service
@@ -34,6 +36,9 @@

    @Autowired
    private LogininforService asyncService;

    @Autowired
    private SysPermissionService permissionService;

    /**
     * 登录验证
@@ -62,17 +67,21 @@
            log.info("登录用户：{} 已被停用.", username);
            throw new ServiceException("对不起，您的账号：" + username + " 已停用");
        }
        BCryptPasswordEncoder passwordEncoder = new BCryptPasswordEncoder();
        String encodePassword = passwordEncoder.encode(password);
        if (SecurityUtils.matchesPassword(user.getPassword(), encodePassword)) {
        if (!SecurityUtils.matchesPassword(password, user.getPassword())) {
            asyncService.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match"), request);
            throw new UserPasswordNotMatchException();
        }
        LoginUser loginUser = new LoginUser();
        loginUser.setUserId(user.getUserId());
        loginUser.setDeptId(user.getDeptId());
        loginUser.setUsername(user.getUserName());
        loginUser.setMenuPermission(permissionService.getMenuPermission(user));
        loginUser.setRolePermission(permissionService.getRolePermission(user));

      asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
        recordLoginInfo(user.getUserId());
        recordLoginInfo(user.getUserId(), username);
        // 生成token
        StpUtil.login(user.getUserId(), "PC");
        LoginUtils.loginByDevice(loginUser, UserType.SYS_USER, DeviceType.PC);
        return StpUtil.getTokenValue();
    }

@@ -103,11 +112,12 @@
     *
     * @param userId 用户ID
     */
    public void recordLoginInfo(Long userId) {
    public void recordLoginInfo(Long userId, String username) {
        SysUser sysUser = new SysUser();
        sysUser.setUserId(userId);
        sysUser.setLoginIp(ServletUtils.getClientIP());
        sysUser.setLoginDate(DateUtils.getNowDate());
        sysUser.setUpdateBy(username);
        userService.updateUserProfile(sysUser);
    }
}