liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

GetOneEmailFromStr修改

Browse Source
This commit is contained in:
gazebo
2019-10-21 18:03:45 +08:00
parent aa6d673936
commit 76bb560aa3
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxutils/jxutils.go
View File

@@ -68,7 +68,7 @@ func init() {
// Go regex does not support lookarounds. // Go regex does not support lookarounds.
// https://stackoverflow.com/questions/38933898/error-parsing-regexp-invalid-or-unsupported-perl-syntax // https://stackoverflow.com/questions/38933898/error-parsing-regexp-invalid-or-unsupported-perl-syntax
skuNamePat = regexp.MustCompile(`([\(（\[【][^\(（\[【\)）\]】]*[\)）\]】])?(.*?)([(（].*[)）])?\s*约?([1-9][\d\.]*)(g|G|kg|kG|Kg|KG|l|L|ml|mL|Ml|ML|克)\s*([(（].*[)）])?\s*(?:\/|／|)\s*([^\s（）()]{0,2})\s*([（(].*[）)])?$`) skuNamePat = regexp.MustCompile(`([\(（\[【][^\(（\[【\)）\]】]*[\)）\]】])?(.*?)([(（].*[)）])?\s*约?([1-9][\d\.]*)(g|G|kg|kG|Kg|KG|l|L|ml|mL|Ml|ML|克)\s*([(（].*[)）])?\s*(?:\/|／|)\s*([^\s（）()]{0,2})\s*([（(].*[）)])?$`)
emailPat = regexp.MustCompile(`[A-Za-z0-9_\-\.]+@(?:[A-Za-z0-9_\-]+\.)+[A-Za-z]+`) emailPat = regexp.MustCompile(`[A-Za-z0-9_\-.]+@(?:[A-Za-z0-9_\-]+\.)+[A-Za-z]+`)
} }
func getJxStoreIDFromOrder(order *model.GoodsOrder) (retVal int) { func getJxStoreIDFromOrder(order *model.GoodsOrder) (retVal int) {

4
business/jxutils/jxutils_test.go
View File

@@ -274,6 +274,10 @@ func TestGetOneEmailFromStr(t *testing.T) {
"test@kk.com", "test@kk.com",
"中人国test@kk.com2342", "中人国test@kk.com2342",
}, },
[]string{
"donald.trump_1-3@163.com",
"中人国donald.trump_1-3@163.com2342",
},
} { } {
if str := GetOneEmailFromStr(v[1]); str != v[0] { if str := GetOneEmailFromStr(v[1]); str != v[0] {
t.Errorf("%s failed, result:%s, expect:%s", v[1], str, v[0]) t.Errorf("%s failed, result:%s, expect:%s", v[1], str, v[0])