diff --git a/pkg/utils/encrypt.go b/pkg/utils/encrypt.go index fc82112..dd073e7 100644 --- a/pkg/utils/encrypt.go +++ b/pkg/utils/encrypt.go @@ -78,9 +78,9 @@ func HmacSha256ToBase64(key string, data string) string { func EncryptPhone(phone string) (string, Error) { // 提取各部分 - prefix := phone[NumberZero:NumberThree] // 前三位 - middle := phone[NumberThree:NumberSeven] // 中四位 - suffix := phone[NumberSeven:NumberEleven] // 尾四位 + prefix := phone[NumberZero:NumberThree] // 前三位 + middle := phone[NumberThree:NumberSeven] // 中四位 + suffix := phone[NumberSeven:] // 尾四位 newPhone := StringEmpty username, cErr := Crypto{}.AESEncryptECB(prefix) if cErr != nil { diff --git a/pkg/utils/log.go b/pkg/utils/log.go index 43f8fd7..cf1936c 100644 --- a/pkg/utils/log.go +++ b/pkg/utils/log.go @@ -3,7 +3,6 @@ package utils import ( "context" "lone-services/pkg/logRedis" - lonelog "lone-services/rpc/lonelog/pb" jsoniter "github.com/json-iterator/go" "github.com/zeromicro/go-zero/core/logx" @@ -121,7 +120,7 @@ func SetLoginLog(adminInfo UserInfo, status bool, reason string) { st = 1 } - log := lonelog.LoginLog{ + log := LoginLog{ AdminId: adminInfo.ID, Name: adminInfo.Name, Ip: adminInfo.ClientIP, diff --git a/pkg/validate/validator_util.go b/pkg/validate/validator_util.go index 5e58fb0..f30667b 100644 --- a/pkg/validate/validator_util.go +++ b/pkg/validate/validator_util.go @@ -4,6 +4,7 @@ import ( "fmt" "lone-services/pkg/utils" "reflect" + "regexp" "github.com/go-playground/validator/v10" ) @@ -17,9 +18,14 @@ type IValidator interface { } var v *validator.Validate +var mobileReg = regexp.MustCompile(`^1[3-9]\d{9}$`) func init() { v = validator.New() + + _ = v.RegisterValidation("mobile", func(fl validator.FieldLevel) bool { + return mobileReg.MatchString(fl.Field().String()) + }) } // CopySameField 反射自动拷贝同名字段:src(proto入参) → dst(校验model结构体指针) diff --git a/services/admin/validator/admin.go b/services/admin/validator/admin.go index 49771e1..2617e4c 100644 --- a/services/admin/validator/admin.go +++ b/services/admin/validator/admin.go @@ -96,7 +96,7 @@ func (p AdminStatusValidator) GetMessage() validate.ValidatorMessages { } type LoginValidator struct { - Username string `validate:"required"` + Username string `validate:"required,mobile"` Password string `validate:"required"` } @@ -104,6 +104,7 @@ type LoginValidator struct { func (p LoginValidator) GetMessage() validate.ValidatorMessages { return validate.ValidatorMessages{ "Username.required": "账号不能为空", + "Username.mobile": "账号不正确", "Password.required": "密码不能为空", } }