diff --git a/modules/app/src/main/java/com/jeesite/modules/app/entity/AppComment.java b/modules/app/src/main/java/com/jeesite/modules/app/entity/AppComment.java index 1679a5ff..9e956ec6 100644 --- a/modules/app/src/main/java/com/jeesite/modules/app/entity/AppComment.java +++ b/modules/app/src/main/java/com/jeesite/modules/app/entity/AppComment.java @@ -6,9 +6,9 @@ package com.jeesite.modules.app.entity; import java.util.Date; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonFormat; import com.jeesite.common.entity.DataEntity; diff --git a/modules/app/src/main/java/com/jeesite/modules/app/entity/AppUpgrade.java b/modules/app/src/main/java/com/jeesite/modules/app/entity/AppUpgrade.java index c502ecbb..1016af12 100644 --- a/modules/app/src/main/java/com/jeesite/modules/app/entity/AppUpgrade.java +++ b/modules/app/src/main/java/com/jeesite/modules/app/entity/AppUpgrade.java @@ -6,7 +6,7 @@ package com.jeesite.modules.app.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.DataEntity; diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java index 1e533d89..9c93758a 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java @@ -13,9 +13,9 @@ import com.jeesite.common.mybatis.annotation.Table; import com.jeesite.common.mybatis.mapper.query.QueryType; import com.jeesite.modules.cms.utils.CmsUtils; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.Date; /** diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleData.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleData.java index 772d3db7..d4440bbd 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleData.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleData.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.entity.Extend; diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java index e4c964b6..39642452 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java @@ -14,8 +14,8 @@ import com.jeesite.common.mybatis.annotation.Table; import com.jeesite.common.mybatis.mapper.query.QueryType; import com.jeesite.modules.cms.utils.CmsUtils; -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/Comment.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Comment.java index 29bc269b..a5ad74a9 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Comment.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/Comment.java @@ -6,10 +6,10 @@ package com.jeesite.modules.cms.entity; import java.util.Date; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; -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/common/shiro/realm/CasAuthorizingRealm.java b/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java index 38177e98..e586798e 100644 --- a/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java +++ b/modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java @@ -31,7 +31,7 @@ import org.jasig.cas.client.validation.TicketValidator; import org.springframework.beans.factory.NoSuchBeanDefinitionException; import jakarta.servlet.http.HttpServletRequest; -import javax.validation.ValidationException; +import jakarta.validation.ValidationException; import java.util.Map; /** diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java index 65bdcafd..da94a430 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java @@ -6,9 +6,9 @@ package com.jeesite.modules.msg.entity; import java.util.Date; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonFormat; import com.jeesite.common.entity.DataEntity; diff --git a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java index ee45b5e4..b90d5bf6 100644 --- a/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java +++ b/modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java @@ -6,9 +6,9 @@ package com.jeesite.modules.msg.entity; import java.util.Date; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotBlank; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonFormat; import com.jeesite.common.entity.DataEntity; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java index 71c98cb2..a0168208 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java @@ -4,8 +4,8 @@ */ package com.jeesite.modules.sys.entity; -import javax.validation.constraints.Size; -import javax.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.entity.TreeEntity; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java index f7b903fe..7f171f03 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java @@ -16,9 +16,9 @@ import com.jeesite.common.mybatis.annotation.JoinTable.Type; import com.jeesite.common.mybatis.annotation.Table; import com.jeesite.common.mybatis.mapper.query.QueryType; -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; import java.util.List; /** diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java index 9330b2ea..26ee54db 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java @@ -19,7 +19,7 @@ import com.jeesite.common.utils.excel.fieldtype.CompanyType; import com.jeesite.common.utils.excel.fieldtype.OfficeType; import io.swagger.annotations.ApiModelProperty; -import javax.validation.Valid; +import jakarta.validation.Valid; /** * 员工用户管理Entity diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java index 60691efc..190c544d 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java @@ -15,8 +15,8 @@ import com.jeesite.common.mybatis.annotation.Table; import com.jeesite.common.mybatis.mapper.query.QueryType; import io.swagger.annotations.ApiModelProperty; -import javax.validation.constraints.NotNull; -import javax.validation.constraints.Size; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.util.List; import java.util.stream.Collectors; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java index 937b151d..f7f49933 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java @@ -4,7 +4,7 @@ */ package com.jeesite.modules.sys.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/core/src/main/java/com/jeesite/modules/sys/entity/Log.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java index 667186a6..457de376 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java @@ -16,8 +16,8 @@ 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.Size; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; import java.util.Date; import java.util.Map; diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java index 94bc83c5..364b978e 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java @@ -18,9 +18,9 @@ import com.jeesite.common.utils.excel.annotation.ExcelFields; import com.jeesite.modules.sys.utils.EmpUtils; 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; /** * 组织机构Entity diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java index b88fa3ae..a4627551 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java @@ -28,8 +28,8 @@ import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; import javax.annotation.PostConstruct; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import java.util.List; /** diff --git a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/OfficeServiceSupport.java b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/OfficeServiceSupport.java index 332049e3..56caceae 100644 --- a/modules/core/src/main/java/com/jeesite/modules/sys/service/support/OfficeServiceSupport.java +++ b/modules/core/src/main/java/com/jeesite/modules/sys/service/support/OfficeServiceSupport.java @@ -18,8 +18,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import javax.validation.ConstraintViolation; -import javax.validation.ConstraintViolationException; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.ConstraintViolationException; import java.util.List; /** diff --git a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml index 4e92b2f5..ec91b0fa 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud/entity.xml @@ -9,7 +9,7 @@ package ${packageName}.${moduleName}.entity${isNotBlank(subModuleName)?'.'+subModuleName:''}; <% if(table.childList.~size > 0){ %> -import javax.validation.Valid; +import jakarta.validation.Valid; <% } %> <% for(i in table.importList){ %> import ${i}; diff --git a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml index 45d81b0b..db97879c 100644 --- a/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml +++ b/modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml @@ -9,7 +9,7 @@ package ${packageName}.${moduleName}.entity${isNotBlank(subModuleName)?'.'+subModuleName:''}; <% if(table.childList.~size > 0){ %> -import javax.validation.Valid; +import jakarta.validation.Valid; <% } %> <% for(i in table.importList){ %> import ${i};