From 27a2943362bb8dfe7f8b590266da9c00661b421d Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期一, 30 一月 2023 22:08:34 +0800 Subject: [PATCH] !280 修改表结构创建人和修改人字段,增加创建部门字段 Merge pull request !280 from MichelleChung/5.X --- ruoyi-admin/src/main/java/com/ruoyi/web/controller/CaptchaController.java | 8 ++------ 1 files changed, 2 insertions(+), 6 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 f24a863..d38d154 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 @@ -80,11 +80,9 @@ */ @GetMapping("/captchaImage") public R<Map<String, Object>> getCode() { - Map<String, Object> ajax = new HashMap<>(); boolean captchaEnabled = configService.selectCaptchaEnabled(); - ajax.put("captchaEnabled", captchaEnabled); if (!captchaEnabled) { - return R.ok(ajax); + return R.ok(Map.of("captchaEnabled", false)); } // 淇濆瓨楠岃瘉鐮佷俊鎭� String uuid = IdUtil.simpleUUID(); @@ -104,9 +102,7 @@ code = exp.getValue(String.class); } RedisUtils.setCacheObject(verifyKey, code, Duration.ofMinutes(Constants.CAPTCHA_EXPIRATION)); - ajax.put("uuid", uuid); - ajax.put("img", captcha.getImageBase64()); - return R.ok(ajax); + return R.ok(Map.of("uuid", uuid, "img", captcha.getImageBase64())); } } -- Gitblit v1.9.3