From d51d8ad8776dff6d7d2ffc9648986235e66f07a5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 15 四月 2022 11:42:52 +0800
Subject: [PATCH] fix 修复 OssConfig 主键类型错误
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 d31624c..a19be65 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
@@ -5,7 +5,7 @@
import cn.hutool.core.convert.Convert;
import cn.hutool.core.util.IdUtil;
import com.ruoyi.common.constant.Constants;
-import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.CaptchaType;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.redis.RedisUtils;
@@ -41,12 +41,12 @@
*/
@ApiOperation("鐢熸垚楠岃瘉鐮�")
@GetMapping("/captchaImage")
- public AjaxResult<Map<String, Object>> getCode() {
+ public R<Map<String, Object>> getCode() {
Map<String, Object> ajax = new HashMap<>();
boolean captchaOnOff = configService.selectCaptchaOnOff();
ajax.put("captchaOnOff", captchaOnOff);
if (!captchaOnOff) {
- return AjaxResult.success(ajax);
+ return R.ok(ajax);
}
// 淇濆瓨楠岃瘉鐮佷俊鎭�
String uuid = IdUtil.simpleUUID();
@@ -63,7 +63,7 @@
RedisUtils.setCacheObject(verifyKey, code, Constants.CAPTCHA_EXPIRATION, TimeUnit.MINUTES);
ajax.put("uuid", uuid);
ajax.put("img", captcha.getImageBase64());
- return AjaxResult.success(ajax);
+ return R.ok(ajax);
}
private String getCodeResult(String capStr) {
--
Gitblit v1.9.3