diff --git a/iot-common-core/pom.xml b/iot-common-core/pom.xml index aee4afd..bfe4882 100755 --- a/iot-common-core/pom.xml +++ b/iot-common-core/pom.xml @@ -80,8 +80,9 @@ - jakarta.validation - jakarta.validation-api + org.hibernate + hibernate-validator + 5.3.0.Final diff --git a/iot-common-core/src/main/java/cc/iotkit/common/api/PageRequest.java b/iot-common-core/src/main/java/cc/iotkit/common/api/PageRequest.java index 21c7360..b7b4d41 100755 --- a/iot-common-core/src/main/java/cc/iotkit/common/api/PageRequest.java +++ b/iot-common-core/src/main/java/cc/iotkit/common/api/PageRequest.java @@ -25,9 +25,9 @@ package cc.iotkit.common.api; import cc.iotkit.common.utils.MapstructUtils; import cn.hutool.core.util.IdUtil; -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; -import jakarta.validation.constraints.NotNull; +import javax.validation.constraints.Max; +import javax.validation.constraints.Min; +import javax.validation.constraints.NotNull; import java.util.Map; diff --git a/iot-common-core/src/main/java/cc/iotkit/common/api/Request.java b/iot-common-core/src/main/java/cc/iotkit/common/api/Request.java index f755366..fe282c0 100755 --- a/iot-common-core/src/main/java/cc/iotkit/common/api/Request.java +++ b/iot-common-core/src/main/java/cc/iotkit/common/api/Request.java @@ -24,10 +24,11 @@ package cc.iotkit.common.api; import cn.hutool.core.util.IdUtil; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotNull; +import javax.validation.Valid; +import javax.validation.constraints.NotNull; import lombok.Data; + import java.io.Serializable; /** diff --git a/iot-common-core/src/main/java/cc/iotkit/common/api/RequestEmpty.java b/iot-common-core/src/main/java/cc/iotkit/common/api/RequestEmpty.java index 50d3eac..e538f83 100755 --- a/iot-common-core/src/main/java/cc/iotkit/common/api/RequestEmpty.java +++ b/iot-common-core/src/main/java/cc/iotkit/common/api/RequestEmpty.java @@ -24,8 +24,8 @@ package cc.iotkit.common.api; import cn.hutool.core.util.IdUtil; -import jakarta.validation.constraints.NotBlank; import lombok.Data; +import org.hibernate.validator.constraints.NotBlank; import java.io.Serializable; diff --git a/iot-common-core/src/main/java/cc/iotkit/common/utils/ValidatorUtils.java b/iot-common-core/src/main/java/cc/iotkit/common/utils/ValidatorUtils.java index c03aed1..1734c45 100755 --- a/iot-common-core/src/main/java/cc/iotkit/common/utils/ValidatorUtils.java +++ b/iot-common-core/src/main/java/cc/iotkit/common/utils/ValidatorUtils.java @@ -23,9 +23,9 @@ package cc.iotkit.common.utils; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ConstraintViolationException; -import jakarta.validation.Validator; +import javax.validation.ConstraintViolation; +import javax.validation.ConstraintViolationException; +import javax.validation.Validator; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/iot-common-excel/src/main/java/cc/iotkit/common/excel/core/DefaultExcelListener.java b/iot-common-excel/src/main/java/cc/iotkit/common/excel/core/DefaultExcelListener.java index 9e7787d..70c2d8f 100755 --- a/iot-common-excel/src/main/java/cc/iotkit/common/excel/core/DefaultExcelListener.java +++ b/iot-common-excel/src/main/java/cc/iotkit/common/excel/core/DefaultExcelListener.java @@ -31,8 +31,8 @@ import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.exception.ExcelAnalysisException; import com.alibaba.excel.exception.ExcelDataConvertException; -import jakarta.validation.ConstraintViolation; -import jakarta.validation.ConstraintViolationException; +import javax.validation.ConstraintViolation; +import javax.validation.ConstraintViolationException; import lombok.NoArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/iot-common-web/pom.xml b/iot-common-web/pom.xml index 53f3607..87506f7 100755 --- a/iot-common-web/pom.xml +++ b/iot-common-web/pom.xml @@ -26,6 +26,7 @@ spring-boot-starter-web + cn.hutool hutool-captcha diff --git a/pom.xml b/pom.xml index e0e8f07..e090f2b 100755 --- a/pom.xml +++ b/pom.xml @@ -143,11 +143,6 @@ - - jakarta.validation - jakarta.validation-api - 3.0.2 - org.lionsoul