v1.4.1

README.md

@@ -51,4 +51,4 @@
 其中的组件源码地址如下：
 * [边缘节点](https://github.com/TeaOSLab/EdgeNode)
 * [API节点](https://github.com/TeaOSLab/EdgeAPI)
-* [管理平台](https://github.com/TeaOSLab/EdgeAdmin)
+* [管理平台](https://github.com/TeaOSLab/EdgeAdmin)

build/build.sh

@@ -103,23 +103,21 @@ function build() {
 	GCC_DIR=""
 	CC_PATH=""
 	CXX_PATH=""
-	if [ "${ARCH}" == "amd64" ]; then
-		GCC_DIR="/usr/local/gcc/x86_64-unknown-linux-gnu/bin"
-		CC_PATH="x86_64-unknown-linux-gnu-gcc"
-		CXX_PATH="x86_64-unknown-linux-gnu-g++"
+	if [[ "${ARCH}" == "amd64" && "${OS}" == "linux" ]]; then
+		CC_PATH=$(command -v x86_64-linux-musl-gcc)
+		CXX_PATH=$(command -v x86_64-linux-musl-g++)
 	fi
-	if [ "${ARCH}" == "arm64" ]; then
-		GCC_DIR="/usr/local/gcc/aarch64-unknown-linux-gnu/bin"
-		CC_PATH="aarch64-unknown-linux-gnu-gcc"
-		CXX_PATH="aarch64-unknown-linux-gnu-g++"
+	if [[ "${ARCH}" == "arm64" && "${OS}" == "linux" ]]; then
+		CC_PATH=$(command -v aarch64-linux-musl-gcc)
+		CXX_PATH=$(command -v aarch64-linux-musl-g++)
 	fi
 
 	# build
 	echo "building ${NAME} ..."
-	if [ -f "${GCC_DIR}/${CC_PATH}" ]; then
-		echo "  building ${NAME} with gcc ..."
-		env CC="${GCC_DIR}/${CC_PATH}" \
-			CXX="${GCC_DIR}/${CXX_PATH}" \
+	if [ -f $CC_PATH ]; then
+		echo "  building ${NAME} with musl gcc ..."
+		env CC=$CC_PATH \
+			CXX=$CXX_PATH \
 			CGO_ENABLED=1 \
 			GOOS="$OS" GOARCH="$ARCH" go build -trimpath -tags "${TAG} gcc" -ldflags="-linkmode external -extldflags -static -s -w" -o "$DIST"/bin/${NAME} "$ROOT"/../cmd/edge-admin/main.go
 	else

cmd/edge-admin/main.go

@@ -4,6 +4,11 @@ import (
 	"bytes"
 	"flag"
 	"fmt"
+	"log"
+	"os"
+	"os/exec"
+	"time"
+
 	"github.com/TeaOSLab/EdgeAdmin/internal/apps"
 	"github.com/TeaOSLab/EdgeAdmin/internal/configs"
 	teaconst "github.com/TeaOSLab/EdgeAdmin/internal/const"
@@ -19,10 +24,6 @@ import (
 	_ "github.com/iwind/TeaGo/bootstrap"
 	"github.com/iwind/TeaGo/maps"
 	"github.com/iwind/gosock/pkg/gosock"
-	"log"
-	"os"
-	"os/exec"
-	"time"
 )
 
 func main() {

go.mod

@@ -1,51 +1,56 @@
 module github.com/TeaOSLab/EdgeAdmin
 
-go 1.21
+go 1.22
 
 replace github.com/TeaOSLab/EdgeCommon => ../EdgeCommon
 
+replace github.com/TeaOSLab/EdgePlus => ../EdgePlus
+
 require (
 	github.com/TeaOSLab/EdgeCommon v0.0.0-00010101000000-000000000000
-	github.com/cespare/xxhash/v2 v2.2.0
-	github.com/go-sql-driver/mysql v1.5.0
-	github.com/iwind/TeaGo v0.0.0-20240429060313-31a7bc8e9cc9
-	github.com/iwind/gosock v0.0.0-20211103081026-ee4652210ca4
-	github.com/miekg/dns v1.1.43
-	github.com/quic-go/quic-go v0.42.0
-	github.com/shirou/gopsutil/v3 v3.22.5
+	github.com/TeaOSLab/EdgePlus v0.0.0-00010101000000-000000000000
+	github.com/cespare/xxhash/v2 v2.3.0
+	github.com/go-sql-driver/mysql v1.8.1
+	github.com/iwind/TeaGo v0.0.0-20240508072741-7647e70b7070
+	github.com/iwind/gosock v0.0.0-20220505115348-f88412125a62
+	github.com/miekg/dns v1.1.59
+	github.com/quic-go/quic-go v0.44.0
+	github.com/shirou/gopsutil/v3 v3.24.2
 	github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e
-	github.com/tdewolff/minify/v2 v2.20.20
-	github.com/tealeg/xlsx/v3 v3.2.3
+	github.com/tealeg/xlsx/v3 v3.2.4
 	github.com/xlzd/gotp v0.1.0
-	golang.org/x/crypto v0.22.0
-	golang.org/x/sys v0.19.0
+	golang.org/x/crypto v0.23.0
+	golang.org/x/sys v0.20.0
 	google.golang.org/grpc v1.63.2
 	gopkg.in/yaml.v3 v3.0.1
 )
 
 require (
+	filippo.io/edwards25519 v1.1.0 // indirect
 	github.com/frankban/quicktest v1.11.3 // indirect
 	github.com/go-ole/go-ole v1.2.6 // indirect
-	github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
+	github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
 	github.com/google/btree v1.0.0 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
-	github.com/google/pprof v0.0.0-20240402174815-29b9bb013b0f // indirect
-	github.com/kr/pretty v0.2.1 // indirect
+	github.com/google/pprof v0.0.0-20240509144519-723abb6459b7 // indirect
+	github.com/kr/pretty v0.3.1 // indirect
 	github.com/kr/text v0.2.0 // indirect
-	github.com/onsi/ginkgo/v2 v2.17.1 // indirect
+	github.com/onsi/ginkgo/v2 v2.17.3 // indirect
 	github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
 	github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c // indirect
 	github.com/quic-go/qpack v0.4.0 // indirect
 	github.com/rogpeppe/fastuuid v1.2.0 // indirect
+	github.com/rogpeppe/go-internal v1.12.0 // indirect
 	github.com/shabbyrobe/xmlwriter v0.0.0-20200208144257-9fca06d00ffa // indirect
-	github.com/tdewolff/parse/v2 v2.7.13 // indirect
-	github.com/yusufpapurcu/wmi v1.2.2 // indirect
+	github.com/stretchr/testify v1.9.0 // indirect
+	github.com/yusufpapurcu/wmi v1.2.4 // indirect
 	go.uber.org/mock v0.4.0 // indirect
-	golang.org/x/exp v0.0.0-20240325151524-a685a6edb6d8 // indirect
+	golang.org/x/exp v0.0.0-20240506185415-9bf2ced13842 // indirect
 	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/net v0.24.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	golang.org/x/tools v0.19.0 // indirect
+	golang.org/x/net v0.25.0 // indirect
+	golang.org/x/sync v0.7.0 // indirect
+	golang.org/x/text v0.15.0 // indirect
+	golang.org/x/tools v0.21.0 // indirect
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20240415180920-8c6c420018be // indirect
 	google.golang.org/protobuf v1.33.0 // indirect
 	gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c // indirect