Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

zss

8 天以前 c93fc713fedb68cc96f6f29e0442d949b44b7caa

 src/main/java/com/ruoyi/framework/security/service/SysLoginService.java

@@ -1,25 +1,10 @@
package com.ruoyi.framework.security.service;



import javax.annotation.Resource;



import com.ruoyi.framework.web.domain.AjaxResult;

import com.ruoyi.project.system.mapper.SysUserMapper;

import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.security.authentication.AuthenticationManager;

import org.springframework.security.authentication.BadCredentialsException;

import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

import org.springframework.security.core.Authentication;

import org.springframework.security.core.context.SecurityContextHolder;

import org.springframework.stereotype.Component;

import com.ruoyi.common.constant.CacheConstants;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.constant.UserConstants;

import com.ruoyi.common.exception.ServiceException;

import com.ruoyi.common.exception.user.BlackListException;

import com.ruoyi.common.exception.user.CaptchaException;

import com.ruoyi.common.exception.user.CaptchaExpireException;

import com.ruoyi.common.exception.user.UserNotExistsException;

import com.ruoyi.common.exception.user.UserPasswordNotMatchException;

import com.ruoyi.common.exception.user.*;

import com.ruoyi.common.utils.DateUtils;

import com.ruoyi.common.utils.MessageUtils;

import com.ruoyi.common.utils.StringUtils;

@@ -30,10 +15,18 @@
import com.ruoyi.framework.security.LoginUser;

import com.ruoyi.framework.security.context.AuthenticationContextHolder;

import com.ruoyi.project.system.domain.SysUser;

import com.ruoyi.project.system.mapper.SysUserMapper;

import com.ruoyi.project.system.service.ISysConfigService;

import com.ruoyi.project.system.service.ISysUserService;

import jakarta.annotation.Resource;

import lombok.RequiredArgsConstructor;

import org.springframework.security.authentication.AuthenticationManager;

import org.springframework.security.authentication.BadCredentialsException;

import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

import org.springframework.security.core.Authentication;

import org.springframework.security.core.context.SecurityContextHolder;

import org.springframework.stereotype.Component;



import java.util.Collections;

import java.util.HashMap;

import java.util.Map;



@@ -43,22 +36,19 @@
 * @author ruoyi

 */

@Component

@RequiredArgsConstructor

public class SysLoginService

{

    @Autowired

    private TokenService tokenService;

    private final TokenService tokenService;



    @Resource

    private AuthenticationManager authenticationManager;



    @Autowired

    private RedisCache redisCache;

    private final RedisCache redisCache;

    private final ISysUserService userService;

    private final ISysConfigService configService;

    private final SysUserMapper sysUserMapper;



    @Autowired

    private ISysUserService userService;



    @Autowired

    private ISysConfigService configService;



    /**

     * 登录验证

@@ -219,8 +209,6 @@
        return loginUser.getUserId();

    }



    @Autowired

    private SysUserMapper sysUserMapper;



    /**

     * 登录验证