diff --git a/cf-dependencies/pom.xml b/cf-dependencies/pom.xml index c06bfc27e..4ee4ac68c 100644 --- a/cf-dependencies/pom.xml +++ b/cf-dependencies/pom.xml @@ -54,7 +54,7 @@ 6.8.0 - 1.0.8 + 1.4.0 1.17.2 1.18.30 1.5.5.Final @@ -604,9 +604,9 @@ - com.xingyuv - spring-boot-starter-captcha-plus - ${captcha-plus.version} + com.anji-plus + captcha-spring-boot-starter + ${anji-plus-captcha.version} diff --git a/cf-framework/cf-spring-boot-starter-captcha/pom.xml b/cf-framework/cf-spring-boot-starter-captcha/pom.xml deleted file mode 100644 index 2520a3eeb..000000000 --- a/cf-framework/cf-spring-boot-starter-captcha/pom.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - com.cf.imes - cf-framework - ${revision} - - 4.0.0 - cf-spring-boot-starter-captcha - jar - - ${project.artifactId} - 验证码拓展 - 1. 基于 aj-captcha 实现滑块验证码，文档：https://ajcaptcha.beliefteam.cn/captcha-doc/ - - - - - - com.xingyuv - spring-boot-starter-captcha-plus - - - - org.springframework.boot - spring-boot-starter - - - - - com.cf.imes - cf-spring-boot-starter-redis - - - - - diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/java/com/cf/imes/framework/captcha/config/ChenfengCaptchaConfiguration.java b/cf-framework/cf-spring-boot-starter-captcha/src/main/java/com/cf/imes/framework/captcha/config/ChenfengCaptchaConfiguration.java deleted file mode 100644 index 0828ffa2c..000000000 --- a/cf-framework/cf-spring-boot-starter-captcha/src/main/java/com/cf/imes/framework/captcha/config/ChenfengCaptchaConfiguration.java +++ /dev/null @@ -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; - } - -} diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService b/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService deleted file mode 100644 index 742d55d0c..000000000 --- a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService +++ /dev/null @@ -1 +0,0 @@ -com.cf.imes.framework.captcha.core.service.RedisCaptchaServiceImpl diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index b784cf670..000000000 --- a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -com.cf.imes.framework.captcha.config.ChenfengCaptchaConfiguration diff --git a/cf-module-system/cf-module-system-biz/pom.xml b/cf-module-system/cf-module-system-biz/pom.xml index 4ce74b0d0..b44f4ef68 100644 --- a/cf-module-system/cf-module-system-biz/pom.xml +++ b/cf-module-system/cf-module-system-biz/pom.xml @@ -154,8 +154,8 @@ - com.cf.imes - cf-spring-boot-starter-captcha + com.anji-plus + captcha-spring-boot-starter @@ -267,10 +267,6 @@ com.cf.imes cf-spring-boot-starter-biz-sms - - com.cf.imes - cf-spring-boot-starter-captcha - com.cf.imes cf-spring-boot-starter-elasticsearch diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/captcha/CaptchaController.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/captcha/CaptchaController.java index 235bd99ef..c3839dbbb 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/controller/admin/captcha/CaptchaController.java +++ b/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; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/captcha/config/ChenfengCaptchaConfiguration.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/captcha/config/ChenfengCaptchaConfiguration.java new file mode 100644 index 000000000..5c633aad9 --- /dev/null +++ b/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; + } + +} diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/java/com/cf/imes/framework/captcha/core/service/RedisCaptchaServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java similarity index 92% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/java/com/cf/imes/framework/captcha/core/service/RedisCaptchaServiceImpl.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java index 6620213f2..eee636624 100644 --- a/cf-framework/cf-spring-boot-starter-captcha/src/main/java/com/cf/imes/framework/captcha/core/service/RedisCaptchaServiceImpl.java +++ b/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; diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/java/com/cf/imes/framework/captcha/package-info.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/captcha/package-info.java similarity index 73% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/java/com/cf/imes/framework/captcha/package-info.java rename to cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/framework/captcha/package-info.java index 5401e780f..20b954761 100644 --- a/cf-framework/cf-spring-boot-starter-captcha/src/main/java/com/cf/imes/framework/captcha/package-info.java +++ b/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; diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java index 86063b38a..fc0e3d59e 100644 --- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImpl.java +++ b/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; diff --git a/cf-module-system/cf-module-system-biz/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService b/cf-module-system/cf-module-system-biz/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService new file mode 100644 index 000000000..28a93bf94 --- /dev/null +++ b/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 diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg1.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg1.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg2.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg2.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg3.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg3.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg4.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg4.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg5.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg5.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg6.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg6.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg7.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg7.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg8.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg8.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg9.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/original/bg9.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/1.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/1.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/2.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/2.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/3.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/3.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/4.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/4.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg1.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg1.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg10.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg10.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg2.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg2.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg3.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg3.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg4.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg4.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg5.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg5.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg6.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg6.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg7.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg7.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg8.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg8.png diff --git a/cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png b/cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg9.png similarity index 100% rename from cf-framework/cf-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png rename to cf-module-system/cf-module-system-biz/src/main/resources/images/pic-click/bg9.png diff --git a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImplTest.java b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImplTest.java index 2d461c0cc..ba6e5bf75 100644 --- a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/auth/AdminAuthServiceImplTest.java +++ b/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;