From e35caae3737064fae5a65c6cd1b09f3f0c8d85ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= Date: Wed, 29 Mar 2023 21:19:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96IP=E5=BA=93=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=88=86=E6=9E=90=E7=A8=8B=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkg/iplibrary/template.go | 2 +- pkg/iplibrary/template_test.go | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkg/iplibrary/template.go b/pkg/iplibrary/template.go index e6ab7d5..01fae7a 100644 --- a/pkg/iplibrary/template.go +++ b/pkg/iplibrary/template.go @@ -38,7 +38,7 @@ func (this *Template) init() error { return keyword }) - reg, err := regexp.Compile("^(?U)" + template) + reg, err := regexp.Compile("^(?U)" + template + "\n?$") if err != nil { return err } diff --git a/pkg/iplibrary/template_test.go b/pkg/iplibrary/template_test.go index b4762a4..92ed22a 100644 --- a/pkg/iplibrary/template_test.go +++ b/pkg/iplibrary/template_test.go @@ -13,14 +13,15 @@ func TestNewTemplate(t *testing.T) { t.Fatal(err) } 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|广东省|广州市|电信\n123", "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|广东省|广州市", } { - values, _ := template.Extract(s, []string{}) - t.Log(s, "=>\n", values) + values, ok := template.Extract(s, []string{}) + t.Log(ok, s, "=>\n", values) } }