diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Report.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Report.java index 9440518b..4e3efc38 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Report.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Report.java @@ -4,7 +4,7 @@ */ package com.jeesite.modules.cms.entity; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.mybatis.annotation.Column; diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java index db10b6c9..5bfb134a 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Site.java @@ -14,8 +14,8 @@ import com.jeesite.modules.cms.utils.CmsUtils; import com.jeesite.modules.sys.utils.CorpUtils; import com.jeesite.modules.sys.utils.UserUtils; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import java.util.List; /** diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Tag.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Tag.java index 9a0298ed..524011d3 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Tag.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Tag.java @@ -4,7 +4,7 @@ */ package com.jeesite.modules.cms.entity; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotNull; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.mybatis.annotation.Column; diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/VisitLog.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/VisitLog.java index 3c68ccb8..81bb916d 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/VisitLog.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/VisitLog.java @@ -6,7 +6,7 @@ package com.jeesite.modules.cms.entity; import java.util.Date; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonFormat; import com.jeesite.common.entity.BaseEntity; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java index 58e84130..b6572ec6 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Post.java @@ -11,9 +11,9 @@ import com.jeesite.common.mybatis.annotation.Table; import com.jeesite.common.mybatis.mapper.query.QueryType; import io.swagger.annotations.ApiModelProperty; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Pattern; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; @Table(name="${_prefix}sys_post", alias="a", label="岗位信息", columns={ @Column(includeEntity=BaseEntity.class), diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml index 007bc46f..75afabc3 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/service.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/service.xml @@ -40,8 +40,8 @@ import com.jeesite.common.config.Global; import com.jeesite.common.validator.ValidatorUtils; import com.jeesite.common.utils.excel.ExcelImport; import org.springframework.web.multipart.MultipartFile; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; <% } %> /** diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml index 9e53499f..c75fb012 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/service.xml @@ -42,8 +42,8 @@ import com.jeesite.common.config.Global; import com.jeesite.common.validator.ValidatorUtils; import com.jeesite.common.utils.excel.ExcelImport; import org.springframework.web.multipart.MultipartFile; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; <% } %> import io.seata.spring.annotation.GlobalTransactional; diff --git a/web-api/src/main/java/com/jeesite/modules/test/entity/TestData.java b/web-api/src/main/java/com/jeesite/modules/test/entity/TestData.java index dbd07330..464cff20 100644 --- a/web-api/src/main/java/com/jeesite/modules/test/entity/TestData.java +++ b/web-api/src/main/java/com/jeesite/modules/test/entity/TestData.java @@ -4,7 +4,7 @@ */ package com.jeesite.modules.test.entity; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import java.util.Date; import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; diff --git a/web-api/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/web-api/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java index 4a83a789..346ff906 100644 --- a/web-api/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java +++ b/web-api/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java @@ -4,7 +4,7 @@ */ package com.jeesite.modules.test.entity; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import java.util.Date; import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; diff --git a/web-api/src/main/java/com/jeesite/modules/test/entity/TestTree.java b/web-api/src/main/java/com/jeesite/modules/test/entity/TestTree.java index 4486ba5f..1db55873 100644 --- a/web-api/src/main/java/com/jeesite/modules/test/entity/TestTree.java +++ b/web-api/src/main/java/com/jeesite/modules/test/entity/TestTree.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.test.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.entity.TreeEntity; diff --git a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestData.java b/web-fast/src/main/java/com/jeesite/modules/test/entity/TestData.java index dbd07330..464cff20 100644 --- a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestData.java +++ b/web-fast/src/main/java/com/jeesite/modules/test/entity/TestData.java @@ -4,7 +4,7 @@ */ package com.jeesite.modules.test.entity; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import java.util.Date; import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; diff --git a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/web-fast/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java index 4a83a789..346ff906 100644 --- a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java +++ b/web-fast/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java @@ -4,7 +4,7 @@ */ package com.jeesite.modules.test.entity; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import java.util.Date; import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; diff --git a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestTree.java b/web-fast/src/main/java/com/jeesite/modules/test/entity/TestTree.java index 4486ba5f..1db55873 100644 --- a/web-fast/src/main/java/com/jeesite/modules/test/entity/TestTree.java +++ b/web-fast/src/main/java/com/jeesite/modules/test/entity/TestTree.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.test.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.entity.TreeEntity; diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java index dbd07330..464cff20 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestData.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestData.java @@ -4,7 +4,7 @@ */ package com.jeesite.modules.test.entity; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import java.util.Date; import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java index 4a83a789..346ff906 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestDataChild.java @@ -4,7 +4,7 @@ */ package com.jeesite.modules.test.entity; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import java.util.Date; import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; diff --git a/web/src/main/java/com/jeesite/modules/test/entity/TestTree.java b/web/src/main/java/com/jeesite/modules/test/entity/TestTree.java index 4486ba5f..1db55873 100644 --- a/web/src/main/java/com/jeesite/modules/test/entity/TestTree.java +++ b/web/src/main/java/com/jeesite/modules/test/entity/TestTree.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.test.entity; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.entity.TreeEntity;