|  | @@ -6,8 +6,8 @@ import java.util.concurrent.TimeUnit;
 | 
	
		
			
				|  |  |  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 @@ public class CaptchaController
 | 
	
		
			
				|  |  |      @Autowired
 | 
	
		
			
				|  |  |      private RedisCache redisCache;
 | 
	
		
			
				|  |  |      
 | 
	
		
			
				|  |  | -    // 验证码类型
 | 
	
		
			
				|  |  | -    @Value("${ruoyi.captchaType}")
 | 
	
		
			
				|  |  | -    private String captchaType;
 | 
	
		
			
				|  |  | -    
 | 
	
		
			
				|  |  |      @Autowired
 | 
	
		
			
				|  |  |      private ISysConfigService configService;
 | 
	
		
			
				|  |  |      /**
 | 
	
	
		
			
				|  | @@ -64,6 +60,7 @@ public class CaptchaController
 | 
	
		
			
				|  |  |          BufferedImage image = null;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |          // 生成验证码
 | 
	
		
			
				|  |  | +        String captchaType = RuoYiConfig.getCaptchaType();
 | 
	
		
			
				|  |  |          if ("math".equals(captchaType))
 | 
	
		
			
				|  |  |          {
 | 
	
		
			
				|  |  |              String capText = captchaProducerMath.createText();
 |