统一全局配置内容, 删除临时调用配置文件

@@ -6,8 +6,8 @@ import java.util.concurrent.TimeUnit;
 import javax.annotation.Resource;
 import javax.annotation.Resource;
 import javax.imageio.ImageIO;
 import javax.imageio.ImageIO;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+import com.ruoyi.common.config.RuoYiConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.util.FastByteArrayOutputStream;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.bind.annotation.RestController;
@@ -36,10 +36,6 @@ public class CaptchaController
     @Autowired
     @Autowired
     private RedisCache redisCache;
     private RedisCache redisCache;
     
     
-    // 验证码类型
-    @Value("${ruoyi.captchaType}")
-    private String captchaType;
-    
     @Autowired
     @Autowired
     private ISysConfigService configService;
     private ISysConfigService configService;
     /**
     /**
@@ -64,6 +60,7 @@ public class CaptchaController
         BufferedImage image = null;
         BufferedImage image = null;
 
 
         // 生成验证码
         // 生成验证码
+        String captchaType = RuoYiConfig.getCaptchaType();
         if ("math".equals(captchaType))
         if ("math".equals(captchaType))
         {
         {
             String capText = captchaProducerMath.createText();
             String capText = captchaProducerMath.createText();

@@ -30,6 +30,9 @@ public class RuoYiConfig
     /** 获取地址开关 */
     /** 获取地址开关 */
     private static boolean addressEnabled;
     private static boolean addressEnabled;
 
 
+    /** 验证码类型 */
+    private static String captchaType;
+
     public String getName()
     public String getName()
     {
     {
         return name;
         return name;
@@ -90,6 +93,14 @@ public class RuoYiConfig
         RuoYiConfig.addressEnabled = addressEnabled;
         RuoYiConfig.addressEnabled = addressEnabled;
     }
     }
 
 
+    public static String getCaptchaType() {
+        return captchaType;
+    }
+
+    public void setCaptchaType(String captchaType) {
+        RuoYiConfig.captchaType = captchaType;
+    }
+
     /**
     /**
      * 获取导入上传路径
      * 获取导入上传路径
      */
      */