v1.4.1

2026-01-24 08:55:47 +08:00 · 2024-07-27 15:42:58 +08:00
parent 7279dc873f
commit d7d0c8fbfe
490 changed files with 2158 additions and 738 deletions
--- a/internal/web/actions/default/setup/checkLocalIP.go
+++ b/internal/web/actions/default/setup/checkLocalIP.go
@@ -1,11 +1,12 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .

 package setup

 import (
+	"net"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/utils"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"net"
 )

 // CheckLocalIPAction 检查IP是否为局域网IP
--- a/internal/web/actions/default/setup/confirm/index.go
+++ b/internal/web/actions/default/setup/confirm/index.go
@@ -3,14 +3,15 @@
 package confirm

 import (
+	"net/url"
+	"strings"
+
 	"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/rpc/pb"
 	"github.com/iwind/TeaGo/Tea"
 	"github.com/iwind/TeaGo/actions"
-	"net/url"
-	"strings"
 )

 type IndexAction struct {
--- a/internal/web/actions/default/setup/detectDB.go
+++ b/internal/web/actions/default/setup/detectDB.go
@@ -3,16 +3,17 @@
 package setup

 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
-	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
-	"github.com/iwind/TeaGo/dbs"
-	"github.com/iwind/TeaGo/maps"
 	"net"
 	"net/url"
 	"os"
 	"runtime"
 	"strings"
 	"time"
+
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
+	"github.com/TeaOSLab/EdgeCommon/pkg/configutils"
+	"github.com/iwind/TeaGo/dbs"
+	"github.com/iwind/TeaGo/maps"
 )

 // DetectDBAction 尝试从本地服务器中发现MySQL
--- a/internal/web/actions/default/setup/index.go
+++ b/internal/web/actions/default/setup/index.go
@@ -1,9 +1,10 @@
 package setup

 import (
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"net"
 	"strings"
+
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 )

 type IndexAction struct {
--- a/internal/web/actions/default/setup/install.go
+++ b/internal/web/actions/default/setup/install.go
@@ -3,6 +3,12 @@ package setup
 import (
 	"bytes"
 	"encoding/json"
+	"io"
+	"os"
+	"os/exec"
+	"strings"
+	"time"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/nodes"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
@@ -16,11 +22,6 @@ import (
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/gosock/pkg/gosock"
 	"gopkg.in/yaml.v3"
-	"io"
-	"os"
-	"os/exec"
-	"strings"
-	"time"
 )

 type InstallAction struct {
--- a/internal/web/actions/default/setup/mysql/installLogs.go
+++ b/internal/web/actions/default/setup/mysql/installLogs.go
@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .

 package mysql

--- a/internal/web/actions/default/setup/mysql/installPopup.go
+++ b/internal/web/actions/default/setup/mysql/installPopup.go
@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .

 package mysql

--- a/internal/web/actions/default/setup/mysql/mysqlinstallers/mysql_installer.go
+++ b/internal/web/actions/default/setup/mysql/mysqlinstallers/mysql_installer.go
@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .

 package mysqlinstallers

@@ -7,10 +7,6 @@ import (
 	"crypto/rand"
 	"errors"
 	"fmt"
-	executils "github.com/TeaOSLab/EdgeAdmin/internal/utils/exec"
-	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/setup/mysql/mysqlinstallers/utils"
-	stringutil "github.com/iwind/TeaGo/utils/string"
-	timeutil "github.com/iwind/TeaGo/utils/time"
 	"io"
 	"net"
 	"net/http"
@@ -22,6 +18,11 @@ import (
 	"strconv"
 	"strings"
 	"time"
+
+	executils "github.com/TeaOSLab/EdgeAdmin/internal/utils/exec"
+	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/default/setup/mysql/mysqlinstallers/utils"
+	stringutil "github.com/iwind/TeaGo/utils/string"
+	timeutil "github.com/iwind/TeaGo/utils/time"
 )

 type MySQLInstaller struct {
--- a/internal/web/actions/default/setup/mysql/mysqlinstallers/utils/cmd.go
+++ b/internal/web/actions/default/setup/mysql/mysqlinstallers/utils/cmd.go
@@ -1,4 +1,4 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .

 package utils

--- a/internal/web/actions/default/setup/mysql/mysqlinstallers/utils/logger.go
+++ b/internal/web/actions/default/setup/mysql/mysqlinstallers/utils/logger.go
@@ -1,4 +1,4 @@
-// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2023 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .

 package utils

--- a/internal/web/actions/default/setup/mysql/mysqlinstallers/utils/proc.go
+++ b/internal/web/actions/default/setup/mysql/mysqlinstallers/utils/proc.go
@@ -1,4 +1,4 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .

 package utils

--- a/internal/web/actions/default/setup/mysql/mysqlinstallers/utils/writer_progress.go
+++ b/internal/web/actions/default/setup/mysql/mysqlinstallers/utils/writer_progress.go
@@ -1,4 +1,4 @@
-// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cn .
+// Copyright 2022 GoEdge CDN goedge.cdn@gmail.com. All rights reserved. Official site: https://goedge.cloud .

 package utils

--- a/internal/web/actions/default/setup/validateAdmin.go
+++ b/internal/web/actions/default/setup/validateAdmin.go
@@ -1,10 +1,11 @@
 package setup

 import (
+	"strings"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
-	"strings"
 )

 type ValidateAdminAction struct {
--- a/internal/web/actions/default/setup/validateApi.go
+++ b/internal/web/actions/default/setup/validateApi.go
@@ -1,6 +1,10 @@
 package setup

 import (
+	"net"
+	"regexp"
+	"strings"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	"github.com/TeaOSLab/EdgeAdmin/internal/rpc"
 	"github.com/TeaOSLab/EdgeAdmin/internal/web/actions/actionutils"
@@ -9,9 +13,6 @@ import (
 	"github.com/iwind/TeaGo/actions"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/TeaGo/types"
-	"net"
-	"regexp"
-	"strings"
 )

 type ValidateApiAction struct {
--- a/internal/web/actions/default/setup/validateDb.go
+++ b/internal/web/actions/default/setup/validateDb.go
@@ -1,6 +1,11 @@
 package setup

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

 type ValidateDbAction struct {
@@ -58,7 +59,7 @@ func (this *ValidateDbAction) RunPost(params struct {
 	// 测试连接
 	db, err := dbs.NewInstanceFromConfig(&dbs.DBConfig{
 		Driver: "mysql",
-		Dsn:    url.QueryEscape(params.Username) + ":" + url.QueryEscape(params.Password) + "@tcp(" + configutils.QuoteIP(params.Host) + ":" + params.Port + ")/" + params.Database,
+		Dsn:    url.QueryEscape(params.Username) + ":" + params.Password + "@tcp(" + configutils.QuoteIP(params.Host) + ":" + params.Port + ")/" + params.Database,
 		Prefix: "",
 	})
 	if err != nil {