Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-04-28 56b8b84689ccf5389ee02814bcb8bfe407f05a87

 src/main/java/com/ruoyi/project/common/CaptchaController.java

@@ -10,7 +10,7 @@
import com.ruoyi.project.system.service.ISysConfigService;

import jakarta.annotation.Resource;

import jakarta.servlet.http.HttpServletResponse;

import lombok.AllArgsConstructor;

import lombok.RequiredArgsConstructor;

import org.springframework.beans.factory.annotation.Value;

import org.springframework.util.FastByteArrayOutputStream;

import org.springframework.web.bind.annotation.GetMapping;

@@ -27,7 +27,7 @@
 * @author ruoyi

 */

@RestController

@AllArgsConstructor

@RequiredArgsConstructor

public class CaptchaController

{

    @Resource(name = "captchaProducer")

@@ -36,13 +36,13 @@
    @Resource(name = "captchaProducerMath")

    private Producer captchaProducerMath;



    private RedisCache redisCache;

    private final RedisCache redisCache;

    

    // 验证码类型

    @Value("${ruoyi.captchaType}")

    private String captchaType;

    

    private ISysConfigService configService;

    private final ISysConfigService configService;



    /**

     * 生成验证码