diff --git a/src/main/java/cloud/tianai/captcha/template/slider/GenerateParam.java b/src/main/java/cloud/tianai/captcha/template/slider/generator/GenerateParam.java similarity index 90% rename from src/main/java/cloud/tianai/captcha/template/slider/GenerateParam.java rename to src/main/java/cloud/tianai/captcha/template/slider/generator/GenerateParam.java index b0bee57..b406b86 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/GenerateParam.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/generator/GenerateParam.java @@ -1,4 +1,4 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.generator; import lombok.AllArgsConstructor; import lombok.Builder; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaConstant.java b/src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaConstant.java similarity index 88% rename from src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaConstant.java rename to src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaConstant.java index d3d03b8..4bcd41a 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaConstant.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaConstant.java @@ -1,4 +1,4 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.generator; /** * @Author: 天爱有情 diff --git a/src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaTemplate.java b/src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaGenerator.java similarity index 85% rename from src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaTemplate.java rename to src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaGenerator.java index c93e09c..e5b7229 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaTemplate.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaGenerator.java @@ -1,11 +1,13 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.generator; + +import cloud.tianai.captcha.template.slider.resource.SliderCaptchaResourceManager; /** * @Author: 天爱有情 * @date 2020/10/19 18:37 * @Description 滑块验证码模板 */ -public interface SliderCaptchaTemplate { +public interface SliderCaptchaGenerator { /** * 获取滑块验证码 diff --git a/src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaInfo.java b/src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaInfo.java similarity index 97% rename from src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaInfo.java rename to src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaInfo.java index 612a12a..725c936 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaInfo.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaInfo.java @@ -1,4 +1,4 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.generator; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/CacheSliderCaptchaTemplate.java b/src/main/java/cloud/tianai/captcha/template/slider/generator/impl/CacheSliderCaptchaGenerator.java similarity index 85% rename from src/main/java/cloud/tianai/captcha/template/slider/CacheSliderCaptchaTemplate.java rename to src/main/java/cloud/tianai/captcha/template/slider/generator/impl/CacheSliderCaptchaGenerator.java index 728423d..8fca964 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/CacheSliderCaptchaTemplate.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/generator/impl/CacheSliderCaptchaGenerator.java @@ -1,5 +1,10 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.generator.impl; +import cloud.tianai.captcha.template.slider.generator.GenerateParam; +import cloud.tianai.captcha.template.slider.generator.SliderCaptchaGenerator; +import cloud.tianai.captcha.template.slider.generator.SliderCaptchaInfo; +import cloud.tianai.captcha.template.slider.util.NamedThreadFactory; +import cloud.tianai.captcha.template.slider.resource.SliderCaptchaResourceManager; import lombok.Getter; import lombok.Setter; import lombok.SneakyThrows; @@ -17,12 +22,12 @@ import java.util.concurrent.atomic.AtomicInteger; * @Description 滑块验证码缓冲器 */ @Slf4j -public class CacheSliderCaptchaTemplate implements SliderCaptchaTemplate { +public class CacheSliderCaptchaGenerator implements SliderCaptchaGenerator { protected final ScheduledExecutorService scheduledExecutor = new ScheduledThreadPoolExecutor(1, new NamedThreadFactory("slider-captcha-queue")); protected ConcurrentLinkedQueue queue; protected AtomicInteger pos = new AtomicInteger(0); - protected SliderCaptchaTemplate target; + protected SliderCaptchaGenerator target; protected int size; /** 等待时间，一般报错或者拉取为空时会休眠一段时间再试. */ protected int waitTime = 1000; @@ -34,13 +39,13 @@ public class CacheSliderCaptchaTemplate implements SliderCaptchaTemplate { @Setter protected boolean requiredGetCaptcha = true; - public CacheSliderCaptchaTemplate(SliderCaptchaTemplate target, GenerateParam generateParam, int size) { + public CacheSliderCaptchaGenerator(SliderCaptchaGenerator target, GenerateParam generateParam, int size) { this.target = target; this.generateParam = generateParam; this.size = size; } - public CacheSliderCaptchaTemplate(SliderCaptchaTemplate target, GenerateParam generateParam, int size, int waitTime, int period) { + public CacheSliderCaptchaGenerator(SliderCaptchaGenerator target, GenerateParam generateParam, int size, int waitTime, int period) { this.target = target; this.generateParam = generateParam; this.size = size; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/StandardSliderCaptchaTemplate.java b/src/main/java/cloud/tianai/captcha/template/slider/generator/impl/StandardSliderCaptchaGenerator.java similarity index 91% rename from src/main/java/cloud/tianai/captcha/template/slider/StandardSliderCaptchaTemplate.java rename to src/main/java/cloud/tianai/captcha/template/slider/generator/impl/StandardSliderCaptchaGenerator.java index b298e03..0dea3c6 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/StandardSliderCaptchaTemplate.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/generator/impl/StandardSliderCaptchaGenerator.java @@ -1,6 +1,13 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.generator.impl; -import cloud.tianai.captcha.template.slider.provider.ClassPathResourceProvider; +import cloud.tianai.captcha.template.slider.generator.GenerateParam; +import cloud.tianai.captcha.template.slider.generator.SliderCaptchaConstant; +import cloud.tianai.captcha.template.slider.generator.SliderCaptchaGenerator; +import cloud.tianai.captcha.template.slider.generator.SliderCaptchaInfo; +import cloud.tianai.captcha.template.slider.resource.provider.ClassPathResourceProvider; +import cloud.tianai.captcha.template.slider.resource.Resource; +import cloud.tianai.captcha.template.slider.resource.ResourceStore; +import cloud.tianai.captcha.template.slider.resource.SliderCaptchaResourceManager; import lombok.Getter; import lombok.Setter; import lombok.SneakyThrows; @@ -22,7 +29,7 @@ import static cloud.tianai.captcha.template.slider.util.CaptchaImageUtils.*; * @Description 滑块验证码模板 */ @Slf4j -public class StandardSliderCaptchaTemplate implements SliderCaptchaTemplate { +public class StandardSliderCaptchaGenerator implements SliderCaptchaGenerator { /** * 默认的resource资源文件路径. @@ -52,8 +59,8 @@ public class StandardSliderCaptchaTemplate implements SliderCaptchaTemplate { /** 默认滑块图片类型. */ public String defaultSliderImageType = DEFAULT_SLIDER_IMAGE_TYPE; - public StandardSliderCaptchaTemplate(SliderCaptchaResourceManager sliderCaptchaResourceManager, - boolean initDefaultResource) { + public StandardSliderCaptchaGenerator(SliderCaptchaResourceManager sliderCaptchaResourceManager, + boolean initDefaultResource) { this.sliderCaptchaResourceManager = sliderCaptchaResourceManager; if (initDefaultResource) { initDefaultResource(); diff --git a/src/main/java/cloud/tianai/captcha/template/slider/DefaultResourceStore.java b/src/main/java/cloud/tianai/captcha/template/slider/resource/DefaultResourceStore.java similarity index 97% rename from src/main/java/cloud/tianai/captcha/template/slider/DefaultResourceStore.java rename to src/main/java/cloud/tianai/captcha/template/slider/resource/DefaultResourceStore.java index a4cf5a2..b1d9f70 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/DefaultResourceStore.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/resource/DefaultResourceStore.java @@ -1,4 +1,4 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.resource; import java.util.ArrayList; import java.util.Collections; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/DefaultSliderCaptchaResourceManager.java b/src/main/java/cloud/tianai/captcha/template/slider/resource/DefaultSliderCaptchaResourceManager.java similarity index 92% rename from src/main/java/cloud/tianai/captcha/template/slider/DefaultSliderCaptchaResourceManager.java rename to src/main/java/cloud/tianai/captcha/template/slider/resource/DefaultSliderCaptchaResourceManager.java index c1cc7f6..b308fc8 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/DefaultSliderCaptchaResourceManager.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/resource/DefaultSliderCaptchaResourceManager.java @@ -1,8 +1,8 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.resource; -import cloud.tianai.captcha.template.slider.provider.ClassPathResourceProvider; -import cloud.tianai.captcha.template.slider.provider.FileResourceProvider; -import cloud.tianai.captcha.template.slider.provider.URLResourceProvider; +import cloud.tianai.captcha.template.slider.resource.provider.ClassPathResourceProvider; +import cloud.tianai.captcha.template.slider.resource.provider.FileResourceProvider; +import cloud.tianai.captcha.template.slider.resource.provider.URLResourceProvider; import java.io.InputStream; import java.util.ArrayList; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/Resource.java b/src/main/java/cloud/tianai/captcha/template/slider/resource/Resource.java similarity index 72% rename from src/main/java/cloud/tianai/captcha/template/slider/Resource.java rename to src/main/java/cloud/tianai/captcha/template/slider/resource/Resource.java index e394b3c..f28ce2a 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/Resource.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/resource/Resource.java @@ -1,5 +1,6 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.resource; +import cloud.tianai.captcha.template.slider.resource.ResourceProvider; import lombok.AllArgsConstructor; import lombok.Data; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/ResourceProvider.java b/src/main/java/cloud/tianai/captcha/template/slider/resource/ResourceProvider.java similarity index 90% rename from src/main/java/cloud/tianai/captcha/template/slider/ResourceProvider.java rename to src/main/java/cloud/tianai/captcha/template/slider/resource/ResourceProvider.java index c795575..9c457bb 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/ResourceProvider.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/resource/ResourceProvider.java @@ -1,4 +1,4 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.resource; import java.io.InputStream; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/ResourceStore.java b/src/main/java/cloud/tianai/captcha/template/slider/resource/ResourceStore.java similarity index 97% rename from src/main/java/cloud/tianai/captcha/template/slider/ResourceStore.java rename to src/main/java/cloud/tianai/captcha/template/slider/resource/ResourceStore.java index afa1fe5..03e156b 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/ResourceStore.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/resource/ResourceStore.java @@ -1,4 +1,4 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.resource; import java.util.List; import java.util.Map; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaResource.java b/src/main/java/cloud/tianai/captcha/template/slider/resource/SliderCaptchaResource.java similarity index 96% rename from src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaResource.java rename to src/main/java/cloud/tianai/captcha/template/slider/resource/SliderCaptchaResource.java index d28632c..155bf2c 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaResource.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/resource/SliderCaptchaResource.java @@ -1,4 +1,4 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.resource; import java.net.URL; import java.util.List; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaResourceManager.java b/src/main/java/cloud/tianai/captcha/template/slider/resource/SliderCaptchaResourceManager.java similarity index 96% rename from src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaResourceManager.java rename to src/main/java/cloud/tianai/captcha/template/slider/resource/SliderCaptchaResourceManager.java index 6320535..e007d91 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/SliderCaptchaResourceManager.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/resource/SliderCaptchaResourceManager.java @@ -1,4 +1,4 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.resource; import java.io.InputStream; import java.util.List; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/provider/AbstractResourceProvider.java b/src/main/java/cloud/tianai/captcha/template/slider/resource/provider/AbstractResourceProvider.java similarity index 75% rename from src/main/java/cloud/tianai/captcha/template/slider/provider/AbstractResourceProvider.java rename to src/main/java/cloud/tianai/captcha/template/slider/resource/provider/AbstractResourceProvider.java index 0c3003c..00d6f06 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/provider/AbstractResourceProvider.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/resource/provider/AbstractResourceProvider.java @@ -1,7 +1,7 @@ -package cloud.tianai.captcha.template.slider.provider; +package cloud.tianai.captcha.template.slider.resource.provider; -import cloud.tianai.captcha.template.slider.Resource; -import cloud.tianai.captcha.template.slider.ResourceProvider; +import cloud.tianai.captcha.template.slider.resource.ResourceProvider; +import cloud.tianai.captcha.template.slider.resource.Resource; import java.io.InputStream; @@ -10,7 +10,7 @@ import java.io.InputStream; * @date 2021/12/16 16:52 * @Description 抽象的ResourceProvider */ -public abstract class AbstractResourceProvider implements ResourceProvider{ +public abstract class AbstractResourceProvider implements ResourceProvider { @Override public InputStream getResourceInputStream(Resource data) { InputStream resourceInputStream = doGetResourceInputStream(data); diff --git a/src/main/java/cloud/tianai/captcha/template/slider/provider/ClassPathResourceProvider.java b/src/main/java/cloud/tianai/captcha/template/slider/resource/provider/ClassPathResourceProvider.java similarity index 88% rename from src/main/java/cloud/tianai/captcha/template/slider/provider/ClassPathResourceProvider.java rename to src/main/java/cloud/tianai/captcha/template/slider/resource/provider/ClassPathResourceProvider.java index a36776c..459c266 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/provider/ClassPathResourceProvider.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/resource/provider/ClassPathResourceProvider.java @@ -1,6 +1,6 @@ -package cloud.tianai.captcha.template.slider.provider; +package cloud.tianai.captcha.template.slider.resource.provider; -import cloud.tianai.captcha.template.slider.Resource; +import cloud.tianai.captcha.template.slider.resource.Resource; import java.io.InputStream; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/provider/FileResourceProvider.java b/src/main/java/cloud/tianai/captcha/template/slider/resource/provider/FileResourceProvider.java similarity index 84% rename from src/main/java/cloud/tianai/captcha/template/slider/provider/FileResourceProvider.java rename to src/main/java/cloud/tianai/captcha/template/slider/resource/provider/FileResourceProvider.java index 4c93fef..e78befd 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/provider/FileResourceProvider.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/resource/provider/FileResourceProvider.java @@ -1,11 +1,10 @@ -package cloud.tianai.captcha.template.slider.provider; +package cloud.tianai.captcha.template.slider.resource.provider; -import cloud.tianai.captcha.template.slider.Resource; +import cloud.tianai.captcha.template.slider.resource.Resource; import lombok.SneakyThrows; import java.io.FileInputStream; import java.io.InputStream; -import java.net.URL; /** * @Author: 天爱有情 diff --git a/src/main/java/cloud/tianai/captcha/template/slider/provider/URLResourceProvider.java b/src/main/java/cloud/tianai/captcha/template/slider/resource/provider/URLResourceProvider.java similarity index 83% rename from src/main/java/cloud/tianai/captcha/template/slider/provider/URLResourceProvider.java rename to src/main/java/cloud/tianai/captcha/template/slider/resource/provider/URLResourceProvider.java index ae487e1..5091a4d 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/provider/URLResourceProvider.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/resource/provider/URLResourceProvider.java @@ -1,6 +1,6 @@ -package cloud.tianai.captcha.template.slider.provider; +package cloud.tianai.captcha.template.slider.resource.provider; -import cloud.tianai.captcha.template.slider.Resource; +import cloud.tianai.captcha.template.slider.resource.Resource; import lombok.SneakyThrows; import java.io.InputStream; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/NamedThreadFactory.java b/src/main/java/cloud/tianai/captcha/template/slider/util/NamedThreadFactory.java similarity index 95% rename from src/main/java/cloud/tianai/captcha/template/slider/NamedThreadFactory.java rename to src/main/java/cloud/tianai/captcha/template/slider/util/NamedThreadFactory.java index a9d6e19..375218d 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/NamedThreadFactory.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/util/NamedThreadFactory.java @@ -1,4 +1,4 @@ -package cloud.tianai.captcha.template.slider; +package cloud.tianai.captcha.template.slider.util; import java.util.concurrent.ThreadFactory; import java.util.concurrent.atomic.AtomicInteger; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/validator/SimpleSliderCaptchaValidator.java b/src/main/java/cloud/tianai/captcha/template/slider/validator/SimpleSliderCaptchaValidator.java index 71653bd..8ae893d 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/validator/SimpleSliderCaptchaValidator.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/validator/SimpleSliderCaptchaValidator.java @@ -1,6 +1,6 @@ package cloud.tianai.captcha.template.slider.validator; -import cloud.tianai.captcha.template.slider.SliderCaptchaInfo; +import cloud.tianai.captcha.template.slider.generator.SliderCaptchaInfo; import cloud.tianai.captcha.template.slider.util.CollectionUtils; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/cloud/tianai/captcha/template/slider/validator/SliderCaptchaValidator.java b/src/main/java/cloud/tianai/captcha/template/slider/validator/SliderCaptchaValidator.java index d4afd78..9255d9e 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/validator/SliderCaptchaValidator.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/validator/SliderCaptchaValidator.java @@ -1,6 +1,6 @@ package cloud.tianai.captcha.template.slider.validator; -import cloud.tianai.captcha.template.slider.SliderCaptchaInfo; +import cloud.tianai.captcha.template.slider.generator.SliderCaptchaInfo; import java.util.Map;