From e02f6923593bd49f87caccd87e063baf312aaa3f Mon Sep 17 00:00:00 2001
From: 稚屿 <1491182878@qq.com>
Date: 星期一, 22 八月 2022 14:19:08 +0800
Subject: [PATCH] 修复菜单管理已知问题 问题描述：在菜单管理下，类型为菜单或者按钮的条目下点击修改按钮。 情况1，如果是类型为菜单，第一次点击修改按钮正常，则第二次点击另一个条目后面的修改按钮时报错！ 情况2，如果是类型为按钮，第一次点击修改时正常，当点击取消按钮关闭弹窗时，浏览器报错！
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 16 +++++++---------
1 files changed, 7 insertions(+), 9 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 649fd11..e1a397e 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
@@ -7,11 +7,12 @@
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.util.FastByteArrayOutputStream;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RestController;
import com.google.code.kaptcha.Producer;
+import com.ruoyi.common.config.RuoYiConfig;
+import com.ruoyi.common.constant.CacheConstants;
import com.ruoyi.common.constant.Constants;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.core.redis.RedisCache;
@@ -36,10 +37,6 @@
@Autowired
private RedisCache redisCache;
- // 楠岃瘉鐮佺被鍨�
- @Value("${ruoyi.captchaType}")
- private String captchaType;
-
@Autowired
private ISysConfigService configService;
/**
@@ -49,21 +46,22 @@
public AjaxResult getCode(HttpServletResponse response) throws IOException
{
AjaxResult ajax = AjaxResult.success();
- boolean captchaOnOff = configService.selectCaptchaOnOff();
- ajax.put("captchaOnOff", captchaOnOff);
- if (!captchaOnOff)
+ boolean captchaEnabled = configService.selectCaptchaEnabled();
+ ajax.put("captchaEnabled", captchaEnabled);
+ if (!captchaEnabled)
{
return ajax;
}
// 淇濆瓨楠岃瘉鐮佷俊鎭�
String uuid = IdUtils.simpleUUID();
- String verifyKey = Constants.CAPTCHA_CODE_KEY + uuid;
+ String verifyKey = CacheConstants.CAPTCHA_CODE_KEY + uuid;
String capStr = null, code = null;
BufferedImage image = null;
// 鐢熸垚楠岃瘉鐮�
+ String captchaType = RuoYiConfig.getCaptchaType();
if ("math".equals(captchaType))
{
String capText = captchaProducerMath.createText();
--
Gitblit v1.9.3