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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
疯狂的狮子li 2021-03-15 10:00:49 +08:00
parent 71325b540a 2509815a4f
commit 46aa17db9c
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,16 +2,13 @@ package com.ruoyi.web.controller.common;
import java.util.concurrent.TimeUnit;
import cn.hutool.captcha.CircleCaptcha;
import cn.hutool.captcha.ICaptcha;
import cn.hutool.captcha.LineCaptcha;
import cn.hutool.captcha.ShearCaptcha;
import cn.hutool.captcha.*;
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.core.text.Convert;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.GetMapping;
@ -76,12 +73,15 @@ public class CaptchaController {
}
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 {
throw new IllegalArgumentException("验证码类别异常");