wezone
/
Ry-master
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

!10 [BUG] 解决只能使用circle干扰的bug 

Merge pull request !10 from wugh/hotfix/captcha
This commit is contained in:
疯狂的狮子li 2021-03-20 10:14:03 +08:00 committed by Gitee
parent a7f235164f 1270b056d5
commit 939d89f0b8
1 changed files with 94 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,23 +1,25 @@
package com.ruoyi.web.controller.common; package com.ruoyi.web.controller.common;
import java.util.concurrent.TimeUnit; import cn.hutool.captcha.AbstractCaptcha;
import cn.hutool.captcha.CircleCaptcha;
import cn.hutool.captcha.*; import cn.hutool.captcha.LineCaptcha;
import cn.hutool.captcha.ShearCaptcha;
import cn.hutool.captcha.generator.CodeGenerator; import cn.hutool.captcha.generator.CodeGenerator;
import cn.hutool.captcha.generator.MathGenerator; import cn.hutool.captcha.generator.MathGenerator;
import cn.hutool.captcha.generator.RandomGenerator; import cn.hutool.captcha.generator.RandomGenerator;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil; 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.Autowired;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController; 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 javax.annotation.Resource;
import java.util.concurrent.TimeUnit;
/** /**
* 验证码操作处理 * 验证码操作处理
@ -61,43 +63,44 @@ public class CaptchaController {
// 保存验证码信息 // 保存验证码信息
String uuid = IdUtil.simpleUUID(); String uuid = IdUtil.simpleUUID();
String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid; String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
String capStr = null, code = null; String code = null;
// 生成验证码 // 生成验证码
CodeGenerator codeGenerator; CodeGenerator codeGenerator;
if ("math".equals(captchaType)) { AbstractCaptcha captcha;
switch (captchaType) {
case "math":
codeGenerator = new MathGenerator(numberLength); codeGenerator = new MathGenerator(numberLength);
} else if ("char".equals(captchaType)) { break;
case "char":
codeGenerator = new RandomGenerator(charLength); codeGenerator = new RandomGenerator(charLength);
} else { break;
default:
throw new IllegalArgumentException("验证码类型异常"); throw new IllegalArgumentException("验证码类型异常");
} }
if ("line".equals(captchaCategory)) { switch (captchaCategory) {
lineCaptcha.setGenerator(codeGenerator); case "line":
lineCaptcha.createCode(); captcha = lineCaptcha;
capStr = lineCaptcha.getCode(); break;
} else if ("circle".equals(captchaCategory)) { case "circle":
circleCaptcha.setGenerator(codeGenerator); captcha = circleCaptcha;
circleCaptcha.createCode(); break;
capStr = circleCaptcha.getCode(); case "shear":
} else if ("shear".equals(captchaCategory)) { captcha = shearCaptcha;
shearCaptcha.setGenerator(codeGenerator); break;
shearCaptcha.createCode(); default:
capStr = shearCaptcha.getCode();
} else {
throw new IllegalArgumentException("验证码类别异常"); throw new IllegalArgumentException("验证码类别异常");
} }
captcha.setGenerator(codeGenerator);
captcha.createCode();
if ("math".equals(captchaType)) { if ("math".equals(captchaType)) {
code = getCodeResult(capStr); code = getCodeResult(captcha.getCode());
} else if ("char".equals(captchaType)) { } else if ("char".equals(captchaType)) {
code = capStr; code = captcha.getCode();
} }
redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
circleCaptcha.createImage(capStr);
AjaxResult ajax = AjaxResult.success(); AjaxResult ajax = AjaxResult.success();
ajax.put("uuid", uuid); ajax.put("uuid", uuid);
ajax.put("img", circleCaptcha.getImageBase64()); ajax.put("img", captcha.getImageBase64());
return ajax; return ajax;
} }