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

U SimpleImageCaptchaValidator 开放 getFloatParam getStringParam 供外部调用

Browse Source
This commit is contained in:
天爱有情
2022-06-17 18:43:18 +08:00
parent e72bd9be4c
commit c19dc82f7c
2 changed files with 11 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/cloud/tianai/captcha/validator/ImageCaptchaValidator.java
+1 -3
View File
@@ -1,8 +1,6 @@
package cloud.tianai.captcha.validator; package cloud.tianai.captcha.validator;
import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack;
import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack; import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack;
import java.util.Map; import java.util.Map;
@@ -53,7 +51,7 @@ public interface ImageCaptchaValidator {
/** /**
* 校验用户滑动滑块是否正确 * 校验用户滑动滑块是否正确
* *
* @param imageCaptchaTrack 包含了滑动轨迹，展示的图片宽高，滑动时间等参数 * @param imageCaptchaTrack 包含了滑动轨迹，展示的图片宽高，滑动时间等参数
* @param sliderCaptchaValidData generateSliderCaptchaValidData(生成的数据 * @param sliderCaptchaValidData generateSliderCaptchaValidData(生成的数据
* @return boolean * @return boolean
*/ */
src/main/java/cloud/tianai/captcha/validator/impl/SimpleImageCaptchaValidator.java
+10 -16
View File
@@ -6,15 +6,6 @@ import cloud.tianai.captcha.common.util.CollectionUtils;
import cloud.tianai.captcha.common.util.ObjectUtils; import cloud.tianai.captcha.common.util.ObjectUtils;
import cloud.tianai.captcha.generator.common.model.dto.ClickImageCheckDefinition; import cloud.tianai.captcha.generator.common.model.dto.ClickImageCheckDefinition;
import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo; import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.common.constant.CaptchaTypeConstant;
import cloud.tianai.captcha.common.util.CaptchaUtils;
import cloud.tianai.captcha.common.util.CollectionUtils;
import cloud.tianai.captcha.common.util.ObjectUtils;
import cloud.tianai.captcha.generator.common.model.dto.ClickImageCheckDefinition;
import cloud.tianai.captcha.generator.common.model.dto.ImageCaptchaInfo;
import cloud.tianai.captcha.validator.ImageCaptchaValidator;
import cloud.tianai.captcha.validator.common.constant.TrackTypeConstant;
import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack;
import cloud.tianai.captcha.validator.ImageCaptchaValidator; import cloud.tianai.captcha.validator.ImageCaptchaValidator;
import cloud.tianai.captcha.validator.common.constant.TrackTypeConstant; import cloud.tianai.captcha.validator.common.constant.TrackTypeConstant;
import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack; import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack;
@@ -181,7 +172,7 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator {
/** /**
* 验证前 * 验证前
* *
* @param imageCaptchaTrack sliderCaptchaTrack * @param imageCaptchaTrack sliderCaptchaTrack
* @param sliderCaptchaValidData sliderCaptchaValidData * @param sliderCaptchaValidData sliderCaptchaValidData
* @param tolerant tolerant * @param tolerant tolerant
* @param type type * @param type type
@@ -194,7 +185,7 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator {
/** /**
* 验证后 * 验证后
* *
* @param imageCaptchaTrack sliderCaptchaTrack * @param imageCaptchaTrack sliderCaptchaTrack
* @param sliderCaptchaValidData sliderCaptchaValidData * @param sliderCaptchaValidData sliderCaptchaValidData
* @param tolerant tolerant * @param tolerant tolerant
* @param type type * @param type type
@@ -223,7 +214,7 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator {
/** /**
* 校验点选验证码 * 校验点选验证码
* *
* @param imageCaptchaTrack sliderCaptchaTrack * @param imageCaptchaTrack sliderCaptchaTrack
* @param sliderCaptchaValidData sliderCaptchaValidData * @param sliderCaptchaValidData sliderCaptchaValidData
* @param tolerant tolerant * @param tolerant tolerant
* @param type type * @param type type
@@ -271,7 +262,7 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator {
/** /**
* 校验滑动验证码 * 校验滑动验证码
* *
* @param imageCaptchaTrack sliderCaptchaTrack * @param imageCaptchaTrack sliderCaptchaTrack
* @param sliderCaptchaValidData sliderCaptchaValidData * @param sliderCaptchaValidData sliderCaptchaValidData
* @param tolerant tolerant * @param tolerant tolerant
* @param type type * @param type type
@@ -295,11 +286,11 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator {
return checkPercentage(calcPercentage, oriPercentage, tolerant); return checkPercentage(calcPercentage, oriPercentage, tolerant);
} }
protected Float getFloatParam(String key, Map<String, Object> sliderCaptchaValidData) { public Float getFloatParam(String key, Map<String, Object> sliderCaptchaValidData) {
return getFloatParam(key, sliderCaptchaValidData, null); return getFloatParam(key, sliderCaptchaValidData, null);
} }
protected Float getFloatParam(String key, Map<String, Object> sliderCaptchaValidData, Float defaultData) { public Float getFloatParam(String key, Map<String, Object> sliderCaptchaValidData, Float defaultData) {
Object data = sliderCaptchaValidData.get(key); Object data = sliderCaptchaValidData.get(key);
if (data != null) { if (data != null) {
if (data instanceof Number) { if (data instanceof Number) {
@@ -317,7 +308,10 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator {
return defaultData; return defaultData;
} }
protected String getStringParam(String key, Map<String, Object> sliderCaptchaValidData, String defaultData) { public String getStringParam(String key, Map<String, Object> sliderCaptchaValidData, String defaultData) {
if (CollectionUtils.isEmpty(sliderCaptchaValidData)) {
return defaultData;
}
Object data = sliderCaptchaValidData.get(key); Object data = sliderCaptchaValidData.get(key);
if (data != null) { if (data != null) {
if (data instanceof String) { if (data instanceof String) {