From 46aa17db9cc277c821c46c82650e7e3cbda97004 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 15 三月 2021 10:00:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
index b170b1d..4ba07d8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java
@@ -2,16 +2,13 @@
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 @@
}
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("楠岃瘉鐮佺被鍒紓甯�");
--
Gitblit v1.9.3