Commit 8c4bc638a4b414c07377f0ae390d9eda3fe57b63

Authored by xingyu
1 parent 34f3e685

chore: captcha-plus

yudao-dependencies/pom.xml
@@ -41,7 +41,7 @@ @@ -41,7 +41,7 @@
41 <!-- Bpm 工作流相关 --> 41 <!-- Bpm 工作流相关 -->
42 <flowable.version>6.8.0</flowable.version> 42 <flowable.version>6.8.0</flowable.version>
43 <!-- 工具类相关 --> 43 <!-- 工具类相关 -->
44 - <captcha-plus.version>1.0.0</captcha-plus.version> 44 + <captcha-plus.version>1.0.1</captcha-plus.version>
45 <jsoup.version>1.15.3</jsoup.version> 45 <jsoup.version>1.15.3</jsoup.version>
46 <lombok.version>1.18.24</lombok.version> 46 <lombok.version>1.18.24</lombok.version>
47 <mapstruct.version>1.5.3.Final</mapstruct.version> 47 <mapstruct.version>1.5.3.Final</mapstruct.version>
yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java
@@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.captcha.config; @@ -3,7 +3,7 @@ package cn.iocoder.yudao.framework.captcha.config;
3 import cn.hutool.core.util.ClassUtil; 3 import cn.hutool.core.util.ClassUtil;
4 import cn.iocoder.yudao.framework.captcha.core.enums.CaptchaRedisKeyConstants; 4 import cn.iocoder.yudao.framework.captcha.core.enums.CaptchaRedisKeyConstants;
5 import cn.iocoder.yudao.framework.captcha.core.service.RedisCaptchaServiceImpl; 5 import cn.iocoder.yudao.framework.captcha.core.service.RedisCaptchaServiceImpl;
6 -import com.anji.captcha.service.CaptchaCacheService; 6 +import com.xingyuv.captcha.service.CaptchaCacheService;
7 import org.springframework.boot.autoconfigure.AutoConfiguration; 7 import org.springframework.boot.autoconfigure.AutoConfiguration;
8 import org.springframework.context.annotation.Bean; 8 import org.springframework.context.annotation.Bean;
9 import org.springframework.data.redis.core.StringRedisTemplate; 9 import org.springframework.data.redis.core.StringRedisTemplate;
yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/enums/CaptchaRedisKeyConstants.java
1 package cn.iocoder.yudao.framework.captcha.core.enums; 1 package cn.iocoder.yudao.framework.captcha.core.enums;
2 2
3 import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine; 3 import cn.iocoder.yudao.framework.redis.core.RedisKeyDefine;
4 -import com.anji.captcha.model.vo.PointVO; 4 +import com.xingyuv.captcha.model.vo.PointVO;
5 5
6 import java.time.Duration; 6 import java.time.Duration;
7 7
yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/service/RedisCaptchaServiceImpl.java
1 package cn.iocoder.yudao.framework.captcha.core.service; 1 package cn.iocoder.yudao.framework.captcha.core.service;
2 2
3 -import com.anji.captcha.service.CaptchaCacheService; 3 +import com.xingyuv.captcha.service.CaptchaCacheService;
4 import lombok.AllArgsConstructor; 4 import lombok.AllArgsConstructor;
5 import lombok.NoArgsConstructor; 5 import lombok.NoArgsConstructor;
6 import org.springframework.data.redis.core.StringRedisTemplate; 6 import org.springframework.data.redis.core.StringRedisTemplate;
yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.anji.captcha.service.CaptchaCacheService renamed to yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/captcha/CaptchaController.java
@@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.system.controller.admin.captcha; @@ -3,9 +3,9 @@ package cn.iocoder.yudao.module.system.controller.admin.captcha;
3 import cn.hutool.core.util.StrUtil; 3 import cn.hutool.core.util.StrUtil;
4 import cn.hutool.extra.servlet.ServletUtil; 4 import cn.hutool.extra.servlet.ServletUtil;
5 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog; 5 import cn.iocoder.yudao.framework.operatelog.core.annotations.OperateLog;
6 -import com.anji.captcha.model.common.ResponseModel;  
7 -import com.anji.captcha.model.vo.CaptchaVO;  
8 -import com.anji.captcha.service.CaptchaService; 6 +import com.xingyuv.captcha.model.common.ResponseModel;
  7 +import com.xingyuv.captcha.model.vo.CaptchaVO;
  8 +import com.xingyuv.captcha.service.CaptchaService;
9 import io.swagger.annotations.Api; 9 import io.swagger.annotations.Api;
10 import io.swagger.annotations.ApiOperation; 10 import io.swagger.annotations.ApiOperation;
11 import org.springframework.web.bind.annotation.PostMapping; 11 import org.springframework.web.bind.annotation.PostMapping;
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java
@@ -22,9 +22,9 @@ import cn.iocoder.yudao.module.system.service.member.MemberService; @@ -22,9 +22,9 @@ import cn.iocoder.yudao.module.system.service.member.MemberService;
22 import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService; 22 import cn.iocoder.yudao.module.system.service.oauth2.OAuth2TokenService;
23 import cn.iocoder.yudao.module.system.service.social.SocialUserService; 23 import cn.iocoder.yudao.module.system.service.social.SocialUserService;
24 import cn.iocoder.yudao.module.system.service.user.AdminUserService; 24 import cn.iocoder.yudao.module.system.service.user.AdminUserService;
25 -import com.anji.captcha.model.common.ResponseModel;  
26 -import com.anji.captcha.model.vo.CaptchaVO;  
27 -import com.anji.captcha.service.CaptchaService; 25 +import com.xingyuv.captcha.model.common.ResponseModel;
  26 +import com.xingyuv.captcha.model.vo.CaptchaVO;
  27 +import com.xingyuv.captcha.service.CaptchaService;
28 import com.google.common.annotations.VisibleForTesting; 28 import com.google.common.annotations.VisibleForTesting;
29 import lombok.extern.slf4j.Slf4j; 29 import lombok.extern.slf4j.Slf4j;
30 import org.springframework.beans.factory.annotation.Value; 30 import org.springframework.beans.factory.annotation.Value;