manager/my-worker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

import javax.validation. 替换为 import jakarta.validation.

Browse Source
This commit is contained in:
thinkgem
2023-06-24 14:38:38 +08:00
parent bc0a9f7f80
commit 8e81648bdd
20 changed files with 37 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/app/src/main/java/com/jeesite/modules/app/entity/AppComment.java
View File

@@ -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;

2
modules/app/src/main/java/com/jeesite/modules/app/entity/AppUpgrade.java
View File

@@ -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;

6
modules/cms/src/main/java/com/jeesite/modules/cms/entity/Article.java
View File

@@ -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;
/**

2
modules/cms/src/main/java/com/jeesite/modules/cms/entity/ArticleData.java
View File

@@ -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;

4
modules/cms/src/main/java/com/jeesite/modules/cms/entity/Category.java
View File

@@ -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;
/**

6
modules/cms/src/main/java/com/jeesite/modules/cms/entity/Comment.java
View File

@@ -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;

2
modules/core/src/main/java/com/jeesite/common/shiro/realm/CasAuthorizingRealm.java
View File

@@ -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;
/**

4
modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInner.java
View File

@@ -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;

4
modules/core/src/main/java/com/jeesite/modules/msg/entity/MsgInnerRecord.java
View File

@@ -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;

4
modules/core/src/main/java/com/jeesite/modules/sys/entity/Area.java
View File

@@ -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;

6
modules/core/src/main/java/com/jeesite/modules/sys/entity/Company.java
View File

@@ -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;
/**

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/EmpUser.java
View File

@@ -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

4
modules/core/src/main/java/com/jeesite/modules/sys/entity/Employee.java
View File

@@ -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;

2
modules/core/src/main/java/com/jeesite/modules/sys/entity/EmployeeOffice.java
View File

@@ -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;

4
modules/core/src/main/java/com/jeesite/modules/sys/entity/Log.java
View File

@@ -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;

6
modules/core/src/main/java/com/jeesite/modules/sys/entity/Office.java
View File

@@ -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

4
modules/core/src/main/java/com/jeesite/modules/sys/service/support/EmpUserServiceSupport.java
View File

@@ -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;
/**

4
modules/core/src/main/java/com/jeesite/modules/sys/service/support/OfficeServiceSupport.java
View File

@@ -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;
/**

2
modules/core/src/main/resources/templates/modules/gen/crud/entity.xml
View File

@@ -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};

2
modules/core/src/main/resources/templates/modules/gen/crud_cloud/entity.xml
View File

@@ -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};