From c19dc82f7c293164d9bc2a914b32d0960958ba6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=A4=A9=E7=88=B1=E6=9C=89=E6=83=85?= Date: Fri, 17 Jun 2022 18:43:18 +0800 Subject: [PATCH] =?UTF-8?q?U=20SimpleImageCaptchaValidator=20=E5=BC=80?= =?UTF-8?q?=E6=94=BE=20getFloatParam=20getStringParam=20=E4=BE=9B=E5=A4=96?= =?UTF-8?q?=E9=83=A8=E8=B0=83=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../validator/ImageCaptchaValidator.java | 4 +-- .../impl/SimpleImageCaptchaValidator.java | 26 +++++++------------ 2 files changed, 11 insertions(+), 19 deletions(-) diff --git a/src/main/java/cloud/tianai/captcha/validator/ImageCaptchaValidator.java b/src/main/java/cloud/tianai/captcha/validator/ImageCaptchaValidator.java index 2c98006..7b3f091 100644 --- a/src/main/java/cloud/tianai/captcha/validator/ImageCaptchaValidator.java +++ b/src/main/java/cloud/tianai/captcha/validator/ImageCaptchaValidator.java @@ -1,8 +1,6 @@ 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.validator.common.model.dto.ImageCaptchaTrack; import cloud.tianai.captcha.validator.common.model.dto.ImageCaptchaTrack; import java.util.Map; @@ -53,7 +51,7 @@ public interface ImageCaptchaValidator { /** * 校验用户滑动滑块是否正确 * - * @param imageCaptchaTrack 包含了滑动轨迹，展示的图片宽高，滑动时间等参数 + * @param imageCaptchaTrack 包含了滑动轨迹，展示的图片宽高，滑动时间等参数 * @param sliderCaptchaValidData generateSliderCaptchaValidData(生成的数据 * @return boolean */ diff --git a/src/main/java/cloud/tianai/captcha/validator/impl/SimpleImageCaptchaValidator.java b/src/main/java/cloud/tianai/captcha/validator/impl/SimpleImageCaptchaValidator.java index 23a1c3e..8929e5e 100644 --- a/src/main/java/cloud/tianai/captcha/validator/impl/SimpleImageCaptchaValidator.java +++ b/src/main/java/cloud/tianai/captcha/validator/impl/SimpleImageCaptchaValidator.java @@ -6,15 +6,6 @@ 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.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.common.constant.TrackTypeConstant; 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 tolerant tolerant * @param type type @@ -194,7 +185,7 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator { /** * 验证后 * - * @param imageCaptchaTrack sliderCaptchaTrack + * @param imageCaptchaTrack sliderCaptchaTrack * @param sliderCaptchaValidData sliderCaptchaValidData * @param tolerant tolerant * @param type type @@ -223,7 +214,7 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator { /** * 校验点选验证码 * - * @param imageCaptchaTrack sliderCaptchaTrack + * @param imageCaptchaTrack sliderCaptchaTrack * @param sliderCaptchaValidData sliderCaptchaValidData * @param tolerant tolerant * @param type type @@ -271,7 +262,7 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator { /** * 校验滑动验证码 * - * @param imageCaptchaTrack sliderCaptchaTrack + * @param imageCaptchaTrack sliderCaptchaTrack * @param sliderCaptchaValidData sliderCaptchaValidData * @param tolerant tolerant * @param type type @@ -295,11 +286,11 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator { return checkPercentage(calcPercentage, oriPercentage, tolerant); } - protected Float getFloatParam(String key, Map sliderCaptchaValidData) { + public Float getFloatParam(String key, Map sliderCaptchaValidData) { return getFloatParam(key, sliderCaptchaValidData, null); } - protected Float getFloatParam(String key, Map sliderCaptchaValidData, Float defaultData) { + public Float getFloatParam(String key, Map sliderCaptchaValidData, Float defaultData) { Object data = sliderCaptchaValidData.get(key); if (data != null) { if (data instanceof Number) { @@ -317,7 +308,10 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator { return defaultData; } - protected String getStringParam(String key, Map sliderCaptchaValidData, String defaultData) { + public String getStringParam(String key, Map sliderCaptchaValidData, String defaultData) { + if (CollectionUtils.isEmpty(sliderCaptchaValidData)) { + return defaultData; + } Object data = sliderCaptchaValidData.get(key); if (data != null) { if (data instanceof String) {