疯狂的狮子Li
2021-10-04 bc6db547d6b75e092cadc084035ef570bad75af7
ruoyi-system/src/main/java/com/ruoyi/system/service/SysLoginService.java
@@ -4,7 +4,9 @@
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.entity.SysUser;
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;
@@ -62,9 +64,7 @@
            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();
        }
@@ -72,7 +72,7 @@
      asyncService.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success"), request);
        recordLoginInfo(user.getUserId());
        // 生成token
        StpUtil.login(user.getUserId(), "PC");
        LoginUtils.loginByDevice(user.getUserId(), UserType.SYS_USER, DeviceType.PC);
        return StpUtil.getTokenValue();
    }