优化异常信息

RuoYi

2021-08-16 20d6d3d73682b6fd25e038f898651b6e138b501e

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

@@ -8,7 +8,7 @@
import org.springframework.security.core.Authentication;

import org.springframework.stereotype.Component;

import com.ruoyi.common.constant.Constants;

import com.ruoyi.common.exception.CustomException;

import com.ruoyi.common.exception.ServiceException;

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

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

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

@@ -21,6 +21,7 @@
import com.ruoyi.framework.redis.RedisCache;

import com.ruoyi.framework.security.LoginUser;

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

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

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



/**

@@ -39,9 +40,12 @@


    @Autowired

    private RedisCache redisCache;

    


    @Autowired

    private ISysUserService userService;

    
    @Autowired

    private ISysConfigService configService;



    /**

     * 登录验证

@@ -54,18 +58,11 @@
     */

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

    {

        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;

        String captcha = redisCache.getCacheObject(verifyKey);

        redisCache.deleteObject(verifyKey);

        if (captcha == null)

        boolean captchaOnOff = configService.selectCaptchaOnOff();

        // 验证码开关

        if (captchaOnOff)

        {

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

            throw new CaptchaExpireException();

        }

        if (!code.equalsIgnoreCase(captcha))

        {

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

            throw new CaptchaException();

            validateCaptcha(username, code, uuid);

        }

        // 用户验证

        Authentication authentication = null;

@@ -85,7 +82,7 @@
            else

            {

                AsyncManager.me().execute(AsyncFactory.recordLogininfor(username, Constants.LOGIN_FAIL, e.getMessage()));

                throw new CustomException(e.getMessage());

                throw new ServiceException(e.getMessage());

            }

        }

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

@@ -96,6 +93,31 @@
    }



    /**

     * 校验验证码

     * 
     * @param username 用户名

     * @param code 验证码

     * @param uuid 唯一标识

     * @return 结果

     */

    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)

        {

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

            throw new CaptchaExpireException();

        }

        if (!code.equalsIgnoreCase(captcha))

        {

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

            throw new CaptchaException();

        }

    }



    /**

     * 记录登录信息

     */

    public void recordLoginInfo(SysUser user)