|
@@ -40,7 +40,8 @@ type AccountPassword struct {
|
|
|
func (l ProjectAccount) Validate() error {
|
|
|
return validation.ValidateStruct(&l,
|
|
|
validation.Field(&l.Account, validation.Required.Error("账号不能为空"), validation.Match(regexp.MustCompile("^[A-Za-z0-9]+$")).Error("只支持英文数字组合")),
|
|
|
- validation.Field(&l.Password, validation.Required.Error("密码不能为空"), validation.Match(regexp.MustCompile("^[a-zA-Z~!@#$%^&*]\\w{5,17}$")).Error("密码支持英文数字及符号,6~18之间")),
|
|
|
+ // validation.Match(regexp.MustCompile("^[a-zA-Z~!@#$%^&*]\\w{5,17}$")).Error("密码支持英文数字及符号,6~18之间")
|
|
|
+ validation.Field(&l.Password, validation.Required.Error("密码不能为空"), validation.Length(6, 18).Error("密码位数6~18之间")),
|
|
|
validation.Field(&l.AccountGroup, validation.Required.Error("账号组不能为空"), validation.In(1, 2, 3, 4).Error("未找到相关账号组")),
|
|
|
validation.Field(&l.Name, validation.Required.Error("姓名不能为空")),
|
|
|
validation.Field(&l.Company, validation.Required.Error("单位不能为空")),
|