From 52d0d62c35d01ee73d9dba7b1be99a29adc35ef2 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 17 八月 2021 10:45:01 +0800
Subject: [PATCH] update 同步 ruoyi 适配改动
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 159 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 111 insertions(+), 48 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 c096344..210ccee 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,62 +1,125 @@
package com.ruoyi.web.controller.common;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.util.concurrent.TimeUnit;
-import javax.servlet.http.HttpServletResponse;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
+import cn.hutool.captcha.AbstractCaptcha;
+import cn.hutool.captcha.CircleCaptcha;
+import cn.hutool.captcha.LineCaptcha;
+import cn.hutool.captcha.ShearCaptcha;
+import cn.hutool.captcha.generator.CodeGenerator;
+import cn.hutool.captcha.generator.RandomGenerator;
+import cn.hutool.core.convert.Convert;
+import cn.hutool.core.util.IdUtil;
+import com.ruoyi.common.utils.StringUtils;
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.VerifyCodeUtils;
-import com.ruoyi.common.utils.sign.Base64;
-import com.ruoyi.common.utils.uuid.IdUtils;
+import com.ruoyi.framework.captcha.UnsignedMathGenerator;
+import com.ruoyi.framework.config.properties.CaptchaProperties;
+import com.ruoyi.system.service.ISysConfigService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
/**
* 楠岃瘉鐮佹搷浣滃鐞�
- *
+ *
* @author ruoyi
*/
@RestController
-public class CaptchaController
-{
- @Autowired
- private RedisCache redisCache;
+public class CaptchaController {
- /**
- * 鐢熸垚楠岃瘉鐮�
- */
- @GetMapping("/captchaImage")
- public AjaxResult getCode(HttpServletResponse response) throws IOException
- {
- // 鐢熸垚闅忔満瀛椾覆
- String verifyCode = VerifyCodeUtils.generateVerifyCode(4);
- // 鍞竴鏍囪瘑
- String uuid = IdUtils.simpleUUID();
- String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+ // 鍦嗗湀骞叉壈楠岃瘉鐮�
+ @Resource(name = "CircleCaptcha")
+ private CircleCaptcha circleCaptcha;
+ // 绾挎骞叉壈鐨勯獙璇佺爜
+ @Resource(name = "LineCaptcha")
+ private LineCaptcha lineCaptcha;
+ // 鎵洸骞叉壈楠岃瘉鐮�
+ @Resource(name = "ShearCaptcha")
+ private ShearCaptcha shearCaptcha;
- redisCache.setCacheObject(verifyKey, verifyCode, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
- // 鐢熸垚鍥剧墖
- int w = 111, h = 36;
- ByteArrayOutputStream stream = new ByteArrayOutputStream();
- VerifyCodeUtils.outputImage(w, h, stream, verifyCode);
- try
- {
- AjaxResult ajax = AjaxResult.success();
- ajax.put("uuid", uuid);
- ajax.put("img", Base64.encode(stream.toByteArray()));
- return ajax;
- }
- catch (Exception e)
- {
- e.printStackTrace();
- return AjaxResult.error(e.getMessage());
- }
- finally
- {
- stream.close();
- }
- }
+ @Autowired
+ private RedisCache redisCache;
+
+ @Autowired
+ private CaptchaProperties captchaProperties;
+
+ @Autowired
+ private ISysConfigService configService;
+
+ /**
+ * 鐢熸垚楠岃瘉鐮�
+ */
+ @GetMapping("/captchaImage")
+ public AjaxResult getCode() {
+ Map<String, Object> ajax = new HashMap<>();
+ boolean captchaOnOff = configService.selectCaptchaOnOff();
+ ajax.put("captchaOnOff", captchaOnOff);
+ if (!captchaOnOff) {
+ return AjaxResult.success(ajax);
+ }
+ // 淇濆瓨楠岃瘉鐮佷俊鎭�
+ String uuid = IdUtil.simpleUUID();
+ String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+ String code = null;
+ // 鐢熸垚楠岃瘉鐮�
+ CodeGenerator codeGenerator;
+ AbstractCaptcha captcha;
+ switch (captchaProperties.getType()) {
+ case "math":
+ codeGenerator = new UnsignedMathGenerator(captchaProperties.getNumberLength());
+ break;
+ case "char":
+ codeGenerator = new RandomGenerator(captchaProperties.getCharLength());
+ break;
+ default:
+ throw new IllegalArgumentException("楠岃瘉鐮佺被鍨嬪紓甯�");
+ }
+ switch (captchaProperties.getCategory()) {
+ case "line":
+ captcha = lineCaptcha;
+ break;
+ case "circle":
+ captcha = circleCaptcha;
+ break;
+ case "shear":
+ captcha = shearCaptcha;
+ break;
+ default:
+ throw new IllegalArgumentException("楠岃瘉鐮佺被鍒紓甯�");
+ }
+ captcha.setGenerator(codeGenerator);
+ captcha.createCode();
+ if ("math".equals(captchaProperties.getType())) {
+ code = getCodeResult(captcha.getCode());
+ } else if ("char".equals(captchaProperties.getType())) {
+ code = captcha.getCode();
+ }
+ redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+ ajax.put("uuid", uuid);
+ ajax.put("img", captcha.getImageBase64());
+ return AjaxResult.success(ajax);
+ }
+
+ private String getCodeResult(String capStr) {
+ int numberLength = captchaProperties.getNumberLength();
+ int a = Convert.toInt(StringUtils.substring(capStr, 0, numberLength).trim());
+ char operator = capStr.charAt(numberLength);
+ int b = Convert.toInt(StringUtils.substring(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