From e72bd9be4cfe6a9de8410ca5d4fed07c7ca9857e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A4=A9=E7=88=B1=E6=9C=89=E6=83=85?=
 <tianaiyouqing@163.com>
Date: Thu, 16 Jun 2022 09:19:25 +0800
Subject: [PATCH] =?UTF-8?q?U=20ImageCaptchaTrack=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E6=89=A9=E5=B1=95=E5=AD=97=E6=AE=B5=E7=94=A8=E4=BA=8E=E4=BC=A0?=
 =?UTF-8?q?=E8=BE=93=E5=8A=A0=E5=AF=86=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../validator/common/model/dto/ImageCaptchaTrack.java    | 3 ++-
 .../validator/impl/SimpleImageCaptchaValidator.java      | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

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<Track> 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) {