From a8d5644f2e9700b0986df935a0a57a51dc2bb439 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 06 二月 2023 09:43:45 +0800
Subject: [PATCH] add 新增 加密插件配置
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java
index d38d154..67281ec 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java
@@ -18,6 +18,7 @@
import com.ruoyi.common.web.config.properties.CaptchaProperties;
import com.ruoyi.common.web.enums.CaptchaType;
import com.ruoyi.system.service.ISysConfigService;
+import com.ruoyi.web.domain.vo.CaptchaVo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.expression.Expression;
@@ -79,10 +80,12 @@
* 鐢熸垚楠岃瘉鐮�
*/
@GetMapping("/captchaImage")
- public R<Map<String, Object>> getCode() {
+ public R<CaptchaVo> getCode() {
+ CaptchaVo captchaVo = new CaptchaVo();
boolean captchaEnabled = configService.selectCaptchaEnabled();
if (!captchaEnabled) {
- return R.ok(Map.of("captchaEnabled", false));
+ captchaVo.setCaptchaEnabled(false);
+ return R.ok(captchaVo);
}
// 淇濆瓨楠岃瘉鐮佷俊鎭�
String uuid = IdUtil.simpleUUID();
@@ -102,7 +105,9 @@
code = exp.getValue(String.class);
}
RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION));
- return R.ok(Map.of("uuid", uuid, "img", captcha.getImageBase64()));
+ captchaVo.setUuid(uuid);
+ captchaVo.setImg(captcha.getImageBase64());
+ return R.ok(captchaVo);
}
}
--
Gitblit v1.9.3