From 96d8ab2aa9c929c1cb94bc52c9435cdd6da02694 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BA=8C=E4=B8=AB=E8=AE=B2=E6=A2=B5?= Date: Sat, 11 Nov 2023 10:46:04 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=AD=97=E6=AE=B5=E9=95=BF=E5=BA=A6?= =?UTF-8?q?=E9=AA=8C=E8=AF=81=E4=B8=8E=E6=A8=A1=E5=9E=8B=E5=AF=B9=E9=BD=90?= =?UTF-8?q?=20(#273)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- model/request/group_req.go | 16 ++++++------- model/request/user_req.go | 46 +++++++++++++++++++------------------- 2 files changed, 31 insertions(+), 31 deletions(-) diff --git a/model/request/group_req.go b/model/request/group_req.go index da486ef..f06754f 100644 --- a/model/request/group_req.go +++ b/model/request/group_req.go @@ -22,19 +22,19 @@ type GroupListAllReq struct { // GroupAddReq 添加资源结构体 type GroupAddReq struct { GroupType string `json:"groupType" validate:"required,min=1,max=20"` - GroupName string `json:"groupName" validate:"required,min=1,max=20"` + GroupName string `json:"groupName" validate:"required,min=1,max=128"` //父级Id 大于等于0 必填 ParentId uint `json:"parentId" validate:"omitempty,min=0"` - Remark string `json:"remark" validate:"min=0,max=100"` // 分组的中文描述 + Remark string `json:"remark" validate:"min=0,max=128"` // 分组的中文描述 } // DingTalkGroupAddReq 添加钉钉资源结构体 type DingGroupAddReq struct { GroupType string `json:"groupType" validate:"required,min=1,max=20"` - GroupName string `json:"groupName" validate:"required,min=1,max=20"` + GroupName string `json:"groupName" validate:"required,min=1,max=128"` //父级Id 大于等于0 必填 ParentId uint `json:"parentId" validate:"omitempty,min=0"` - Remark string `json:"remark" validate:"min=0,max=100"` // 分组的中文描述 + Remark string `json:"remark" validate:"min=0,max=128"` // 分组的中文描述 SourceDeptId string `json:"sourceDeptId"` Source string `json:"source"` SourceDeptParentId string `json:"SourceDeptParentId"` @@ -44,10 +44,10 @@ type DingGroupAddReq struct { // WeComGroupAddReq 添加企业微信资源结构体 type WeComGroupAddReq struct { GroupType string `json:"groupType" validate:"required,min=1,max=20"` - GroupName string `json:"groupName" validate:"required,min=1,max=20"` + GroupName string `json:"groupName" validate:"required,min=1,max=128"` //父级Id 大于等于0 必填 ParentId uint `json:"parentId" validate:"omitempty,min=0"` - Remark string `json:"remark" validate:"min=0,max=100"` // 分组的中文描述 + Remark string `json:"remark" validate:"min=0,max=128"` // 分组的中文描述 SourceDeptId string `json:"sourceDeptId"` Source string `json:"source"` SourceDeptParentId string `json:"SourceDeptParentId"` @@ -57,8 +57,8 @@ type WeComGroupAddReq struct { // GroupUpdateReq 更新资源结构体 type GroupUpdateReq struct { ID uint `json:"id" form:"id" validate:"required"` - GroupName string `json:"groupName" validate:"required,min=1,max=20"` - Remark string `json:"remark" validate:"min=0,max=100"` // 分组的中文描述 + GroupName string `json:"groupName" validate:"required,min=1,max=128"` + Remark string `json:"remark" validate:"min=0,max=128"` // 分组的中文描述 } // GroupDeleteReq 删除资源结构体 diff --git a/model/request/user_req.go b/model/request/user_req.go index cdaf204..f219db1 100644 --- a/model/request/user_req.go +++ b/model/request/user_req.go @@ -2,41 +2,41 @@ package request // UserAddReq 创建资源结构体 type UserAddReq struct { - Username string `json:"username" validate:"required,min=2,max=20"` + Username string `json:"username" validate:"required,min=2,max=50"` Password string `json:"password"` - Nickname string `json:"nickname" validate:"required,min=0,max=20"` - GivenName string `json:"givenName" validate:"min=0,max=20"` + Nickname string `json:"nickname" validate:"required,min=0,max=50"` + GivenName string `json:"givenName" validate:"min=0,max=50"` Mail string `json:"mail" validate:"required,min=0,max=100"` JobNumber string `json:"jobNumber" validate:"required,min=0,max=20"` PostalAddress string `json:"postalAddress" validate:"min=0,max=255"` - Departments string `json:"departments" validate:"min=0,max=255"` - Position string `json:"position" validate:"min=0,max=255"` + Departments string `json:"departments" validate:"min=0,max=512"` + Position string `json:"position" validate:"min=0,max=128"` Mobile string `json:"mobile" validate:"required,checkMobile"` Avatar string `json:"avatar"` Introduction string `json:"introduction" validate:"min=0,max=255"` Status uint `json:"status" validate:"oneof=1 2"` DepartmentId []uint `json:"departmentId" validate:"required"` - Source string `json:"source" validate:"min=0,max=20"` + Source string `json:"source" validate:"min=0,max=50"` RoleIds []uint `json:"roleIds" validate:"required"` } // DingUserAddReq 钉钉用户创建资源结构体 type DingUserAddReq struct { - Username string `json:"username" validate:"required,min=2,max=20"` + Username string `json:"username" validate:"required,min=2,max=50"` Password string `json:"password"` - Nickname string `json:"nickname" validate:"required,min=0,max=20"` - GivenName string `json:"givenName" validate:"min=0,max=20"` + Nickname string `json:"nickname" validate:"required,min=0,max=50"` + GivenName string `json:"givenName" validate:"min=0,max=50"` Mail string `json:"mail" validate:"required,min=0,max=100"` JobNumber string `json:"jobNumber" validate:"required,min=0,max=20"` PostalAddress string `json:"postalAddress" validate:"min=0,max=255"` - Departments string `json:"departments" validate:"min=0,max=255"` - Position string `json:"position" validate:"min=0,max=255"` + Departments string `json:"departments" validate:"min=0,max=512"` + Position string `json:"position" validate:"min=0,max=128"` Mobile string `json:"mobile" validate:"required,checkMobile"` Avatar string `json:"avatar"` Introduction string `json:"introduction" validate:"min=0,max=255"` Status uint `json:"status" validate:"oneof=1 2"` DepartmentId []uint `json:"departmentId" validate:"required"` - Source string `json:"source" validate:"min=0,max=20"` + Source string `json:"source" validate:"min=0,max=50"` RoleIds []uint `json:"roleIds" validate:"required"` SourceUserId string `json:"sourceUserId"` // 第三方用户id SourceUnionId string `json:"sourceUnionId"` // 第三方唯一unionId @@ -44,21 +44,21 @@ type DingUserAddReq struct { // WeComUserAddReq 企业微信用户创建资源结构体 type WeComUserAddReq struct { - Username string `json:"username" validate:"required,min=2,max=20"` + Username string `json:"username" validate:"required,min=2,max=50"` Password string `json:"password"` - Nickname string `json:"nickname" validate:"required,min=0,max=20"` - GivenName string `json:"givenName" validate:"min=0,max=20"` + Nickname string `json:"nickname" validate:"required,min=0,max=50"` + GivenName string `json:"givenName" validate:"min=0,max=50"` Mail string `json:"mail" validate:"required,min=0,max=100"` JobNumber string `json:"jobNumber" validate:"required,min=0,max=20"` PostalAddress string `json:"postalAddress" validate:"min=0,max=255"` - Departments string `json:"departments" validate:"min=0,max=255"` - Position string `json:"position" validate:"min=0,max=255"` + Departments string `json:"departments" validate:"min=0,max=512"` + Position string `json:"position" validate:"min=0,max=128"` Mobile string `json:"mobile" validate:"required,checkMobile"` Avatar string `json:"avatar"` Introduction string `json:"introduction" validate:"min=0,max=255"` Status uint `json:"status" validate:"oneof=1 2"` DepartmentId []uint `json:"departmentId" validate:"required"` - Source string `json:"source" validate:"min=0,max=20"` + Source string `json:"source" validate:"min=0,max=50"` RoleIds []uint `json:"roleIds" validate:"required"` SourceUserId string `json:"sourceUserId"` // 第三方用户id SourceUnionId string `json:"sourceUnionId"` // 第三方唯一unionId @@ -67,19 +67,19 @@ type WeComUserAddReq struct { // UserUpdateReq 更新资源结构体 type UserUpdateReq struct { ID uint `json:"id" validate:"required"` - Username string `json:"username" validate:"required,min=2,max=20"` + Username string `json:"username" validate:"required,min=2,max=50"` Nickname string `json:"nickname" validate:"min=0,max=20"` - GivenName string `json:"givenName" validate:"min=0,max=20"` + GivenName string `json:"givenName" validate:"min=0,max=50"` Mail string `json:"mail" validate:"min=0,max=100"` JobNumber string `json:"jobNumber" validate:"min=0,max=20"` PostalAddress string `json:"postalAddress" validate:"min=0,max=255"` - Departments string `json:"departments" validate:"min=0,max=255"` - Position string `json:"position" validate:"min=0,max=255"` + Departments string `json:"departments" validate:"min=0,max=512"` + Position string `json:"position" validate:"min=0,max=128"` Mobile string `json:"mobile" validate:"checkMobile"` Avatar string `json:"avatar"` Introduction string `json:"introduction" validate:"min=0,max=255"` DepartmentId []uint `json:"departmentId" validate:"required"` - Source string `json:"source" validate:"min=0,max=20"` + Source string `json:"source" validate:"min=0,max=50"` RoleIds []uint `json:"roleIds" validate:"required"` }