update 请求响应对象 与 分页对象 结构修改 适配接口文档配置

疯狂的狮子li

2021-05-20 7076deb2b6da9ab0a8b599c61150ec2bd5a926f8

 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.beans.factory.annotation.Value;
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;

/**
@@ -42,18 +44,8 @@
   @Autowired
   private RedisCache redisCache;

   // 验证码类型
   @Value("${captcha.captchaType}")
   private String captchaType;
   // 验证码类别
   @Value("${captcha.captchaCategory}")
   private String captchaCategory;
   // 数字验证码位数
   @Value("${captcha.captchaNumberLength}")
   private int numberLength;
   // 字符验证码长度
   @Value("${captcha.captchaCharLength}")
   private int charLength;
   @Autowired
   private CaptchaProperties captchaProperties;

   /**
    * 生成验证码
@@ -67,17 +59,17 @@
      // 生成验证码
      CodeGenerator codeGenerator;
      AbstractCaptcha captcha;
      switch (captchaType) {
      switch (captchaProperties.getType()) {
         case "math":
            codeGenerator = new MathGenerator(numberLength);
            codeGenerator = new UnsignedMathGenerator(captchaProperties.getNumberLength());
            break;
         case "char":
            codeGenerator = new RandomGenerator(charLength);
            codeGenerator = new RandomGenerator(captchaProperties.getCharLength());
            break;
         default:
            throw new IllegalArgumentException("验证码类型异常");
      }
      switch (captchaCategory) {
      switch (captchaProperties.getCategory()) {
         case "line":
            captcha = lineCaptcha;
            break;
@@ -92,19 +84,20 @@
      }
      captcha.setGenerator(codeGenerator);
      captcha.createCode();
      if ("math".equals(captchaType)) {
      if ("math".equals(captchaProperties.getType())) {
         code = getCodeResult(captcha.getCode());
      } else if ("char".equals(captchaType)) {
      } else if ("char".equals(captchaProperties.getType())) {
         code = captcha.getCode();
      }
      redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
      AjaxResult ajax = AjaxResult.success();
      Map<String,Object> ajax = new HashMap<>();
      ajax.put("uuid", uuid);
      ajax.put("img", captcha.getImageBase64());
      return ajax;
      return AjaxResult.success(ajax);
   }

   private String getCodeResult(String capStr) {
      int numberLength = captchaProperties.getNumberLength();
      int a = Convert.toInt(StrUtil.sub(capStr, 0, numberLength).trim());
      char operator = capStr.charAt(numberLength);
      int b = Convert.toInt(StrUtil.sub(capStr, numberLength + 1, numberLength + 1 + numberLength).trim());