增加恢复模式

2025-12-15 04:26:36 +08:00 · 2021-07-20 17:15:17 +08:00
parent 320b325496
commit 064bf2016b
34 changed files with 948 additions and 285 deletions
--- a/internal/web/actions/default/setup/index.go
+++ b/internal/web/actions/default/setup/index.go
@@ -3,8 +3,7 @@ package setup
 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"net"
-	"regexp"
-	"sort"
+	"strings"
 )

 type IndexAction struct {
@@ -16,31 +15,18 @@ func (this *IndexAction) Init() {
 }

 func (this *IndexAction) RunGet(params struct{}) {
-	// 当前服务器的IP
-	serverIPs := []string{}
-	addrs, _ := net.InterfaceAddrs()
-	for _, addr := range addrs {
-		netAddr, ok := addr.(*net.IPNet)
-		if !ok {
-			continue
+	var currentHost = this.Request.Host
+	if strings.Contains(this.Request.Host, ":") {
+		host, _, err := net.SplitHostPort(this.Request.Host)
+		if err == nil {
+			currentHost = host
 		}
-
-		serverIPs = append(serverIPs, netAddr.IP.String())
 	}
-
-	// 对IP进行排序，我们希望IPv4排在前面，而且希望127.0.0.1排在IPv4里的最后
-	sort.Slice(serverIPs, func(i, j int) bool {
-		ip1 := serverIPs[i]
-
-		if ip1 == "127.0.0.1" {
-			return false
-		}
-		if regexp.MustCompile(`^\d+\.\d+\.\d+.\d+$`).MatchString(ip1) {
-			return true
-		}
-		return false
-	})
-	this.Data["serverIPs"] = serverIPs
+	if net.ParseIP(currentHost) != nil {
+		this.Data["currentHost"] = currentHost
+	} else {
+		this.Data["currentHost"] = ""
+	}

 	this.Show()
 }
--- a/internal/web/actions/default/setup/install.go
+++ b/internal/web/actions/default/setup/install.go
@@ -7,6 +7,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/nodes"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/TeaOSLab/EdgeCommon/pkg/systemconfigs"
 	"github.com/go-yaml/yaml"
@@ -68,14 +69,14 @@ func (this *InstallAction) RunPost(params struct {
 			_, err = os.Stat(apiNodeDir)
 			if err != nil {
 				if os.IsNotExist(err) {
-					this.Fail("在当前目录下找不到" + dir + "目录，请将" + dir + "目录上传或者重新下载解压")
+					this.Fail("在当前目录（" + Tea.Root + "）下找不到" + dir + "目录，请将" + dir + "目录上传或者重新下载解压")
 				}
 				this.Fail("无法检查" + dir + "目录，发生错误：" + err.Error())
 			}
 		}

 		// 保存数据库配置
-		dsn := dbMap.GetString("username") + ":" + dbMap.GetString("password") + "@tcp(" + dbMap.GetString("host") + ":" + dbMap.GetString("port") + ")/" + dbMap.GetString("database") + "?charset=utf8mb4&timeout=30s"
+		dsn := dbMap.GetString("username") + ":" + dbMap.GetString("password") + "@tcp(" + configutils.QuoteIP(dbMap.GetString("host")) + ":" + dbMap.GetString("port") + ")/" + dbMap.GetString("database") + "?charset=utf8mb4&timeout=30s"
 		dbConfig := &dbs.Config{
 			DBs: map[string]*dbs.DBConfig{
 				"prod": {
@@ -175,7 +176,7 @@ func (this *InstallAction) RunPost(params struct {
 			RPC: struct {
 				Endpoints []string `yaml:"endpoints"`
 			}{
-				Endpoints: []string{"http://" + apiNodeMap.GetString("newHost") + ":" + apiNodeMap.GetString("newPort")},
+				Endpoints: []string{"http://" + configutils.QuoteIP(apiNodeMap.GetString("newHost")) + ":" + apiNodeMap.GetString("newPort")},
 			},
 			NodeId: resultMap.GetString("adminNodeId"),
 			Secret: resultMap.GetString("adminNodeSecret"),
@@ -233,7 +234,7 @@ func (this *InstallAction) RunPost(params struct {
 			RPC: struct {
 				Endpoints []string `yaml:"endpoints"`
 			}{
-				Endpoints: []string{apiNodeMap.GetString("oldProtocol") + "://" + apiNodeMap.GetString("oldHost") + ":" + apiNodeMap.GetString("oldPort")},
+				Endpoints: []string{apiNodeMap.GetString("oldProtocol") + "://" + configutils.QuoteIP(apiNodeMap.GetString("oldHost")) + ":" + apiNodeMap.GetString("oldPort")},
 			},
 			NodeId: apiNodeMap.GetString("oldNodeId"),
 			Secret: apiNodeMap.GetString("oldNodeSecret"),
--- a/internal/web/actions/default/setup/validateApi.go
+++ b/internal/web/actions/default/setup/validateApi.go
@@ -4,6 +4,7 @@ import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	"github.com/TeaOSLab/EdgeCommon/pkg/rpc/pb"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
@@ -62,7 +63,7 @@ func (this *ValidateApiAction) RunPost(params struct {
 		if net.ParseIP(params.NewHost) == nil {
 			this.FailField("newHost", "请输入正确的节点主机地址")
 		}
-		
+
 		params.Must.
 			Field("newHost", params.NewHost).
 			Require("请输入节点主机地址")
@@ -86,7 +87,7 @@ func (this *ValidateApiAction) RunPost(params struct {
 		RPC: struct {
 			Endpoints []string `yaml:"endpoints"`
 		}{
-			Endpoints: []string{params.OldProtocol + "://" + params.OldHost + ":" + params.OldPort},
+			Endpoints: []string{params.OldProtocol + "://" + configutils.QuoteIP(params.OldHost) + ":" + params.OldPort},
 		},
 		NodeId: params.OldNodeId,
 		Secret: params.OldNodeSecret,
--- a/internal/web/actions/default/setup/validateDb.go
+++ b/internal/web/actions/default/setup/validateDb.go
@@ -2,11 +2,14 @@ package setup

 import (
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/dbs"
 	"github.com/iwind/TeaGo/maps"
 	stringutil "github.com/iwind/TeaGo/utils/string"
+	"net"
+	"regexp"
 	"strings"
 )

@@ -27,7 +30,20 @@ func (this *ValidateDbAction) RunPost(params struct {
 	params.Must.
 		Field("host", params.Host).
 		Require("请输入主机地址").
-		Match(`^[\w\.-]+$`, "主机地址中不能包含特殊字符").
+		Expect(func() (message string, success bool) {
+			// 是否为IP
+			if net.ParseIP(params.Host) != nil {
+				success = true
+				return
+			}
+			if !regexp.MustCompile(`^[\w.-]+$`).MatchString(params.Host) {
+				message = "主机地址中不能包含特殊字符"
+				success = false
+				return
+			}
+			success = true
+			return
+		}).
 		Field("port", params.Port).
 		Require("请输入端口").
 		Match(`^\d+$`, "端口中只能包含数字").
@@ -41,7 +57,7 @@ func (this *ValidateDbAction) RunPost(params struct {
 	// 测试连接
 	db, err := dbs.NewInstanceFromConfig(&dbs.DBConfig{
 		Driver: "mysql",
-		Dsn:    params.Username + ":" + params.Password + "@tcp(" + params.Host + ":" + params.Port + ")/" + params.Database,
+		Dsn:    params.Username + ":" + params.Password + "@tcp(" + configutils.QuoteIP(params.Host) + ":" + params.Port + ")/" + params.Database,
 		Prefix: "",
 	})
 	if err != nil {
@@ -58,7 +74,7 @@ func (this *ValidateDbAction) RunPost(params struct {
 		if strings.Contains(err.Error(), "Error 1049") {
 			db, err := dbs.NewInstanceFromConfig(&dbs.DBConfig{
 				Driver: "mysql",
-				Dsn:    params.Username + ":" + params.Password + "@tcp(" + params.Host + ":" + params.Port + ")/",
+				Dsn:    params.Username + ":" + params.Password + "@tcp(" + configutils.QuoteIP(params.Host) + ":" + params.Port + ")/",
 				Prefix: "",
 			})