From a24d5383fb14ac64670128c2cae337867ee85a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=85=89=E6=98=A5?= Date: Fri, 16 Sep 2022 18:08:04 +0800 Subject: [PATCH] - update --- const.go | 2 +- ip2region/qqery.go | 8 ++++---- ip2region_v2/query.go | 3 +++ 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/const.go b/const.go index 611662b..8f0b4f8 100644 --- a/const.go +++ b/const.go @@ -1,3 +1,3 @@ package goip -const Version = "1.0.33" +const Version = "1.0.34" diff --git a/ip2region/qqery.go b/ip2region/qqery.go index 9e359ef..330dedc 100644 --- a/ip2region/qqery.go +++ b/ip2region/qqery.go @@ -29,7 +29,7 @@ func (c *Client) Query(ipAddress net.IP) (result QueryResult, err error) { if err != nil { - return result, err + return QueryResult{}, err } c.firstIndexPtr = getLong(dbBuff, 0) @@ -39,7 +39,7 @@ func (c *Client) Query(ipAddress net.IP) (result QueryResult, err error) { ip, err := ip2long(result.Ip) if err != nil { - return result, err + return QueryResult{}, err } h := c.totalBlocks @@ -62,12 +62,12 @@ func (c *Client) Query(ipAddress net.IP) (result QueryResult, err error) { } } if dataPtr == 0 { - return result, errors.New("not found") + return QueryResult{}, errors.New("not found") } dataLen := (dataPtr >> 24) & 0xFF dataPtr = dataPtr & 0x00FFFFFF result = getIpInfo(result.Ip, getLong(dbBuff, dataPtr), dbBuff[(dataPtr)+4:dataPtr+dataLen]) - return result, nil + return result, nil } diff --git a/ip2region_v2/query.go b/ip2region_v2/query.go index a7dc513..de90582 100644 --- a/ip2region_v2/query.go +++ b/ip2region_v2/query.go @@ -32,6 +32,9 @@ func (c *Client) Query(ipAddress net.IP) (result QueryResult, err error) { result.Ip = ipAddress.String() result.Country = split[0] + if result.Country == "0" { + result.Country = "" + } result.Province = split[2] if result.Province == "0" { result.Province = ""