mirror of
https://github.com/dromara/tianai-captcha.git
synced 2026-05-07 06:04:34 +08:00
U SimpleImageCaptchaValidator 开放 getFloatParam getStringParam 供外部调用
This commit is contained in:
@@ -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;
|
||||||
|
|||||||
@@ -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;
|
||||||
@@ -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) {
|
||||||
|
|||||||
Reference in New Issue
Block a user