From 59a775aad4d1fba6e2d374e785b3c4b111571b69 Mon Sep 17 00:00:00 2001 From: swift <77133741+swift-fs@users.noreply.github.com> Date: Tue, 4 Jun 2024 20:36:28 +0800 Subject: [PATCH] util/gvalid: add `171` number support for virtual phone number validation (#3622) --- util/gvalid/gvalid_z_example_feature_rule_test.go | 7 +++---- util/gvalid/internal/builtin/builtin_phone.go | 6 +++--- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/util/gvalid/gvalid_z_example_feature_rule_test.go b/util/gvalid/gvalid_z_example_feature_rule_test.go index de7f4721d..9980e9ba0 100644 --- a/util/gvalid/gvalid_z_example_feature_rule_test.go +++ b/util/gvalid/gvalid_z_example_feature_rule_test.go @@ -394,8 +394,8 @@ func ExampleRule_Phone() { ctx = context.Background() req = BizReq{ PhoneNumber1: "13578912345", - PhoneNumber2: "11578912345", // error 11x not exist - PhoneNumber3: "17178912345", // error 171 not exit + PhoneNumber2: "17178912345", + PhoneNumber3: "11578912345", // error 11x not exist PhoneNumber4: "1357891234", // error len must be 11 } ) @@ -404,8 +404,7 @@ func ExampleRule_Phone() { } // Output: - // The PhoneNumber2 value `11578912345` is not a valid phone number - // The PhoneNumber3 value `17178912345` is not a valid phone number + // The PhoneNumber3 value `11578912345` is not a valid phone number // The PhoneNumber4 value `1357891234` is not a valid phone number } diff --git a/util/gvalid/internal/builtin/builtin_phone.go b/util/gvalid/internal/builtin/builtin_phone.go index 72453dc9f..155016d71 100644 --- a/util/gvalid/internal/builtin/builtin_phone.go +++ b/util/gvalid/internal/builtin/builtin_phone.go @@ -25,11 +25,11 @@ import ( // 3. China Telecom: // 133, 153, 180, 181, 189, 177(4G) // -// 4. Satelite: +// 4. Satellite: // 1349 // // 5. Virtual: -// 170, 173 +// 170, 171, 173 // // 6. 2018: // 16x, 19x @@ -51,7 +51,7 @@ func (r RulePhone) Message() string { func (r RulePhone) Run(in RunInput) error { ok := gregex.IsMatchString( - `^13[\d]{9}$|^14[5,7]{1}\d{8}$|^15[^4]{1}\d{8}$|^16[\d]{9}$|^17[0,2,3,5,6,7,8]{1}\d{8}$|^18[\d]{9}$|^19[\d]{9}$`, + `^13[\d]{9}$|^14[5,7]{1}\d{8}$|^15[^4]{1}\d{8}$|^16[\d]{9}$|^17[0,1,2,3,5,6,7,8]{1}\d{8}$|^18[\d]{9}$|^19[\d]{9}$`, in.Value.String(), ) if ok {