update default uuid

RuoYi

2022-02-16 a94eccc04d3988f750ddf3c2b04f0b5f1e657f29

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

@@ -8,15 +8,22 @@
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;

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.project.system.domain.SysUser;

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

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



/**

 * 登录校验方法

@@ -35,6 +42,12 @@
    @Autowired

    private RedisCache redisCache;



    @Autowired

    private ISysUserService userService;

    
    @Autowired

    private ISysConfigService configService;



    /**

     * 登录验证

     * 

@@ -46,18 +59,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;

@@ -77,12 +83,52 @@
            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")));

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

        recordLoginInfo(loginUser.getUserId());

        // 生成token

        return tokenService.createToken(loginUser);

    }



    /**

     * 校验验证码

     * 
     * @param username 用户名

     * @param code 验证码

     * @param uuid 唯一标识

     * @return 结果

     */

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

    {

        String verifyKey = Constants.CAPTCHA_CODE_KEY + StringUtils.nvl(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();

        }

    }



    /**

     * 记录登录信息

     *

     * @param userId 用户ID

     */

    public void recordLoginInfo(Long userId)

    {

        SysUser sysUser = new SysUser();

        sysUser.setUserId(userId);

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

        sysUser.setLoginDate(DateUtils.getNowDate());

        userService.updateUserProfile(sysUser);

    }

}