diff --git a/server/go.sum b/server/go.sum index c1d25d2..54f57a3 100644 --- a/server/go.sum +++ b/server/go.sum @@ -457,6 +457,7 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= github.com/stretchr/testify v1.8.3 h1:RP3t2pwF7cMEbC1dqtB6poj3niw/9gnV4Cjg5oW5gtY= +github.com/stretchr/testify v1.8.3/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.194/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.633 h1:Yj8s35IjbgaHp4Ic9BZLVGWdN2gXBMtwYi1JJ+qYbrc= github.com/tencentcloud/tencentcloud-sdk-go/tencentcloud/common v1.0.633/go.mod h1:7sCQWVkxcsR38nffDW057DRGk8mUjK1Ing/EFOK8s8Y= diff --git a/server/utility/validate/validate.go b/server/utility/validate/validate.go index f45313e..532c354 100644 --- a/server/utility/validate/validate.go +++ b/server/utility/validate/validate.go @@ -89,8 +89,8 @@ func IsMobile(mobile string) bool { // IsEmail 是否为邮箱地址 func IsEmail(email string) bool { - // pattern := `\w+([-+.]\w+)@\w+([-.]\w+).\w+([-.]\w+)*` //匹配电子邮箱 - pattern := `^[0-9a-z][_.0-9a-z-]{0,31}@([0-9a-z][0-9a-z-]{0,30}[0-9a-z].){1,4}[a-z]{2,4}$` + // pattern := `^[0-9a-z][_.0-9a-z-]{0,31}@([0-9a-z][0-9a-z-]{0,30}[0-9a-z].){1,4}[a-z]{2,4}$` //匹配电子邮箱 + pattern := `^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$` reg := regexp.MustCompile(pattern) return reg.MatchString(email) } diff --git a/server/utility/validate/validate_test.go b/server/utility/validate/validate_test.go new file mode 100644 index 0000000..6a07e8a --- /dev/null +++ b/server/utility/validate/validate_test.go @@ -0,0 +1,11 @@ +package validate + +import ( + "github.com/gogf/gf/v2/test/gtest" + "testing" +) + +func TestIsEmail(t *testing.T) { + b := IsEmail("QTT123456@163.com") + gtest.Assert(true, b) +}