[bug修复] 解决调整验证码干扰的类型无效,只用circle的bug [优化] 调整使用那种验证码的逻辑判断,使用switch优化,并减少重复代码

wugh

2021-03-19 1270b056d5630001accff9a010af85a49f89b841

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java

@@ -1,23 +1,25 @@
package com.ruoyi.web.controller.common;

import java.util.concurrent.TimeUnit;

import cn.hutool.captcha.*;
import cn.hutool.captcha.AbstractCaptcha;
import cn.hutool.captcha.CircleCaptcha;
import cn.hutool.captcha.LineCaptcha;
import cn.hutool.captcha.ShearCaptcha;
import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.captcha.generator.MathGenerator;
import cn.hutool.captcha.generator.RandomGenerator;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;

import javax.annotation.Resource;
import java.util.concurrent.TimeUnit;

/**
 * 验证码操作处理
@@ -61,43 +63,44 @@
        // 保存验证码信息
        String uuid = IdUtil.simpleUUID();
        String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
        String capStr = null, code = null;
      String code = null;
        // 生成验证码
        CodeGenerator codeGenerator;
        if ("math".equals(captchaType)) {
      AbstractCaptcha captcha;
      switch (captchaType) {
         case "math":
            codeGenerator = new MathGenerator(numberLength);
        } else if ("char".equals(captchaType)) {
            break;
         case "char":
            codeGenerator = new RandomGenerator(charLength);
        } else {
            break;
         default:
            throw new IllegalArgumentException("验证码类型异常");
        }
        if ("line".equals(captchaCategory)) {
            lineCaptcha.setGenerator(codeGenerator);
            lineCaptcha.createCode();
            capStr = lineCaptcha.getCode();
        } else if ("circle".equals(captchaCategory)) {
            circleCaptcha.setGenerator(codeGenerator);
            circleCaptcha.createCode();
            capStr = circleCaptcha.getCode();
        } else if ("shear".equals(captchaCategory)) {
            shearCaptcha.setGenerator(codeGenerator);
            shearCaptcha.createCode();
            capStr = shearCaptcha.getCode();
        }  else {
      switch (captchaCategory) {
         case "line":
            captcha = lineCaptcha;
            break;
         case "circle":
            captcha = circleCaptcha;
            break;
         case "shear":
            captcha = shearCaptcha;
            break;
         default:
            throw new IllegalArgumentException("验证码类别异常");
        }
      captcha.setGenerator(codeGenerator);
      captcha.createCode();
        if ("math".equals(captchaType)) {
            code = getCodeResult(capStr);
         code = getCodeResult(captcha.getCode());
        } else if ("char".equals(captchaType)) {
            code = capStr;
         code = captcha.getCode();
        }

        redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);

        circleCaptcha.createImage(capStr);
        AjaxResult ajax = AjaxResult.success();
        ajax.put("uuid", uuid);
        ajax.put("img", circleCaptcha.getImageBase64());
      ajax.put("img", captcha.getImageBase64());
        return ajax;
    }