cf-framework：captcha移到cf-module-system-biz、第三方验证码版本更新升级为com.anji.captcha

cf-dependencies/pom.xml

@@ -54,7 +54,7 @@
         <!-- Bpm 工作流相关 -->
         <flowable.version>6.8.0</flowable.version>
         <!-- 工具类相关 -->
-        <captcha-plus.version>1.0.8</captcha-plus.version>
+        <anji-plus-captcha.version>1.4.0</anji-plus-captcha.version>
         <jsoup.version>1.17.2</jsoup.version>
         <lombok.version>1.18.30</lombok.version>
         <mapstruct.version>1.5.5.Final</mapstruct.version>
@@ -604,9 +604,9 @@
             </dependency>
 
             <dependency>
-                <groupId>com.xingyuv</groupId>
+                <groupId>com.anji-plus</groupId>
-                <artifactId>spring-boot-starter-captcha-plus</artifactId>
+                <artifactId>captcha-spring-boot-starter</artifactId> <!-- 验证码，一般用于登录使用 -->
-                <version>${captcha-plus.version}</version>
+                <version>${anji-plus-captcha.version}</version>
             </dependency>
 
             <dependency>

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

@@ -1,39 +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>com.cf.imes</groupId>
-        <artifactId>cf-framework</artifactId>
-        <version>${revision}</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>cf-spring-boot-starter-captcha</artifactId>
-    <packaging>jar</packaging>
-
-    <name>${project.artifactId}</name>
-    <description>验证码拓展
-        1. 基于 aj-captcha 实现滑块验证码，文档：https://ajcaptcha.beliefteam.cn/captcha-doc/
-    </description>
-
-    <dependencies>
-        <!-- Spring 核心 -->
-        <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>com.cf.imes</groupId>
-            <artifactId>cf-spring-boot-starter-redis</artifactId>
-        </dependency>
-
-    </dependencies>
-
-</project>

cf-framework/cf-spring-boot-starter-captcha/src/main/java/com/cf/imes/framework/captcha/config/ChenfengCaptchaConfiguration.java

@@ -1,29 +0,0 @@
-package com.cf.imes.framework.captcha.config;
-
-import com.cf.imes.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 javax.annotation.Resource;
-
-@AutoConfiguration
-public class ChenfengCaptchaConfiguration {
-
-    @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;
-    }
-
-}

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

@@ -1 +0,0 @@
-com.cf.imes.framework.captcha.core.service.RedisCaptchaServiceImpl

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

@@ -1 +0,0 @@
-com.cf.imes.framework.captcha.config.ChenfengCaptchaConfiguration

cf-module-system/cf-module-system-biz/pom.xml

@@ -154,8 +154,8 @@
         </dependency>
 
         <dependency>
-            <groupId>com.cf.imes</groupId>
+            <groupId>com.anji-plus</groupId>
-            <artifactId>cf-spring-boot-starter-captcha</artifactId>
+            <artifactId>captcha-spring-boot-starter</artifactId> <!-- 验证码，一般用于登录使用 -->
         </dependency>
 
         <dependency>
@@ -267,10 +267,6 @@
                             <groupId>com.cf.imes</groupId>
                             <artifactId>cf-spring-boot-starter-biz-sms</artifactId>
                         </include>
-                        <include>
-                            <groupId>com.cf.imes</groupId>
-                            <artifactId>cf-spring-boot-starter-captcha</artifactId>
-                        </include>
                         <include>
                             <groupId>com.cf.imes</groupId>
                             <artifactId>cf-spring-boot-starter-elasticsearch</artifactId>

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/captcha/CaptchaController.java

@@ -1,11 +1,11 @@
 package com.cf.imes.module.system.controller.admin.captcha;
 
 import cn.hutool.core.text.CharSequenceUtil;
+import com.anji.captcha.model.common.ResponseModel;
+import com.anji.captcha.model.vo.CaptchaVO;
+import com.anji.captcha.service.CaptchaService;
 import com.cf.imes.framework.common.util.servlet.ServletUtils;
 import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
-import com.xingyuv.captcha.model.common.ResponseModel;
-import com.xingyuv.captcha.model.vo.CaptchaVO;
-import com.xingyuv.captcha.service.CaptchaService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import org.springframework.web.bind.annotation.PostMapping;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/captcha/config/ChenfengCaptchaConfiguration.java

