From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 129 ++++++++++++++++---------------------------
1 files changed, 48 insertions(+), 81 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..4a2bf30 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,119 +1,86 @@
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.AbstractCaptcha;
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;
-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 com.ruoyi.common.enums.CaptchaType;
+import com.ruoyi.common.utils.RedisUtils;
+import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.reflect.ReflectUtils;
+import com.ruoyi.common.utils.spring.SpringUtils;
+import com.ruoyi.framework.config.properties.CaptchaProperties;
+import com.ruoyi.system.service.ISysConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+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 Lion Li
*/
+@Api(value = "楠岃瘉鐮佹搷浣滃鐞�", tags = {"楠岃瘉鐮佺鐞�"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
public class CaptchaController {
- // 鍦嗗湀骞叉壈楠岃瘉鐮�
- @Resource(name = "CircleCaptcha")
- private CircleCaptcha circleCaptcha;
- // 绾挎骞叉壈鐨勯獙璇佺爜
- @Resource(name = "LineCaptcha")
- private LineCaptcha lineCaptcha;
- // 鎵洸骞叉壈楠岃瘉鐮�
- @Resource(name = "ShearCaptcha")
- private ShearCaptcha shearCaptcha;
-
- @Autowired
- private RedisCache redisCache;
-
- // 楠岃瘉鐮佺被鍨�
- @Value("${captcha.captchaType}")
- private String captchaType;
- // 楠岃瘉鐮佺被鍒�
- @Value("${captcha.captchaCategory}")
- private String captchaCategory;
- // 鏁板瓧楠岃瘉鐮佷綅鏁�
- @Value("${captcha.captchaNumberLength}")
- private int numberLength;
- // 瀛楃楠岃瘉鐮侀暱搴�
- @Value("${captcha.captchaCharLength}")
- private int charLength;
+ private final CaptchaProperties captchaProperties;
+ private final ISysConfigService configService;
/**
* 鐢熸垚楠岃瘉鐮�
*/
+ @ApiOperation("鐢熸垚楠岃瘉鐮�")
@GetMapping("/captchaImage")
- public AjaxResult getCode() {
+ public AjaxResult<Map<String, Object>> 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 capStr = null, code = null;
// 鐢熸垚楠岃瘉鐮�
- CodeGenerator codeGenerator;
- if ("math".equals(captchaType)) {
- codeGenerator = new MathGenerator(numberLength);
- } else if ("char".equals(captchaType)) {
- codeGenerator = new RandomGenerator(charLength);
- } else {
- throw new IllegalArgumentException("楠岃瘉鐮佺被鍨嬪紓甯�");
- }
- if ("line".equals(captchaCategory)) {
- lineCaptcha.setGenerator(codeGenerator);
- capStr = lineCaptcha.getCode();
- } else if ("circle".equals(captchaCategory)) {
- circleCaptcha.setGenerator(codeGenerator);
- capStr = circleCaptcha.getCode();
- } else if ("shear".equals(captchaCategory)) {
- shearCaptcha.setGenerator(codeGenerator);
- 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);
-
- circleCaptcha.createImage(capStr);
- AjaxResult ajax = AjaxResult.success();
+ CaptchaType captchaType = captchaProperties.getType();
+ boolean isMath = CaptchaType.MATH == captchaType;
+ Integer length = isMath ? captchaProperties.getNumberLength() : captchaProperties.getCharLength();
+ CodeGenerator codeGenerator = ReflectUtils.newInstance(captchaType.getClazz(), length);
+ AbstractCaptcha captcha = SpringUtils.getBean(captchaProperties.getCategory().getClazz());
+ captcha.setGenerator(codeGenerator);
+ captcha.createCode();
+ String code = isMath ? getCodeResult(captcha.getCode()) : captcha.getCode();
+ RedisUtils.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
ajax.put("uuid", uuid);
- ajax.put("img", circleCaptcha.getImageBase64());
- return ajax;
+ ajax.put("img", captcha.getImageBase64());
+ return AjaxResult.success(ajax);
}
private String getCodeResult(String capStr) {
- int a = Convert.toInt(StrUtil.sub(capStr, 0, numberLength).trim());
+ int numberLength = captchaProperties.getNumberLength();
+ int a = Convert.toInt(StringUtils.substring(capStr, 0, numberLength).trim());
char operator = capStr.charAt(numberLength);
- int b = Convert.toInt(StrUtil.sub(capStr, numberLength + 1, numberLength + 1 + numberLength).trim());
+ int b = Convert.toInt(StringUtils.substring(capStr, numberLength + 1, numberLength + 1 + numberLength).trim());
switch (operator) {
case '*':
- return a * b + "";
+ return Convert.toStr(a * b);
case '+':
- return a + b + "";
+ return Convert.toStr(a + b);
case '-':
- return a - b + "";
+ return Convert.toStr(a - b);
default:
- return "";
+ return StringUtils.EMPTY;
}
}
--
Gitblit v1.9.3