From 6ac809c472dd1726566a18f747a9448e19d86c7f Mon Sep 17 00:00:00 2001 From: SanJin Date: Mon, 12 Aug 2019 18:29:15 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BC=96=E7=A0=81=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 3 +-- go.sum | 7 +++---- utils/ip/ip.go | 10 ++++------ 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index cb91e47..a1af813 100644 --- a/go.mod +++ b/go.mod @@ -4,13 +4,12 @@ go 1.12 require ( github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 // indirect - github.com/djimenez/iconv-go v0.0.0-20160305225143-8960e66bd3da + github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 // indirect github.com/gin-gonic/gin v1.4.0 github.com/gliderlabs/ssh v0.2.2 github.com/jehiah/go-strftime v0.0.0-20171201141054-1d33003b3869 github.com/mattn/go-sqlite3 v1.11.0 - github.com/yob/graval v0.0.0-20130908151632-6309660927ac gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc // indirect gopkg.in/gomail.v2 v2.0.0-20160411212932-81ebce5c23df ) diff --git a/go.sum b/go.sum index 298c01c..fc7bb5d 100644 --- a/go.sum +++ b/go.sum @@ -1,9 +1,9 @@ github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA= github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239/go.mod h1:2FmKhYUyUczH0OGQWaF5ceTx0UBShxjsH6f8oGKYe2c= +github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394 h1:OYA+5W64v3OgClL+IrOD63t4i/RW7RqrAVl9LTZ9UqQ= +github.com/axgle/mahonia v0.0.0-20180208002826-3358181d7394/go.mod h1:Q8n74mJTIgjX4RBBcHnJ05h//6/k6foqmgE45jTQtxg= github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/djimenez/iconv-go v0.0.0-20160305225143-8960e66bd3da h1:0qwwqQCLOOXPl58ljnq3sTJR7yRuMolM02vjxDh4ZVE= -github.com/djimenez/iconv-go v0.0.0-20160305225143-8960e66bd3da/go.mod h1:ns+zIWBBchgfRdxNgIJWn2x6U95LQchxeqiN5Cgdgts= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568 h1:BHsljHzVlRcyQhjrss6TZTdY2VfCqZPbv5k3iBFa2ZQ= github.com/flynn/go-shlex v0.0.0-20150515145356-3f9db97f8568/go.mod h1:xEzjJPgXI435gkrCt3MPfRiAkVrwSbHsst4LCFVfpJc= github.com/gin-contrib/sse v0.0.0-20190301062529-5545eab6dad3 h1:t8FVkw33L+wilf2QiWkw0UV77qRpcH/JHPKGpKa2E8g= @@ -33,8 +33,6 @@ github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= github.com/ugorji/go v1.1.4 h1:j4s+tAvLfL3bZyefP2SEWmhBzmuIlH/eqNuPdFPgngw= github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc= -github.com/yob/graval v0.0.0-20130908151632-6309660927ac h1:DUrCF+teiclkmKFBwhTEED8HxJikcfD+cFbN7anPVSk= -github.com/yob/graval v0.0.0-20130908151632-6309660927ac/go.mod h1:SNCG+vBljbVZKFP13IZMXSGbOeuRNrh74+J3BU+6Ag0= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2 h1:VklqNMn3ovrHsnt90PveolxSbWFaJdECFbxSq0Mqo2M= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c h1:uOCk1iQW6Vc18bnC13MfzScl+wdKBmM9Y9kU7Z83/lw= @@ -42,6 +40,7 @@ golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223 h1:DH4skfRX4EBpamg7iV4ZlCpblAHI6s6TDM39bFZumv8= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= +golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc h1:2gGKlE2+asNV9m7xrywl36YYNnBG5ZQ0r/BOOxqPpmk= gopkg.in/alexcesaro/quotedprintable.v3 v3.0.0-20150716171945-2caba252f4dc/go.mod h1:m7x9LTH6d71AHyAX77c9yqWCCa3UKHcVEj9y7hAtKDk= diff --git a/utils/ip/ip.go b/utils/ip/ip.go index 43b9895..a28f1e0 100644 --- a/utils/ip/ip.go +++ b/utils/ip/ip.go @@ -4,13 +4,13 @@ import ( "net/http" "HFish/error" "io/ioutil" - "github.com/djimenez/iconv-go" + "github.com/axgle/mahonia" "regexp" "strings" - "HFish/utils/try" - "HFish/utils/log" "net" "fmt" + "HFish/utils/try" + "HFish/utils/log" ) // 爬虫 ip138 获取 ip 地理信息 @@ -24,9 +24,7 @@ func Get(ip string) string { input, err := ioutil.ReadAll(resp.Body) error.Check(err, "读取IP138内容异常") - out := make([]byte, len(input)) - out = out[:] - iconv.Convert(input, out, "gb2312", "utf-8") + out := mahonia.NewDecoder("gbk").ConvertString(string(input)) reg := regexp.MustCompile(`