From 05e524b8f2664fe83e4d18c6e4e327340f12558b Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期六, 16 四月 2022 22:02:12 +0800
Subject: [PATCH] 新增获取不带后缀文件名称方法
---
src/main/java/com/ruoyi/project/common/CaptchaController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/common/CaptchaController.java b/src/main/java/com/ruoyi/project/common/CaptchaController.java
index 68823fc..b4fb767 100644
--- a/src/main/java/com/ruoyi/project/common/CaptchaController.java
+++ b/src/main/java/com/ruoyi/project/common/CaptchaController.java
@@ -13,10 +13,11 @@
import org.springframework.web.bind.annotation.RestController;
import com.google.code.kaptcha.Producer;
import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.utils.IdUtils;
import com.ruoyi.common.utils.sign.Base64;
+import com.ruoyi.common.utils.uuid.IdUtils;
import com.ruoyi.framework.redis.RedisCache;
import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.project.system.service.ISysConfigService;
/**
* 楠岃瘉鐮佹搷浣滃鐞�
@@ -26,7 +27,6 @@
@RestController
public class CaptchaController
{
-
@Resource(name = "captchaProducer")
private Producer captchaProducer;
@@ -39,6 +39,9 @@
// 楠岃瘉鐮佺被鍨�
@Value("${ruoyi.captchaType}")
private String captchaType;
+
+ @Autowired
+ private ISysConfigService configService;
/**
* 鐢熸垚楠岃瘉鐮�
@@ -46,6 +49,14 @@
@GetMapping("/captchaImage")
public AjaxResult getCode(HttpServletResponse response) throws IOException
{
+ AjaxResult ajax = AjaxResult.success();
+ boolean captchaOnOff = configService.selectCaptchaOnOff();
+ ajax.put("captchaOnOff", captchaOnOff);
+ if (!captchaOnOff)
+ {
+ return ajax;
+ }
+
// 淇濆瓨楠岃瘉鐮佷俊鎭�
String uuid = IdUtils.simpleUUID();
String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
@@ -79,7 +90,6 @@
return AjaxResult.error(e.getMessage());
}
- AjaxResult ajax = AjaxResult.success();
ajax.put("uuid", uuid);
ajax.put("img", Base64.encode(os.toByteArray()));
return ajax;
--
Gitblit v1.9.3