✨ 全局：简化 captcha 组件，融合到 system 模块

yudao-framework/pom.xml

@@ -33,7 +33,6 @@
         <module>yudao-spring-boot-starter-biz-ip</module>
 
         <module>yudao-spring-boot-starter-flowable</module>
-        <module>yudao-spring-boot-starter-captcha</module>
         <module>yudao-spring-boot-starter-websocket</module>
     </modules>
 

yudao-framework/yudao-spring-boot-starter-captcha/pom.xml

@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>cn.iocoder.boot</groupId>
-        <artifactId>yudao-framework</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>yudao-spring-boot-starter-captcha</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>验证码拓展
-        1. 基于 aj-captcha 实现滑块验证码，文档：https://ajcaptcha.beliefteam.cn/captcha-doc/
-    </description>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.xingyuv</groupId>
-            <artifactId>spring-boot-starter-captcha-plus</artifactId>
-        </dependency>
-        <!-- Spring 核心 -->
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter</artifactId>
-        </dependency>
-
-        <!-- DB 相关 -->
-        <dependency>
-            <groupId>cn.iocoder.boot</groupId>
-            <artifactId>yudao-spring-boot-starter-redis</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java

@@ -1,29 +0,0 @@
-package cn.iocoder.yudao.framework.captcha.config;
-
-import cn.iocoder.yudao.framework.captcha.core.service.RedisCaptchaServiceImpl;
-import com.xingyuv.captcha.properties.AjCaptchaProperties;
-import com.xingyuv.captcha.service.CaptchaCacheService;
-import com.xingyuv.captcha.service.impl.CaptchaServiceFactory;
-import org.springframework.boot.autoconfigure.AutoConfiguration;
-import org.springframework.context.annotation.Bean;
-import org.springframework.data.redis.core.StringRedisTemplate;
-
-import jakarta.annotation.Resource;
-
-@AutoConfiguration
-public class YudaoCaptchaConfiguration {
-
-    @Resource
-    private StringRedisTemplate stringRedisTemplate;
-
-    @Bean
-    public CaptchaCacheService captchaCacheService(AjCaptchaProperties config) {
-        // 缓存类型 redis/local/....
-        CaptchaCacheService ret = CaptchaServiceFactory.getCache(config.getCacheType().name());
-        if (ret instanceof RedisCaptchaServiceImpl) {
-            ((RedisCaptchaServiceImpl) ret).setStringRedisTemplate(stringRedisTemplate);
-        }
-        return ret;
-    }
-
-}

yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/enums/CaptchaRedisKeyConstants.java

@@ -1,28 +0,0 @@
-package cn.iocoder.yudao.framework.captcha.core.enums;
-
-/**
- * 验证码 Redis Key 枚举类
- *
- * @author 芋道源码
- */
-public interface CaptchaRedisKeyConstants {
-
-    /**
-     * 验证码的请求限流
-     *
-     * KEY 格式：AJ.CAPTCHA.REQ.LIMIT-%s-%s
-     * VALUE 数据类型：String // 例如说：验证失败 5 次，get 接口锁定
-     * 过期时间：60 秒
-     */
-    String AJ_CAPTCHA_REQ_LIMIT = "AJ.CAPTCHA.REQ.LIMIT-%s-%s";
-
-    /**
-     * 验证码的坐标
-     *
-     * KEY 格式：RUNNING:CAPTCHA:%s // AbstractCaptchaService.REDIS_CAPTCHA_KEY
-     * VALUE 数据类型：String // PointVO.class {"secretKey":"PP1w2Frr2KEejD2m","x":162,"y":5}
-     * 过期时间：120 秒
-     */
-    String AJ_CAPTCHA_RUNNING = "RUNNING:CAPTCHA:%s";
-
-}

yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/service/RedisCaptchaServiceImpl.java

@@ -1,57 +0,0 @@
-package cn.iocoder.yudao.framework.captcha.core.service;
-
-import com.xingyuv.captcha.service.CaptchaCacheService;
-import lombok.AllArgsConstructor;
-import lombok.NoArgsConstructor;
-import org.springframework.data.redis.core.StringRedisTemplate;
-
-import jakarta.annotation.Resource;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 基于 Redis 实现验证码的存储
- *
- * @author 星语
- */
-@NoArgsConstructor // 保证 aj-captcha 的 SPI 创建
-@AllArgsConstructor
-public class RedisCaptchaServiceImpl implements CaptchaCacheService {
-
-    @Resource // 保证 aj-captcha 的 SPI 创建时的注入
-    private StringRedisTemplate stringRedisTemplate;
-
-    @Override
-    public String type() {
-        return "redis";
-    }
-
-    public void setStringRedisTemplate(StringRedisTemplate stringRedisTemplate) {
-        this.stringRedisTemplate = stringRedisTemplate;
-    }
-
-    @Override
-    public void set(String key, String value, long expiresInSeconds) {
-        stringRedisTemplate.opsForValue().set(key, value, expiresInSeconds, TimeUnit.SECONDS);
-    }
-
-    @Override
-    public boolean exists(String key) {
-        return Boolean.TRUE.equals(stringRedisTemplate.hasKey(key));
-    }
-
-    @Override
-    public void delete(String key) {
-        stringRedisTemplate.delete(key);
-    }
-
-    @Override
-    public String get(String key) {
-        return stringRedisTemplate.opsForValue().get(key);
-    }
-
-    @Override
-    public Long increment(String key, long val) {
-        return stringRedisTemplate.opsForValue().increment(key,val);
-    }
-
-}

yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/package-info.java

@@ -1,7 +0,0 @@
-/**
- * 验证码拓展
- * 1. 基于 aj-captcha 实现滑块验证码，文档：https://ajcaptcha.beliefteam.cn/captcha-doc/
- *
- * @author 星语
- */
-package cn.iocoder.yudao.framework.captcha;

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService

@@ -1 +0,0 @@
-cn.iocoder.yudao.framework.captcha.core.service.RedisCaptchaServiceImpl

yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports

@@ -1 +0,0 @@
-cn.iocoder.yudao.framework.captcha.config.YudaoCaptchaConfiguration