From 46914b3eb0927dfa12d1ab6fefabe54086009dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E7=A5=A5=E8=B6=85?= <iwind.liu@gmail.com>
Date: Mon, 18 Jan 2021 12:35:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=85=E5=8D=87=E7=BA=A7?=
 =?UTF-8?q?=E8=8A=82=E7=82=B9=E7=89=88=E6=9C=AC=E5=8F=B7=E5=AF=B9=E6=AF=94?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/db/models/node_dao.go         | 11 +++++----
 internal/nodes/node_status_executor.go |  2 ++
 internal/utils/ip.go                   | 19 ++++++++++++++++
 internal/utils/version.go              | 18 +++++++++++++++
 internal/utils/version_test.go         | 31 ++++++++++++++++++++++++++
 5 files changed, 77 insertions(+), 4 deletions(-)
 create mode 100644 internal/utils/ip.go
 create mode 100644 internal/utils/version.go
 create mode 100644 internal/utils/version_test.go

diff --git a/internal/db/models/node_dao.go b/internal/db/models/node_dao.go
index ef2e2f8b..b25e416f 100644
--- a/internal/db/models/node_dao.go
+++ b/internal/db/models/node_dao.go
@@ -3,6 +3,7 @@ package models
 import (
 	"encoding/json"
 	"github.com/TeaOSLab/EdgeAPI/internal/errors"
+	"github.com/TeaOSLab/EdgeAPI/internal/utils"
 	"github.com/TeaOSLab/EdgeAPI/internal/utils/numberutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
@@ -10,6 +11,7 @@ import (
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/dbs"
+	"github.com/iwind/TeaGo/logs"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/rands"
 	"github.com/iwind/TeaGo/types"
@@ -603,10 +605,10 @@ func (this *NodeDAO) CountAllLowerVersionNodesWithClusterId(tx *dbs.Tx, clusterI
 		Where("status IS NOT NULL").
 		Where("JSON_EXTRACT(status, '$.os')=:os").
 		Where("JSON_EXTRACT(status, '$.arch')=:arch").
-		Where("INET_ATON(JSON_UNQUOTE(JSON_EXTRACT(status, '$.buildVersion')))<INET_ATON(:version)").
+		Where("(JSON_EXTRACT(status, '$.buildVersionCode') IS NULL OR JSON_EXTRACT(status, '$.buildVersionCode')<:version)").
 		Param("os", os).
 		Param("arch", arch).
-		Param("version", version).
+		Param("version", utils.VersionToLong(version)).
 		Count()
 }
 
@@ -618,13 +620,14 @@ func (this *NodeDAO) FindAllLowerVersionNodesWithClusterId(tx *dbs.Tx, clusterId
 		Where("status IS NOT NULL").
 		Where("JSON_EXTRACT(status, '$.os')=:os").
 		Where("JSON_EXTRACT(status, '$.arch')=:arch").
-		Where("INET_ATON(JSON_UNQUOTE(JSON_EXTRACT(status, '$.buildVersion')))<INET_ATON(:version)").
+		Where("(JSON_EXTRACT(status, '$.buildVersionCode') IS NULL OR JSON_EXTRACT(status, '$.buildVersionCode')<:version)").
 		Param("os", os).
 		Param("arch", arch).
-		Param("version", version).
+		Param("version", utils.VersionToLong(version)).
 		DescPk().
 		Slice(&result).
 		FindAll()
+	logs.Println(len(result), version) // TODO
 	return
 }
 
diff --git a/internal/nodes/node_status_executor.go b/internal/nodes/node_status_executor.go
index 32f79999..8859eee0 100644
--- a/internal/nodes/node_status_executor.go
+++ b/internal/nodes/node_status_executor.go
@@ -6,6 +6,7 @@ import (
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
 	"github.com/TeaOSLab/EdgeAPI/internal/events"
 	"github.com/TeaOSLab/EdgeAPI/internal/remotelogs"
+	"github.com/TeaOSLab/EdgeAPI/internal/utils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/nodeconfigs"
 	"github.com/iwind/TeaGo/lists"
 	"github.com/shirou/gopsutil/cpu"
@@ -54,6 +55,7 @@ func (this *NodeStatusExecutor) update() {
 
 	status := &nodeconfigs.NodeStatus{}
 	status.BuildVersion = teaconst.Version
+	status.BuildVersionCode = utils.VersionToLong(teaconst.Version)
 	status.OS = runtime.GOOS
 	status.Arch = runtime.GOARCH
 	status.ConfigVersion = 0
diff --git a/internal/utils/ip.go b/internal/utils/ip.go
new file mode 100644
index 00000000..58105208
--- /dev/null
+++ b/internal/utils/ip.go
@@ -0,0 +1,19 @@
+package utils
+
+import (
+	"encoding/binary"
+	"net"
+)
+
+// 将IP转换为整型
+func IP2Long(ip string) uint32 {
+	s := net.ParseIP(ip)
+	if s == nil {
+		return 0
+	}
+
+	if len(s) == 16 {
+		return binary.BigEndian.Uint32(s[12:16])
+	}
+	return binary.BigEndian.Uint32(s)
+}
diff --git a/internal/utils/version.go b/internal/utils/version.go
new file mode 100644
index 00000000..8940a0cb
--- /dev/null
+++ b/internal/utils/version.go
@@ -0,0 +1,18 @@
+package utils
+
+import (
+	"strings"
+)
+
+// 计算版本代号
+func VersionToLong(version string) uint32 {
+	countDots := strings.Count(version, ".")
+	if countDots == 2 {
+		version += ".0"
+	} else if countDots == 1 {
+		version += ".0.0"
+	} else if countDots == 0 {
+		version += ".0.0.0"
+	}
+	return IP2Long(version)
+}
diff --git a/internal/utils/version_test.go b/internal/utils/version_test.go
new file mode 100644
index 00000000..31ad85cd
--- /dev/null
+++ b/internal/utils/version_test.go
@@ -0,0 +1,31 @@
+package utils
+
+import "testing"
+
+func TestNodeStatus_ComputerBuildVersionCode(t *testing.T) {
+	{
+		t.Log("", VersionToLong(""))
+	}
+
+	{
+		t.Log("0.0.6", VersionToLong("0.0.6"))
+	}
+
+	{
+		t.Log("0.0.6.1", VersionToLong("0.0.6.1"))
+	}
+
+	{
+		t.Log("0.0.7", VersionToLong("0.0.7"))
+	}
+
+	{
+		t.Log("0.7", VersionToLong("0.7"))
+	}
+	{
+		t.Log("7", VersionToLong("7"))
+	}
+	{
+		t.Log("7.0.1", VersionToLong("7.0.1"))
+	}
+}