From 11502c7f9f26edda0733c43a17b5b773ee8447e4 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 20 五月 2026 16:47:47 +0800
Subject: [PATCH] refactor(account): 财务模块更新
---
src/main/java/com/ruoyi/project/common/CaptchaController.java | 28 +++++++++++++---------------
1 files changed, 13 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/common/CaptchaController.java b/src/main/java/com/ruoyi/project/common/CaptchaController.java
index efa004f..5966fb5 100644
--- a/src/main/java/com/ruoyi/project/common/CaptchaController.java
+++ b/src/main/java/com/ruoyi/project/common/CaptchaController.java
@@ -6,7 +6,7 @@
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.R;
+import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.project.system.service.ISysConfigService;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletResponse;
@@ -19,13 +19,11 @@
import javax.imageio.ImageIO;
import java.awt.image.BufferedImage;
import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
import java.util.concurrent.TimeUnit;
/**
* 楠岃瘉鐮佹搷浣滃鐞�
- *
+ *
* @author ruoyi
*/
@RestController
@@ -39,25 +37,25 @@
private Producer captchaProducerMath;
private final RedisCache redisCache;
-
+
// 楠岃瘉鐮佺被鍨�
@Value("${ruoyi.captchaType}")
private String captchaType;
-
+
private final ISysConfigService configService;
/**
* 鐢熸垚楠岃瘉鐮�
*/
@GetMapping("/captchaImage")
- public R<?> getCode(HttpServletResponse response) throws IOException
+ public AjaxResult getCode(HttpServletResponse response) throws IOException
{
- Map<String, Object> map = new HashMap<>();
+ AjaxResult ajax = AjaxResult.success();
boolean captchaEnabled = configService.selectCaptchaEnabled();
- map.put("captchaEnabled", captchaEnabled);
+ ajax.put("captchaEnabled", captchaEnabled);
if (!captchaEnabled)
{
- return R.ok(map);
+ return ajax;
}
// 淇濆瓨楠岃瘉鐮佷俊鎭�
@@ -90,11 +88,11 @@
}
catch (IOException e)
{
- return R.fail(e.getMessage());
+ return AjaxResult.error(e.getMessage());
}
- map.put("uuid", uuid);
- map.put("img", Base64.encode(os.toByteArray()));
- return R.ok(map);
+ ajax.put("uuid", uuid);
+ ajax.put("img", Base64.encode(os.toByteArray()));
+ return ajax;
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.3