From b00171366ff27099133675f8bd66464b5e037867 Mon Sep 17 00:00:00 2001
From: XTvLi <948038320@qq.com>
Date: 星期三, 10 十一月 2021 18:17:43 +0800
Subject: [PATCH] 统一全局配置内容, 删除临时调用配置文件
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/common/CaptchaController.java | 7 ++-----
ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java | 11 +++++++++++
2 files changed, 13 insertions(+), 5 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..955c784 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
@@ -6,8 +6,8 @@
import javax.annotation.Resource;
import javax.imageio.ImageIO;
import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.config.RuoYiConfig;
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;
@@ -36,10 +36,6 @@
@Autowired
private RedisCache redisCache;
- // 楠岃瘉鐮佺被鍨�
- @Value("${ruoyi.captchaType}")
- private String captchaType;
-
@Autowired
private ISysConfigService configService;
/**
@@ -64,6 +60,7 @@
BufferedImage image = null;
// 鐢熸垚楠岃瘉鐮�
+ String captchaType = RuoYiConfig.getCaptchaType();
if ("math".equals(captchaType))
{
String capText = captchaProducerMath.createText();
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
index 843b919..84c0029 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/config/RuoYiConfig.java
@@ -30,6 +30,9 @@
/** 鑾峰彇鍦板潃寮�鍏� */
private static boolean addressEnabled;
+ /** 楠岃瘉鐮佺被鍨� */
+ private static String captchaType;
+
public String getName()
{
return name;
@@ -90,6 +93,14 @@
RuoYiConfig.addressEnabled = addressEnabled;
}
+ public static String getCaptchaType() {
+ return captchaType;
+ }
+
+ public void setCaptchaType(String captchaType) {
+ RuoYiConfig.captchaType = captchaType;
+ }
+
/**
* 鑾峰彇瀵煎叆涓婁紶璺緞
*/
--
Gitblit v1.9.3