Skip to content

Commit 96d8ab2

Browse files
eryajferyajf
authored
fix: 字段长度验证与模型对齐 (#273)
1 parent 07b7fe8 commit 96d8ab2

File tree

2 files changed

+31
-31
lines changed

2 files changed

+31
-31
lines changed

‎model/request/group_req.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,19 +22,19 @@ type GroupListAllReq struct {
2222
// GroupAddReq 添加资源结构体
2323
type GroupAddReq struct {
2424
GroupType string `json:"groupType" validate:"required,min=1,max=20"`
25-
GroupName string `json:"groupName" validate:"required,min=1,max=20"`
25+
GroupName string `json:"groupName" validate:"required,min=1,max=128"`
2626
//父级Id 大于等于0 必填
2727
ParentId uint `json:"parentId" validate:"omitempty,min=0"`
28-
Remark string `json:"remark" validate:"min=0,max=100"` // 分组的中文描述
28+
Remark string `json:"remark" validate:"min=0,max=128"` // 分组的中文描述
2929
}
3030

3131
// DingTalkGroupAddReq 添加钉钉资源结构体
3232
type DingGroupAddReq struct {
3333
GroupType string `json:"groupType" validate:"required,min=1,max=20"`
34-
GroupName string `json:"groupName" validate:"required,min=1,max=20"`
34+
GroupName string `json:"groupName" validate:"required,min=1,max=128"`
3535
//父级Id 大于等于0 必填
3636
ParentId uint `json:"parentId" validate:"omitempty,min=0"`
37-
Remark string `json:"remark" validate:"min=0,max=100"` // 分组的中文描述
37+
Remark string `json:"remark" validate:"min=0,max=128"` // 分组的中文描述
3838
SourceDeptId string `json:"sourceDeptId"`
3939
Source string `json:"source"`
4040
SourceDeptParentId string `json:"SourceDeptParentId"`
@@ -44,10 +44,10 @@ type DingGroupAddReq struct {
4444
// WeComGroupAddReq 添加企业微信资源结构体
4545
type WeComGroupAddReq struct {
4646
GroupType string `json:"groupType" validate:"required,min=1,max=20"`
47-
GroupName string `json:"groupName" validate:"required,min=1,max=20"`
47+
GroupName string `json:"groupName" validate:"required,min=1,max=128"`
4848
//父级Id 大于等于0 必填
4949
ParentId uint `json:"parentId" validate:"omitempty,min=0"`
50-
Remark string `json:"remark" validate:"min=0,max=100"` // 分组的中文描述
50+
Remark string `json:"remark" validate:"min=0,max=128"` // 分组的中文描述
5151
SourceDeptId string `json:"sourceDeptId"`
5252
Source string `json:"source"`
5353
SourceDeptParentId string `json:"SourceDeptParentId"`
@@ -57,8 +57,8 @@ type WeComGroupAddReq struct {
5757
// GroupUpdateReq 更新资源结构体
5858
type GroupUpdateReq struct {
5959
ID uint `json:"id" form:"id" validate:"required"`
60-
GroupName string `json:"groupName" validate:"required,min=1,max=20"`
61-
Remark string `json:"remark" validate:"min=0,max=100"` // 分组的中文描述
60+
GroupName string `json:"groupName" validate:"required,min=1,max=128"`
61+
Remark string `json:"remark" validate:"min=0,max=128"` // 分组的中文描述
6262
}
6363

6464
// GroupDeleteReq 删除资源结构体

‎model/request/user_req.go‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -2,63 +2,63 @@ package request
22

33
// UserAddReq 创建资源结构体
44
type UserAddReq struct {
5-
Username string `json:"username" validate:"required,min=2,max=20"`
5+
Username string `json:"username" validate:"required,min=2,max=50"`
66
Password string `json:"password"`
7-
Nickname string `json:"nickname" validate:"required,min=0,max=20"`
8-
GivenName string `json:"givenName" validate:"min=0,max=20"`
7+
Nickname string `json:"nickname" validate:"required,min=0,max=50"`
8+
GivenName string `json:"givenName" validate:"min=0,max=50"`
99
Mail string `json:"mail" validate:"required,min=0,max=100"`
1010
JobNumber string `json:"jobNumber" validate:"required,min=0,max=20"`
1111
PostalAddress string `json:"postalAddress" validate:"min=0,max=255"`
12-
Departments string `json:"departments" validate:"min=0,max=255"`
13-
Position string `json:"position" validate:"min=0,max=255"`
12+
Departments string `json:"departments" validate:"min=0,max=512"`
13+
Position string `json:"position" validate:"min=0,max=128"`
1414
Mobile string `json:"mobile" validate:"required,checkMobile"`
1515
Avatar string `json:"avatar"`
1616
Introduction string `json:"introduction" validate:"min=0,max=255"`
1717
Status uint `json:"status" validate:"oneof=1 2"`
1818
DepartmentId []uint `json:"departmentId" validate:"required"`
19-
Source string `json:"source" validate:"min=0,max=20"`
19+
Source string `json:"source" validate:"min=0,max=50"`
2020
RoleIds []uint `json:"roleIds" validate:"required"`
2121
}
2222

2323
// DingUserAddReq 钉钉用户创建资源结构体
2424
type DingUserAddReq struct {
25-
Username string `json:"username" validate:"required,min=2,max=20"`
25+
Username string `json:"username" validate:"required,min=2,max=50"`
2626
Password string `json:"password"`
27-
Nickname string `json:"nickname" validate:"required,min=0,max=20"`
28-
GivenName string `json:"givenName" validate:"min=0,max=20"`
27+
Nickname string `json:"nickname" validate:"required,min=0,max=50"`
28+
GivenName string `json:"givenName" validate:"min=0,max=50"`
2929
Mail string `json:"mail" validate:"required,min=0,max=100"`
3030
JobNumber string `json:"jobNumber" validate:"required,min=0,max=20"`
3131
PostalAddress string `json:"postalAddress" validate:"min=0,max=255"`
32-
Departments string `json:"departments" validate:"min=0,max=255"`
33-
Position string `json:"position" validate:"min=0,max=255"`
32+
Departments string `json:"departments" validate:"min=0,max=512"`
33+
Position string `json:"position" validate:"min=0,max=128"`
3434
Mobile string `json:"mobile" validate:"required,checkMobile"`
3535
Avatar string `json:"avatar"`
3636
Introduction string `json:"introduction" validate:"min=0,max=255"`
3737
Status uint `json:"status" validate:"oneof=1 2"`
3838
DepartmentId []uint `json:"departmentId" validate:"required"`
39-
Source string `json:"source" validate:"min=0,max=20"`
39+
Source string `json:"source" validate:"min=0,max=50"`
4040
RoleIds []uint `json:"roleIds" validate:"required"`
4141
SourceUserId string `json:"sourceUserId"` // 第三方用户id
4242
SourceUnionId string `json:"sourceUnionId"` // 第三方唯一unionId
4343
}
4444

4545
// WeComUserAddReq 企业微信用户创建资源结构体
4646
type WeComUserAddReq struct {
47-
Username string `json:"username" validate:"required,min=2,max=20"`
47+
Username string `json:"username" validate:"required,min=2,max=50"`
4848
Password string `json:"password"`
49-
Nickname string `json:"nickname" validate:"required,min=0,max=20"`
50-
GivenName string `json:"givenName" validate:"min=0,max=20"`
49+
Nickname string `json:"nickname" validate:"required,min=0,max=50"`
50+
GivenName string `json:"givenName" validate:"min=0,max=50"`
5151
Mail string `json:"mail" validate:"required,min=0,max=100"`
5252
JobNumber string `json:"jobNumber" validate:"required,min=0,max=20"`
5353
PostalAddress string `json:"postalAddress" validate:"min=0,max=255"`
54-
Departments string `json:"departments" validate:"min=0,max=255"`
55-
Position string `json:"position" validate:"min=0,max=255"`
54+
Departments string `json:"departments" validate:"min=0,max=512"`
55+
Position string `json:"position" validate:"min=0,max=128"`
5656
Mobile string `json:"mobile" validate:"required,checkMobile"`
5757
Avatar string `json:"avatar"`
5858
Introduction string `json:"introduction" validate:"min=0,max=255"`
5959
Status uint `json:"status" validate:"oneof=1 2"`
6060
DepartmentId []uint `json:"departmentId" validate:"required"`
61-
Source string `json:"source" validate:"min=0,max=20"`
61+
Source string `json:"source" validate:"min=0,max=50"`
6262
RoleIds []uint `json:"roleIds" validate:"required"`
6363
SourceUserId string `json:"sourceUserId"` // 第三方用户id
6464
SourceUnionId string `json:"sourceUnionId"` // 第三方唯一unionId
@@ -67,19 +67,19 @@ type WeComUserAddReq struct {
6767
// UserUpdateReq 更新资源结构体
6868
type UserUpdateReq struct {
6969
ID uint `json:"id" validate:"required"`
70-
Username string `json:"username" validate:"required,min=2,max=20"`
70+
Username string `json:"username" validate:"required,min=2,max=50"`
7171
Nickname string `json:"nickname" validate:"min=0,max=20"`
72-
GivenName string `json:"givenName" validate:"min=0,max=20"`
72+
GivenName string `json:"givenName" validate:"min=0,max=50"`
7373
Mail string `json:"mail" validate:"min=0,max=100"`
7474
JobNumber string `json:"jobNumber" validate:"min=0,max=20"`
7575
PostalAddress string `json:"postalAddress" validate:"min=0,max=255"`
76-
Departments string `json:"departments" validate:"min=0,max=255"`
77-
Position string `json:"position" validate:"min=0,max=255"`
76+
Departments string `json:"departments" validate:"min=0,max=512"`
77+
Position string `json:"position" validate:"min=0,max=128"`
7878
Mobile string `json:"mobile" validate:"checkMobile"`
7979
Avatar string `json:"avatar"`
8080
Introduction string `json:"introduction" validate:"min=0,max=255"`
8181
DepartmentId []uint `json:"departmentId" validate:"required"`
82-
Source string `json:"source" validate:"min=0,max=20"`
82+
Source string `json:"source" validate:"min=0,max=50"`
8383
RoleIds []uint `json:"roleIds" validate:"required"`
8484
}
8585

0 commit comments

Comments
 (0)