From 0317e4279d28704c6f0cecbc8e2fce0febc1277a Mon Sep 17 00:00:00 2001 From: YunaiV Date: Wed, 28 Feb 2024 20:31:55 +0800 Subject: [PATCH] ✨ 全局：简化 captcha 组件，融合到 system 模块 --- yudao-dependencies/pom.xml | 10 ---------- yudao-framework/pom.xml | 1 - yudao-framework/yudao-spring-boot-starter-captcha/pom.xml | 38 -------------------------------------- yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java | 29 ----------------------------- yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/enums/CaptchaRedisKeyConstants.java | 28 ---------------------------- yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/service/RedisCaptchaServiceImpl.java | 57 --------------------------------------------------------- yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/package-info.java | 7 ------- yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService | 1 - yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports | 1 - yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png | Bin 17827 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png | Bin 28732 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png | Bin 25814 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png | Bin 27859 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png | Bin 24036 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png | Bin 19160 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png | Bin 21445 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png | Bin 30332 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png | Bin 26977 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png | Bin 2158 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png | Bin 1657 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png | Bin 1657 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png | Bin 1657 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png | Bin 1873 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png | Bin 1872 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png | Bin 1872 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png | Bin 1838 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png | Bin 1839 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png | Bin 1836 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png | Bin 1838 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png | Bin 1657 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png | Bin 1657 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png | Bin 2297 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png | Bin 2241 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png | Bin 2255 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png | Bin 24041 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png | Bin 27872 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png | Bin 28394 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png | Bin 23407 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png | Bin 25379 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png | Bin 16422 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png | Bin 23607 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png | Bin 26113 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png | Bin 27260 -> 0 bytes yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png | Bin 29878 -> 0 bytes yudao-module-system/yudao-module-system-biz/pom.xml | 10 +++++----- yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/config/YudaoCaptchaConfiguration.java | 29 +++++++++++++++++++++++++++++ yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/package-info.java | 8 ++++++++ yudao-module-system/yudao-module-system-biz/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService | 1 + yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg1.png | Bin 0 -> 17827 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg2.png | Bin 0 -> 28732 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg3.png | Bin 0 -> 25814 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg4.png | Bin 0 -> 27859 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg5.png | Bin 0 -> 24036 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg6.png | Bin 0 -> 19160 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg7.png | Bin 0 -> 21445 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg8.png | Bin 0 -> 30332 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg9.png | Bin 0 -> 26977 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/1.png | Bin 0 -> 2158 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png | Bin 0 -> 1657 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png | Bin 0 -> 1657 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png | Bin 0 -> 1657 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png | Bin 0 -> 1873 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png | Bin 0 -> 1872 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png | Bin 0 -> 1872 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png | Bin 0 -> 1838 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png | Bin 0 -> 1839 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png | Bin 0 -> 1836 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png | Bin 0 -> 1838 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png | Bin 0 -> 1657 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png | Bin 0 -> 1657 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/2.png | Bin 0 -> 2297 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/3.png | Bin 0 -> 2241 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/4.png | Bin 0 -> 2255 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg1.png | Bin 0 -> 24041 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg10.png | Bin 0 -> 27872 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg2.png | Bin 0 -> 28394 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg3.png | Bin 0 -> 23407 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg4.png | Bin 0 -> 25379 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg5.png | Bin 0 -> 16422 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg6.png | Bin 0 -> 23607 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg7.png | Bin 0 -> 26113 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg8.png | Bin 0 -> 27260 bytes yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg9.png | Bin 0 -> 29878 bytes yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java | 4 ++-- 85 files changed, 94 insertions(+), 179 deletions(-) delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/pom.xml delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/enums/CaptchaRedisKeyConstants.java delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/service/RedisCaptchaServiceImpl.java delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/package-info.java delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png delete mode 100644 yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/config/YudaoCaptchaConfiguration.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/package-info.java create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg1.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg2.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg3.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg4.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg5.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg6.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg7.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg8.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg9.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/1.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/2.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/3.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/4.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg1.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg10.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg2.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg3.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg4.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg5.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg6.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg7.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg8.png create mode 100644 yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg9.png diff --git a/yudao-dependencies/pom.xml b/yudao-dependencies/pom.xml index f073e67..befb06e 100644 --- a/yudao-dependencies/pom.xml +++ b/yudao-dependencies/pom.xml @@ -131,16 +131,6 @@ yudao-spring-boot-starter-biz-ip ${revision} - - cn.iocoder.boot - yudao-spring-boot-starter-captcha - ${revision} - - - cn.iocoder.boot - yudao-spring-boot-starter-desensitize - ${revision} - diff --git a/yudao-framework/pom.xml b/yudao-framework/pom.xml index 446fd4d..c260ff9 100644 --- a/yudao-framework/pom.xml +++ b/yudao-framework/pom.xml @@ -33,7 +33,6 @@ yudao-spring-boot-starter-biz-ip yudao-spring-boot-starter-flowable - yudao-spring-boot-starter-captcha yudao-spring-boot-starter-websocket diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/pom.xml b/yudao-framework/yudao-spring-boot-starter-captcha/pom.xml deleted file mode 100644 index 654d756..0000000 --- a/yudao-framework/yudao-spring-boot-starter-captcha/pom.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - cn.iocoder.boot - yudao-framework - ${revision} - - 4.0.0 - yudao-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 - - - - - cn.iocoder.boot - yudao-spring-boot-starter-redis - - - - - diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java deleted file mode 100644 index 78213b6..0000000 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/config/YudaoCaptchaConfiguration.java +++ /dev/null @@ -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; - } - -} diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/enums/CaptchaRedisKeyConstants.java b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/enums/CaptchaRedisKeyConstants.java deleted file mode 100644 index 5fa5b58..0000000 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/enums/CaptchaRedisKeyConstants.java +++ /dev/null @@ -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"; - -} diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/service/RedisCaptchaServiceImpl.java b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/service/RedisCaptchaServiceImpl.java deleted file mode 100644 index d3b1967..0000000 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/core/service/RedisCaptchaServiceImpl.java +++ /dev/null @@ -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); - } - -} diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/package-info.java b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/package-info.java deleted file mode 100644 index e78d9ea..0000000 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/java/cn/iocoder/yudao/framework/captcha/package-info.java +++ /dev/null @@ -1,7 +0,0 @@ -/** - * 验证码拓展 - * 1. 基于 aj-captcha 实现滑块验证码，文档：https://ajcaptcha.beliefteam.cn/captcha-doc/ - * - * @author 星语 - */ -package cn.iocoder.yudao.framework.captcha; diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService deleted file mode 100644 index afede97..0000000 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.captcha.core.service.RedisCaptchaServiceImpl diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 8411d2c..0000000 --- a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -cn.iocoder.yudao.framework.captcha.config.YudaoCaptchaConfiguration \ No newline at end of file diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png deleted file mode 100644 index c481457..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg1.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png deleted file mode 100644 index bf8fb38..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg2.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png deleted file mode 100644 index f871d3d..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg3.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png deleted file mode 100644 index 2e3d871..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg4.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png deleted file mode 100644 index fe383b7..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg5.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png deleted file mode 100644 index 5024ceb..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg6.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png deleted file mode 100644 index efe76f8..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg7.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png deleted file mode 100644 index 2727aa3..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg8.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png deleted file mode 100644 index 4463aa2..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/original/bg9.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png deleted file mode 100644 index ef11324..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/1.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png deleted file mode 100644 index 297e44c..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/10.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png deleted file mode 100644 index d9b1da8..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/11.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png deleted file mode 100644 index 07e7313..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/12.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png deleted file mode 100644 index 82c3dd9..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/13.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png deleted file mode 100644 index 0b9a866..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/14.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png deleted file mode 100644 index 86b0d1c..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/15.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png deleted file mode 100644 index e90a6e2..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/16.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png deleted file mode 100644 index a82cbc7..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/17.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png deleted file mode 100644 index d3f3cfd..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/18.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png deleted file mode 100644 index eb2855b..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/19.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png deleted file mode 100644 index 3cb5ce1..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/8.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png deleted file mode 100644 index 384d354..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/11/9.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png deleted file mode 100644 index baf3f06..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/2.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png deleted file mode 100644 index ccaf617..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/3.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png deleted file mode 100644 index 7dab162..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/jigsaw/slidingBlock/4.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png deleted file mode 100644 index 14e7345..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg1.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png deleted file mode 100644 index 1ea1d6d..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg10.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png deleted file mode 100644 index 0edb329..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg2.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png deleted file mode 100644 index 9167996..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg3.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png deleted file mode 100644 index e8e8e6c..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg4.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png deleted file mode 100644 index 66a3181..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg5.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png deleted file mode 100644 index 9b0f5d8..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg6.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png deleted file mode 100644 index db41c74..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg7.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png deleted file mode 100644 index 3496813..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg8.png and /dev/null differ diff --git a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png b/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png deleted file mode 100644 index 4e7b477..0000000 Binary files a/yudao-framework/yudao-spring-boot-starter-captcha/src/main/resources/images/pic-click/bg9.png and /dev/null differ diff --git a/yudao-module-system/yudao-module-system-biz/pom.xml b/yudao-module-system/yudao-module-system-biz/pom.xml index 350ff4b..4743dea 100644 --- a/yudao-module-system/yudao-module-system-biz/pom.xml +++ b/yudao-module-system/yudao-module-system-biz/pom.xml @@ -99,11 +99,6 @@ - cn.iocoder.boot - yudao-spring-boot-starter-captcha - - - org.springframework.boot spring-boot-starter-mail @@ -135,6 +130,11 @@ com.tencentcloudapi tencentcloud-sdk-java-sms + + + com.xingyuv + spring-boot-starter-captcha-plus + diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/config/YudaoCaptchaConfiguration.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/config/YudaoCaptchaConfiguration.java new file mode 100644 index 0000000..23c8d78 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/config/YudaoCaptchaConfiguration.java @@ -0,0 +1,29 @@ +package cn.iocoder.yudao.module.system.framework.captcha.config; + +import cn.iocoder.yudao.module.system.framework.captcha.core.RedisCaptchaServiceImpl; +import com.xingyuv.captcha.properties.AjCaptchaProperties; +import com.xingyuv.captcha.service.CaptchaCacheService; +import com.xingyuv.captcha.service.impl.CaptchaServiceFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.core.StringRedisTemplate; + +/** + * 验证码的配置类 + * + * @author 芋道源码 + */ +@Configuration(proxyBeanMethods = false) +public class YudaoCaptchaConfiguration { + + @Bean + public CaptchaCacheService captchaCacheService(AjCaptchaProperties config, + StringRedisTemplate stringRedisTemplate) { + CaptchaCacheService captchaCacheService = CaptchaServiceFactory.getCache(config.getCacheType().name()); + if (captchaCacheService instanceof RedisCaptchaServiceImpl) { + ((RedisCaptchaServiceImpl) captchaCacheService).setStringRedisTemplate(stringRedisTemplate); + } + return captchaCacheService; + } + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java new file mode 100644 index 0000000..d69b88c --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/core/RedisCaptchaServiceImpl.java @@ -0,0 +1,49 @@ +package cn.iocoder.yudao.module.system.framework.captcha.core; + +import com.xingyuv.captcha.service.CaptchaCacheService; +import lombok.Setter; +import org.springframework.data.redis.core.StringRedisTemplate; + +import java.util.concurrent.TimeUnit; + +/** + * 基于 Redis 实现验证码的存储 + * + * @author 星语 + */ +@Setter +public class RedisCaptchaServiceImpl implements CaptchaCacheService { + + private StringRedisTemplate stringRedisTemplate; + + @Override + public String type() { + return "redis"; + } + + @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); + } + +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/package-info.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/package-info.java new file mode 100644 index 0000000..a94be21 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/framework/captcha/package-info.java @@ -0,0 +1,8 @@ +/** + * 验证码拓展 + * + * 基于 aj-captcha 实现滑块验证码，文档：https://ajcaptcha.beliefteam.cn/captcha-doc/ + * + * @author 星语 + */ +package cn.iocoder.yudao.module.system.framework.captcha; \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService b/yudao-module-system/yudao-module-system-biz/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService new file mode 100644 index 0000000..946ee59 --- /dev/null +++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/META-INF/services/com.xingyuv.captcha.service.CaptchaCacheService @@ -0,0 +1 @@ +cn.iocoder.yudao.module.system.framework.captcha.core.RedisCaptchaServiceImpl diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg1.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg1.png new file mode 100644 index 0000000..c481457 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg1.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg2.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg2.png new file mode 100644 index 0000000..bf8fb38 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg2.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg3.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg3.png new file mode 100644 index 0000000..f871d3d Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg3.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg4.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg4.png new file mode 100644 index 0000000..2e3d871 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg4.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg5.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg5.png new file mode 100644 index 0000000..fe383b7 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg5.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg6.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg6.png new file mode 100644 index 0000000..5024ceb Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg6.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg7.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg7.png new file mode 100644 index 0000000..efe76f8 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg7.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg8.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg8.png new file mode 100644 index 0000000..2727aa3 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg8.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg9.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg9.png new file mode 100644 index 0000000..4463aa2 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/original/bg9.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/1.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/1.png new file mode 100644 index 0000000..ef11324 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/1.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png new file mode 100644 index 0000000..297e44c Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/10.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png new file mode 100644 index 0000000..d9b1da8 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/11.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png new file mode 100644 index 0000000..07e7313 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/12.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png new file mode 100644 index 0000000..82c3dd9 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/13.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png new file mode 100644 index 0000000..0b9a866 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/14.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png new file mode 100644 index 0000000..86b0d1c Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/15.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png new file mode 100644 index 0000000..e90a6e2 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/16.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png new file mode 100644 index 0000000..a82cbc7 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/17.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png new file mode 100644 index 0000000..d3f3cfd Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/18.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png new file mode 100644 index 0000000..eb2855b Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/19.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png new file mode 100644 index 0000000..3cb5ce1 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/8.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png new file mode 100644 index 0000000..384d354 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/11/9.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/2.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/2.png new file mode 100644 index 0000000..baf3f06 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/2.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/3.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/3.png new file mode 100644 index 0000000..ccaf617 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/3.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/4.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/4.png new file mode 100644 index 0000000..7dab162 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/jigsaw/slidingBlock/4.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg1.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg1.png new file mode 100644 index 0000000..14e7345 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg1.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg10.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg10.png new file mode 100644 index 0000000..1ea1d6d Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg10.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg2.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg2.png new file mode 100644 index 0000000..0edb329 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg2.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg3.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg3.png new file mode 100644 index 0000000..9167996 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg3.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg4.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg4.png new file mode 100644 index 0000000..e8e8e6c Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg4.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg5.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg5.png new file mode 100644 index 0000000..66a3181 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg5.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg6.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg6.png new file mode 100644 index 0000000..9b0f5d8 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg6.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg7.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg7.png new file mode 100644 index 0000000..db41c74 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg7.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg8.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg8.png new file mode 100644 index 0000000..3496813 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg8.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg9.png b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg9.png new file mode 100644 index 0000000..4e7b477 Binary files /dev/null and b/yudao-module-system/yudao-module-system-biz/src/main/resources/images/pic-click/bg9.png differ diff --git a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java index 344ae13..c800f58 100644 --- a/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java +++ b/yudao-module-system/yudao-module-system-biz/src/test/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImplTest.java @@ -207,8 +207,8 @@ public class AdminAuthServiceImplTest extends BaseDbUnitTest { public void testSmsLogin_success() { // 准备参数 String mobile = randomString(); - String scene = randomString(); - AuthSmsLoginReqVO reqVO = new AuthSmsLoginReqVO(mobile, scene); + String code = randomString(); + AuthSmsLoginReqVO reqVO = new AuthSmsLoginReqVO(mobile, code); // mock 方法（用户信息） AdminUserDO user = randomPojo(AdminUserDO.class, o -> o.setId(1L)); when(userService.getUserByMobile(eq(mobile))).thenReturn(user); -- libgit2 0.21.4