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

185
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;
/** /**
* 验证码操作处理 * 验证码操作处理
@ -27,94 +29,95 @@ import javax.annotation.Resource;
@RestController @RestController
public class CaptchaController { public class CaptchaController {
// 圆圈干扰验证码 // 圆圈干扰验证码
@Resource(name = "CircleCaptcha") @Resource(name = "CircleCaptcha")
private CircleCaptcha circleCaptcha; private CircleCaptcha circleCaptcha;
// 线段干扰的验证码 // 线段干扰的验证码
@Resource(name = "LineCaptcha") @Resource(name = "LineCaptcha")
private LineCaptcha lineCaptcha; private LineCaptcha lineCaptcha;
// 扭曲干扰验证码 // 扭曲干扰验证码
@Resource(name = "ShearCaptcha") @Resource(name = "ShearCaptcha")
private ShearCaptcha shearCaptcha; private ShearCaptcha shearCaptcha;
@Autowired @Autowired
private RedisCache redisCache; private RedisCache redisCache;
// 验证码类型 // 验证码类型
@Value("${captcha.captchaType}") @Value("${captcha.captchaType}")
private String captchaType; private String captchaType;
// 验证码类别 // 验证码类别
@Value("${captcha.captchaCategory}") @Value("${captcha.captchaCategory}")
private String captchaCategory; private String captchaCategory;
// 数字验证码位数 // 数字验证码位数
@Value("${captcha.captchaNumberLength}") @Value("${captcha.captchaNumberLength}")
private int numberLength; private int numberLength;
// 字符验证码长度 // 字符验证码长度
@Value("${captcha.captchaCharLength}") @Value("${captcha.captchaCharLength}")
private int charLength; private int charLength;
/** /**
* 生成验证码 * 生成验证码
*/ */
@GetMapping("/captchaImage") @GetMapping("/captchaImage")
public AjaxResult getCode() { public AjaxResult getCode() {
// 保存验证码信息 // 保存验证码信息
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;
codeGenerator = new MathGenerator(numberLength); switch (captchaType) {
} else if ("char".equals(captchaType)) { case "math":
codeGenerator = new RandomGenerator(charLength); codeGenerator = new MathGenerator(numberLength);
} else { break;
throw new IllegalArgumentException("验证码类型异常"); case "char":
} codeGenerator = new RandomGenerator(charLength);
if ("line".equals(captchaCategory)) { break;
lineCaptcha.setGenerator(codeGenerator); default:
lineCaptcha.createCode(); throw new IllegalArgumentException("验证码类型异常");
capStr = lineCaptcha.getCode(); }
} else if ("circle".equals(captchaCategory)) { switch (captchaCategory) {
circleCaptcha.setGenerator(codeGenerator); case "line":
circleCaptcha.createCode(); captcha = lineCaptcha;
capStr = circleCaptcha.getCode(); break;
} else if ("shear".equals(captchaCategory)) { case "circle":
shearCaptcha.setGenerator(codeGenerator); captcha = circleCaptcha;
shearCaptcha.createCode(); break;
capStr = shearCaptcha.getCode(); case "shear":
} else { captcha = shearCaptcha;
throw new IllegalArgumentException("验证码类别异常"); break;
} default:
if ("math".equals(captchaType)) { throw new IllegalArgumentException("验证码类别异常");
code = getCodeResult(capStr); }
} else if ("char".equals(captchaType)) { captcha.setGenerator(codeGenerator);
code = capStr; captcha.createCode();
} if ("math".equals(captchaType)) {
code = getCodeResult(captcha.getCode());
} else if ("char".equals(captchaType)) {
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;
}
redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES); private String getCodeResult(String capStr) {
int a = Convert.toInt(StrUtil.sub(capStr, 0, numberLength).trim());
circleCaptcha.createImage(capStr); char operator = capStr.charAt(numberLength);
AjaxResult ajax = AjaxResult.success(); int b = Convert.toInt(StrUtil.sub(capStr, numberLength + 1, numberLength + 1 + numberLength).trim());
ajax.put("uuid", uuid); switch (operator) {
ajax.put("img", circleCaptcha.getImageBase64()); case '*':
return ajax; return a * b + "";
} case '+':
return a + b + "";
private String getCodeResult(String capStr) { case '-':
int a = Convert.toInt(StrUtil.sub(capStr, 0, numberLength).trim()); return a - b + "";
char operator = capStr.charAt(numberLength); default:
int b = Convert.toInt(StrUtil.sub(capStr, numberLength + 1, numberLength + 1 + numberLength).trim()); return "";
switch (operator) { }
case '*': }
return a * b + "";
case '+':
return a + b + "";
case '-':
return a - b + "";
default:
return "";
}
}
} }