From fd5414f82e6305eaf35297f63f9e7c95615f99e3 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期二, 13 七月 2021 13:34:10 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 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 28be0fe..4654516 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
@@ -14,17 +14,20 @@
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 {
@@ -45,11 +48,20 @@
@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;
@@ -88,10 +100,9 @@
code = captcha.getCode();
}
redisCache.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
- AjaxResult ajax = AjaxResult.success();
ajax.put("uuid", uuid);
ajax.put("img", captcha.getImageBase64());
- return ajax;
+ return AjaxResult.success(ajax);
}
private String getCodeResult(String capStr) {
--
Gitblit v1.9.3