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

调整包结构 更改版本为1.3.1

Browse Source
This commit is contained in:
天爱有情
2022-04-20 12:00:45 +08:00
parent e9e60b9178
commit ef04a4e5a7
29 changed files with 95 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/cloud/tianai/captcha/template/slider/exception/SliderCaptchaException.java → src/main/java/cloud/tianai/captcha/template/slider/common/exception/SliderCaptchaException.java
+1 -1
View File
@@ -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() {
src/main/java/cloud/tianai/captcha/template/slider/util/CaptchaImageUtils.java → src/main/java/cloud/tianai/captcha/template/slider/common/util/CaptchaImageUtils.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cloud.tianai.captcha.template.slider.util;
package cloud.tianai.captcha.template.slider.common.util;
import lombok.SneakyThrows;
src/main/java/cloud/tianai/captcha/template/slider/util/CollectionUtils.java → src/main/java/cloud/tianai/captcha/template/slider/common/util/CollectionUtils.java
+1 -1
View File
@@ -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.*;
src/main/java/cloud/tianai/captcha/template/slider/util/NamedThreadFactory.java → src/main/java/cloud/tianai/captcha/template/slider/common/util/NamedThreadFactory.java
+1 -1
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/util/ObjectUtils.java → src/main/java/cloud/tianai/captcha/template/slider/common/util/ObjectUtils.java
+1 -1
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaGenerator.java
+12 -5
View File
@@ -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);
/**
src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaConstant.java → src/main/java/cloud/tianai/captcha/template/slider/generator/common/constant/SliderCaptchaConstant.java
+1 -1
View File
@@ -1,4 +1,4 @@
package cloud.tianai.captcha.template.slider.generator;
package cloud.tianai.captcha.template.slider.generator.common.constant;
/**
* @Author: 天爱有情
src/main/java/cloud/tianai/captcha/template/slider/generator/GenerateParam.java → src/main/java/cloud/tianai/captcha/template/slider/generator/common/model/dto/GenerateParam.java
+1 -1
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/generator/SliderCaptchaInfo.java → src/main/java/cloud/tianai/captcha/template/slider/generator/common/model/dto/SliderCaptchaInfo.java
+1 -1
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/generator/impl/CacheSliderCaptchaGenerator.java
+12 -12
View File
@@ -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
src/main/java/cloud/tianai/captcha/template/slider/generator/impl/StandardSliderCaptchaGenerator.java
+11 -12
View File
@@ -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();
src/main/java/cloud/tianai/captcha/template/slider/resource/provider/AbstractResourceProvider.java → src/main/java/cloud/tianai/captcha/template/slider/resource/AbstractResourceProvider.java
+2 -2
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/resource/ResourceProvider.java
+2
View File
@@ -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;
/**
src/main/java/cloud/tianai/captcha/template/slider/resource/ResourceStore.java
+2
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/resource/SliderCaptchaResourceManager.java
+2
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/resource/Resource.java → src/main/java/cloud/tianai/captcha/template/slider/resource/common/model/dto/Resource.java
+1 -1
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/resource/DefaultResourceStore.java → src/main/java/cloud/tianai/captcha/template/slider/resource/impl/DefaultResourceStore.java
+4 -1
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/resource/DefaultSliderCaptchaResourceManager.java → src/main/java/cloud/tianai/captcha/template/slider/resource/impl/DefaultSliderCaptchaResourceManager.java
+8 -4
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/resource/provider/ClassPathResourceProvider.java → src/main/java/cloud/tianai/captcha/template/slider/resource/impl/provider/ClassPathResourceProvider.java
+3 -2
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/resource/provider/FileResourceProvider.java → src/main/java/cloud/tianai/captcha/template/slider/resource/impl/provider/FileResourceProvider.java
+3 -2
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/resource/provider/URLResourceProvider.java → src/main/java/cloud/tianai/captcha/template/slider/resource/impl/provider/URLResourceProvider.java
+3 -2
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/validator/SliderCaptchaValidator.java
+2 -1
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/validator/SliderCaptchaTrack.java → src/main/java/cloud/tianai/captcha/template/slider/validator/common/model/dto/SliderCaptchaTrack.java
+1 -3
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/validator/BasicCaptchaTrackValidator.java → src/main/java/cloud/tianai/captcha/template/slider/validator/impl/BasicCaptchaTrackValidator.java
+4 -3
View File
@@ -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;
src/main/java/cloud/tianai/captcha/template/slider/validator/SimpleSliderCaptchaValidator.java → src/main/java/cloud/tianai/captcha/template/slider/validator/impl/SimpleSliderCaptchaValidator.java
+5 -3
View File
@@ -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;
src/main/java/example/DecodeTest.java → src/main/test/java/example/DecodeTest.java
View File
src/main/java/example/EncodeTest.java → src/main/test/java/example/EncodeTest.java
View File