From 9b4b9e0c744f43417a3c8b741f35090ab4e3c68f Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 15 三月 2021 16:38:43 +0800
Subject: [PATCH] update 删除通用工具 改为使用hutool
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 126 ++++++++++++++++++++++++++---------------
1 files changed, 80 insertions(+), 46 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 8cafcef..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
@@ -1,86 +1,120 @@
package com.ruoyi.web.controller.common;
-import java.awt.image.BufferedImage;
-import java.io.IOException;
import java.util.concurrent.TimeUnit;
-import javax.annotation.Resource;
-import javax.imageio.ImageIO;
-import javax.servlet.http.HttpServletResponse;
+
+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 org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
-import org.springframework.util.FastByteArrayOutputStream;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
-import com.google.code.kaptcha.Producer;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.utils.sign.Base64;
-import com.ruoyi.common.utils.uuid.IdUtils;
+
+import javax.annotation.Resource;
/**
* 楠岃瘉鐮佹搷浣滃鐞�
- *
- * @author ruoyi
+ *
+ * @author Lion Li
*/
@RestController
-public class CaptchaController
-{
- @Resource(name = "captchaProducer")
- private Producer captchaProducer;
+public class CaptchaController {
- @Resource(name = "captchaProducerMath")
- private Producer captchaProducerMath;
+ // 鍦嗗湀骞叉壈楠岃瘉鐮�
+ @Resource(name = "CircleCaptcha")
+ private CircleCaptcha circleCaptcha;
+ // 绾挎骞叉壈鐨勯獙璇佺爜
+ @Resource(name = "LineCaptcha")
+ private LineCaptcha lineCaptcha;
+ // 鎵洸骞叉壈楠岃瘉鐮�
+ @Resource(name = "ShearCaptcha")
+ private ShearCaptcha shearCaptcha;
@Autowired
private RedisCache redisCache;
-
+
// 楠岃瘉鐮佺被鍨�
- @Value("${ruoyi.captchaType}")
+ @Value("${captcha.captchaType}")
private String captchaType;
+ // 楠岃瘉鐮佺被鍒�
+ @Value("${captcha.captchaCategory}")
+ private String captchaCategory;
+ // 鏁板瓧楠岃瘉鐮佷綅鏁�
+ @Value("${captcha.captchaNumberLength}")
+ private int numberLength;
+ // 瀛楃楠岃瘉鐮侀暱搴�
+ @Value("${captcha.captchaCharLength}")
+ private int charLength;
/**
* 鐢熸垚楠岃瘉鐮�
*/
@GetMapping("/captchaImage")
- public AjaxResult getCode(HttpServletResponse response) throws IOException
- {
+ public AjaxResult getCode() {
// 淇濆瓨楠岃瘉鐮佷俊鎭�
- String uuid = IdUtils.simpleUUID();
+ String uuid = IdUtil.simpleUUID();
String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
-
String capStr = null, code = null;
- BufferedImage image = null;
-
// 鐢熸垚楠岃瘉鐮�
- if ("math".equals(captchaType))
- {
- String capText = captchaProducerMath.createText();
- capStr = capText.substring(0, capText.lastIndexOf("@"));
- code = capText.substring(capText.lastIndexOf("@") + 1);
- image = captchaProducerMath.createImage(capStr);
+ CodeGenerator codeGenerator;
+ if ("math".equals(captchaType)) {
+ codeGenerator = new MathGenerator(numberLength);
+ } else if ("char".equals(captchaType)) {
+ codeGenerator = new RandomGenerator(charLength);
+ } else {
+ throw new IllegalArgumentException("楠岃瘉鐮佺被鍨嬪紓甯�");
}
- else if ("char".equals(captchaType))
- {
- capStr = code = captchaProducer.createText();
- image = captchaProducer.createImage(capStr);
+ 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("楠岃瘉鐮佺被鍒紓甯�");
+ }
+ if ("math".equals(captchaType)) {
+ code = getCodeResult(capStr);
+ } else if ("char".equals(captchaType)) {
+ code = capStr;
}
redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
- // 杞崲娴佷俊鎭啓鍑�
- FastByteArrayOutputStream os = new FastByteArrayOutputStream();
- try
- {
- ImageIO.write(image, "jpg", os);
- }
- catch (IOException e)
- {
- return AjaxResult.error(e.getMessage());
- }
+ circleCaptcha.createImage(capStr);
AjaxResult ajax = AjaxResult.success();
ajax.put("uuid", uuid);
- ajax.put("img", Base64.encode(os.toByteArray()));
+ ajax.put("img", circleCaptcha.getImageBase64());
return ajax;
}
+
+ private String getCodeResult(String capStr) {
+ 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());
+ switch (operator) {
+ case '*':
+ return a * b + "";
+ case '+':
+ return a + b + "";
+ case '-':
+ return a - b + "";
+ default:
+ return "";
+ }
+ }
+
}
--
Gitblit v1.9.3