@@ -0,0 +1,30 @@
+package com.cf.imes.module.system.framework.captcha.config;
+
+import com.anji.captcha.config.AjCaptchaAutoConfiguration;
+import com.anji.captcha.properties.AjCaptchaProperties;
+import com.anji.captcha.service.CaptchaCacheService;
+import com.anji.captcha.service.impl.CaptchaServiceFactory;
+import com.cf.imes.module.system.framework.captcha.core.RedisCaptchaServiceImpl;
+import org.springframework.boot.autoconfigure.ImportAutoConfiguration;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.data.redis.core.StringRedisTemplate;
+
+@Configuration(proxyBeanMethods = false)
+@ImportAutoConfiguration(AjCaptchaAutoConfiguration.class)
+public class ChenfengCaptchaConfiguration {
+
+    @Bean(name = "AjCaptchaCacheService")
+    @Primary
+    public CaptchaCacheService captchaCacheService(AjCaptchaProperties config,
+                                                   StringRedisTemplate stringRedisTemplate) {
+        // 缓存类型 redis/local/....
+        CaptchaCacheService captchaCacheService = CaptchaServiceFactory.getCache(config.getCacheType().name());
+        if (captchaCacheService instanceof RedisCaptchaServiceImpl) {
+            ((RedisCaptchaServiceImpl) captchaCacheService).setStringRedisTemplate(stringRedisTemplate);
+        }
+        return captchaCacheService;
+    }
+
+}

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java

@@ -1,6 +1,6 @@
-package com.cf.imes.framework.captcha.core.service;
+package com.cf.imes.module.system.framework.captcha.core;
 
-import com.xingyuv.captcha.service.CaptchaCacheService;
+import com.anji.captcha.service.CaptchaCacheService;
 import lombok.AllArgsConstructor;
 import lombok.NoArgsConstructor;
 import org.springframework.data.redis.core.StringRedisTemplate;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/captcha/package-info.java

@@ -4,4 +4,4 @@
  *
  * @author 星语
  */
-package com.cf.imes.framework.captcha;
+package com.cf.imes.module.system.framework.captcha;

cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java

@@ -1,6 +1,9 @@
 package com.cf.imes.module.system.service.auth;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.anji.captcha.model.common.ResponseModel;
+import com.anji.captcha.model.vo.CaptchaVO;
+import com.anji.captcha.service.CaptchaService;
 import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.common.enums.UserTypeEnum;
 import com.cf.imes.framework.common.exception.util.ServiceExceptionUtil;
@@ -36,9 +39,6 @@ import com.cf.imes.module.system.service.organ.OrganService;
 import com.cf.imes.module.system.service.user.AdminUserService;
 import com.cf.imes.module.system.enums.ErrorCodeConstants;
 import com.google.common.annotations.VisibleForTesting;
-import com.xingyuv.captcha.model.common.ResponseModel;
-import com.xingyuv.captcha.model.vo.CaptchaVO;
-import com.xingyuv.captcha.service.CaptchaService;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;

cf-module-system/cf-module-system-biz/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService

@@ -0,0 +1 @@
+com.cf.imes.module.system.framework.captcha.core.RedisCaptchaServiceImpl

cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImplTest.java

@@ -1,6 +1,8 @@
 package com.cf.imes.module.system.service.auth;
 
 import cn.hutool.core.util.ReflectUtil;
+import com.anji.captcha.model.common.ResponseModel;
+import com.anji.captcha.service.CaptchaService;
 import com.cf.imes.framework.common.enums.CommonStatusEnum;
 import com.cf.imes.framework.common.enums.UserTypeEnum;
 import com.cf.imes.framework.test.core.ut.BaseDbUnitTest;
@@ -16,8 +18,6 @@ import com.cf.imes.module.system.enums.sms.SmsSceneEnum;
 import com.cf.imes.module.system.service.logger.LoginLogService;
 import com.cf.imes.module.system.service.oauth2.OAuth2TokenService;
 import com.cf.imes.module.system.service.user.AdminUserService;
-import com.xingyuv.captcha.model.common.ResponseModel;
-import com.xingyuv.captcha.service.CaptchaService;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.mock.mockito.MockBean;