fix 修复升级合并错误

疯狂的狮子li

2021-07-12 cd34c87afa730c48e2b2be61d700b1fee409e02c

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

@@ -5,7 +5,6 @@
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;
@@ -13,12 +12,15 @@
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
import com.ruoyi.framework.captcha.UnsignedMathGenerator;
import com.ruoyi.framework.config.properties.CaptchaProperties;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;

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

/**
@@ -50,6 +52,12 @@
    */
   @GetMapping("/captchaImage")
   public AjaxResult getCode() {
      Map<String, Object> ajax = new HashMap<>();
      Boolean enabled = captchaProperties.getEnabled();
      ajax.put("enabled", enabled);
      if (!enabled) {
         return AjaxResult.success(ajax);
      }
      // 保存验证码信息
      String uuid = IdUtil.simpleUUID();
      String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
@@ -59,7 +67,7 @@
      AbstractCaptcha captcha;
      switch (captchaProperties.getType()) {
         case "math":
            codeGenerator = new MathGenerator(captchaProperties.getNumberLength());
            codeGenerator = new UnsignedMathGenerator(captchaProperties.getNumberLength());
            break;
         case "char":
            codeGenerator = new RandomGenerator(captchaProperties.getCharLength());
@@ -88,10 +96,9 @@
         code = captcha.getCode();
      }
      redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
      AjaxResult ajax = AjaxResult.success();
      ajax.put("uuid", uuid);
      ajax.put("img", captcha.getImageBase64());
      return ajax;
      return AjaxResult.success(ajax);
   }

   private String getCodeResult(String capStr) {