diff --git a/src/main/java/cloud/tianai/captcha/validator/common/model/dto/ImageCaptchaTrack.java b/src/main/java/cloud/tianai/captcha/validator/common/model/dto/ImageCaptchaTrack.java index f24ae3d..96ff727 100644 --- a/src/main/java/cloud/tianai/captcha/validator/common/model/dto/ImageCaptchaTrack.java +++ b/src/main/java/cloud/tianai/captcha/validator/common/model/dto/ImageCaptchaTrack.java @@ -30,7 +30,8 @@ public class ImageCaptchaTrack { private Date endSlidingTime; /** 滑动的轨迹. */ private List trackList; - + /** 扩展数据,用户传输加密数据等.*/ + private Object data; /** * 兼容一下旧版本 * 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 05ef074..23a1c3e 100644 --- a/src/main/java/cloud/tianai/captcha/validator/impl/SimpleImageCaptchaValidator.java +++ b/src/main/java/cloud/tianai/captcha/validator/impl/SimpleImageCaptchaValidator.java @@ -154,6 +154,11 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator { Float tolerant = getFloatParam(TOLERANT_KEY, sliderCaptchaValidData, defaultTolerant); // 读验证码类型 String type = getStringParam(TYPE_KEY, sliderCaptchaValidData, CaptchaTypeConstant.SLIDER); + // 验证前 + // 在验证前必须读取 容错值 和验证码类型 + if (!beforeValid(imageCaptchaTrack, sliderCaptchaValidData, tolerant, type)) { + return false; + } Integer bgImageWidth = imageCaptchaTrack.getBgImageWidth(); if (bgImageWidth == null || bgImageWidth < 1) { // 没有背景图片宽度 @@ -164,10 +169,6 @@ public class SimpleImageCaptchaValidator implements ImageCaptchaValidator { // 没有滑动轨迹 return false; } - // 验证前 - if (!beforeValid(imageCaptchaTrack, sliderCaptchaValidData, tolerant, type)) { - return false; - } // 验证 boolean valid = doValid(imageCaptchaTrack, sliderCaptchaValidData, tolerant, type); if (valid) {