From f8ab5663ef7220f8adc0fd8fcbd7d0cf84c6d77d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 02 八月 2021 12:15:14 +0800
Subject: [PATCH] update 日常字符串校验 统一重构到 StringUtils 便于维护扩展
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 193 ++++++++++++++++++++++++-----------------------
1 files changed, 99 insertions(+), 94 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 4ba07d8..fb2fb20 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,120 +1,125 @@
package com.ruoyi.web.controller.common;
-import java.util.concurrent.TimeUnit;
-
-import cn.hutool.captcha.*;
+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.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.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RestController;
+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.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 Lion Li
+ * @author ruoyi
*/
@RestController
public class CaptchaController {
- // 鍦嗗湀骞叉壈楠岃瘉鐮�
- @Resource(name = "CircleCaptcha")
- private CircleCaptcha circleCaptcha;
- // 绾挎骞叉壈鐨勯獙璇佺爜
- @Resource(name = "LineCaptcha")
- private LineCaptcha lineCaptcha;
- // 鎵洸骞叉壈楠岃瘉鐮�
- @Resource(name = "ShearCaptcha")
- private ShearCaptcha shearCaptcha;
+ // 鍦嗗湀骞叉壈楠岃瘉鐮�
+ @Resource(name = "CircleCaptcha")
+ private CircleCaptcha circleCaptcha;
+ // 绾挎骞叉壈鐨勯獙璇佺爜
+ @Resource(name = "LineCaptcha")
+ private LineCaptcha lineCaptcha;
+ // 鎵洸骞叉壈楠岃瘉鐮�
+ @Resource(name = "ShearCaptcha")
+ private ShearCaptcha shearCaptcha;
- @Autowired
- private RedisCache redisCache;
+ @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;
+ @Autowired
+ private CaptchaProperties captchaProperties;
- /**
- * 鐢熸垚楠岃瘉鐮�
- */
- @GetMapping("/captchaImage")
- public AjaxResult getCode() {
- // 淇濆瓨楠岃瘉鐮佷俊鎭�
- 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);
- 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;
- }
+ @Autowired
+ private ISysConfigService configService;
- redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
+ /**
+ * 鐢熸垚楠岃瘉鐮�
+ */
+ @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);
+ }
- circleCaptcha.createImage(capStr);
- AjaxResult ajax = AjaxResult.success();
- ajax.put("uuid", uuid);
- 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 "";
- }
- }
+ private String getCodeResult(String capStr) {
+ int numberLength = captchaProperties.getNumberLength();
+ int a = Convert.toInt(StringUtils.sub(capStr, 0, numberLength).trim());
+ char operator = capStr.charAt(numberLength);
+ int b = Convert.toInt(StringUtils.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