feat(升级依赖): 升级依赖并去掉废弃函数

.gitignore

@@ -1,4 +1,4 @@
 .idea/
 .vscode/
 .devcontainer/
-qqwry.dat
+assets/qqwry.dat

README.md

@@ -1,6 +1,11 @@
-# qqwry[![Go Reference](https://pkg.go.dev/badge/github.com/xiaoqidun/qqwry.svg)](https://pkg.go.dev/github.com/xiaoqidun/qqwry)
+# QQWry [![Go Reference](https://pkg.go.dev/badge/github.com/xiaoqidun/qqwry.svg)](https://pkg.go.dev/github.com/xiaoqidun/qqwry)
 
-golang qqwry，内存操作，线程安全，支持缓存的纯真IP查询库
+Golang QQWry，高性能纯真IP查询库。
+
+# 使用须知
+
+1. 仅支持ipv4查询。
+2. city也可能是国家。
 
 # 使用说明
 
@@ -18,11 +23,27 @@ func main() {
 		panic(err)
 	}
 	// 从内存或缓存查询IP
-	country, area, err := qqwry.QueryIP("1.1.1.1")
-	log.Printf("国家：%s，区域：%s，错误：%v", country, area, err)
+	city, isp, err := qqwry.QueryIP("1.1.1.1")
+	log.Printf("城市：%s，运营商：%s，错误：%v", city, isp, err)
 }
 ```
 
+# IP数据库
+
+- [https://aite.xyz/share-file/qqwry/qqwry.dat](https://aite.xyz/share-file/qqwry/qqwry.dat)
+
+# 编译说明
+
+1. 下载IP数据库并放置于assets目录中。
+2. client和server需要go1.16的内嵌资源特性。
+3. 作为库使用，请直接引包，并不需要go1.16+才能编译。
+
+# 服务接口
+
+1. 自行根据需要调整server下源码。
+2. 可以通过-listen参数指定http服务地址。
+3. json api：curl http://127.0.0.1/ip/1.1.1.1
+
 # 特别感谢
 
 - 感谢[纯真IP库](https://www.cz88.net/)一直坚持为大家提供免费IP数据库。

assets/assets.go

@@ -0,0 +1,6 @@
+package assets
+
+import _ "embed"
+
+//go:embed qqwry.dat
+var QQWryDat []byte

client/client.go

@@ -0,0 +1,25 @@
+package main
+
+import (
+	"fmt"
+	"github.com/xiaoqidun/qqwry"
+	"github.com/xiaoqidun/qqwry/assets"
+	"os"
+)
+
+func init() {
+	qqwry.LoadData(assets.QQWryDat)
+}
+
+func main() {
+	if len(os.Args) < 2 {
+		return
+	}
+	queryIp := os.Args[1]
+	city, isp, err := qqwry.QueryIP(queryIp)
+	if err != nil {
+		fmt.Printf("错误：%v\n", err)
+		return
+	}
+	fmt.Printf("城市：%s，运营商：%s\n", city, isp)
+}

go.mod

@@ -1,5 +1,5 @@
 module github.com/xiaoqidun/qqwry
 
-go 1.16
+go 1.20
 
-require golang.org/x/text v0.3.5
+require golang.org/x/text v0.9.0

go.sum

@@ -1,3 +1,2 @@
-golang.org/x/text v0.3.5 h1:i6eZZ+zk0SOf0xgBpEpPD18qWcJda6q1sxt3S0kzyUQ=
-golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
+golang.org/x/text v0.9.0 h1:2sjJmO8cDvYveuX97RDLsxlyUxLl+GHoLxBiRdHllBE=
+golang.org/x/text v0.9.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8=

qqwry.go

@@ -2,13 +2,14 @@ package qqwry
 
 import (
 	"bytes"
-	_ "embed"
 	"encoding/binary"
 	"errors"
 	"golang.org/x/text/encoding/simplifiedchinese"
 	"golang.org/x/text/transform"
-	"io/ioutil"
+	"io"
 	"net"
+	"os"
+	"strings"
 	"sync"
 )
 
@@ -25,8 +26,8 @@ const (
 )
 
 type cache struct {
-	Country string
-	Area    string
+	City string
+	Isp  string
 }
 
 func byte3ToUInt32(data []byte) uint32 {
@@ -39,15 +40,15 @@ func byte3ToUInt32(data []byte) uint32 {
 func gb18030Decode(src []byte) string {
 	in := bytes.NewReader(src)
 	out := transform.NewReader(in, simplifiedchinese.GB18030.NewDecoder())
-	d, _ := ioutil.ReadAll(out)
+	d, _ := io.ReadAll(out)
 	return string(d)
 }
 
 // QueryIP 从内存或缓存查询IP
-func QueryIP(queryIp string) (country string, area string, err error) {
+func QueryIP(queryIp string) (city string, isp string, err error) {
 	if v, ok := ipCache.Load(queryIp); ok {
-		country = v.(cache).Country
-		area = v.(cache).Area
+		city = v.(cache).City
+		isp = v.(cache).Isp
 		return
 	}
 	ip := net.ParseIP(queryIp).To4()
@@ -83,64 +84,73 @@ func QueryIP(queryIp string) (country string, area string, err error) {
 		}
 	}
 	if offset <= 0 {
+		err = errors.New("ip not found")
 		return
 	}
 	posM := offset + 4
 	mode := data[posM]
-	var areaPos uint32
+	var ispPos uint32
 	switch mode {
 	case redirectMode1:
 		posC := byte3ToUInt32(data[posM+1 : posM+4])
 		mode = data[posC]
-		var cA uint32 = 0
+		posCA := posC
 		if mode == redirectMode2 {
-			cA = byte3ToUInt32(data[posC+1 : posC+4])
+			posCA = byte3ToUInt32(data[posC+1 : posC+4])
 			posC += 4
 		}
-		for i := cA; i < dataLen; i++ {
+		for i := posCA; i < dataLen; i++ {
 			if data[i] == 0 {
-				country = string(data[cA:i])
+				city = string(data[posCA:i])
 				break
 			}
 		}
 		if mode != redirectMode2 {
-			posC += uint32(len(country) + 1)
+			posC += uint32(len(city) + 1)
 		}
-		areaPos = posC
+		ispPos = posC
 	case redirectMode2:
-		cA := byte3ToUInt32(data[posM+1 : posM+4])
-		for i := cA; i < dataLen; i++ {
+		posCA := byte3ToUInt32(data[posM+1 : posM+4])
+		for i := posCA; i < dataLen; i++ {
 			if data[i] == 0 {
-				country = string(data[cA:i])
+				city = string(data[posCA:i])
 				break
 			}
 		}
-		areaPos = offset + 8
+		ispPos = offset + 8
 	default:
-		cA := offset + 4
-		for i := cA; i < dataLen; i++ {
+		posCA := offset + 4
+		for i := posCA; i < dataLen; i++ {
 			if data[i] == 0 {
-				country = string(data[cA:i])
+				city = string(data[posCA:i])
 				break
 			}
 		}
-		areaPos = offset + uint32(5+len(country))
+		ispPos = offset + uint32(5+len(city))
 	}
-	areaMode := data[areaPos]
-	if areaMode == redirectMode1 || areaMode == redirectMode2 {
-		areaPos = byte3ToUInt32(data[areaPos+1 : areaPos+4])
+	if city != "" {
+		city = strings.TrimSpace(gb18030Decode([]byte(city)))
 	}
-	if areaPos > 0 {
-		for i := areaPos; i < dataLen; i++ {
+	ispMode := data[ispPos]
+	if ispMode == redirectMode1 || ispMode == redirectMode2 {
+		ispPos = byte3ToUInt32(data[ispPos+1 : ispPos+4])
+	}
+	if ispPos > 0 {
+		for i := ispPos; i < dataLen; i++ {
 			if data[i] == 0 {
-				area = string(data[areaPos:i])
+				isp = string(data[ispPos:i])
+				if isp != "" {
+					if strings.Contains(isp, "CZ88.NET") {
+						isp = ""
+					} else {
+						isp = strings.TrimSpace(gb18030Decode([]byte(isp)))
+					}
+				}
 				break
 			}
 		}
 	}
-	country = gb18030Decode([]byte(country))
-	area = gb18030Decode([]byte(area))
-	ipCache.Store(queryIp, cache{Country: country, Area: area})
+	ipCache.Store(queryIp, cache{City: city, Isp: isp})
 	return
 }
 
@@ -152,7 +162,7 @@ func LoadData(database []byte) {
 
 // LoadFile 从文件加载IP数据库
 func LoadFile(filepath string) (err error) {
-	data, err = ioutil.ReadFile(filepath)
+	data, err = os.ReadFile(filepath)
 	if err != nil {
 		return
 	}

qqwry_test.go

@@ -5,16 +5,16 @@ import (
 )
 
 func init() {
-	if err := LoadFile("qqwry.dat"); err != nil {
+	if err := LoadFile("assets/qqwry.dat"); err != nil {
 		panic(err)
 	}
 }
 
 func TestQueryIP(t *testing.T) {
 	queryIp := "1.1.1.1"
-	country, area, err := QueryIP(queryIp)
+	city, isp, err := QueryIP(queryIp)
 	if err != nil {
 		t.Fatal(err)
 	}
-	t.Log(country, area)
+	t.Logf("城市：%s，运营商：%s", city, isp)
 }

server/server.go

@@ -0,0 +1,47 @@
+package main
+
+import (
+	"encoding/json"
+	"flag"
+	"github.com/xiaoqidun/qqwry"
+	"github.com/xiaoqidun/qqwry/assets"
+	"net"
+	"net/http"
+)
+
+type resp struct {
+	IP   string `json:"ip"`
+	Err  string `json:"err"`
+	City string `json:"city"`
+	Isp  string `json:"isp"`
+}
+
+func init() {
+	qqwry.LoadData(assets.QQWryDat)
+}
+
+func main() {
+	listen := flag.String("listen", "127.0.0.1:80", "http server listen addr")
+	flag.Parse()
+	http.HandleFunc("/ip/", IpAPI)
+	if err := http.ListenAndServe(*listen, nil); err != nil {
+		panic(err)
+	}
+}
+
+func IpAPI(writer http.ResponseWriter, request *http.Request) {
+	ip := request.URL.Path[4:]
+	if ip == "" {
+		ip, _, _ = net.SplitHostPort(request.RemoteAddr)
+	}
+	rw := &resp{IP: ip}
+	city, isp, err := qqwry.QueryIP(ip)
+	if err != nil {
+		rw.Err = err.Error()
+	} else {
+		rw.City = city
+		rw.Isp = isp
+	}
+	b, _ := json.MarshalIndent(rw, "", "    ")
+	_, _ = writer.Write(b)
+}