调整包结构更改版本为1.3.1

2026-05-07 22:23:05 +08:00 · 2022-04-20 12:00:45 +08:00
parent e9e60b9178
commit ef04a4e5a7
29 changed files with 95 additions and 71 deletions
@@ -1,4 +1,4 @@
-package cloud.tianai.captcha.template.slider.exception;
+package cloud.tianai.captcha.template.slider.common.exception;

 public class SliderCaptchaException extends RuntimeException{
    public SliderCaptchaException() {
@@ -1,4 +1,4 @@
-package cloud.tianai.captcha.template.slider.util;
+package cloud.tianai.captcha.template.slider.common.util;

 import lombok.SneakyThrows;

@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package cloud.tianai.captcha.template.slider.util;
+package cloud.tianai.captcha.template.slider.common.util;

 import java.util.*;

@@ -1,4 +1,4 @@
-package cloud.tianai.captcha.template.slider.util;
+package cloud.tianai.captcha.template.slider.common.util;

 import java.util.concurrent.ThreadFactory;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -14,7 +14,7 @@
 * limitations under the License.
 */

-package cloud.tianai.captcha.template.slider.util;
+package cloud.tianai.captcha.template.slider.common.util;

 import java.lang.reflect.Array;
 import java.util.Arrays;
@@ -1,6 +1,9 @@
 package cloud.tianai.captcha.template.slider.generator;

+import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam;
+import cloud.tianai.captcha.template.slider.generator.common.model.dto.SliderCaptchaInfo;
 import cloud.tianai.captcha.template.slider.resource.SliderCaptchaResourceManager;
+import cloud.tianai.captcha.template.slider.validator.SliderCaptchaValidator;

 /**
 * @Author: 天爱有情
@@ -14,25 +17,25 @@ public interface SliderCaptchaGenerator {
     *
     * @return SliderCaptchaInfo
     */
-    SliderCaptchaInfo getSlideImageInfo();
+    SliderCaptchaInfo generateSlideImageInfo();


    /**
-     * 获取滑块验证码
+     * 生成滑块验证码
     *
     * @param targetFormatName jpeg或者webp格式
     * @param matrixFormatName png或者webp格式
     * @return SliderCaptchaInfo
     */
-    SliderCaptchaInfo getSlideImageInfo(String targetFormatName, String matrixFormatName);
+    SliderCaptchaInfo generateSlideImageInfo(String targetFormatName, String matrixFormatName);

    /**
-     * 获取滑块验证码
+     * 生成滑块验证码
     *
     * @param param 生成参数
     * @return SliderCaptchaInfo
     */
-    SliderCaptchaInfo getSlideImageInfo(GenerateParam param);
+    SliderCaptchaInfo generateSlideImageInfo(GenerateParam param);

    /**
     * 百分比对比
@@ -40,7 +43,11 @@ public interface SliderCaptchaGenerator {
     * @param newPercentage 用户百分比
     * @param oriPercentage 原百分比
     * @return true 成功 false 失败
+     * <p>
+     * 废除 ， 建议使用
+     * @see SliderCaptchaValidator 进行校验
     */
+    @Deprecated
    boolean percentageContrast(Float newPercentage, Float oriPercentage);

    /**
@@ -1,4 +1,4 @@
-package cloud.tianai.captcha.template.slider.generator;
+package cloud.tianai.captcha.template.slider.generator.common.constant;

 /**
 * @Author: 天爱有情
@@ -1,4 +1,4 @@
-package cloud.tianai.captcha.template.slider.generator;
+package cloud.tianai.captcha.template.slider.generator.common.model.dto;

 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -1,4 +1,4 @@
-package cloud.tianai.captcha.template.slider.generator;
+package cloud.tianai.captcha.template.slider.generator.common.model.dto;

 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -1,9 +1,9 @@
 package cloud.tianai.captcha.template.slider.generator.impl;

-import cloud.tianai.captcha.template.slider.generator.GenerateParam;
+import cloud.tianai.captcha.template.slider.generator.common.model.dto.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.generator.common.model.dto.SliderCaptchaInfo;
+import cloud.tianai.captcha.template.slider.common.util.NamedThreadFactory;
 import cloud.tianai.captcha.template.slider.resource.SliderCaptchaResourceManager;
 import lombok.Getter;
 import lombok.Setter;
@@ -71,7 +71,7 @@ public class CacheSliderCaptchaGenerator implements SliderCaptchaGenerator {
                    if (pos.get() >= size) {
                        return;
                    }
-                    SliderCaptchaInfo slideImageInfo = target.getSlideImageInfo(generateParam);
+                    SliderCaptchaInfo slideImageInfo = target.generateSlideImageInfo(generateParam);
                    if (slideImageInfo != null) {
                        boolean addStatus = queue.offer(slideImageInfo);
                        if (addStatus) {
@@ -101,17 +101,17 @@ public class CacheSliderCaptchaGenerator implements SliderCaptchaGenerator {

    @SneakyThrows
    @Override
-    public SliderCaptchaInfo getSlideImageInfo() {
-        return getSlideImageInfo(this.requiredGetCaptcha);
+    public SliderCaptchaInfo generateSlideImageInfo() {
+        return generateSlideImageInfo(this.requiredGetCaptcha);
    }

    @SneakyThrows
-    public SliderCaptchaInfo getSlideImageInfo(boolean requiredGetCaptcha) {
+    public SliderCaptchaInfo generateSlideImageInfo(boolean requiredGetCaptcha) {
        SliderCaptchaInfo poll = queue.poll();
        if (poll == null && requiredGetCaptcha) {
            log.warn("滑块验证码缓存不足, genParam:{}", generateParam);
            // 如果池内没数据， 则直接生成
-            return target.getSlideImageInfo(generateParam);
+            return target.generateSlideImageInfo(generateParam);
        }
        // 减1
        pos.decrementAndGet();
@@ -119,13 +119,13 @@ public class CacheSliderCaptchaGenerator implements SliderCaptchaGenerator {
    }

    @Override
-    public SliderCaptchaInfo getSlideImageInfo(String targetFormatName, String matrixFormatName) {
-        return target.getSlideImageInfo(targetFormatName, matrixFormatName);
+    public SliderCaptchaInfo generateSlideImageInfo(String targetFormatName, String matrixFormatName) {
+        return target.generateSlideImageInfo(targetFormatName, matrixFormatName);
    }

    @Override
-    public SliderCaptchaInfo getSlideImageInfo(GenerateParam param) {
-        return target.getSlideImageInfo(param);
+    public SliderCaptchaInfo generateSlideImageInfo(GenerateParam param) {
+        return target.generateSlideImageInfo(param);
    }

    @Override
@@ -1,11 +1,11 @@
 package cloud.tianai.captcha.template.slider.generator.impl;

-import cloud.tianai.captcha.template.slider.generator.GenerateParam;
-import cloud.tianai.captcha.template.slider.generator.SliderCaptchaConstant;
+import cloud.tianai.captcha.template.slider.generator.common.model.dto.GenerateParam;
+import cloud.tianai.captcha.template.slider.generator.common.constant.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.generator.common.model.dto.SliderCaptchaInfo;
+import cloud.tianai.captcha.template.slider.resource.impl.provider.ClassPathResourceProvider;
+import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource;
 import cloud.tianai.captcha.template.slider.resource.ResourceStore;
 import cloud.tianai.captcha.template.slider.resource.SliderCaptchaResourceManager;
 import lombok.Getter;
@@ -21,7 +21,7 @@ import java.io.InputStream;
 import java.util.*;
 import java.util.concurrent.ThreadLocalRandom;

-import static cloud.tianai.captcha.template.slider.util.CaptchaImageUtils.*;
+import static cloud.tianai.captcha.template.slider.common.util.CaptchaImageUtils.*;

 /**
 * @Author: 天爱有情
@@ -68,14 +68,14 @@ public class StandardSliderCaptchaGenerator implements SliderCaptchaGenerator {
    }

    @Override
-    public SliderCaptchaInfo getSlideImageInfo() {
-        return getSlideImageInfo(defaultBgImageType, defaultSliderImageType);
+    public SliderCaptchaInfo generateSlideImageInfo() {
+        return generateSlideImageInfo(defaultBgImageType, defaultSliderImageType);
    }

    @SneakyThrows
    @Override
-    public SliderCaptchaInfo getSlideImageInfo(String backgroundFormatName, String sliderFormatName) {
-        return getSlideImageInfo(GenerateParam.builder()
+    public SliderCaptchaInfo generateSlideImageInfo(String backgroundFormatName, String sliderFormatName) {
+        return generateSlideImageInfo(GenerateParam.builder()
                .backgroundFormatName(backgroundFormatName)
                .sliderFormatName(sliderFormatName)
                .obfuscate(false)
@@ -84,7 +84,7 @@ public class StandardSliderCaptchaGenerator implements SliderCaptchaGenerator {

    @SneakyThrows
    @Override
-    public SliderCaptchaInfo getSlideImageInfo(GenerateParam param) {
+    public SliderCaptchaInfo generateSlideImageInfo(GenerateParam param) {
        Boolean obfuscate = param.getObfuscate();
        Map<String, Resource> templateImages = sliderCaptchaResourceManager.randomGetTemplate();
        if (templateImages == null || templateImages.isEmpty()) {
@@ -174,7 +174,6 @@ public class StandardSliderCaptchaGenerator implements SliderCaptchaGenerator {
     * @param bufferedImage 图片
     * @param formatType    格式化类型
     * @return String
-     * @throws IOException
     */
    public String transform(BufferedImage bufferedImage, String formatType) throws IOException {
        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
@@ -1,7 +1,7 @@
-package cloud.tianai.captcha.template.slider.resource.provider;
+package cloud.tianai.captcha.template.slider.resource;

 import cloud.tianai.captcha.template.slider.resource.ResourceProvider;
-import cloud.tianai.captcha.template.slider.resource.Resource;
+import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource;

 import java.io.InputStream;

@@ -1,5 +1,7 @@
 package cloud.tianai.captcha.template.slider.resource;

+import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource;
+
 import java.io.InputStream;

 /**
@@ -1,5 +1,7 @@
 package cloud.tianai.captcha.template.slider.resource;

+import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource;
+
 import java.util.List;
 import java.util.Map;

@@ -1,5 +1,7 @@
 package cloud.tianai.captcha.template.slider.resource;

+import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource;
+
 import java.io.InputStream;
 import java.util.List;
 import java.util.Map;
@@ -1,4 +1,4 @@
-package cloud.tianai.captcha.template.slider.resource;
+package cloud.tianai.captcha.template.slider.resource.common.model.dto;

 import cloud.tianai.captcha.template.slider.resource.ResourceProvider;
 import lombok.AllArgsConstructor;
@@ -1,4 +1,7 @@
-package cloud.tianai.captcha.template.slider.resource;
+package cloud.tianai.captcha.template.slider.resource.impl;
+
+import cloud.tianai.captcha.template.slider.resource.ResourceStore;
+import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource;

 import java.util.ArrayList;
 import java.util.Collections;
@@ -1,8 +1,12 @@
-package cloud.tianai.captcha.template.slider.resource;
+package cloud.tianai.captcha.template.slider.resource.impl;

-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 cloud.tianai.captcha.template.slider.resource.ResourceProvider;
+import cloud.tianai.captcha.template.slider.resource.ResourceStore;
+import cloud.tianai.captcha.template.slider.resource.SliderCaptchaResourceManager;
+import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource;
+import cloud.tianai.captcha.template.slider.resource.impl.provider.ClassPathResourceProvider;
+import cloud.tianai.captcha.template.slider.resource.impl.provider.FileResourceProvider;
+import cloud.tianai.captcha.template.slider.resource.impl.provider.URLResourceProvider;

 import java.io.InputStream;
 import java.util.ArrayList;
@@ -1,6 +1,7 @@
-package cloud.tianai.captcha.template.slider.resource.provider;
+package cloud.tianai.captcha.template.slider.resource.impl.provider;

-import cloud.tianai.captcha.template.slider.resource.Resource;
+import cloud.tianai.captcha.template.slider.resource.AbstractResourceProvider;
+import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource;

 import java.io.InputStream;

@@ -1,6 +1,7 @@
-package cloud.tianai.captcha.template.slider.resource.provider;
+package cloud.tianai.captcha.template.slider.resource.impl.provider;

-import cloud.tianai.captcha.template.slider.resource.Resource;
+import cloud.tianai.captcha.template.slider.resource.AbstractResourceProvider;
+import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource;
 import lombok.SneakyThrows;

 import java.io.FileInputStream;
@@ -1,6 +1,7 @@
-package cloud.tianai.captcha.template.slider.resource.provider;
+package cloud.tianai.captcha.template.slider.resource.impl.provider;

-import cloud.tianai.captcha.template.slider.resource.Resource;
+import cloud.tianai.captcha.template.slider.resource.AbstractResourceProvider;
+import cloud.tianai.captcha.template.slider.resource.common.model.dto.Resource;
 import lombok.SneakyThrows;

 import java.io.InputStream;
@@ -1,6 +1,7 @@
 package cloud.tianai.captcha.template.slider.validator;

-import cloud.tianai.captcha.template.slider.generator.SliderCaptchaInfo;
+import cloud.tianai.captcha.template.slider.generator.common.model.dto.SliderCaptchaInfo;
+import cloud.tianai.captcha.template.slider.validator.common.model.dto.SliderCaptchaTrack;

 import java.util.Map;

@@ -1,7 +1,5 @@
-package cloud.tianai.captcha.template.slider.validator;
+package cloud.tianai.captcha.template.slider.validator.common.model.dto;

-import cloud.tianai.captcha.template.slider.util.CollectionUtils;
-import cloud.tianai.captcha.template.slider.util.ObjectUtils;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -1,7 +1,8 @@
-package cloud.tianai.captcha.template.slider.validator;
+package cloud.tianai.captcha.template.slider.validator.impl;

-import cloud.tianai.captcha.template.slider.util.CollectionUtils;
-import cloud.tianai.captcha.template.slider.util.ObjectUtils;
+import cloud.tianai.captcha.template.slider.common.util.CollectionUtils;
+import cloud.tianai.captcha.template.slider.common.util.ObjectUtils;
+import cloud.tianai.captcha.template.slider.validator.common.model.dto.SliderCaptchaTrack;

 import java.util.List;
 import java.util.Map;
@@ -1,7 +1,9 @@
-package cloud.tianai.captcha.template.slider.validator;
+package cloud.tianai.captcha.template.slider.validator.impl;

-import cloud.tianai.captcha.template.slider.generator.SliderCaptchaInfo;
-import cloud.tianai.captcha.template.slider.util.CollectionUtils;
+import cloud.tianai.captcha.template.slider.generator.common.model.dto.SliderCaptchaInfo;
+import cloud.tianai.captcha.template.slider.common.util.CollectionUtils;
+import cloud.tianai.captcha.template.slider.validator.SliderCaptchaValidator;
+import cloud.tianai.captcha.template.slider.validator.common.model.dto.SliderCaptchaTrack;
 import lombok.Getter;
 import lombok.Setter;
 import lombok.extern.slf4j.Slf4j;
@@ -1,37 +0,0 @@
-package example;
-
-import com.luciad.imageio.webp.WebPReadParam;
-
-import javax.imageio.ImageIO;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.FileImageInputStream;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
-public class DecodeTest {
-    public static void main(String args[]) throws IOException {
-        String inputWebpPath = "test_pic/test.webp";
-        String outputJpgPath = "test_pic/test_.jpg";
-        String outputJpegPath = "test_pic/test_.jpeg";
-        String outputPngPath = "test_pic/test_.png";
-
-        // Obtain a WebP ImageReader instance
-        ImageReader reader = ImageIO.getImageReadersByMIMEType("image/webp").next();
-
-        // Configure decoding parameters
-        WebPReadParam readParam = new WebPReadParam();
-        readParam.setBypassFiltering(true);
-
-        // Configure the input on the ImageReader
-        reader.setInput(new FileImageInputStream(new File(inputWebpPath)));
-
-        // Decode the image
-        BufferedImage image = reader.read(0, readParam);
-
-        ImageIO.write(image, "png", new File(outputPngPath));
-        ImageIO.write(image, "jpg", new File(outputJpgPath));
-        ImageIO.write(image, "jpeg", new File(outputJpegPath));
-
-    }
-}
@@ -1,37 +0,0 @@
-package example;
-
-import com.luciad.imageio.webp.WebPWriteParam;
-
-import javax.imageio.IIOImage;
-import javax.imageio.ImageIO;
-import javax.imageio.ImageWriter;
-import javax.imageio.stream.FileImageOutputStream;
-import java.awt.image.BufferedImage;
-import java.io.File;
-import java.io.IOException;
-
-public class EncodeTest {
-    public static void main(String args[]) throws IOException {
-        String inputPngPath = "test_pic/test.png";
-        String inputJpgPath = "test_pic/test.jpg";
-        String outputWebpPath = "test_pic/test_.webp";
-
-        // Obtain an image to encode from somewhere
-        BufferedImage image = ImageIO.read(new File(inputJpgPath));
-
-        // Obtain a WebP ImageWriter instance
-        ImageWriter writer = ImageIO.getImageWritersByMIMEType("image/webp").next();
-
-        // Configure encoding parameters
-        WebPWriteParam writeParam = new WebPWriteParam(writer.getLocale());
-        writeParam.setCompressionMode(WebPWriteParam.MODE_DEFAULT);
-
-        // Configure the output on the ImageWriter
-        writer.setOutput(new FileImageOutputStream(new File(outputWebpPath)));
-
-        // Encode
-        long st = System.currentTimeMillis();
-        writer.write(null, new IIOImage(image, null, null), writeParam);
-        System.out.println("cost: " + (System.currentTimeMillis() - st));
-    }
-}