sinvo/tianai-captcha
1
0
Fork 0
mirror of https://github.com/dromara/tianai-captcha.git synced 2026-05-07 06:04:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化

Browse Source
This commit is contained in:
天爱有情
2022-05-07 11:14:15 +08:00
parent d802fd481a
commit afbb88c67d
46 changed files with 376 additions and 260 deletions
Download Patch File Download Diff File Expand all files Collapse all files
image/3.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 106 KiB

image/6.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 59 KiB

After

Width:  |  Height:  |  Size: 36 KiB

pom.xml
+2 -2
View File
@@ -4,10 +4,10 @@
<modelVersion>4.0.0</modelVersion> <modelVersion>4.0.0</modelVersion>
<groupId>cloud.tianai.captcha</groupId> <groupId>cloud.tianai.captcha</groupId>
<artifactId>tianai-captcha</artifactId> <artifactId>tianai-captcha</artifactId>
<version>1.3.1.alpha</version> <version>1.3.1</version>
<name>tianai-captcha</name> <name>tianai-captcha</name>
<description>滑块验证码</description> <description>行为验证码</description>
<url>https://gitee.com/tianai/tianai-captcha</url> <url>https://gitee.com/tianai/tianai-captcha</url>
<properties> <properties>
readme.md
+118 -54
View File
@@ -1,4 +1,4 @@
这是一个滑块验证码的实现 这是一个行为验证码的实现
## [在线体验](https://www.tianai.cloud) ## [在线体验](https://www.tianai.cloud)
@@ -6,18 +6,27 @@
![](image/1.png) ![](image/1.png)
![](image/2.png) ![](image/2.png)
![](image/3.png)
![](image/4.png) ![](image/4.png)
![](image/5.png) ![](image/5.png)
![](image/6.png) ![](image/6.png)
![](image/7.png)
![](image/9.png)
![](image/10.png)
![](image/11.png)
![](image/12.png)
- 该滑块验证码实现了 普通图片和 **webp**图片两种格式 ## 简单介绍
- java获取滑块验证码例子 - tianai-captcha 目前支持的行为验证码类型
- 滑块验证码
- 旋转验证码
- 滑动还原验证码
- 文字点选验证码
- 后面会陆续支持市面上更多好玩的验证码玩法... 敬请期待
- 该滑块验证码实现了 普通图片和 **webp**(拷贝github大神开源的webp图片生成代码)图片两种格式
## 快速上手 ## 快速上手
-
如果是SpringBoot开发者可直接使用SpringBoot快速启动器[tianai-captcha-springboot-starter](https://gitee.com/tianai/tianai-captcha-springboot-starter) 如果是SpringBoot开发者可直接使用SpringBoot快速启动器[tianai-captcha-springboot-starter](https://gitee.com/tianai/tianai-captcha-springboot-starter)
### 1. 导入xml ### 1. 导入xml
@@ -27,47 +36,59 @@
<dependency> <dependency>
<groupId>cloud.tianai.captcha</groupId> <groupId>cloud.tianai.captcha</groupId>
<artifactId>tianai-captcha</artifactId> <artifactId>tianai-captcha</artifactId>
<version>1.3.0.RELEASE</version> <version>1.3.1</version>
</dependency> </dependency>
``` ```
### 2. 使用 `SliderCaptchaGenerator`生成器生成滑块验证码 ### 2. 使用 `ImageCaptchaGenerator`生成器生成验证码
```java ```java
import cloud.tianai.captcha.template.slider.generator.impl.StandardSliderImageCaptchaGenerator; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.generator.impl.StandardSliderCaptchaGenerator; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.generator.impl.MultiImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.resource.impl.DefaultImageCaptchaResourceManager; import cloud.tianai.captcha.generator.impl.StandardSliderImageCaptchaGenerator;
import cloud.tianai.captcha.generator.impl.StandardSliderCaptchaGenerator;
import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.resource.impl.DefaultImageCaptchaResourceManager;
public class Test { public class Test {
public static void main(String[] args) throws InterruptedException { public static void main(String[] args) throws InterruptedException {
ImageCaptchaResourceManager imageCaptchaResourceManager = new DefaultImageCaptchaResourceManager(); ImageCaptchaResourceManager imageCaptchaResourceManager = new DefaultImageCaptchaResourceManager();
StandardSliderImageCaptchaGenerator sliderCaptchaGenerator = new StandardSliderImageCaptchaGenerator(imageCaptchaResourceManager, true); MultiImageCaptchaGenerator imageCaptchaGenerator = new MultiImageCaptchaGenerator(imageCaptchaResourceManager, true);
// 生成滑块图片 /*
SliderCaptchaInfo slideImageInfo = sliderCaptchaGenerator.generateCaptchaImage(); 生成滑块验证码图片, 可选项
System.out.println(slideImageInfo); SLIDER (滑块验证码)
ROTATE (旋转验证码)
CONCAT (滑动还原验证码)
WORD_IMAGE_CLICK (文字点选验证码)
更多验证码支持 详见 cloud.tianai.captcha.common.constant.CaptchaTypeConstant
*/
ImageCaptchaInfo imageCaptchaInfo = imageCaptchaGenerator.generateCaptchaImage(CaptchaTypeConstant.SLIDER);
System.out.println(imageCaptchaInfo);
// 负责计算一些数据存到缓存中，用于校验使用 // 负责计算一些数据存到缓存中，用于校验使用
// SliderCaptchaValidator负责校验用户滑动滑块是否正确和生成滑块的一些校验数据; 比如滑块到凹槽的百分比值 // ImageCaptchaValidator负责校验用户滑动滑块是否正确和生成滑块的一些校验数据; 比如滑块到凹槽的百分比值
SliderCaptchaValidator sliderCaptchaValidator = new BasicCaptchaTrackValidator(); ImageCaptchaValidator imageCaptchaValidator = new BasicCaptchaTrackValidator();
// 这个map数据应该存到缓存中，校验的时候需要用到该数据 // 这个map数据应该存到缓存中，校验的时候需要用到该数据
Map<String, Object> map = sliderCaptchaValidator.generateSliderCaptchaValidData(slideImageInfo); Map<String, Object> map = imageCaptchaValidator.generateSliderCaptchaValidData(imageCaptchaInfo);
} }
} }
``` ```
### 3. 使用`SliderCaptchaValidator`校验器 验证 ### 3. 使用`ImageCaptchaGenerator`校验器 验证
```java ```java
import cloud.tianai.captcha.template.slider.generator.ImageCaptchaGenerator; import cloud.tianai.captcha.generator.ImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.generator.SliderCaptchaGenerator; import cloud.tianai.captcha.generator.SliderCaptchaGenerator;
import cloud.tianai.captcha.validator.ImageCaptchaValidator;
public class Test2 { public class Test2 {
public static void main(String[] args) { public static void main(String[] args) {
ImageCaptchaGenerator sliderCaptchaValidator = new BasicCaptchaTrackValidator(); ImageCaptchaValidator sliderCaptchaValidator = new BasicCaptchaTrackValidator();
// 用户传来的行为轨迹和进行校验 // 用户传来的行为轨迹和进行校验
// - sliderCaptchaTrack为前端传来的滑动轨迹数据 // - imageCaptchaTrack为前端传来的滑动轨迹数据
// - map 为生成验证码时缓存的map数据 // - map 为生成验证码时缓存的map数据
boolean check = sliderCaptchaValidator.valid(imageCaptchaTrack, map); boolean check = sliderCaptchaValidator.valid(imageCaptchaTrack, map);
// 如果只想校验用户是否滑到指定凹槽即可，也可以使用 // 如果只想校验用户是否滑到指定凹槽即可，也可以使用
@@ -80,14 +101,14 @@ public class Test2 {
## 整体架构设计 ## 整体架构设计
> tianai-captcha 验证码整体分为 生成器(`SliderCaptchaGenerator`)、校验器(`SliderCaptchaValidato`r)、资源管理器(`SliderCaptchaResourceManager`) > tianai-captcha 验证码整体分为 生成器(`ImageCaptchaGenerator`)、校验器(`ImageCaptchaValidator`)、资源管理器(`ImageCaptchaResourceManager`)
> 其中生成器、校验器、资源管理器等都是基于接口模式实现 可插拔的，可以替换为自定义实现，灵活度高 > 其中生成器、校验器、资源管理器等都是基于接口模式实现 可插拔的，可以替换为自定义实现，灵活度高
- 生成器(`SliderCaptchaGenerator`) - 生成器(`ImageCaptchaGenerator`)
- 主要负责生成滑块验证码所需的图片 - 主要负责生成滑块验证码所需的图片
- 校验器(`SliderCaptchaValidator`) - 校验器(`ImageCaptchaValidator`)
- 主要负责校验用户滑动的行为轨迹是否合规 - 主要负责校验用户滑动的行为轨迹是否合规
- 资源管理器(`SliderCaptchaResourceManager`) - 资源管理器(`ImageCaptchaResourceManager`)
- 主要负责读取验证码背景图片和模板图片等 - 主要负责读取验证码背景图片和模板图片等
- 资源管理器细分为 资源存储(`ResourceStore`)、资源提供者(`ResourceProvider`) - 资源管理器细分为 资源存储(`ResourceStore`)、资源提供者(`ResourceProvider`)
- 资源存储(`ResourceStore`) 负责存储背景图和模板图 - 资源存储(`ResourceStore`) 负责存储背景图和模板图
@@ -95,17 +116,26 @@ public class Test2 {
- 一般资源存储器中存储的是图片的url地址或者id之类， 资源提供者 就是负责将url或者别的id转换为真正的图片文件 - 一般资源存储器中存储的是图片的url地址或者id之类， 资源提供者 就是负责将url或者别的id转换为真正的图片文件
## 扩展 ## 扩展
### 生成带有混淆滑块的图片 ### 生成带有混淆滑块的图片
```java ```java
import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.generator.ImageCaptchaGenerator;
import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.generator.impl.MultiImageCaptchaGenerator;
import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.resource.impl.DefaultImageCaptchaResourceManager;
public class Test { public class Test {
public static void main(String[] args) { public static void main(String[] args) {
// 资源管理器 // 资源管理器
SliderCaptchaResourceManager imageCaptchaResourceManager = new DefaultSliderCaptchaResourceManager(); ImageCaptchaResourceManager imageCaptchaResourceManager = new DefaultImageCaptchaResourceManager();
// 标准验证码生成器 // 标准验证码生成器
StandardSliderCaptchaGenerator sliderCaptchaGenerator = new StandardSliderCaptchaGenerator(imageCaptchaResourceManager, true); ImageCaptchaGenerator imageCaptchaGenerator = new MultiImageCaptchaGenerator(imageCaptchaResourceManager, true);
// 生成滑块图片 // 生成 具有混淆的 滑块验证码 (目前只有滑块验证码支持混淆滑块， 旋转验证，滑动还原，点选验证 均不支持混淆功能)
SliderCaptchaInfo slideImageInfo = sliderCaptchaGenerator.generateSlideImageInfo(GenerateParam.builder() ImageCaptchaInfo imageCaptchaInfo = imageCaptchaGenerator.generateCaptchaImage(GenerateParam.builder()
.type(CaptchaTypeConstant.SLIDER)
.sliderFormatName("jpeg") .sliderFormatName("jpeg")
.backgroundFormatName("png") .backgroundFormatName("png")
// 是否添加混淆滑块 // 是否添加混淆滑块
@@ -118,18 +148,23 @@ public class Test {
### 生成webp格式的滑块图片 ### 生成webp格式的滑块图片
```java ```java
import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.generator.ImageCaptchaGenerator;
import cloud.tianai.captcha.generator.impl.MultiImageCaptchaGenerator;
import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.resource.impl.DefaultImageCaptchaResourceManager;
public class Test { public class Test {
public static void main(String[] args) { public static void main(String[] args) {
// 资源管理器 // 资源管理器
SliderCaptchaResourceManager imageCaptchaResourceManager = new DefaultSliderCaptchaResourceManager(); ImageCaptchaResourceManager imageCaptchaResourceManager = new DefaultImageCaptchaResourceManager();
// 标准验证码生成器 // 标准验证码生成器
StandardSliderCaptchaGenerator sliderCaptchaGenerator = new StandardSliderCaptchaGenerator(imageCaptchaResourceManager, true); ImageCaptchaGenerator imageCaptchaGenerator = new MultiImageCaptchaGenerator(imageCaptchaResourceManager, true);
// 生成滑块图片 // 生成旋转验证码 图片类型为 webp
SliderCaptchaInfo slideImageInfo = sliderCaptchaGenerator.generateSlideImageInfo(GenerateParam.builder() SliderCaptchaInfo slideImageInfo = sliderCaptchaGenerator.generateSlideImageInfo(GenerateParam.builder()
.type(CaptchaTypeConstant.ROTATE)
.sliderFormatName("webp") .sliderFormatName("webp")
.backgroundFormatName("webp") .backgroundFormatName("webp")
// 是否添加混淆滑块
.obfuscate(false)
.build()); .build());
} }
} }
@@ -140,8 +175,16 @@ public class Test {
- 自定义图片资源大小为 590*360 格式为jpg - 自定义图片资源大小为 590*360 格式为jpg
```java ```java
public class Test { import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.resource.ResourceStore;
import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.resource.impl.DefaultImageCaptchaResourceManager;
import cloud.tianai.captcha.resource.impl.provider.ClassPathResourceProvider;
import cloud.tianai.captcha.resource.impl.provider.URLResourceProvider;
public class Test {
public static void main(String[] args) { public static void main(String[] args) {
ImageCaptchaResourceManager imageCaptchaResourceManager = new DefaultImageCaptchaResourceManager();
// 通过资源管理器或者资源存储器 // 通过资源管理器或者资源存储器
ResourceStore resourceStore = imageCaptchaResourceManager.getResourceStore(); ResourceStore resourceStore = imageCaptchaResourceManager.getResourceStore();
// 添加classpath目录下的 aa.jpg 图片 // 添加classpath目录下的 aa.jpg 图片
@@ -162,11 +205,17 @@ public class Test {
- 模板大小为 110*360 格式为png，该图为固定格式，是一张纯透明图片 - 模板大小为 110*360 格式为png，该图为固定格式，是一张纯透明图片
```java ```java
public class Test { import cloud.tianai.captcha.generator.common.constant.SliderCaptchaConstant;
import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.resource.ResourceStore;
import cloud.tianai.captcha.resource.impl.DefaultImageCaptchaResourceManager;
public class Test {
public static void main(String[] args) { public static void main(String[] args) {
ImageCaptchaResourceManager imageCaptchaResourceManager = new DefaultImageCaptchaResourceManager();
// 通过资源管理器或者资源存储器 // 通过资源管理器或者资源存储器
ResourceStore resourceStore = imageCaptchaResourceManager.getResourceStore(); ResourceStore resourceStore = imageCaptchaResourceManager.getResourceStore();
// 添加模板.模板图片由三张图片组成 // 添加滑块验证码模板.模板图片由三张图片组成
Map<String, Resource> template1 = new HashMap<>(4); Map<String, Resource> template1 = new HashMap<>(4);
template1.put(SliderCaptchaConstant.TEMPLATE_ACTIVE_IMAGE_NAME, new Resource(ClassPathResourceProvider.NAME, "/active.png")); template1.put(SliderCaptchaConstant.TEMPLATE_ACTIVE_IMAGE_NAME, new Resource(ClassPathResourceProvider.NAME, "/active.png"));
template1.put(SliderCaptchaConstant.TEMPLATE_FIXED_IMAGE_NAME, new Resource(ClassPathResourceProvider.NAME, "/fixed.png")); template1.put(SliderCaptchaConstant.TEMPLATE_FIXED_IMAGE_NAME, new Resource(ClassPathResourceProvider.NAME, "/fixed.png"));
@@ -181,45 +230,61 @@ public class Test {
- 清除内置的图片资源和模板资源 - 清除内置的图片资源和模板资源
```java ```java
import cloud.tianai.captcha.generator.ImageCaptchaGenerator;
import cloud.tianai.captcha.generator.impl.MultiImageCaptchaGenerator;
public class Test { public class Test {
public static void main(String[] args) { public static void main(String[] args) {
//为方便快速上手 系统本身自带了一张图片和两套滑块模板，如果不想用系统自带的可以不让它加载系统自带的 //为方便快速上手 系统本身自带了一张图片和两套滑块模板，如果不想用系统自带的可以不让它加载系统自带的
// 第二个构造参数设置为false时将不加载默认的图片和模板 // 第二个构造参数设置为false时将不加载默认的图片和模板
SliderCaptchaGenerator sliderCaptchaGenerator = new StandardSliderCaptchaGenerator(imageCaptchaResourceManager, false); ImageCaptchaGenerator imageCaptchaGenerator = new MultiImageCaptchaGenerator(imageCaptchaResourceManager, false);
} }
} }
``` ```
### 自定义 `SliderCaptchaValidator` 校验器 ### 自定义 `imageCaptchaValidator` 校验器
```java ```java
// 该接口负责对用户滑动验证码后传回的数据进行校验，比如滑块是否滑到指定位置，滑块行为轨迹是否正常等等 // 该接口负责对用户滑动验证码后传回的数据进行校验，比如滑块是否滑到指定位置，滑块行为轨迹是否正常等等
// 该接口的默认实现有 // 该接口的默认实现有
// SimpleSliderCaptchaValidator 校验用户是否滑到了指定缺口处 // SimpleImageCaptchaValidator 校验用户是否滑到了指定缺口处
// BasicCaptchaTrackValidator 是对 SimpleSliderCaptchaValidator增强 // BasicCaptchaTrackValidator 是对 SimpleImageCaptchaValidator增强
// BasicCaptchaTrackValidator是对SimpleSliderCaptchaValidator的增强 对滑动轨迹进行了简单的验证 // BasicCaptchaTrackValidator是对SimpleImageCaptchaValidator的增强 对滑动轨迹进行了简单的验证
// 友情提示 因为BasicCaptchaTrackValidator 里面校验滑动轨迹的算法已经开源，有强制要求的建议重写该接口的方法，避免被破解 // 友情提示 因为BasicCaptchaTrackValidator 里面校验滑动轨迹的算法已经开源，有强制要求的建议重写该接口的方法，避免被破解
``` ```
### 自定义 `ResourceProvider` 实现自定义文件读取策略， 比如 oss之类的 ### 自定义 `ResourceProvider` 实现自定义文件读取策略， 比如 oss之类的
```java ```java
public class Test { import cloud.tianai.captcha.generator.ImageCaptchaGenerator;
import cloud.tianai.captcha.generator.impl.MultiImageCaptchaGenerator;
import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.resource.impl.DefaultImageCaptchaResourceManager;
public class Test {
public static void main(String[] args) { public static void main(String[] args) {
// 实现了 ResourceProvider 后 // 实现了 ResourceProvider 后
SliderCaptchaResourceManager imageCaptchaResourceManager = new DefaultSliderCaptchaResourceManager(); ImageCaptchaResourceManager imageCaptchaResourceManager = new DefaultImageCaptchaResourceManager();
StandardSliderCaptchaGenerator sliderCaptchaGenerator = new StandardSliderCaptchaGenerator(imageCaptchaResourceManager, true); ImageCaptchaGenerator imageCaptchaGenerator = new MultiImageCaptchaGenerator(imageCaptchaResourceManager, true);
// 注册 // 注册
imageCaptchaResourceManager.registerResourceProvider(new CustomResourceProvider()); imageCaptchaResourceManager.registerResourceProvider(new CustomResourceProvider());
} }
} }
``` ```
### 扩展，对`StandardSliderCaptchaGenerator`增加了缓存模块 ### 扩展，对`StandardImageCaptchaGenerator`增加了缓存模块
> 由于实时生成滑块图片可能会有一点性能影响，内部基于`StandardSliderCaptchaGenerator`进行了提前缓存生成好的图片，`CacheSliderCaptchaGenerator` 这只是基本的缓存逻辑，比较简单，用户可以定义一些更加有意思的扩展，用于突破性能瓶颈 > 由于实时生成滑块图片可能会有一点性能影响，内部基于`StandardSliderCaptchaGenerator`进行了提前缓存生成好的图片，`CacheSliderCaptchaGenerator` 这只是基本的缓存逻辑，比较简单，用户可以定义一些更加有意思的扩展，用于突破性能瓶颈
```java ```java
import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.generator.ImageCaptchaGenerator;
import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.generator.impl.CacheImageCaptchaGenerator;
import cloud.tianai.captcha.generator.impl.MultiImageCaptchaGenerator;
import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.resource.impl.DefaultImageCaptchaResourceManager;
public class Test { public class Test {
public static void main(String[] args) throws InterruptedException { public static void main(String[] args) throws InterruptedException {
// 使用 CacheSliderCaptchaGenerator 对滑块验证码进行缓存，使其提前生成滑块图片 // 使用 CacheSliderCaptchaGenerator 对滑块验证码进行缓存，使其提前生成滑块图片
@@ -227,17 +292,16 @@ public class Test {
// 参数二: 默认提前缓存多少个 // 参数二: 默认提前缓存多少个
// 参数三: 出错后 等待xx时间再进行生成 // 参数三: 出错后 等待xx时间再进行生成
// 参数四: 检查时间间隔 // 参数四: 检查时间间隔
SliderCaptchaResourceManager imageCaptchaResourceManager = new DefaultSliderCaptchaResourceManager(); ImageCaptchaResourceManager imageCaptchaResourceManager = new DefaultImageCaptchaResourceManager();
SliderCaptchaGenerator sliderCaptchaGenerator = new CacheSliderCaptchaGenerator(new StandardSliderCaptchaGenerator(imageCaptchaResourceManager, true), 10, 1000, 100); ImageCaptchaGenerator imageCaptchaGenerator = new CacheImageCaptchaGenerator(new MultiImageCaptchaGenerator(imageCaptchaResourceManager, true), 10, 1000, 100);
// 生成滑块图片 // 生成滑块图片
SliderCaptchaInfo slideImageInfo = sliderCaptchaGenerator.generateSlideImageInfo(); ImageCaptchaInfo slideImageInfo = imageCaptchaGenerator.generateCaptchaImage(CaptchaTypeConstant.SLIDER);
// 获取背景图片的base64 // 获取背景图片的base64
String backgroundImage = slideImageInfo.getBackgroundImage(); String backgroundImage = slideImageInfo.getBackgroundImage();
// 获取滑块图片 // 获取滑块图片
slideImageInfo.getSliderImage(); String sliderImage = slideImageInfo.getSliderImage();
System.out.println(slideImageInfo); System.out.println(slideImageInfo);
} }
} }
``` ```
# qq群: 1021884609 # qq群: 1021884609
src/main/java/cloud/tianai/captcha/template/slider/common/constant/CaptchaTypeConstant.java → src/main/java/cloud/tianai/captcha/common/constant/CaptchaTypeConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cloud.tianai.captcha.template.slider.common.constant; package cloud.tianai.captcha.common.constant;
/** /**
* @Author: 天爱有情 * @Author: 天爱有情
src/main/java/cloud/tianai/captcha/template/slider/common/exception/ImageCaptchaException.java → src/main/java/cloud/tianai/captcha/common/exception/ImageCaptchaException.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cloud.tianai.captcha.template.slider.common.exception; package cloud.tianai.captcha.common.exception;
/** /**
* @Author: 天爱有情 * @Author: 天爱有情
src/main/java/cloud/tianai/captcha/template/slider/common/util/CaptchaUtils.java → src/main/java/cloud/tianai/captcha/common/util/CaptchaUtils.java
+3 -2
View File
@@ -1,6 +1,7 @@
package cloud.tianai.captcha.template.slider.common.util; package cloud.tianai.captcha.common.util;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
/** /**
* @Author: 天爱有情 * @Author: 天爱有情
src/main/java/cloud/tianai/captcha/template/slider/common/util/CollectionUtils.java → src/main/java/cloud/tianai/captcha/common/util/CollectionUtils.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package cloud.tianai.captcha.template.slider.common.util; package cloud.tianai.captcha.common.util;
import java.util.*; import java.util.*;
src/main/java/cloud/tianai/captcha/template/slider/common/util/FontUtils.java → src/main/java/cloud/tianai/captcha/common/util/FontUtils.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cloud.tianai.captcha.template.slider.common.util; package cloud.tianai.captcha.common.util;
import lombok.SneakyThrows; import lombok.SneakyThrows;
src/main/java/cloud/tianai/captcha/template/slider/common/util/NamedThreadFactory.java → src/main/java/cloud/tianai/captcha/common/util/NamedThreadFactory.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cloud.tianai.captcha.template.slider.common.util; package cloud.tianai.captcha.common.util;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicInteger;
src/main/java/cloud/tianai/captcha/template/slider/common/util/ObjectUtils.java → src/main/java/cloud/tianai/captcha/common/util/ObjectUtils.java
+1 -1
View File
@@ -14,7 +14,7 @@
* limitations under the License. * limitations under the License.
*/ */
package cloud.tianai.captcha.template.slider.common.util; package cloud.tianai.captcha.common.util;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.Arrays; import java.util.Arrays;
src/main/java/cloud/tianai/captcha/template/slider/generator/AbstractImageCaptchaGenerator.java → src/main/java/cloud/tianai/captcha/generator/AbstractImageCaptchaGenerator.java
+4 -4
View File
@@ -1,8 +1,8 @@
package cloud.tianai.captcha.template.slider.generator; package cloud.tianai.captcha.generator;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam; import cloud.tianai.captcha.generator.common.model.dto.GenerateParam;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.SneakyThrows; import lombok.SneakyThrows;
src/main/java/cloud/tianai/captcha/template/slider/generator/ImageCaptchaGenerator.java → src/main/java/cloud/tianai/captcha/generator/ImageCaptchaGenerator.java
+6 -5
View File
@@ -1,9 +1,10 @@
package cloud.tianai.captcha.template.slider.generator; package cloud.tianai.captcha.generator;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.GenerateParam;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
/** /**
* @Author: 天爱有情 * @Author: 天爱有情
src/main/java/cloud/tianai/captcha/template/slider/generator/common/constant/SliderCaptchaConstant.java → src/main/java/cloud/tianai/captcha/generator/common/constant/SliderCaptchaConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cloud.tianai.captcha.template.slider.generator.common.constant; package cloud.tianai.captcha.generator.common.constant;
/** /**
* @Author: 天爱有情 * @Author: 天爱有情
src/main/java/cloud/tianai/captcha/template/slider/generator/common/model/dto/ClickImageCheckDefinition.java → src/main/java/cloud/tianai/captcha/generator/common/model/dto/ClickImageCheckDefinition.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cloud.tianai.captcha.template.slider.generator.common.model.dto; package cloud.tianai.captcha.generator.common.model.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
src/main/java/cloud/tianai/captcha/template/slider/generator/common/model/dto/GenerateParam.java → src/main/java/cloud/tianai/captcha/generator/common/model/dto/GenerateParam.java
+3 -2
View File
@@ -1,6 +1,7 @@
package cloud.tianai.captcha.template.slider.generator.common.model.dto; package cloud.tianai.captcha.generator.common.model.dto;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import lombok.*; import lombok.*;
/** /**
src/main/java/cloud/tianai/captcha/template/slider/generator/common/model/dto/ImageCaptchaInfo.java → src/main/java/cloud/tianai/captcha/generator/common/model/dto/ImageCaptchaInfo.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cloud.tianai.captcha.template.slider.generator.common.model.dto; package cloud.tianai.captcha.generator.common.model.dto;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
src/main/java/cloud/tianai/captcha/template/slider/generator/common/model/dto/RotateImageCaptchaInfo.java → src/main/java/cloud/tianai/captcha/generator/common/model/dto/RotateImageCaptchaInfo.java
+3 -2
View File
@@ -1,6 +1,7 @@
package cloud.tianai.captcha.template.slider.generator.common.model.dto; package cloud.tianai.captcha.generator.common.model.dto;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
src/main/java/cloud/tianai/captcha/template/slider/generator/common/model/dto/SliderImageCaptchaInfo.java → src/main/java/cloud/tianai/captcha/generator/common/model/dto/SliderImageCaptchaInfo.java
+3 -2
View File
@@ -1,6 +1,7 @@
package cloud.tianai.captcha.template.slider.generator.common.model.dto; package cloud.tianai.captcha.generator.common.model.dto;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode; import lombok.EqualsAndHashCode;
import lombok.ToString; import lombok.ToString;
src/main/java/cloud/tianai/captcha/template/slider/generator/common/util/CaptchaImageUtils.java → src/main/java/cloud/tianai/captcha/generator/common/util/CaptchaImageUtils.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cloud.tianai.captcha.template.slider.generator.common.util; package cloud.tianai.captcha.generator.common.util;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import sun.font.FontDesignMetrics; import sun.font.FontDesignMetrics;
src/main/java/cloud/tianai/captcha/template/slider/generator/impl/AbstractClickImageCaptchaGenerator.java → src/main/java/cloud/tianai/captcha/generator/impl/AbstractClickImageCaptchaGenerator.java
+11 -9
View File
@@ -1,11 +1,13 @@
package cloud.tianai.captcha.template.slider.generator.impl; package cloud.tianai.captcha.generator.impl;
import cloud.tianai.captcha.template.slider.generator.AbstractImageCaptchaGenerator; import cloud.tianai.captcha.generator.common.model.dto.ClickImageCheckDefinition;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ClickImageCheckDefinition; import cloud.tianai.captcha.generator.common.util.CaptchaImageUtils;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam; import cloud.tianai.captcha.generator.AbstractImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ClickImageCheckDefinition;
import cloud.tianai.captcha.template.slider.generator.common.util.CaptchaImageUtils; import cloud.tianai.captcha.generator.common.model.dto.GenerateParam;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.generator.common.util.CaptchaImageUtils;
import cloud.tianai.captcha.resource.common.model.dto.Resource;
import lombok.*; import lombok.*;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@@ -14,7 +16,7 @@ import java.io.InputStream;
import java.util.*; import java.util.*;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import static cloud.tianai.captcha.template.slider.generator.common.util.CaptchaImageUtils.wrapFile2BufferedImage; import static cloud.tianai.captcha.generator.common.util.CaptchaImageUtils.wrapFile2BufferedImage;
/** /**
* @Author: 天爱有情 * @Author: 天爱有情
@@ -41,7 +43,7 @@ public abstract class AbstractClickImageCaptchaGenerator extends AbstractImageCa
Resource resourceImage = getImageResourceManager().randomGetResource(param.getType()); Resource resourceImage = getImageResourceManager().randomGetResource(param.getType());
InputStream resourceInputStream = getImageResourceManager().getResourceInputStream(resourceImage); InputStream resourceInputStream = getImageResourceManager().getResourceInputStream(resourceImage);
inputStreams.add(resourceInputStream); inputStreams.add(resourceInputStream);
BufferedImage bgImage = wrapFile2BufferedImage(resourceInputStream); BufferedImage bgImage = CaptchaImageUtils.wrapFile2BufferedImage(resourceInputStream);
List<ClickImageCheckDefinition> clickImageCheckDefinitionList = new ArrayList<>(interferenceCount); List<ClickImageCheckDefinition> clickImageCheckDefinitionList = new ArrayList<>(interferenceCount);
int allImages = interferenceCount + checkClickCount; int allImages = interferenceCount + checkClickCount;
src/main/java/cloud/tianai/captcha/template/slider/generator/impl/CacheImageCaptchaGenerator.java → src/main/java/cloud/tianai/captcha/generator/impl/CacheImageCaptchaGenerator.java
+7 -6
View File
@@ -1,10 +1,11 @@
package cloud.tianai.captcha.template.slider.generator.impl; package cloud.tianai.captcha.generator.impl;
import cloud.tianai.captcha.template.slider.common.util.NamedThreadFactory; import cloud.tianai.captcha.common.util.NamedThreadFactory;
import cloud.tianai.captcha.template.slider.generator.ImageCaptchaGenerator; import cloud.tianai.captcha.common.util.NamedThreadFactory;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam; import cloud.tianai.captcha.generator.ImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.GenerateParam;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.SneakyThrows; import lombok.SneakyThrows;
src/main/java/cloud/tianai/captcha/template/slider/generator/impl/MultiImageCaptchaGenerator.java → src/main/java/cloud/tianai/captcha/generator/impl/MultiImageCaptchaGenerator.java
+8 -8
View File
@@ -1,12 +1,12 @@
package cloud.tianai.captcha.template.slider.generator.impl; package cloud.tianai.captcha.generator.impl;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.common.util.ObjectUtils; import cloud.tianai.captcha.common.util.ObjectUtils;
import cloud.tianai.captcha.template.slider.generator.AbstractImageCaptchaGenerator; import cloud.tianai.captcha.generator.AbstractImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.generator.ImageCaptchaGenerator; import cloud.tianai.captcha.generator.ImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam; import cloud.tianai.captcha.generator.common.model.dto.GenerateParam;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
src/main/java/cloud/tianai/captcha/template/slider/generator/impl/StandardConcatImageCaptchaGenerator.java → src/main/java/cloud/tianai/captcha/generator/impl/StandardConcatImageCaptchaGenerator.java
+11 -11
View File
@@ -1,13 +1,13 @@
package cloud.tianai.captcha.template.slider.generator.impl; package cloud.tianai.captcha.generator.impl;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.generator.AbstractImageCaptchaGenerator; import cloud.tianai.captcha.generator.AbstractImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam; import cloud.tianai.captcha.generator.common.model.dto.GenerateParam;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.template.slider.resource.ResourceStore; import cloud.tianai.captcha.resource.ResourceStore;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.template.slider.resource.impl.provider.ClassPathResourceProvider; import cloud.tianai.captcha.resource.impl.provider.ClassPathResourceProvider;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@@ -17,8 +17,8 @@ import java.util.Collection;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import static cloud.tianai.captcha.template.slider.generator.common.util.CaptchaImageUtils.*; import static cloud.tianai.captcha.generator.common.util.CaptchaImageUtils.*;
import static cloud.tianai.captcha.template.slider.generator.impl.StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_RESOURCE_PATH; import static cloud.tianai.captcha.generator.impl.StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_RESOURCE_PATH;
/** /**
* @Author: 天爱有情 * @Author: 天爱有情
src/main/java/cloud/tianai/captcha/template/slider/generator/impl/StandardRandomWordClickImageCaptchaGenerator.java → src/main/java/cloud/tianai/captcha/generator/impl/StandardRandomWordClickImageCaptchaGenerator.java
+17 -13
View File
@@ -1,15 +1,19 @@
package cloud.tianai.captcha.template.slider.generator.impl; package cloud.tianai.captcha.generator.impl;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.common.util.FontUtils; import cloud.tianai.captcha.common.util.FontUtils;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ClickImageCheckDefinition; import cloud.tianai.captcha.generator.common.model.dto.ClickImageCheckDefinition;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam; import cloud.tianai.captcha.generator.common.util.CaptchaImageUtils;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.generator.common.util.CaptchaImageUtils; import cloud.tianai.captcha.common.util.FontUtils;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.generator.common.model.dto.ClickImageCheckDefinition;
import cloud.tianai.captcha.template.slider.resource.ResourceStore; import cloud.tianai.captcha.generator.common.model.dto.GenerateParam;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.resource.impl.provider.ClassPathResourceProvider; import cloud.tianai.captcha.generator.common.util.CaptchaImageUtils;
import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.resource.ResourceStore;
import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.resource.impl.provider.ClassPathResourceProvider;
import lombok.Data; import lombok.Data;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import sun.font.FontDesignMetrics; import sun.font.FontDesignMetrics;
@@ -21,7 +25,7 @@ import java.util.List;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static cloud.tianai.captcha.template.slider.generator.impl.StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_RESOURCE_PATH; import static cloud.tianai.captcha.generator.impl.StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_RESOURCE_PATH;
/** /**
* @Author: 天爱有情 * @Author: 天爱有情
@@ -73,7 +77,7 @@ public class StandardRandomWordClickImageCaptchaGenerator extends AbstractClickI
public void initDefaultResource() { public void initDefaultResource() {
ResourceStore resourceStore = imageCaptchaResourceManager.getResourceStore(); ResourceStore resourceStore = imageCaptchaResourceManager.getResourceStore();
// 添加一些系统的资源文件 // 添加一些系统的资源文件
resourceStore.addResource(CaptchaTypeConstant.WORD_IMAGE_CLICK, new Resource(ClassPathResourceProvider.NAME, DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/1.jpg"))); resourceStore.addResource(CaptchaTypeConstant.WORD_IMAGE_CLICK, new Resource(ClassPathResourceProvider.NAME, StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/1.jpg")));
} }
@Override @Override
src/main/java/cloud/tianai/captcha/template/slider/generator/impl/StandardRotateImageCaptchaGenerator.java → src/main/java/cloud/tianai/captcha/generator/impl/StandardRotateImageCaptchaGenerator.java
+38 -27
View File
@@ -1,15 +1,26 @@
package cloud.tianai.captcha.template.slider.generator.impl; package cloud.tianai.captcha.generator.impl;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.generator.AbstractImageCaptchaGenerator; import cloud.tianai.captcha.generator.AbstractImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.generator.common.constant.SliderCaptchaConstant; import cloud.tianai.captcha.generator.common.constant.SliderCaptchaConstant;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam; import cloud.tianai.captcha.generator.common.model.dto.GenerateParam;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.RotateImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.RotateImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.generator.common.util.CaptchaImageUtils;
import cloud.tianai.captcha.template.slider.resource.ResourceStore; import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.ResourceStore;
import cloud.tianai.captcha.template.slider.resource.impl.provider.ClassPathResourceProvider; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.resource.impl.provider.ClassPathResourceProvider;
import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.generator.AbstractImageCaptchaGenerator;
import cloud.tianai.captcha.generator.common.constant.SliderCaptchaConstant;
import cloud.tianai.captcha.generator.common.model.dto.GenerateParam;
import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.generator.common.model.dto.RotateImageCaptchaInfo;
import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.resource.ResourceStore;
import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.resource.impl.provider.ClassPathResourceProvider;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
@@ -21,9 +32,9 @@ import java.util.LinkedList;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import static cloud.tianai.captcha.template.slider.generator.common.util.CaptchaImageUtils.*; import static cloud.tianai.captcha.generator.common.util.CaptchaImageUtils.*;
import static cloud.tianai.captcha.template.slider.generator.impl.StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_RESOURCE_PATH; import static cloud.tianai.captcha.generator.impl.StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_RESOURCE_PATH;
import static cloud.tianai.captcha.template.slider.generator.impl.StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH; import static cloud.tianai.captcha.generator.impl.StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH;
/** /**
* @Author: 天爱有情 * @Author: 天爱有情
@@ -44,13 +55,13 @@ public class StandardRotateImageCaptchaGenerator extends AbstractImageCaptchaGen
public void initDefaultResource() { public void initDefaultResource() {
ResourceStore resourceStore = imageCaptchaResourceManager.getResourceStore(); ResourceStore resourceStore = imageCaptchaResourceManager.getResourceStore();
// 添加一些系统的资源文件 // 添加一些系统的资源文件
resourceStore.addResource(CaptchaTypeConstant.ROTATE, new Resource(ClassPathResourceProvider.NAME, DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/1.jpg"))); resourceStore.addResource(CaptchaTypeConstant.ROTATE, new Resource(ClassPathResourceProvider.NAME, StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/1.jpg")));
// 添加一些系统的 模板文件 // 添加一些系统的 模板文件
Map<String, Resource> template1 = new HashMap<>(4); Map<String, Resource> template1 = new HashMap<>(4);
template1.put(SliderCaptchaConstant.TEMPLATE_ACTIVE_IMAGE_NAME, new Resource(ClassPathResourceProvider.NAME, DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/3/active.png"))); template1.put(SliderCaptchaConstant.TEMPLATE_ACTIVE_IMAGE_NAME, new Resource(ClassPathResourceProvider.NAME, StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/3/active.png")));
template1.put(SliderCaptchaConstant.TEMPLATE_FIXED_IMAGE_NAME, new Resource(ClassPathResourceProvider.NAME, DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/3/fixed.png"))); template1.put(SliderCaptchaConstant.TEMPLATE_FIXED_IMAGE_NAME, new Resource(ClassPathResourceProvider.NAME, StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/3/fixed.png")));
template1.put(SliderCaptchaConstant.TEMPLATE_MATRIX_IMAGE_NAME, new Resource(ClassPathResourceProvider.NAME, DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/3/matrix.png"))); template1.put(SliderCaptchaConstant.TEMPLATE_MATRIX_IMAGE_NAME, new Resource(ClassPathResourceProvider.NAME, StandardSliderImageCaptchaGenerator.DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/3/matrix.png")));
resourceStore.addTemplate(CaptchaTypeConstant.ROTATE, template1); resourceStore.addTemplate(CaptchaTypeConstant.ROTATE, template1);
} }
@@ -66,34 +77,34 @@ public class StandardRotateImageCaptchaGenerator extends AbstractImageCaptchaGen
Resource resourceImage = imageCaptchaResourceManager.randomGetResource(param.getType()); Resource resourceImage = imageCaptchaResourceManager.randomGetResource(param.getType());
InputStream resourceInputStream = imageCaptchaResourceManager.getResourceInputStream(resourceImage); InputStream resourceInputStream = imageCaptchaResourceManager.getResourceInputStream(resourceImage);
inputStreams.add(resourceInputStream); inputStreams.add(resourceInputStream);
BufferedImage cutBackground = wrapFile2BufferedImage(resourceInputStream); BufferedImage cutBackground = CaptchaImageUtils.wrapFile2BufferedImage(resourceInputStream);
// 拷贝一份图片 // 拷贝一份图片
BufferedImage targetBackground = deepCopyBufferedImage(cutBackground); BufferedImage targetBackground = CaptchaImageUtils.deepCopyBufferedImage(cutBackground);
InputStream fixedTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_FIXED_IMAGE_NAME); InputStream fixedTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_FIXED_IMAGE_NAME);
inputStreams.add(fixedTemplateInput); inputStreams.add(fixedTemplateInput);
BufferedImage fixedTemplate = wrapFile2BufferedImage(fixedTemplateInput); BufferedImage fixedTemplate = CaptchaImageUtils.wrapFile2BufferedImage(fixedTemplateInput);
InputStream activeTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_ACTIVE_IMAGE_NAME); InputStream activeTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_ACTIVE_IMAGE_NAME);
inputStreams.add(activeTemplateInput); inputStreams.add(activeTemplateInput);
BufferedImage activeTemplate = wrapFile2BufferedImage(activeTemplateInput); BufferedImage activeTemplate = CaptchaImageUtils.wrapFile2BufferedImage(activeTemplateInput);
InputStream matrixTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_MATRIX_IMAGE_NAME); InputStream matrixTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_MATRIX_IMAGE_NAME);
inputStreams.add(matrixTemplateInput); inputStreams.add(matrixTemplateInput);
BufferedImage matrixTemplate = wrapFile2BufferedImage(matrixTemplateInput); BufferedImage matrixTemplate = CaptchaImageUtils.wrapFile2BufferedImage(matrixTemplateInput);
// 算出居中的x和y // 算出居中的x和y
int x = targetBackground.getWidth() / 2 - fixedTemplate.getWidth() / 2; int x = targetBackground.getWidth() / 2 - fixedTemplate.getWidth() / 2;
int y = targetBackground.getHeight() / 2 - fixedTemplate.getHeight() / 2; int y = targetBackground.getHeight() / 2 - fixedTemplate.getHeight() / 2;
overlayImage(targetBackground, fixedTemplate, x, y); CaptchaImageUtils.overlayImage(targetBackground, fixedTemplate, x, y);
// 抠图部分 // 抠图部分
BufferedImage cutImage = cutImage(cutBackground, fixedTemplate, x, y); BufferedImage cutImage = CaptchaImageUtils.cutImage(cutBackground, fixedTemplate, x, y);
overlayImage(cutImage, activeTemplate, 0, 0); CaptchaImageUtils.overlayImage(cutImage, activeTemplate, 0, 0);
// 随机旋转抠图部分 // 随机旋转抠图部分
// 随机x， 转换为角度 // 随机x， 转换为角度
int randomX = ThreadLocalRandom.current().nextInt(fixedTemplate.getWidth() + 10, targetBackground.getWidth() - 10); int randomX = ThreadLocalRandom.current().nextInt(fixedTemplate.getWidth() + 10, targetBackground.getWidth() - 10);
double degree = 360d - randomX / ((targetBackground.getWidth()) / 360d); double degree = 360d - randomX / ((targetBackground.getWidth()) / 360d);
centerOverlayAndRotateImage(matrixTemplate, cutImage, degree); CaptchaImageUtils.centerOverlayAndRotateImage(matrixTemplate, cutImage, degree);
return wrapRotateCaptchaInfo(degree, randomX, targetBackground, matrixTemplate, param); return wrapRotateCaptchaInfo(degree, randomX, targetBackground, matrixTemplate, param);
} finally { } finally {
// 使用完后关闭流 // 使用完后关闭流
src/main/java/cloud/tianai/captcha/template/slider/generator/impl/StandardSliderImageCaptchaGenerator.java → src/main/java/cloud/tianai/captcha/generator/impl/StandardSliderImageCaptchaGenerator.java
+24 -22
View File
@@ -1,15 +1,17 @@
package cloud.tianai.captcha.template.slider.generator.impl; package cloud.tianai.captcha.generator.impl;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.generator.AbstractImageCaptchaGenerator; import cloud.tianai.captcha.generator.common.util.CaptchaImageUtils;
import cloud.tianai.captcha.template.slider.generator.common.constant.SliderCaptchaConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam; import cloud.tianai.captcha.generator.AbstractImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.constant.SliderCaptchaConstant;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.SliderImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.GenerateParam;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.resource.ResourceStore; import cloud.tianai.captcha.generator.common.model.dto.SliderImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.template.slider.resource.impl.provider.ClassPathResourceProvider; import cloud.tianai.captcha.resource.ResourceStore;
import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.resource.impl.provider.ClassPathResourceProvider;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -22,7 +24,7 @@ import java.util.LinkedList;
import java.util.Map; import java.util.Map;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
import static cloud.tianai.captcha.template.slider.generator.common.util.CaptchaImageUtils.*; import static cloud.tianai.captcha.generator.common.util.CaptchaImageUtils.*;
/** /**
* @Author: 天爱有情 * @Author: 天爱有情
@@ -65,22 +67,22 @@ public class StandardSliderImageCaptchaGenerator extends AbstractImageCaptchaGen
Resource resourceImage = imageCaptchaResourceManager.randomGetResource(param.getType()); Resource resourceImage = imageCaptchaResourceManager.randomGetResource(param.getType());
InputStream resourceInputStream = imageCaptchaResourceManager.getResourceInputStream(resourceImage); InputStream resourceInputStream = imageCaptchaResourceManager.getResourceInputStream(resourceImage);
inputStreams.add(resourceInputStream); inputStreams.add(resourceInputStream);
BufferedImage cutBackground = wrapFile2BufferedImage(resourceInputStream); BufferedImage cutBackground = CaptchaImageUtils.wrapFile2BufferedImage(resourceInputStream);
// 拷贝一份图片 // 拷贝一份图片
BufferedImage targetBackground = deepCopyBufferedImage(cutBackground); BufferedImage targetBackground = CaptchaImageUtils.deepCopyBufferedImage(cutBackground);
InputStream fixedTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_FIXED_IMAGE_NAME); InputStream fixedTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_FIXED_IMAGE_NAME);
inputStreams.add(fixedTemplateInput); inputStreams.add(fixedTemplateInput);
BufferedImage fixedTemplate = wrapFile2BufferedImage(fixedTemplateInput); BufferedImage fixedTemplate = CaptchaImageUtils.wrapFile2BufferedImage(fixedTemplateInput);
InputStream activeTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_ACTIVE_IMAGE_NAME); InputStream activeTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_ACTIVE_IMAGE_NAME);
inputStreams.add(activeTemplateInput); inputStreams.add(activeTemplateInput);
BufferedImage activeTemplate = wrapFile2BufferedImage(activeTemplateInput); BufferedImage activeTemplate = CaptchaImageUtils.wrapFile2BufferedImage(activeTemplateInput);
InputStream matrixTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_MATRIX_IMAGE_NAME); InputStream matrixTemplateInput = getTemplateFile(templateImages, SliderCaptchaConstant.TEMPLATE_MATRIX_IMAGE_NAME);
inputStreams.add(matrixTemplateInput); inputStreams.add(matrixTemplateInput);
BufferedImage matrixTemplate = wrapFile2BufferedImage(matrixTemplateInput); BufferedImage matrixTemplate = CaptchaImageUtils.wrapFile2BufferedImage(matrixTemplateInput);
// BufferedImage cutTemplate = warpFile2BufferedImage(getTemplateFile(templateImages, CUT_IMAGE_NAME)); // BufferedImage cutTemplate = warpFile2BufferedImage(getTemplateFile(templateImages, CUT_IMAGE_NAME));
@@ -88,15 +90,15 @@ public class StandardSliderImageCaptchaGenerator extends AbstractImageCaptchaGen
int randomX = ThreadLocalRandom.current().nextInt(fixedTemplate.getWidth() + 5, targetBackground.getWidth() - fixedTemplate.getWidth() - 10); int randomX = ThreadLocalRandom.current().nextInt(fixedTemplate.getWidth() + 5, targetBackground.getWidth() - fixedTemplate.getWidth() - 10);
int randomY = ThreadLocalRandom.current().nextInt(targetBackground.getHeight() - fixedTemplate.getHeight()); int randomY = ThreadLocalRandom.current().nextInt(targetBackground.getHeight() - fixedTemplate.getHeight());
overlayImage(targetBackground, fixedTemplate, randomX, randomY); CaptchaImageUtils.overlayImage(targetBackground, fixedTemplate, randomX, randomY);
if (obfuscate) { if (obfuscate) {
// 加入混淆滑块 // 加入混淆滑块
int obfuscateX = randomObfuscateX(randomX, fixedTemplate.getWidth(), targetBackground.getWidth()); int obfuscateX = randomObfuscateX(randomX, fixedTemplate.getWidth(), targetBackground.getWidth());
overlayImage(targetBackground, fixedTemplate, obfuscateX, randomY); CaptchaImageUtils.overlayImage(targetBackground, fixedTemplate, obfuscateX, randomY);
} }
BufferedImage cutImage = cutImage(cutBackground, fixedTemplate, randomX, randomY); BufferedImage cutImage = CaptchaImageUtils.cutImage(cutBackground, fixedTemplate, randomX, randomY);
overlayImage(cutImage, activeTemplate, 0, 0); CaptchaImageUtils.overlayImage(cutImage, activeTemplate, 0, 0);
overlayImage(matrixTemplate, cutImage, 0, randomY); CaptchaImageUtils.overlayImage(matrixTemplate, cutImage, 0, randomY);
return wrapSliderCaptchaInfo(randomX, randomY, targetBackground, matrixTemplate, param); return wrapSliderCaptchaInfo(randomX, randomY, targetBackground, matrixTemplate, param);
} finally { } finally {
// 使用完后关闭流 // 使用完后关闭流
src/main/java/cloud/tianai/captcha/template/slider/resource/AbstractResourceProvider.java → src/main/java/cloud/tianai/captcha/resource/AbstractResourceProvider.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cloud.tianai.captcha.template.slider.resource; package cloud.tianai.captcha.resource;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import java.io.InputStream; import java.io.InputStream;
src/main/java/cloud/tianai/captcha/template/slider/resource/ImageCaptchaResourceManager.java → src/main/java/cloud/tianai/captcha/resource/ImageCaptchaResourceManager.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cloud.tianai.captcha.template.slider.resource; package cloud.tianai.captcha.resource;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import java.io.InputStream; import java.io.InputStream;
import java.util.List; import java.util.List;
src/main/java/cloud/tianai/captcha/template/slider/resource/ResourceProvider.java → src/main/java/cloud/tianai/captcha/resource/ResourceProvider.java
+3 -2
View File
@@ -1,6 +1,7 @@
package cloud.tianai.captcha.template.slider.resource; package cloud.tianai.captcha.resource;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.resource.common.model.dto.Resource;
import java.io.InputStream; import java.io.InputStream;
src/main/java/cloud/tianai/captcha/template/slider/resource/ResourceStore.java → src/main/java/cloud/tianai/captcha/resource/ResourceStore.java
+3 -2
View File
@@ -1,6 +1,7 @@
package cloud.tianai.captcha.template.slider.resource; package cloud.tianai.captcha.resource;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.resource.common.model.dto.Resource;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
src/main/java/cloud/tianai/captcha/template/slider/resource/common/model/dto/Resource.java → src/main/java/cloud/tianai/captcha/resource/common/model/dto/Resource.java
+2 -2
View File
@@ -1,6 +1,6 @@
package cloud.tianai.captcha.template.slider.resource.common.model.dto; package cloud.tianai.captcha.resource.common.model.dto;
import cloud.tianai.captcha.template.slider.resource.ResourceProvider; import cloud.tianai.captcha.resource.ResourceProvider;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
src/main/java/cloud/tianai/captcha/template/slider/resource/impl/DefaultImageCaptchaResourceManager.java → src/main/java/cloud/tianai/captcha/resource/impl/DefaultImageCaptchaResourceManager.java
+10 -8
View File
@@ -1,12 +1,14 @@
package cloud.tianai.captcha.template.slider.resource.impl; package cloud.tianai.captcha.resource.impl;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.template.slider.resource.ResourceProvider; import cloud.tianai.captcha.resource.impl.provider.URLResourceProvider;
import cloud.tianai.captcha.template.slider.resource.ResourceStore; import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.ResourceProvider;
import cloud.tianai.captcha.template.slider.resource.impl.provider.ClassPathResourceProvider; import cloud.tianai.captcha.resource.ResourceStore;
import cloud.tianai.captcha.template.slider.resource.impl.provider.FileResourceProvider; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.template.slider.resource.impl.provider.URLResourceProvider; import cloud.tianai.captcha.resource.impl.provider.ClassPathResourceProvider;
import cloud.tianai.captcha.resource.impl.provider.FileResourceProvider;
import cloud.tianai.captcha.resource.impl.provider.URLResourceProvider;
import java.io.InputStream; import java.io.InputStream;
import java.util.ArrayList; import java.util.ArrayList;
src/main/java/cloud/tianai/captcha/template/slider/resource/impl/DefaultResourceStore.java → src/main/java/cloud/tianai/captcha/resource/impl/DefaultResourceStore.java
+6 -4
View File
@@ -1,8 +1,10 @@
package cloud.tianai.captcha.template.slider.resource.impl; package cloud.tianai.captcha.resource.impl;
import cloud.tianai.captcha.template.slider.common.util.CollectionUtils; import cloud.tianai.captcha.common.util.CollectionUtils;
import cloud.tianai.captcha.template.slider.resource.ResourceStore; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.common.util.CollectionUtils;
import cloud.tianai.captcha.resource.ResourceStore;
import cloud.tianai.captcha.resource.common.model.dto.Resource;
import java.util.*; import java.util.*;
import java.util.concurrent.ThreadLocalRandom; import java.util.concurrent.ThreadLocalRandom;
src/main/java/cloud/tianai/captcha/template/slider/resource/impl/provider/ClassPathResourceProvider.java → src/main/java/cloud/tianai/captcha/resource/impl/provider/ClassPathResourceProvider.java
+5 -3
View File
@@ -1,7 +1,9 @@
package cloud.tianai.captcha.template.slider.resource.impl.provider; package cloud.tianai.captcha.resource.impl.provider;
import cloud.tianai.captcha.template.slider.resource.AbstractResourceProvider; import cloud.tianai.captcha.resource.AbstractResourceProvider;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.resource.AbstractResourceProvider;
import cloud.tianai.captcha.resource.common.model.dto.Resource;
import java.io.InputStream; import java.io.InputStream;
src/main/java/cloud/tianai/captcha/template/slider/resource/impl/provider/FileResourceProvider.java → src/main/java/cloud/tianai/captcha/resource/impl/provider/FileResourceProvider.java
+5 -3
View File
@@ -1,7 +1,9 @@
package cloud.tianai.captcha.template.slider.resource.impl.provider; package cloud.tianai.captcha.resource.impl.provider;
import cloud.tianai.captcha.template.slider.resource.AbstractResourceProvider; import cloud.tianai.captcha.resource.AbstractResourceProvider;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.resource.AbstractResourceProvider;
import cloud.tianai.captcha.resource.common.model.dto.Resource;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import java.io.FileInputStream; import java.io.FileInputStream;
src/main/java/cloud/tianai/captcha/template/slider/resource/impl/provider/URLResourceProvider.java → src/main/java/cloud/tianai/captcha/resource/impl/provider/URLResourceProvider.java
+4 -3
View File
@@ -1,7 +1,8 @@
package cloud.tianai.captcha.template.slider.resource.impl.provider; package cloud.tianai.captcha.resource.impl.provider;
import cloud.tianai.captcha.template.slider.resource.AbstractResourceProvider; import cloud.tianai.captcha.resource.AbstractResourceProvider;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.AbstractResourceProvider;
import cloud.tianai.captcha.resource.common.model.dto.Resource;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import java.io.InputStream; import java.io.InputStream;
src/main/java/cloud/tianai/captcha/template/slider/validator/ImageCaptchaValidator.java → src/main/java/cloud/tianai/captcha/validator/ImageCaptchaValidator.java
+5 -3
View File
@@ -1,7 +1,9 @@
package cloud.tianai.captcha.template.slider.validator; package cloud.tianai.captcha.validator;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.validator.common.model.dto.ImageCaptchaTrack; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack;
import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack;
import java.util.Map; import java.util.Map;
src/main/java/cloud/tianai/captcha/template/slider/validator/common/constant/TrackTypeConstant.java → src/main/java/cloud/tianai/captcha/validator/common/constant/TrackTypeConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cloud.tianai.captcha.template.slider.validator.common.constant; package cloud.tianai.captcha.validator.common.constant;
/** /**
* @Author: 天爱有情 * @Author: 天爱有情
src/main/java/cloud/tianai/captcha/template/slider/validator/common/model/dto/ImageCaptchaTrack.java → src/main/java/cloud/tianai/captcha/validator/common/model/dto/ImageCaptchaTrack.java
+3 -2
View File
@@ -1,6 +1,7 @@
package cloud.tianai.captcha.template.slider.validator.common.model.dto; package cloud.tianai.captcha.validator.common.model.dto;
import cloud.tianai.captcha.template.slider.validator.common.constant.TrackTypeConstant; import cloud.tianai.captcha.validator.common.constant.TrackTypeConstant;
import cloud.tianai.captcha.validator.common.constant.TrackTypeConstant;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.NoArgsConstructor; import lombok.NoArgsConstructor;
src/main/java/cloud/tianai/captcha/template/slider/validator/impl/BasicCaptchaTrackValidator.java → src/main/java/cloud/tianai/captcha/validator/impl/BasicCaptchaTrackValidator.java
+9 -5
View File
@@ -1,9 +1,13 @@
package cloud.tianai.captcha.template.slider.validator.impl; package cloud.tianai.captcha.validator.impl;
import cloud.tianai.captcha.template.slider.common.util.CaptchaUtils; import cloud.tianai.captcha.common.util.CaptchaUtils;
import cloud.tianai.captcha.template.slider.common.util.CollectionUtils; import cloud.tianai.captcha.common.util.CollectionUtils;
import cloud.tianai.captcha.template.slider.common.util.ObjectUtils; import cloud.tianai.captcha.common.util.ObjectUtils;
import cloud.tianai.captcha.template.slider.validator.common.model.dto.ImageCaptchaTrack; import cloud.tianai.captcha.common.util.CaptchaUtils;
import cloud.tianai.captcha.common.util.CollectionUtils;
import cloud.tianai.captcha.common.util.ObjectUtils;
import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack;
import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
src/main/java/cloud/tianai/captcha/template/slider/validator/impl/SimpleImageCaptchaValidator.java → src/main/java/cloud/tianai/captcha/validator/impl/SimpleImageCaptchaValidator.java
+20 -11
View File
@@ -1,14 +1,23 @@
package cloud.tianai.captcha.template.slider.validator.impl; package cloud.tianai.captcha.validator.impl;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.common.util.CaptchaUtils; import cloud.tianai.captcha.common.util.CaptchaUtils;
import cloud.tianai.captcha.template.slider.common.util.CollectionUtils; import cloud.tianai.captcha.common.util.CollectionUtils;
import cloud.tianai.captcha.template.slider.common.util.ObjectUtils; import cloud.tianai.captcha.common.util.ObjectUtils;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ClickImageCheckDefinition; import cloud.tianai.captcha.generator.common.model.dto.ClickImageCheckDefinition;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.validator.ImageCaptchaValidator; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.validator.common.constant.TrackTypeConstant; import cloud.tianai.captcha.common.util.CaptchaUtils;
import cloud.tianai.captcha.template.slider.validator.common.model.dto.ImageCaptchaTrack; import cloud.tianai.captcha.common.util.CollectionUtils;
import cloud.tianai.captcha.common.util.ObjectUtils;
import cloud.tianai.captcha.generator.common.model.dto.ClickImageCheckDefinition;
import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.validator.ImageCaptchaValidator;
import cloud.tianai.captcha.validator.common.constant.TrackTypeConstant;
import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack;
import cloud.tianai.captcha.validator.ImageCaptchaValidator;
import cloud.tianai.captcha.validator.common.constant.TrackTypeConstant;
import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -206,7 +215,7 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator {
return doValidClickCaptcha(imageCaptchaTrack, sliderCaptchaValidData, tolerant, type); return doValidClickCaptcha(imageCaptchaTrack, sliderCaptchaValidData, tolerant, type);
} }
// 不支持的类型 // 不支持的类型
log.warn("校验验证码警告， 不支持的验证码类型:{}, 请手动扩展 cloud.tianai.captcha.template.slider.validator.impl.SimpleImageCaptchaValidator.doValid 进行校验扩展", type); log.warn("校验验证码警告， 不支持的验证码类型:{}, 请手动扩展 cloud.tianai.captcha.validator.impl.SimpleImageCaptchaValidator.doValid 进行校验扩展", type);
return false; return false;
} }
src/main/test/java/example/DrawCaptchaUtil.java
+2 -2
View File
@@ -1,7 +1,7 @@
package example; package example;
import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource; import cloud.tianai.captcha.resource.common.model.dto.Resource;
import cloud.tianai.captcha.template.slider.resource.impl.provider.ClassPathResourceProvider; import cloud.tianai.captcha.resource.impl.provider.ClassPathResourceProvider;
import lombok.SneakyThrows; import lombok.SneakyThrows;
import sun.font.FontDesignMetrics; import sun.font.FontDesignMetrics;
src/main/test/java/example/StandardConcatCaptchaGeneratorTest.java
+10 -10
View File
@@ -1,15 +1,15 @@
package example; package example;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.RotateImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.RotateImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.generator.impl.CacheImageCaptchaGenerator; import cloud.tianai.captcha.generator.impl.CacheImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.generator.impl.StandardConcatImageCaptchaGenerator; import cloud.tianai.captcha.generator.impl.StandardConcatImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.generator.impl.StandardRotateImageCaptchaGenerator; import cloud.tianai.captcha.generator.impl.StandardRotateImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.template.slider.resource.ResourceStore; import cloud.tianai.captcha.resource.ResourceStore;
import cloud.tianai.captcha.template.slider.resource.impl.DefaultImageCaptchaResourceManager; import cloud.tianai.captcha.resource.impl.DefaultImageCaptchaResourceManager;
import cloud.tianai.captcha.template.slider.resource.impl.DefaultResourceStore; import cloud.tianai.captcha.resource.impl.DefaultResourceStore;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
src/main/test/java/example/StandardRotateCaptchaGeneratorTest.java
+9 -9
View File
@@ -1,14 +1,14 @@
package example; package example;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.RotateImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.RotateImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.generator.impl.CacheImageCaptchaGenerator; import cloud.tianai.captcha.generator.impl.CacheImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.generator.impl.StandardRotateImageCaptchaGenerator; import cloud.tianai.captcha.generator.impl.StandardRotateImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.template.slider.resource.ResourceStore; import cloud.tianai.captcha.resource.ResourceStore;
import cloud.tianai.captcha.template.slider.resource.impl.DefaultImageCaptchaResourceManager; import cloud.tianai.captcha.resource.impl.DefaultImageCaptchaResourceManager;
import cloud.tianai.captcha.template.slider.resource.impl.DefaultResourceStore; import cloud.tianai.captcha.resource.impl.DefaultResourceStore;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
src/main/test/java/example/StandardWordClickImageCaptchaGeneratorTest.java
+7 -7
View File
@@ -1,12 +1,12 @@
package example; package example;
import cloud.tianai.captcha.template.slider.common.constant.CaptchaTypeConstant; import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam; import cloud.tianai.captcha.generator.common.model.dto.GenerateParam;
import cloud.tianai.captcha.template.slider.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.template.slider.generator.impl.StandardRandomWordClickImageCaptchaGenerator; import cloud.tianai.captcha.generator.impl.StandardRandomWordClickImageCaptchaGenerator;
import cloud.tianai.captcha.template.slider.resource.ImageCaptchaResourceManager; import cloud.tianai.captcha.resource.ImageCaptchaResourceManager;
import cloud.tianai.captcha.template.slider.resource.impl.DefaultImageCaptchaResourceManager; import cloud.tianai.captcha.resource.impl.DefaultImageCaptchaResourceManager;
import cloud.tianai.captcha.template.slider.validator.impl.BasicCaptchaTrackValidator; import cloud.tianai.captcha.validator.impl.BasicCaptchaTrackValidator;
import java.util.Map; import java.util.Map;