IP名单新增IPv6和所有IP两种类型

internal/utils/ip.go

@@ -2,18 +2,22 @@ package utils
 
 import (
 	"encoding/binary"
+	"github.com/cespare/xxhash"
+	"math"
 	"net"
+	"strings"
 )
 
 // 将IP转换为整型
-func IP2Long(ip string) uint32 {
+// 注意IPv6没有顺序
+func IP2Long(ip string) uint64 {
 	s := net.ParseIP(ip)
 	if s == nil {
 		return 0
 	}
 
-	if len(s) == 16 {
-		return binary.BigEndian.Uint32(s[12:16])
+	if strings.Contains(ip, ":") {
+		return math.MaxUint32 + xxhash.Sum64String(ip)
 	}
-	return binary.BigEndian.Uint32(s)
+	return uint64(binary.BigEndian.Uint32(s.To4()))
 }

internal/utils/ip_test.go

@@ -6,4 +6,6 @@ func TestIP2Long(t *testing.T) {
 	t.Log(IP2Long("0.0.0.0"))
 	t.Log(IP2Long("1.0.0.0"))
 	t.Log(IP2Long("0.0.0.0.0"))
+	t.Log(IP2Long("2001:db8:0:1::101"))
+	t.Log(IP2Long("2001:db8:0:1::102"))
 }

internal/utils/version.go

@@ -14,5 +14,5 @@ func VersionToLong(version string) uint32 {
 	} else if countDots == 0 {
 		version += ".0.0.0"
 	}
-	return IP2Long(version)
+	return uint32(IP2Long(version))
 }