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/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/etc/admin.yaml b/services/admin/etc/admin.yaml deleted file mode 100644 index 2152980..0000000 --- a/services/admin/etc/admin.yaml +++ /dev/null @@ -1,7 +0,0 @@ -Nacos: - Hosts: - - rnacos:8848 - NamespaceId: test - Group: LONE_SERVICES - RegisterIP: admin - ConfigID: admin \ No newline at end of file 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": "密码不能为空", } } diff --git a/services/lonelog/etc/lonelog.yaml b/services/lonelog/etc/lonelog.yaml deleted file mode 100644 index ae3b4f1..0000000 --- a/services/lonelog/etc/lonelog.yaml +++ /dev/null @@ -1,7 +0,0 @@ -Nacos: - Hosts: - - rnacos:8848 - NamespaceId: test - Group: LONE_SERVICES - RegisterIP: log - ConfigID: develop-logs \ No newline at end of file diff --git a/services/order/etc/order.yaml b/services/order/etc/order.yaml deleted file mode 100644 index 2e7b225..0000000 --- a/services/order/etc/order.yaml +++ /dev/null @@ -1,7 +0,0 @@ -Nacos: - Hosts: - - rnacos:8848 - NamespaceId: test - Group: LONE_SERVICES - RegisterIP: order - ConfigID: develop-order \ No newline at end of file