更好地支持IPv6

internal/utils/ip.go

@@ -1,31 +0,0 @@
-package utils
-
-import (
-	"encoding/binary"
-	"github.com/cespare/xxhash/v2"
-	"math"
-	"net"
-	"strings"
-)
-
-// IP2Long 将IP转换为整型
-// 注意IPv6没有顺序
-func IP2Long(ip string) uint64 {
-	if len(ip) == 0 {
-		return 0
-	}
-	s := net.ParseIP(ip)
-	if len(s) == 0 {
-		return 0
-	}
-
-	if strings.Contains(ip, ":") {
-		return math.MaxUint32 + xxhash.Sum64(s)
-	}
-	return uint64(binary.BigEndian.Uint32(s.To4()))
-}
-
-// IsIPv6 判断是否为IPv6
-func IsIPv6(ip string) bool {
-	return strings.Contains(ip, ":")
-}

internal/utils/version.go

@@ -1,12 +1,14 @@
 package utils
 
 import (
+	"encoding/binary"
+	"net"
 	"strings"
 )
 
-// 计算版本代号
+// VersionToLong 计算版本代号
 func VersionToLong(version string) uint32 {
-	countDots := strings.Count(version, ".")
+	var countDots = strings.Count(version, ".")
 	if countDots == 2 {
 		version += ".0"
 	} else if countDots == 1 {
@@ -14,5 +16,9 @@ func VersionToLong(version string) uint32 {
 	} else if countDots == 0 {
 		version += ".0.0.0"
 	}
-	return uint32(IP2Long(version))
+	var ip = net.ParseIP(version)
+	if ip == nil || ip.To4() == nil {
+		return 0
+	}
+	return binary.BigEndian.Uint32(ip.To4())
 }