From 3f50e9e810b478dbbd3225d9e5cedf47f586b69b Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 05 九月 2023 11:25:43 +0800
Subject: [PATCH] 45386
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 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 47a496f..00b53ba 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
@@ -2,10 +2,13 @@
import java.awt.image.BufferedImage;
import java.io.IOException;
+import java.util.HashMap;
import java.util.concurrent.TimeUnit;
import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
+
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.util.FastByteArrayOutputStream;
import org.springframework.web.bind.annotation.GetMapping;
@@ -26,6 +29,7 @@
* @author ruoyi
*/
@RestController
+@Slf4j
public class CaptchaController
{
@Resource(name = "captchaProducer")
@@ -47,7 +51,6 @@
{
AjaxResult ajax = AjaxResult.success();
boolean captchaEnabled = configService.selectCaptchaEnabled();
- ajax.put("captchaEnabled", captchaEnabled);
if (!captchaEnabled)
{
return ajax;
@@ -87,11 +90,15 @@
return AjaxResult.error(e.getMessage());
}
- ajax.put("uuid", uuid);
- ajax.put("img", Base64.encode(os.toByteArray()));
- ajax.put("code",200);
- ajax.put("value",code);
- ajax.put("txt","4545");
+ HashMap<String, Object> data = new HashMap<>();
+ data.put("uuid",uuid);
+ data.put("img",Base64.encode(os.toByteArray()));
+ data.put("value",code);
+ data.put("txt","77777");
+ ajax.put("msg","鎿嶄綔鎴愬姛");
+ ajax.put("data",data);
+
+ log.info("value:{}",code);
return ajax;
}
}
--
Gitblit v1.9.1