!368 未合理判断验证码失效 Merge pull request !368 from PowderSnow/N/A

若依

2024-05-29 1a3751ab7162b1fdfa43b6ef18b0f35a3e7be5e6

 ruoyi-gateway/src/main/java/com/ruoyi/gateway/service/impl/ValidateCodeServiceImpl.java

@@ -9,11 +9,12 @@
import org.springframework.stereotype.Service;

import org.springframework.util.FastByteArrayOutputStream;

import com.google.code.kaptcha.Producer;

import com.ruoyi.common.core.constant.CacheConstants;

import com.ruoyi.common.core.constant.Constants;

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

import com.ruoyi.common.core.utils.IdUtils;

import com.ruoyi.common.core.utils.StringUtils;

import com.ruoyi.common.core.utils.sign.Base64;

import com.ruoyi.common.core.utils.uuid.IdUtils;

import com.ruoyi.common.core.web.domain.AjaxResult;

import com.ruoyi.common.redis.service.RedisService;

import com.ruoyi.gateway.config.properties.CaptchaProperties;

@@ -43,19 +44,19 @@
     * 生成验证码

     */

    @Override

    public AjaxResult createCapcha() throws IOException, CaptchaException

    public AjaxResult createCaptcha() throws IOException, CaptchaException

    {

        AjaxResult ajax = AjaxResult.success();

        boolean captchaOnOff = captchaProperties.getEnabled();

        ajax.put("captchaOnOff", captchaOnOff);

        if (!captchaOnOff)

        boolean captchaEnabled = captchaProperties.getEnabled();

        ajax.put("captchaEnabled", captchaEnabled);

        if (!captchaEnabled)

        {

            return ajax;

        }



        // 保存验证码信息

        String uuid = IdUtils.simpleUUID();

        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;

        String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;



        String capStr = null, code = null;

        BufferedImage image = null;

@@ -96,7 +97,7 @@
     * 校验验证码

     */

    @Override

    public void checkCapcha(String code, String uuid) throws CaptchaException

    public void checkCaptcha(String code, String uuid) throws CaptchaException

    {

        if (StringUtils.isEmpty(code))

        {

@@ -104,10 +105,16 @@
        }

        if (StringUtils.isEmpty(uuid))

        {

            throw new CaptchaException("uuid不能为空");

        }

        
        String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;

        String captcha = redisService.getCacheObject(verifyKey);

        if (captcha == null)

        {

            throw new CaptchaException("验证码已失效");

        }

        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;

        String captcha = redisService.getCacheObject(verifyKey);



        redisService.deleteObject(verifyKey);



        if (!code.equalsIgnoreCase(captcha))