调整包结构

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;

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: 天爱有情

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 {
 
     /**
      * 获取滑块验证码

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;

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<SliderCaptchaInfo> 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;

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,
+    public StandardSliderCaptchaGenerator(SliderCaptchaResourceManager sliderCaptchaResourceManager,
-                                         boolean initDefaultResource) {
+                                          boolean initDefaultResource) {
         this.sliderCaptchaResourceManager = sliderCaptchaResourceManager;
         if (initDefaultResource) {
             initDefaultResource();

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;

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.resource.provider.ClassPathResourceProvider;
-import cloud.tianai.captcha.template.slider.provider.FileResourceProvider;
+import cloud.tianai.captcha.template.slider.resource.provider.FileResourceProvider;
-import cloud.tianai.captcha.template.slider.provider.URLResourceProvider;
+import cloud.tianai.captcha.template.slider.resource.provider.URLResourceProvider;
 
 import java.io.InputStream;
 import java.util.ArrayList;

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;
 

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;
 

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;

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;

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;

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.resource.ResourceProvider;
-import cloud.tianai.captcha.template.slider.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);

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;
 

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: 天爱有情

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;

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;

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;

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;