全局查询添加租户

chenrui

2025-05-07 925a974564f0df25857fd5d9b92889a8b0ac6d68

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

@@ -7,19 +7,24 @@
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;

import org.springframework.security.core.Authentication;

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.utils.DateUtils;

import com.ruoyi.common.utils.MessageUtils;

import com.ruoyi.common.utils.ServletUtils;

import com.ruoyi.common.utils.StringUtils;

import com.ruoyi.common.utils.ip.IpUtils;

import com.ruoyi.framework.manager.AsyncManager;

import com.ruoyi.framework.manager.factory.AsyncFactory;

import com.ruoyi.framework.redis.RedisCache;

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.service.ISysConfigService;

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

@@ -43,7 +48,7 @@


    @Autowired

    private ISysUserService userService;

    


    @Autowired

    private ISysConfigService configService;



@@ -58,19 +63,18 @@
     */

    public String login(String username, String password, String code, String uuid)

    {

        boolean captchaOnOff = configService.selectCaptchaOnOff();

        // 验证码开关

        if (captchaOnOff)

        {

            validateCaptcha(username, code, uuid);

        }

        // 验证码校验

//        validateCaptcha(username, code, uuid);

        // 登录前置校验

        loginPreCheck(username, password);

        // 用户验证

        Authentication authentication = null;

        try

        {

            UsernamePasswordAuthenticationToken authenticationToken = new UsernamePasswordAuthenticationToken(username, password);

            AuthenticationContextHolder.setContext(authenticationToken);

            // 该方法会去调用UserDetailsServiceImpl.loadUserByUsername

            authentication = authenticationManager

                    .authenticate(new UsernamePasswordAuthenticationToken(username, password));

            authentication = authenticationManager.authenticate(authenticationToken);

        }

        catch (Exception e)

        {

@@ -85,9 +89,13 @@
                throw new ServiceException(e.getMessage());

            }

        }

        finally

        {

            AuthenticationContextHolder.clearContext();

        }

        AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_SUCCESS, MessageUtils.message("user.login.success")));

        LoginUser loginUser = (LoginUser) authentication.getPrincipal();

        recordLoginInfo(loginUser.getUser());

        recordLoginInfo(loginUser.getUserId());

        // 生成token

        return tokenService.createToken(loginUser);

    }

@@ -102,28 +110,72 @@
     */

    public void validateCaptcha(String username, String code, String uuid)

    {

        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;

        String captcha = redisCache.getCacheObject(verifyKey);

        redisCache.deleteObject(verifyKey);

        if (captcha == null)

        boolean captchaEnabled = configService.selectCaptchaEnabled();

        if (captchaEnabled)

        {

            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));

            throw new CaptchaExpireException();

            String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + StringUtils.nvl(uuid, "");

            String captcha = redisCache.getCacheObject(verifyKey);

            if (captcha == null)

            {

                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.expire")));

                throw new CaptchaExpireException();

            }

            redisCache.deleteObject(verifyKey);

            if (!code.equalsIgnoreCase(captcha))

            {

                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));

                throw new CaptchaException();

            }

        }

        if (!code.equalsIgnoreCase(captcha))

    }



    /**

     * 登录前置校验

     * @param username 用户名

     * @param password 用户密码

     */

    public void loginPreCheck(String username, String password)

    {

        // 用户名或密码为空 错误

        if (StringUtils.isEmpty(username) || StringUtils.isEmpty(password))

        {

            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.jcaptcha.error")));

            throw new CaptchaException();

            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("not.null")));

            throw new UserNotExistsException();

        }

        // 密码如果不在指定范围内 错误

        if (password.length() < UserConstants.PASSWORD_MIN_LENGTH

                || password.length() > UserConstants.PASSWORD_MAX_LENGTH)

        {

            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));

            throw new UserPasswordNotMatchException();

        }

        // 用户名不在指定范围内 错误

        if (username.length() < UserConstants.USERNAME_MIN_LENGTH

                || username.length() > UserConstants.USERNAME_MAX_LENGTH)

        {

            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("user.password.not.match")));

            throw new UserPasswordNotMatchException();

        }

        // IP黑名单校验

        String blackStr = configService.selectConfigByKey("sys.login.blackIPList");

        if (IpUtils.isMatchedIp(blackStr, IpUtils.getIpAddr()))

        {

            AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, MessageUtils.message("login.blocked")));

            throw new BlackListException();

        }

    }



    /**

     * 记录登录信息

     *

     * @param userId 用户ID

     */

    public void recordLoginInfo(SysUser user)

    public void recordLoginInfo(Long userId)

    {

        user.setLoginIp(IpUtils.getIpAddr(ServletUtils.getRequest()));

        user.setLoginDate(DateUtils.getNowDate());

        userService.updateUserProfile(user);

        SysUser sysUser = new SysUser();

        sysUser.setUserId(userId);

        sysUser.setLoginIp(IpUtils.getIpAddr());

        sysUser.setLoginDate(DateUtils.getNowDate());

        userService.updateUserProfile(sysUser);

    }

}