From 1d3540eef465a5c4b0b85fd89a1d5f8650c6f6c6 Mon Sep 17 00:00:00 2001 From: thinkgem Date: Wed, 13 Oct 2021 18:14:10 +0800 Subject: [PATCH] @Length to @Size --- .../jeesite/modules/cms/entity/Article.java | 24 ++++----- .../modules/cms/entity/ArticleData.java | 6 +-- .../jeesite/modules/cms/entity/Category.java | 32 +++++------ .../modules/cms/entity/CategoryRole.java | 4 +- .../jeesite/modules/cms/entity/Comment.java | 20 +++---- .../jeesite/modules/cms/entity/Report.java | 12 ++--- .../com/jeesite/modules/cms/entity/Site.java | 20 +++---- .../jeesite/modules/cms/entity/VisitLog.java | 54 +++++++++---------- .../jeesite/modules/msg/entity/MsgInner.java | 18 +++---- .../modules/msg/entity/MsgInnerRecord.java | 12 ++--- .../com/jeesite/modules/sys/entity/Area.java | 6 +-- .../jeesite/modules/sys/entity/Company.java | 6 +-- .../jeesite/modules/sys/entity/Employee.java | 8 +-- .../modules/sys/entity/EmployeeOffice.java | 4 +- .../com/jeesite/modules/sys/entity/Log.java | 24 ++++----- .../jeesite/modules/sys/entity/Office.java | 18 +++---- .../com/jeesite/modules/sys/entity/Post.java | 6 +-- .../jeesite/modules/test/entity/TestData.java | 18 +++---- .../modules/test/entity/TestDataChild.java | 20 +++---- .../jeesite/modules/test/entity/TestTree.java | 4 +- 20 files changed, 158 insertions(+), 158 deletions(-) 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 c6cf4afa..0ba2e1d6 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 @@ -8,7 +8,7 @@ import java.util.Date; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonFormat; import com.jeesite.common.entity.BaseEntity; @@ -115,7 +115,7 @@ public class Article extends DataEntity
{ this.category = category; } - @Length(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符") + @Size(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符") public String getModuleType() { return moduleType; } @@ -125,7 +125,7 @@ public class Article extends DataEntity
{ } @NotBlank(message = "内容标题不能为空") - @Length(min = 0, max = 255, message = "内容标题长度不能超过 255 个字符") + @Size(min = 0, max = 255, message = "内容标题长度不能超过 255 个字符") public String getTitle() { return title; } @@ -134,7 +134,7 @@ public class Article extends DataEntity
{ this.title = title; } - @Length(min = 0, max = 1000, message = "外部链接长度不能超过 1000 个字符") + @Size(min = 0, max = 1000, message = "外部链接长度不能超过 1000 个字符") public String getHref() { return href; } @@ -143,7 +143,7 @@ public class Article extends DataEntity
{ this.href = href; } - @Length(min = 0, max = 50, message = "标题颜色长度不能超过 50 个字符") + @Size(min = 0, max = 50, message = "标题颜色长度不能超过 50 个字符") public String getColor() { return color; } @@ -152,7 +152,7 @@ public class Article extends DataEntity
{ this.color = color; } - @Length(min = 0, max = 1000, message = "内容图片长度不能超过 1000 个字符") + @Size(min = 0, max = 1000, message = "内容图片长度不能超过 1000 个字符") public String getImage() { return image; } @@ -161,7 +161,7 @@ public class Article extends DataEntity
{ this.image = image; } - @Length(min = 0, max = 500, message = "关键字长度不能超过 500 个字符") + @Size(min = 0, max = 500, message = "关键字长度不能超过 500 个字符") public String getKeywords() { return keywords; } @@ -170,7 +170,7 @@ public class Article extends DataEntity
{ this.keywords = keywords; } - @Length(min = 0, max = 500, message = "描述长度不能超过 500 个字符") + @Size(min = 0, max = 500, message = "描述长度不能超过 500 个字符") public String getDescription() { return description; } @@ -196,7 +196,7 @@ public class Article extends DataEntity
{ this.weightDate = weightDate; } - @Length(min = 0, max = 1, message = "来源长度不能超过 1 个字符") + @Size(min = 0, max = 1, message = "来源长度不能超过 1 个字符") public String getSource() { return source; } @@ -205,7 +205,7 @@ public class Article extends DataEntity
{ this.source = source; } - @Length(min = 0, max = 255, message = "文章来源出处长度不能超过 255 个字符") + @Size(min = 0, max = 255, message = "文章来源出处长度不能超过 255 个字符") public String getCopyfrom() { return copyfrom; } @@ -248,7 +248,7 @@ public class Article extends DataEntity
{ this.wordCount = wordCount; } - @Length(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符") + @Size(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符") public String getCustomContentView() { return customContentView; } @@ -257,7 +257,7 @@ public class Article extends DataEntity
{ this.customContentView = customContentView; } - @Length(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符") + @Size(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符") public String getViewConfig() { return viewConfig; } 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 51d82019..1b148c6c 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 @@ -3,7 +3,7 @@ */ package com.jeesite.modules.cms.entity; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.entity.Extend; @@ -47,7 +47,7 @@ public class ArticleData extends DataEntity { this.content = content; } - @Length(min = 0, max = 1000, message = "相关文章长度不能超过 1000 个字符") + @Size(min = 0, max = 1000, message = "相关文章长度不能超过 1000 个字符") public String getRelation() { return relation; } @@ -56,7 +56,7 @@ public class ArticleData extends DataEntity { this.relation = relation; } - @Length(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符") + @Size(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符") public String getIsCanComment() { return isCanComment; } 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 089e3c68..d92ec1b6 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 @@ -7,7 +7,7 @@ import java.util.List; import javax.validation.constraints.NotBlank; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.jeesite.common.collect.ListUtils; import com.jeesite.common.entity.DataEntity; @@ -110,7 +110,7 @@ public class Category extends TreeEntity { } @NotBlank(message = "栏目名称不能为空") - @Length(min = 0, max = 100, message = "栏目名称长度不能超过 100 个字符") + @Size(min = 0, max = 100, message = "栏目名称长度不能超过 100 个字符") public String getCategoryName() { return categoryName; } @@ -130,7 +130,7 @@ public class Category extends TreeEntity { this.site = site; } - @Length(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符") + @Size(min = 0, max = 50, message = "模块类型长度不能超过 50 个字符") public String getModuleType() { return moduleType; } @@ -139,7 +139,7 @@ public class Category extends TreeEntity { this.moduleType = moduleType; } - @Length(min = 0, max = 255, message = "栏目图片长度不能超过 255 个字符") + @Size(min = 0, max = 255, message = "栏目图片长度不能超过 255 个字符") public String getImage() { return image; } @@ -148,7 +148,7 @@ public class Category extends TreeEntity { this.image = image; } - @Length(min = 0, max = 255, message = "链接长度不能超过 255 个字符") + @Size(min = 0, max = 255, message = "链接长度不能超过 255 个字符") public String getHref() { return href; } @@ -157,7 +157,7 @@ public class Category extends TreeEntity { this.href = href; } - @Length(min = 0, max = 20, message = "目标长度不能超过 20 个字符") + @Size(min = 0, max = 20, message = "目标长度不能超过 20 个字符") public String getTarget() { return target; } @@ -166,7 +166,7 @@ public class Category extends TreeEntity { this.target = target; } - @Length(min = 0, max = 500, message = "关键字长度不能超过 500 个字符") + @Size(min = 0, max = 500, message = "关键字长度不能超过 500 个字符") public String getKeywords() { return keywords; } @@ -175,7 +175,7 @@ public class Category extends TreeEntity { this.keywords = keywords; } - @Length(min = 0, max = 500, message = "描述长度不能超过 500 个字符") + @Size(min = 0, max = 500, message = "描述长度不能超过 500 个字符") public String getDescription() { return description; } @@ -184,7 +184,7 @@ public class Category extends TreeEntity { this.description = description; } - @Length(min = 0, max = 1, message = "是否在导航中显示长度不能超过 1 个字符") + @Size(min = 0, max = 1, message = "是否在导航中显示长度不能超过 1 个字符") public String getInMenu() { return inMenu; } @@ -193,7 +193,7 @@ public class Category extends TreeEntity { this.inMenu = inMenu; } - @Length(min = 0, max = 1, message = "是否在分类页中显示列表长度不能超过 1 个字符") + @Size(min = 0, max = 1, message = "是否在分类页中显示列表长度不能超过 1 个字符") public String getInList() { return inList; } @@ -202,7 +202,7 @@ public class Category extends TreeEntity { this.inList = inList; } - @Length(min = 0, max = 1, message = "展现模式长度不能超过 1 个字符") + @Size(min = 0, max = 1, message = "展现模式长度不能超过 1 个字符") public String getShowModes() { return showModes; } @@ -211,7 +211,7 @@ public class Category extends TreeEntity { this.showModes = showModes; } - @Length(min = 0, max = 1, message = "是否需要审核长度不能超过 1 个字符") + @Size(min = 0, max = 1, message = "是否需要审核长度不能超过 1 个字符") public String getIsNeedAudit() { return isNeedAudit; } @@ -220,7 +220,7 @@ public class Category extends TreeEntity { this.isNeedAudit = isNeedAudit; } - @Length(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符") + @Size(min = 0, max = 1, message = "是否允许评论长度不能超过 1 个字符") public String getIsCanComment() { return isCanComment; } @@ -229,7 +229,7 @@ public class Category extends TreeEntity { this.isCanComment = isCanComment; } - @Length(min = 0, max = 255, message = "自定义列表视图长度不能超过 255 个字符") + @Size(min = 0, max = 255, message = "自定义列表视图长度不能超过 255 个字符") public String getCustomListView() { return customListView; } @@ -238,7 +238,7 @@ public class Category extends TreeEntity { this.customListView = customListView; } - @Length(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符") + @Size(min = 0, max = 255, message = "自定义内容视图长度不能超过 255 个字符") public String getCustomContentView() { return customContentView; } @@ -247,7 +247,7 @@ public class Category extends TreeEntity { this.customContentView = customContentView; } - @Length(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符") + @Size(min = 0, max = 1000, message = "视图配置长度不能超过 1000 个字符") public String getViewConfig() { return viewConfig; } diff --git a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/CategoryRole.java b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/CategoryRole.java index ce6c744e..b1a6fd35 100644 --- a/modules/cms/src/main/java/com/jeesite/modules/cms/entity/CategoryRole.java +++ b/modules/cms/src/main/java/com/jeesite/modules/cms/entity/CategoryRole.java @@ -3,7 +3,7 @@ */ package com.jeesite.modules.cms.entity; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.mybatis.annotation.Column; @@ -52,7 +52,7 @@ public class CategoryRole extends DataEntity { this.roleCode = roleCode; } - @Length(min = 0, max = 32, message = "控制类型长度不能超过 32 个字符") + @Size(min = 0, max = 32, message = "控制类型长度不能超过 32 个字符") public String getCtrlType() { return ctrlType; } 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 79cc9001..8436cd90 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 @@ -8,7 +8,7 @@ import java.util.Date; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonFormat; import com.jeesite.common.entity.BaseEntity; @@ -77,7 +77,7 @@ public class Comment extends DataEntity { } @NotBlank(message="栏目编码不能为空") - @Length(min=0, max=64, message="栏目编码长度不能超过 64 个字符") + @Size(min=0, max=64, message="栏目编码长度不能超过 64 个字符") public String getCategoryCode() { return categoryCode; } @@ -87,7 +87,7 @@ public class Comment extends DataEntity { } @NotBlank(message="内容编号不能为空") - @Length(min=0, max=64, message="内容编号长度不能超过 64 个字符") + @Size(min=0, max=64, message="内容编号长度不能超过 64 个字符") public String getArticleId() { return articleId; } @@ -96,7 +96,7 @@ public class Comment extends DataEntity { this.articleId = articleId; } - @Length(min=0, max=64, message="父级评论长度不能超过 64 个字符") + @Size(min=0, max=64, message="父级评论长度不能超过 64 个字符") public String getParentId() { return parentId; } @@ -106,7 +106,7 @@ public class Comment extends DataEntity { } @NotBlank(message="内容标题不能为空") - @Length(min=0, max=255, message="内容标题长度不能超过 255 个字符") + @Size(min=0, max=255, message="内容标题长度不能超过 255 个字符") public String getArticleTitle() { return articleTitle; } @@ -116,7 +116,7 @@ public class Comment extends DataEntity { } @NotBlank(message="评论内容不能为空") - @Length(min=0, max=255, message="评论内容长度不能超过 255 个字符") + @Size(min=0, max=255, message="评论内容长度不能超过 255 个字符") public String getContent() { return content; } @@ -125,7 +125,7 @@ public class Comment extends DataEntity { this.content = content; } - @Length(min=0, max=50, message="评论姓名长度不能超过 50 个字符") + @Size(min=0, max=50, message="评论姓名长度不能超过 50 个字符") public String getName() { return name; } @@ -134,7 +134,7 @@ public class Comment extends DataEntity { this.name = name; } - @Length(min=0, max=100, message="评论IP长度不能超过 100 个字符") + @Size(min=0, max=100, message="评论IP长度不能超过 100 个字符") public String getIp() { return ip; } @@ -143,7 +143,7 @@ public class Comment extends DataEntity { this.ip = ip; } - @Length(min=0, max=64, message="审核人长度不能超过 64 个字符") + @Size(min=0, max=64, message="审核人长度不能超过 64 个字符") public String getAuditUserCode() { return auditUserCode; } @@ -161,7 +161,7 @@ public class Comment extends DataEntity { this.auditDate = auditDate; } - @Length(min=0, max=200, message="审核意见长度不能超过 200 个字符") + @Size(min=0, max=200, message="审核意见长度不能超过 200 个字符") public String getAuditComment() { return auditComment; } 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 32a4129c..7aa05b23 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 @@ -3,7 +3,7 @@ */ package com.jeesite.modules.cms.entity; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.mybatis.annotation.Column; @@ -40,7 +40,7 @@ public class Report extends DataEntity { super(id); } - @Length(min=0, max=1, message="举报来源长度不能超过 1 个字符") + @Size(min=0, max=1, message="举报来源长度不能超过 1 个字符") public String getReportSource() { return reportSource; } @@ -49,7 +49,7 @@ public class Report extends DataEntity { this.reportSource = reportSource; } - @Length(min=0, max=500, message="举报内容长度不能超过 500 个字符") + @Size(min=0, max=500, message="举报内容长度不能超过 500 个字符") public String getReportContent() { return reportContent; } @@ -58,7 +58,7 @@ public class Report extends DataEntity { this.reportContent = reportContent; } - @Length(min=0, max=1000, message="举报的URL长度不能超过 1000 个字符") + @Size(min=0, max=1000, message="举报的URL长度不能超过 1000 个字符") public String getReportUrl() { return reportUrl; } @@ -67,7 +67,7 @@ public class Report extends DataEntity { this.reportUrl = reportUrl; } - @Length(min=0, max=1, message="举报类型长度不能超过 1 个字符") + @Size(min=0, max=1, message="举报类型长度不能超过 1 个字符") public String getReportType() { return reportType; } @@ -76,7 +76,7 @@ public class Report extends DataEntity { this.reportType = reportType; } - @Length(min=0, max=500, message="举报原因长度不能超过 500 个字符") + @Size(min=0, max=500, message="举报原因长度不能超过 500 个字符") public String getReportCause() { return reportCause; } 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 fcf31ac5..eacaaf5d 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 @@ -6,7 +6,7 @@ package com.jeesite.modules.cms.entity; import java.util.List; import javax.validation.constraints.NotBlank; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.jeesite.common.config.Global; import com.jeesite.common.entity.DataEntity; @@ -85,7 +85,7 @@ public class Site extends DataEntity { } @NotBlank(message = "站点名称不能为空") - @Length(min = 0, max = 100, message = "站点名称长度不能超过 100 个字符") + @Size(min = 0, max = 100, message = "站点名称长度不能超过 100 个字符") public String getSiteName() { return siteName; } @@ -103,7 +103,7 @@ public class Site extends DataEntity { } @NotBlank(message = "站点标题不能为空") - @Length(min = 0, max = 100, message = "站点标题长度不能超过 100 个字符") + @Size(min = 0, max = 100, message = "站点标题长度不能超过 100 个字符") public String getTitle() { return title; } @@ -112,7 +112,7 @@ public class Site extends DataEntity { this.title = title; } - @Length(min = 0, max = 1000, message = "站点Logo长度不能超过 1000 个字符") + @Size(min = 0, max = 1000, message = "站点Logo长度不能超过 1000 个字符") public String getLogo() { return logo; } @@ -121,7 +121,7 @@ public class Site extends DataEntity { this.logo = logo; } - @Length(min = 0, max = 500, message = "站点域名长度不能超过 500 个字符") + @Size(min = 0, max = 500, message = "站点域名长度不能超过 500 个字符") public String getDomain() { return domain; } @@ -130,7 +130,7 @@ public class Site extends DataEntity { this.domain = domain; } - @Length(min = 0, max = 500, message = "关键字长度不能超过 500 个字符") + @Size(min = 0, max = 500, message = "关键字长度不能超过 500 个字符") public String getKeywords() { return keywords; } @@ -139,7 +139,7 @@ public class Site extends DataEntity { this.keywords = keywords; } - @Length(min = 0, max = 500, message = "描述长度不能超过 500 个字符") + @Size(min = 0, max = 500, message = "描述长度不能超过 500 个字符") public String getDescription() { return description; } @@ -148,7 +148,7 @@ public class Site extends DataEntity { this.description = description; } - @Length(min = 0, max = 500, message = "主题长度不能超过 500 个字符") + @Size(min = 0, max = 500, message = "主题长度不能超过 500 个字符") public String getTheme() { return theme; } @@ -157,7 +157,7 @@ public class Site extends DataEntity { this.theme = theme; } - @Length(min = 0, max = 1000, message = "版权信息长度不能超过 1000 个字符") + @Size(min = 0, max = 1000, message = "版权信息长度不能超过 1000 个字符") public String getCopyright() { return copyright; } @@ -166,7 +166,7 @@ public class Site extends DataEntity { this.copyright = copyright; } - @Length(min = 0, max = 500, message = "自定义站点首页视图长度不能超过 500 个字符") + @Size(min = 0, max = 500, message = "自定义站点首页视图长度不能超过 500 个字符") public String getCustomIndexView() { return customIndexView; } 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 f215a8ff..43e4ecb4 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 @@ -5,7 +5,7 @@ package com.jeesite.modules.cms.entity; import java.util.Date; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonFormat; import com.jeesite.common.entity.BaseEntity; @@ -96,7 +96,7 @@ public class VisitLog extends DataEntity { super(id); } - @Length(min=0, max=1000, message="请求的URL地址长度不能超过 1000 个字符") + @Size(min=0, max=1000, message="请求的URL地址长度不能超过 1000 个字符") public String getRequestUrl() { return requestUrl; } @@ -105,7 +105,7 @@ public class VisitLog extends DataEntity { this.requestUrl = requestUrl; } - @Length(min=0, max=128, message="受访域名长度不能超过 128 个字符") + @Size(min=0, max=128, message="受访域名长度不能超过 128 个字符") public String getRequestUrlHost() { return requestUrlHost; } @@ -114,7 +114,7 @@ public class VisitLog extends DataEntity { this.requestUrlHost = requestUrlHost; } - @Length(min=0, max=1000, message="来源页面/上一个页面长度不能超过 1000 个字符") + @Size(min=0, max=1000, message="来源页面/上一个页面长度不能超过 1000 个字符") public String getSourceReferer() { return sourceReferer; } @@ -123,7 +123,7 @@ public class VisitLog extends DataEntity { this.sourceReferer = sourceReferer; } - @Length(min=0, max=128, message="来源域名长度不能超过 128 个字符") + @Size(min=0, max=128, message="来源域名长度不能超过 128 个字符") public String getSourceRefererHost() { return sourceRefererHost; } @@ -132,7 +132,7 @@ public class VisitLog extends DataEntity { this.sourceRefererHost = sourceRefererHost; } - @Length(min=0, max=1, message="访问来源类型长度不能超过 1 个字符") + @Size(min=0, max=1, message="访问来源类型长度不能超过 1 个字符") public String getSourceType() { return sourceType; } @@ -141,7 +141,7 @@ public class VisitLog extends DataEntity { this.sourceType = sourceType; } - @Length(min=0, max=200, message="使用的搜索引擎长度不能超过 200 个字符") + @Size(min=0, max=200, message="使用的搜索引擎长度不能超过 200 个字符") public String getSearchEngine() { return searchEngine; } @@ -150,7 +150,7 @@ public class VisitLog extends DataEntity { this.searchEngine = searchEngine; } - @Length(min=0, max=200, message="搜索的关键词长度不能超过 200 个字符") + @Size(min=0, max=200, message="搜索的关键词长度不能超过 200 个字符") public String getSearchWord() { return searchWord; } @@ -159,7 +159,7 @@ public class VisitLog extends DataEntity { this.searchWord = searchWord; } - @Length(min=0, max=50, message="客户IP地址长度不能超过 50 个字符") + @Size(min=0, max=50, message="客户IP地址长度不能超过 50 个字符") public String getRemoteAddr() { return remoteAddr; } @@ -168,7 +168,7 @@ public class VisitLog extends DataEntity { this.remoteAddr = remoteAddr; } - @Length(min=0, max=500, message="用户代理字符串长度不能超过 500 个字符") + @Size(min=0, max=500, message="用户代理字符串长度不能超过 500 个字符") public String getUserAgent() { return userAgent; } @@ -177,7 +177,7 @@ public class VisitLog extends DataEntity { this.userAgent = userAgent; } - @Length(min=0, max=32, message="客户机语言长度不能超过 32 个字符") + @Size(min=0, max=32, message="客户机语言长度不能超过 32 个字符") public String getUserLanguage() { return userLanguage; } @@ -186,7 +186,7 @@ public class VisitLog extends DataEntity { this.userLanguage = userLanguage; } - @Length(min=0, max=32, message="客户机屏幕大小0x0长度不能超过 32 个字符") + @Size(min=0, max=32, message="客户机屏幕大小0x0长度不能超过 32 个字符") public String getUserScreenSize() { return userScreenSize; } @@ -195,7 +195,7 @@ public class VisitLog extends DataEntity { this.userScreenSize = userScreenSize; } - @Length(min=0, max=32, message="客户机设备类型长度不能超过 32 个字符") + @Size(min=0, max=32, message="客户机设备类型长度不能超过 32 个字符") public String getUserDevice() { return userDevice; } @@ -204,7 +204,7 @@ public class VisitLog extends DataEntity { this.userDevice = userDevice; } - @Length(min=0, max=32, message="客户机操作系统长度不能超过 32 个字符") + @Size(min=0, max=32, message="客户机操作系统长度不能超过 32 个字符") public String getUserOsName() { return userOsName; } @@ -213,7 +213,7 @@ public class VisitLog extends DataEntity { this.userOsName = userOsName; } - @Length(min=0, max=32, message="客户机浏览器长度不能超过 32 个字符") + @Size(min=0, max=32, message="客户机浏览器长度不能超过 32 个字符") public String getUserBrowser() { return userBrowser; } @@ -222,7 +222,7 @@ public class VisitLog extends DataEntity { this.userBrowser = userBrowser; } - @Length(min=0, max=16, message="浏览器版本长度不能超过 16 个字符") + @Size(min=0, max=16, message="浏览器版本长度不能超过 16 个字符") public String getUserBrowserVersion() { return userBrowserVersion; } @@ -231,7 +231,7 @@ public class VisitLog extends DataEntity { this.userBrowserVersion = userBrowserVersion; } - @Length(min=0, max=64, message="唯一访问标识长度不能超过 64 个字符") + @Size(min=0, max=64, message="唯一访问标识长度不能超过 64 个字符") public String getUniqueVisitId() { return uniqueVisitId; } @@ -240,7 +240,7 @@ public class VisitLog extends DataEntity { this.uniqueVisitId = uniqueVisitId; } - @Length(min=0, max=8, message="本次访问日期长度不能超过 8 个字符") + @Size(min=0, max=8, message="本次访问日期长度不能超过 8 个字符") public String getVisitDate() { return visitDate; } @@ -258,7 +258,7 @@ public class VisitLog extends DataEntity { this.visitTime = visitTime; } - @Length(min=0, max=1, message="是否新访问长度不能超过 1 个字符") + @Size(min=0, max=1, message="是否新访问长度不能超过 1 个字符") public String getIsNewVisit() { return isNewVisit; } @@ -291,7 +291,7 @@ public class VisitLog extends DataEntity { this.totalRemainTime = totalRemainTime; } - @Length(min=0, max=64, message="站点编码长度不能超过 64 个字符") + @Size(min=0, max=64, message="站点编码长度不能超过 64 个字符") public String getSiteCode() { return siteCode; } @@ -300,7 +300,7 @@ public class VisitLog extends DataEntity { this.siteCode = siteCode; } - @Length(min=0, max=100, message="站点名称长度不能超过 100 个字符") + @Size(min=0, max=100, message="站点名称长度不能超过 100 个字符") public String getSiteName() { return siteName; } @@ -309,7 +309,7 @@ public class VisitLog extends DataEntity { this.siteName = siteName; } - @Length(min=0, max=64, message="栏目编码长度不能超过 64 个字符") + @Size(min=0, max=64, message="栏目编码长度不能超过 64 个字符") public String getCategoryCode() { return categoryCode; } @@ -318,7 +318,7 @@ public class VisitLog extends DataEntity { this.categoryCode = categoryCode; } - @Length(min=0, max=100, message="栏目名称长度不能超过 100 个字符") + @Size(min=0, max=100, message="栏目名称长度不能超过 100 个字符") public String getCategoryName() { return categoryName; } @@ -327,7 +327,7 @@ public class VisitLog extends DataEntity { this.categoryName = categoryName; } - @Length(min=0, max=64, message="栏目内容编号长度不能超过 64 个字符") + @Size(min=0, max=64, message="栏目内容编号长度不能超过 64 个字符") public String getContentId() { return contentId; } @@ -336,7 +336,7 @@ public class VisitLog extends DataEntity { this.contentId = contentId; } - @Length(min=0, max=255, message="访问页面标题长度不能超过 255 个字符") + @Size(min=0, max=255, message="访问页面标题长度不能超过 255 个字符") public String getContentTitle() { return contentTitle; } @@ -345,7 +345,7 @@ public class VisitLog extends DataEntity { this.contentTitle = contentTitle; } - @Length(min=0, max=100, message="访问用户编码长度不能超过 100 个字符") + @Size(min=0, max=100, message="访问用户编码长度不能超过 100 个字符") public String getVisitUserCode() { return visitUserCode; } @@ -354,7 +354,7 @@ public class VisitLog extends DataEntity { this.visitUserCode = visitUserCode; } - @Length(min=0, max=100, message="访问用户姓名长度不能超过 100 个字符") + @Size(min=0, max=100, message="访问用户姓名长度不能超过 100 个字符") public String getVisitUserName() { return visitUserName; } 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 cbb587b0..9e8fcfe8 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 @@ -7,7 +7,7 @@ import java.util.Date; import javax.validation.constraints.NotBlank; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonFormat; import com.jeesite.common.entity.DataEntity; @@ -77,7 +77,7 @@ public class MsgInner extends DataEntity { } @NotBlank(message="消息标题不能为空") - @Length(min=0, max=200, message="消息标题长度不能超过 200 个字符") + @Size(min=0, max=200, message="消息标题长度不能超过 200 个字符") public String getMsgTitle() { return msgTitle; } @@ -87,7 +87,7 @@ public class MsgInner extends DataEntity { } @NotBlank(message="内容级别不能为空") - @Length(min=0, max=1, message="内容级别长度不能超过 1 个字符") + @Size(min=0, max=1, message="内容级别长度不能超过 1 个字符") public String getContentLevel() { return contentLevel; } @@ -96,7 +96,7 @@ public class MsgInner extends DataEntity { this.contentLevel = contentLevel; } - @Length(min=0, max=1, message="内容类型长度不能超过 1 个字符") + @Size(min=0, max=1, message="内容类型长度不能超过 1 个字符") public String getContentType() { return contentType; } @@ -115,7 +115,7 @@ public class MsgInner extends DataEntity { } @NotBlank(message="接受者类型不能为空") - @Length(min=0, max=1, message="接受者类型长度不能超过 1 个字符") + @Size(min=0, max=1, message="接受者类型长度不能超过 1 个字符") public String getReceiveType() { return receiveType; } @@ -140,7 +140,7 @@ public class MsgInner extends DataEntity { this.receiveNames = receiveNames; } - @Length(min=0, max=64, message="发送者用户编码长度不能超过 64 个字符") + @Size(min=0, max=64, message="发送者用户编码长度不能超过 64 个字符") public String getSendUserCode() { return sendUserCode; } @@ -149,7 +149,7 @@ public class MsgInner extends DataEntity { this.sendUserCode = sendUserCode; } - @Length(min=0, max=100, message="发送者用户姓名长度不能超过 100 个字符") + @Size(min=0, max=100, message="发送者用户姓名长度不能超过 100 个字符") public String getSendUserName() { return sendUserName; } @@ -185,7 +185,7 @@ public class MsgInner extends DataEntity { sqlMap.getWhere().and("send_date", QueryType.LTE, sendDate); } - @Length(min=0, max=1, message="是否有附件长度不能超过 1 个字符") + @Size(min=0, max=1, message="是否有附件长度不能超过 1 个字符") public String getIsAttac() { return isAttac; } @@ -194,7 +194,7 @@ public class MsgInner extends DataEntity { this.isAttac = isAttac; } - @Length(min=0, max=100, message="通知类型长度不能超过 100 个字符") + @Size(min=0, max=100, message="通知类型长度不能超过 100 个字符") public String getNotifyTypes() { return notifyTypes; } 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 33cd81ec..cf5cf8c8 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 @@ -7,7 +7,7 @@ import java.util.Date; import javax.validation.constraints.NotBlank; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.fasterxml.jackson.annotation.JsonFormat; import com.jeesite.common.entity.DataEntity; @@ -53,7 +53,7 @@ public class MsgInnerRecord extends DataEntity { } @NotBlank(message="所属消息不能为空") - @Length(min=0, max=64, message="所属消息长度不能超过 64 个字符") + @Size(min=0, max=64, message="所属消息长度不能超过 64 个字符") public String getMsgInnerId() { return msgInnerId; } @@ -62,7 +62,7 @@ public class MsgInnerRecord extends DataEntity { this.msgInnerId = msgInnerId; } - @Length(min=0, max=64, message="接受者用户编码长度不能超过 64 个字符") + @Size(min=0, max=64, message="接受者用户编码长度不能超过 64 个字符") public String getReceiveUserCode() { return receiveUserCode; } @@ -72,7 +72,7 @@ public class MsgInnerRecord extends DataEntity { } @NotBlank(message="接受者用户姓名不能为空") - @Length(min=0, max=100, message="接受者用户姓名长度不能超过 100 个字符") + @Size(min=0, max=100, message="接受者用户姓名长度不能超过 100 个字符") public String getReceiveUserName() { return receiveUserName; } @@ -82,7 +82,7 @@ public class MsgInnerRecord extends DataEntity { } @NotBlank(message="读取状态不能为空") - @Length(min=0, max=1, message="读取状态长度不能超过 1 个字符") + @Size(min=0, max=1, message="读取状态长度不能超过 1 个字符") public String getReadStatus() { return readStatus; } @@ -100,7 +100,7 @@ public class MsgInnerRecord extends DataEntity { this.readDate = readDate; } - @Length(min=0, max=1, message="是否标星长度不能超过 1 个字符") + @Size(min=0, max=1, message="是否标星长度不能超过 1 个字符") public String getIsStar() { return isStar; } 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 3e174663..c223781f 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 @@ -3,7 +3,7 @@ */ package com.jeesite.modules.sys.entity; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import javax.validation.constraints.NotBlank; import com.jeesite.common.entity.DataEntity; @@ -59,7 +59,7 @@ public class Area extends TreeEntity { } @NotBlank(message="名称不能为空") - @Length(min=0, max=100, message="名称长度不能超过 100 个字符") + @Size(min=0, max=100, message="名称长度不能超过 100 个字符") public String getAreaName() { return areaName; } @@ -69,7 +69,7 @@ public class Area extends TreeEntity { } @NotBlank(message="类型不能为空") - @Length(min=0, max=1, message="类型长度不能超过 1 个字符") + @Size(min=0, max=1, message="类型长度不能超过 1 个字符") public String getAreaType() { return areaType; } 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 afb4a638..4ba937ba 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 @@ -8,7 +8,7 @@ import java.util.List; import javax.validation.constraints.Pattern; import org.apache.commons.lang3.StringUtils; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import javax.validation.constraints.NotBlank; import com.jeesite.common.collect.ListUtils; @@ -98,7 +98,7 @@ public class Company extends TreeEntity { } @NotBlank(message="公司名称不能为空") - @Length(min=0, max=200, message="公司名称长度不能超过 200 个字符") + @Size(min=0, max=200, message="公司名称长度不能超过 200 个字符") public String getCompanyName() { return companyName; } @@ -108,7 +108,7 @@ public class Company extends TreeEntity { } @NotBlank(message="公司全称不能为空") - @Length(min=0, max=200, message="公司全称长度不能超过 200 个字符") + @Size(min=0, max=200, message="公司全称长度不能超过 200 个字符") public String getFullName() { return fullName; } 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 9cd6d4ed..7122d10e 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 @@ -7,7 +7,7 @@ import java.util.List; import javax.validation.constraints.NotNull; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.jeesite.common.collect.ListUtils; import com.jeesite.common.entity.BaseEntity; @@ -78,7 +78,7 @@ public class Employee extends DataEntity { this.empCode = empCode; } - @Length(min=0, max=100, message="工号长度不能超过 100 个字符") + @Size(min=0, max=100, message="工号长度不能超过 100 个字符") public String getEmpNo() { return empNo; } @@ -87,7 +87,7 @@ public class Employee extends DataEntity { this.empNo = empNo; } - @Length(min=0, max=100, message="名称长度不能超过 100 个字符") + @Size(min=0, max=100, message="名称长度不能超过 100 个字符") public String getEmpName() { return empName; } @@ -96,7 +96,7 @@ public class Employee extends DataEntity { this.empName = empName; } - @Length(min=0, max=100, message="英文名长度不能超过 100 个字符") + @Size(min=0, max=100, message="英文名长度不能超过 100 个字符") public String getEmpNameEn() { return empNameEn; } 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 e239d833..32b590c6 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 @@ -3,7 +3,7 @@ */ package com.jeesite.modules.sys.entity; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.mybatis.annotation.Column; @@ -75,7 +75,7 @@ public class EmployeeOffice extends DataEntity { this.officeCode = officeCode; } - @Length(min=0, max=64, message="岗位编码长度不能超过 64 个字符") + @Size(min=0, max=64, message="岗位编码长度不能超过 64 个字符") public String getPostCode() { return postCode; } 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 1d7bbac5..2639a0aa 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 @@ -8,7 +8,7 @@ import java.util.Map; import javax.validation.constraints.NotBlank; import org.apache.commons.lang3.builder.ReflectionToStringBuilder; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.jeesite.common.codec.EncodeUtils; import com.jeesite.common.collect.MapUtils; @@ -87,7 +87,7 @@ public class Log extends DataEntity { } @NotBlank(message="日志类型不能为空") - @Length(min=0, max=1, message="日志类型长度不能超过 1 个字符") + @Size(min=0, max=1, message="日志类型长度不能超过 1 个字符") public String getLogType() { return logType; } @@ -97,7 +97,7 @@ public class Log extends DataEntity { } @NotBlank(message="日志标题不能为空") - @Length(min=0, max=500, message="日志标题长度不能超过 500 个字符") + @Size(min=0, max=500, message="日志标题长度不能超过 500 个字符") public String getLogTitle() { return logTitle; } @@ -106,7 +106,7 @@ public class Log extends DataEntity { this.logTitle = logTitle; } - @Length(min=0, max=500, message="请求URI长度不能超过 500 个字符") + @Size(min=0, max=500, message="请求URI长度不能超过 500 个字符") public String getRequestUri() { return requestUri; } @@ -115,7 +115,7 @@ public class Log extends DataEntity { this.requestUri = requestUri; } - @Length(min=0, max=10, message="操作方式长度不能超过 10 个字符") + @Size(min=0, max=10, message="操作方式长度不能超过 10 个字符") public String getRequestMethod() { return requestMethod; } @@ -140,7 +140,7 @@ public class Log extends DataEntity { this.diffModifyData = diffModifyData; } - @Length(min=0, max=64, message="业务主键长度不能超过 64 个字符") + @Size(min=0, max=64, message="业务主键长度不能超过 64 个字符") public String getBizKey() { return bizKey; } @@ -149,7 +149,7 @@ public class Log extends DataEntity { this.bizKey = bizKey; } - @Length(min=0, max=64, message="业务类型长度不能超过 64 个字符") + @Size(min=0, max=64, message="业务类型长度不能超过 64 个字符") public String getBizType() { return bizType; } @@ -159,7 +159,7 @@ public class Log extends DataEntity { } @NotBlank(message="操作IP地址不能为空") - @Length(min=0, max=255, message="操作IP地址长度不能超过 255 个字符") + @Size(min=0, max=255, message="操作IP地址长度不能超过 255 个字符") public String getRemoteAddr() { return remoteAddr; } @@ -169,7 +169,7 @@ public class Log extends DataEntity { } @NotBlank(message="请求服务器地址不能为空") - @Length(min=0, max=255, message="请求服务器地址长度不能超过 255 个字符") + @Size(min=0, max=255, message="请求服务器地址长度不能超过 255 个字符") public String getServerAddr() { return serverAddr; } @@ -194,7 +194,7 @@ public class Log extends DataEntity { this.exceptionInfo = exceptionInfo; } - @Length(min=0, max=500, message="用户代理长度不能超过 500 个字符") + @Size(min=0, max=500, message="用户代理长度不能超过 500 个字符") public String getUserAgent() { return userAgent; } @@ -203,7 +203,7 @@ public class Log extends DataEntity { this.userAgent = userAgent; } - @Length(min=0, max=100, message="设备名称/操作系统长度不能超过 100 个字符") + @Size(min=0, max=100, message="设备名称/操作系统长度不能超过 100 个字符") public String getDeviceName() { return deviceName; } @@ -212,7 +212,7 @@ public class Log extends DataEntity { this.deviceName = deviceName; } - @Length(min=0, max=100, message="浏览器名称长度不能超过 100 个字符") + @Size(min=0, max=100, message="浏览器名称长度不能超过 100 个字符") public String getBrowserName() { return browserName; } 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 1a8d278b..986cf85c 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 @@ -5,7 +5,7 @@ package com.jeesite.modules.sys.entity; import javax.validation.constraints.Pattern; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import javax.validation.constraints.NotBlank; import com.fasterxml.jackson.annotation.JsonIgnore; @@ -94,7 +94,7 @@ public class Office extends TreeEntity { } @NotBlank(message="机构名称不能为空") - @Length(min=0, max=100, message="机构名称长度不能超过 100 个字符") + @Size(min=0, max=100, message="机构名称长度不能超过 100 个字符") public String getOfficeName() { return officeName; } @@ -104,7 +104,7 @@ public class Office extends TreeEntity { } @NotBlank(message="机构全称不能为空") - @Length(min=0, max=200, message="机构全称长度不能超过 200 个字符") + @Size(min=0, max=200, message="机构全称长度不能超过 200 个字符") public String getFullName() { return fullName; } @@ -114,7 +114,7 @@ public class Office extends TreeEntity { } @NotBlank(message="机构类型不能为空") - @Length(min=0, max=1, message="机构类型长度不能超过 1 个字符") + @Size(min=0, max=1, message="机构类型长度不能超过 1 个字符") public String getOfficeType() { return officeType; } @@ -131,7 +131,7 @@ public class Office extends TreeEntity { sqlMap.getWhere().and("office_type", QueryType.IN, officeTypes); } - @Length(min=0, max=100, message="负责人长度不能超过 100 个字符") + @Size(min=0, max=100, message="负责人长度不能超过 100 个字符") public String getLeader() { return leader; } @@ -140,7 +140,7 @@ public class Office extends TreeEntity { this.leader = leader; } - @Length(min=0, max=100, message="电话长度不能超过 100 个字符") + @Size(min=0, max=100, message="电话长度不能超过 100 个字符") public String getPhone() { return phone; } @@ -149,7 +149,7 @@ public class Office extends TreeEntity { this.phone = phone; } - @Length(min=0, max=255, message="联系地址长度不能超过 255 个字符") + @Size(min=0, max=255, message="联系地址长度不能超过 255 个字符") public String getAddress() { return address; } @@ -158,7 +158,7 @@ public class Office extends TreeEntity { this.address = address; } - @Length(min=0, max=100, message="邮政编码长度不能超过 100 个字符") + @Size(min=0, max=100, message="邮政编码长度不能超过 100 个字符") public String getZipCode() { return zipCode; } @@ -167,7 +167,7 @@ public class Office extends TreeEntity { this.zipCode = zipCode; } - @Length(min=0, max=200, message="邮箱长度不能超过 200 个字符") + @Size(min=0, max=200, message="邮箱长度不能超过 200 个字符") public String getEmail() { return email; } 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 016b3885..0eeeb47e 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 @@ -3,7 +3,7 @@ */ package com.jeesite.modules.sys.entity; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import javax.validation.constraints.NotBlank; import com.jeesite.common.entity.BaseEntity; @@ -48,7 +48,7 @@ public class Post extends DataEntity { } @NotBlank(message="岗位名称不能为空") - @Length(min=0, max=100, message="岗位名称长度不能超过 100 个字符") + @Size(min=0, max=100, message="岗位名称长度不能超过 100 个字符") public String getPostName() { return postName; } @@ -65,7 +65,7 @@ public class Post extends DataEntity { getSqlMap().getWhere().and("post_name", QueryType.LIKE, roleName); } - @Length(min=0, max=100, message="岗位分类长度不能超过 100 个字符") + @Size(min=0, max=100, message="岗位分类长度不能超过 100 个字符") public String getPostType() { return postType; } 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 7678bd7f..1a6247cd 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 @@ -3,7 +3,7 @@ */ package com.jeesite.modules.test.entity; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import java.util.Date; import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; @@ -76,7 +76,7 @@ public class TestData extends DataEntity { super(id); } - @Length(min=0, max=200, message="单行文本长度不能超过 200 个字符") + @Size(min=0, max=200, message="单行文本长度不能超过 200 个字符") public String getTestInput() { return testInput; } @@ -85,7 +85,7 @@ public class TestData extends DataEntity { this.testInput = testInput; } - @Length(min=0, max=200, message="多行文本长度不能超过 200 个字符") + @Size(min=0, max=200, message="多行文本长度不能超过 200 个字符") public String getTestTextarea() { return testTextarea; } @@ -94,7 +94,7 @@ public class TestData extends DataEntity { this.testTextarea = testTextarea; } - @Length(min=0, max=10, message="下拉框长度不能超过 10 个字符") + @Size(min=0, max=10, message="下拉框长度不能超过 10 个字符") public String getTestSelect() { return testSelect; } @@ -103,7 +103,7 @@ public class TestData extends DataEntity { this.testSelect = testSelect; } - @Length(min=0, max=200, message="下拉多选长度不能超过 200 个字符") + @Size(min=0, max=200, message="下拉多选长度不能超过 200 个字符") public String getTestSelectMultiple() { return testSelectMultiple; } @@ -112,7 +112,7 @@ public class TestData extends DataEntity { this.testSelectMultiple = testSelectMultiple; } - @Length(min=0, max=10, message="单选框长度不能超过 10 个字符") + @Size(min=0, max=10, message="单选框长度不能超过 10 个字符") public String getTestRadio() { return testRadio; } @@ -121,7 +121,7 @@ public class TestData extends DataEntity { this.testRadio = testRadio; } - @Length(min=0, max=200, message="复选框长度不能超过 200 个字符") + @Size(min=0, max=200, message="复选框长度不能超过 200 个字符") public String getTestCheckbox() { return testCheckbox; } @@ -164,7 +164,7 @@ public class TestData extends DataEntity { this.testOffice = testOffice; } - @Length(min=0, max=64, message="区域选择长度不能超过 64 个字符") + @Size(min=0, max=64, message="区域选择长度不能超过 64 个字符") public String getTestAreaCode() { return testAreaCode; } @@ -173,7 +173,7 @@ public class TestData extends DataEntity { this.testAreaCode = testAreaCode; } - @Length(min=0, max=100, message="区域名称长度不能超过 100 个字符") + @Size(min=0, max=100, message="区域名称长度不能超过 100 个字符") public String getTestAreaName() { return testAreaName; } 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 861492b2..39a6416a 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 @@ -3,7 +3,7 @@ */ package com.jeesite.modules.test.entity; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import java.util.Date; import com.jeesite.common.mybatis.annotation.JoinTable; import com.jeesite.common.mybatis.annotation.JoinTable.Type; @@ -85,7 +85,7 @@ public class TestDataChild extends DataEntity { this.testSort = testSort; } - @Length(min=0, max=64, message="父表主键长度不能超过 64 个字符") + @Size(min=0, max=64, message="父表主键长度不能超过 64 个字符") public TestData getTestData() { return testData; } @@ -94,7 +94,7 @@ public class TestDataChild extends DataEntity { this.testData = testData; } - @Length(min=0, max=200, message="单行文本长度不能超过 200 个字符") + @Size(min=0, max=200, message="单行文本长度不能超过 200 个字符") public String getTestInput() { return testInput; } @@ -103,7 +103,7 @@ public class TestDataChild extends DataEntity { this.testInput = testInput; } - @Length(min=0, max=200, message="多行文本长度不能超过 200 个字符") + @Size(min=0, max=200, message="多行文本长度不能超过 200 个字符") public String getTestTextarea() { return testTextarea; } @@ -112,7 +112,7 @@ public class TestDataChild extends DataEntity { this.testTextarea = testTextarea; } - @Length(min=0, max=10, message="下拉框长度不能超过 10 个字符") + @Size(min=0, max=10, message="下拉框长度不能超过 10 个字符") public String getTestSelect() { return testSelect; } @@ -121,7 +121,7 @@ public class TestDataChild extends DataEntity { this.testSelect = testSelect; } - @Length(min=0, max=200, message="下拉多选长度不能超过 200 个字符") + @Size(min=0, max=200, message="下拉多选长度不能超过 200 个字符") public String getTestSelectMultiple() { return testSelectMultiple; } @@ -130,7 +130,7 @@ public class TestDataChild extends DataEntity { this.testSelectMultiple = testSelectMultiple; } - @Length(min=0, max=10, message="单选框长度不能超过 10 个字符") + @Size(min=0, max=10, message="单选框长度不能超过 10 个字符") public String getTestRadio() { return testRadio; } @@ -139,7 +139,7 @@ public class TestDataChild extends DataEntity { this.testRadio = testRadio; } - @Length(min=0, max=200, message="复选框长度不能超过 200 个字符") + @Size(min=0, max=200, message="复选框长度不能超过 200 个字符") public String getTestCheckbox() { return testCheckbox; } @@ -182,7 +182,7 @@ public class TestDataChild extends DataEntity { this.testOffice = testOffice; } - @Length(min=0, max=64, message="区域选择长度不能超过 64 个字符") + @Size(min=0, max=64, message="区域选择长度不能超过 64 个字符") public String getTestAreaCode() { return testAreaCode; } @@ -191,7 +191,7 @@ public class TestDataChild extends DataEntity { this.testAreaCode = testAreaCode; } - @Length(min=0, max=100, message="区域名称长度不能超过 100 个字符") + @Size(min=0, max=100, message="区域名称长度不能超过 100 个字符") public String getTestAreaName() { return testAreaName; } 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 cb295777..d0fb3dcc 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,7 +4,7 @@ package com.jeesite.modules.test.entity; import javax.validation.constraints.NotBlank; -import org.hibernate.validator.constraints.Length; +import javax.validation.constraints.Size; import com.jeesite.common.entity.DataEntity; import com.jeesite.common.entity.TreeEntity; @@ -57,7 +57,7 @@ public class TestTree extends TreeEntity { } @NotBlank(message="节点名称不能为空") - @Length(min=0, max=200, message="节点名称长度不能超过 200 个字符") + @Size(min=0, max=200, message="节点名称长度不能超过 200 个字符") public String getTreeName() { return treeName; }