TRKJ/EdgeCommon
2
0
Fork 0
mirror of https://github.com/TeaOSLab/EdgeCommon.git synced 2025-11-24 20:00:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

优化IP库模板分析程序

Browse Source
This commit is contained in:
GoEdgeLab
2023-03-29 21:19:01 +08:00
parent 84a4b72266
commit de4c86c836
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/iplibrary/template.go
View File

@@ -38,7 +38,7 @@ func (this *Template) init() error {
return keyword return keyword
}) })
reg, err := regexp.Compile("^(?U)" + template) reg, err := regexp.Compile("^(?U)" + template + "\n?$")
if err != nil { if err != nil {
return err return err
} }

5
pkg/iplibrary/template_test.go
View File

@@ -13,14 +13,15 @@ func TestNewTemplate(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
for _, s := range []string{ for _, s := range []string{
"0.0.0.0|0.255.255.255|0|0|0|内网IP|内网IP",
"42.0.32.0|42.0.63.255|中国|0|广东省|广州市|电信", "42.0.32.0|42.0.63.255|中国|0|广东省|广州市|电信",
"42.0.32.0|42.0.63.255|中国|0|广东省|广州市|电信\n123", "42.0.32.0|42.0.63.255|中国|0|广东省|广州市|电信\n123",
"42.0.32.0|42.0.63.255|中国||广东省|广州市|电信", "42.0.32.0|42.0.63.255|中国||广东省|广州市|电信",
"42.0.32.0|42.0.63.255|中国|0||广州市|电信", "42.0.32.0|42.0.63.255|中国|0||广州市|电信",
"42.0.32.0|42.0.63.255|中国|0|广东省|广州市", "42.0.32.0|42.0.63.255|中国|0|广东省|广州市",
} { } {
values, _ := template.Extract(s, []string{}) values, ok := template.Extract(s, []string{})
t.Log(s, "=>\n", values) t.Log(ok, s, "=>\n", values)
} }
} }