diff --git a/pom.xml b/pom.xml index c085227..cfc80c1 100644 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ 4.0.0 cloud.tianai.captcha tianai-captcha - 1.0.1-beta + 1.1 tianai-captcha 滑块验证码 diff --git a/src/main/java/cloud/tianai/captcha/template/slider/DefaultSliderCaptchaTemplate.java b/src/main/java/cloud/tianai/captcha/template/slider/DefaultSliderCaptchaTemplate.java index c2e9b34..8f339fc 100644 --- a/src/main/java/cloud/tianai/captcha/template/slider/DefaultSliderCaptchaTemplate.java +++ b/src/main/java/cloud/tianai/captcha/template/slider/DefaultSliderCaptchaTemplate.java @@ -15,7 +15,6 @@ import java.net.URL; import java.util.List; import java.util.*; import java.util.concurrent.ThreadLocalRandom; -import java.util.concurrent.atomic.AtomicBoolean; /** * @Author: 天爱有情 @@ -35,7 +34,6 @@ public class DefaultSliderCaptchaTemplate implements SliderCaptchaTemplate { public static final String DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH = "META-INF/cut-image/template"; public static final String ACTIVE_IMAGE_NAME = "active.png"; - public static final String CUT_IMAGE_NAME = "cut.png"; public static final String FIXED_IMAGE_NAME = "fixed.png"; public static final String MATRIX_IMAGE_NAME = "matrix.png"; @@ -54,20 +52,10 @@ public class DefaultSliderCaptchaTemplate implements SliderCaptchaTemplate { public void initDefaultResource() { // 添加一些系统的资源文件 addResource(getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/1.jpg"))); - addResource(getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/2.jpg"))); - addResource(getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/3.jpg"))); - addResource(getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/4.jpg"))); - addResource(getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/5.jpg"))); - addResource(getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/6.jpg"))); - addResource(getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/7.jpg"))); - addResource(getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/8.jpg"))); - addResource(getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/9.jpg"))); - addResource(getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_RESOURCE_PATH.concat("/10.jpg"))); // 添加一些系统的 模板文件 Map template1 = new HashMap<>(4); template1.put(ACTIVE_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/1/active.png"))); - template1.put(CUT_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/1/cut.png"))); template1.put(FIXED_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/1/fixed.png"))); template1.put(MATRIX_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/1/matrix.png"))); addTemplate(template1); @@ -75,25 +63,12 @@ public class DefaultSliderCaptchaTemplate implements SliderCaptchaTemplate { Map template2 = new HashMap<>(4); template2.put(ACTIVE_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/2/active.png"))); - template2.put(CUT_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/2/cut.png"))); template2.put(FIXED_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/2/fixed.png"))); template2.put(MATRIX_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/2/matrix.png"))); addTemplate(template2); - Map template3 = new HashMap<>(4); - template3.put(ACTIVE_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/3/active.png"))); - template3.put(CUT_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/3/cut.png"))); - template3.put(FIXED_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/3/fixed.png"))); - template3.put(MATRIX_IMAGE_NAME, getClassLoader().getResource(DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH.concat("/3/matrix.png"))); - addTemplate(template3); } - - private final AtomicBoolean loadResources = new AtomicBoolean(false); - - private String sliderImageResourcePath = DEFAULT_SLIDER_IMAGE_RESOURCE_PATH; - private String sliderImageTemplatePath = DEFAULT_SLIDER_IMAGE_TEMPLATE_PATH; - public DefaultSliderCaptchaTemplate(boolean initDefaultResource) { // 加载系统资源文件 if (initDefaultResource) { @@ -111,15 +86,11 @@ public class DefaultSliderCaptchaTemplate implements SliderCaptchaTemplate { public DefaultSliderCaptchaTemplate(String targetFormatName, String matrixFormatName, - String sliderImageResourcePath, - String sliderImageTemplatePath, List r, List> t, boolean initDefaultResource) { this.targetFormatName = targetFormatName; this.matrixFormatName = matrixFormatName; - this.sliderImageResourcePath = sliderImageResourcePath; - this.sliderImageTemplatePath = sliderImageTemplatePath; resourceImageFiles = r; templateImageFiles = t; if (initDefaultResource) { @@ -362,14 +333,6 @@ public class DefaultSliderCaptchaTemplate implements SliderCaptchaTemplate { if (temp == 0) { temp = j; } - if (j == width) { - if (temp == 0) { - rec.add(new Area(new Rectangle(j, i, 1, 1))); - } else { - rec.add(new Area(new Rectangle(temp, i, j - temp, 1))); - temp = 0; - } - } } else { if (temp != 0) { rec.add(new Area(new Rectangle(temp, i, j - temp, 1))); @@ -403,7 +366,7 @@ public class DefaultSliderCaptchaTemplate implements SliderCaptchaTemplate { private URL getTemplateFile(Map templateImages, String imageName) { URL url = templateImages.get(imageName); if (url == null) { - throw new IllegalArgumentException("查找模板异常， 该模板下未找到 "); + throw new IllegalArgumentException("查找模板异常， 该模板下未找到 ".concat(imageName)); } return url; } diff --git a/src/main/resources/META-INF/cut-image/resource/1.jpg b/src/main/resources/META-INF/cut-image/resource/1.jpg index cd5b21d..64b17ef 100644 Binary files a/src/main/resources/META-INF/cut-image/resource/1.jpg and b/src/main/resources/META-INF/cut-image/resource/1.jpg differ diff --git a/src/main/resources/META-INF/cut-image/resource/10.jpg b/src/main/resources/META-INF/cut-image/resource/10.jpg deleted file mode 100644 index 7e58078..0000000 Binary files a/src/main/resources/META-INF/cut-image/resource/10.jpg and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/resource/2.jpg b/src/main/resources/META-INF/cut-image/resource/2.jpg deleted file mode 100644 index 238ccb1..0000000 Binary files a/src/main/resources/META-INF/cut-image/resource/2.jpg and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/resource/3.jpg b/src/main/resources/META-INF/cut-image/resource/3.jpg deleted file mode 100644 index b57a46e..0000000 Binary files a/src/main/resources/META-INF/cut-image/resource/3.jpg and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/resource/4.jpg b/src/main/resources/META-INF/cut-image/resource/4.jpg deleted file mode 100644 index b809dd9..0000000 Binary files a/src/main/resources/META-INF/cut-image/resource/4.jpg and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/resource/5.jpg b/src/main/resources/META-INF/cut-image/resource/5.jpg deleted file mode 100644 index 3fc6fa5..0000000 Binary files a/src/main/resources/META-INF/cut-image/resource/5.jpg and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/resource/6.jpg b/src/main/resources/META-INF/cut-image/resource/6.jpg deleted file mode 100644 index 9cf4e13..0000000 Binary files a/src/main/resources/META-INF/cut-image/resource/6.jpg and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/resource/7.jpg b/src/main/resources/META-INF/cut-image/resource/7.jpg deleted file mode 100644 index 40e4f56..0000000 Binary files a/src/main/resources/META-INF/cut-image/resource/7.jpg and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/resource/8.jpg b/src/main/resources/META-INF/cut-image/resource/8.jpg deleted file mode 100644 index 64b17ef..0000000 Binary files a/src/main/resources/META-INF/cut-image/resource/8.jpg and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/resource/9.jpg b/src/main/resources/META-INF/cut-image/resource/9.jpg deleted file mode 100644 index e51db4b..0000000 Binary files a/src/main/resources/META-INF/cut-image/resource/9.jpg and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/template/1/cut.png b/src/main/resources/META-INF/cut-image/template/1/cut.png deleted file mode 100644 index 8c5e443..0000000 Binary files a/src/main/resources/META-INF/cut-image/template/1/cut.png and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/template/2/active.png b/src/main/resources/META-INF/cut-image/template/2/active.png deleted file mode 100644 index 3ed2a04..0000000 Binary files a/src/main/resources/META-INF/cut-image/template/2/active.png and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/template/2/cut.png b/src/main/resources/META-INF/cut-image/template/2/cut.png deleted file mode 100644 index 8c5e443..0000000 Binary files a/src/main/resources/META-INF/cut-image/template/2/cut.png and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/template/2/fixed.png b/src/main/resources/META-INF/cut-image/template/2/fixed.png deleted file mode 100644 index f7959d8..0000000 Binary files a/src/main/resources/META-INF/cut-image/template/2/fixed.png and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/template/2/matrix.png b/src/main/resources/META-INF/cut-image/template/2/matrix.png deleted file mode 100644 index 5f17f0d..0000000 Binary files a/src/main/resources/META-INF/cut-image/template/2/matrix.png and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/template/3/active.png b/src/main/resources/META-INF/cut-image/template/3/active.png deleted file mode 100644 index 3f3b9b2..0000000 Binary files a/src/main/resources/META-INF/cut-image/template/3/active.png and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/template/3/cut.png b/src/main/resources/META-INF/cut-image/template/3/cut.png deleted file mode 100644 index b5775ad..0000000 Binary files a/src/main/resources/META-INF/cut-image/template/3/cut.png and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/template/3/fixed.png b/src/main/resources/META-INF/cut-image/template/3/fixed.png deleted file mode 100644 index 5ab0814..0000000 Binary files a/src/main/resources/META-INF/cut-image/template/3/fixed.png and /dev/null differ diff --git a/src/main/resources/META-INF/cut-image/template/3/matrix.png b/src/main/resources/META-INF/cut-image/template/3/matrix.png deleted file mode 100644 index 5f17f0d..0000000 Binary files a/src/main/resources/META-INF/cut-image/template/3/matrix.png and /dev/null differ