update

.github/workflows/main.yaml

@@ -8,14 +8,19 @@ on:
 jobs:
   goreleaser:
     runs-on: ubuntu-latest
+    container:
+      # 1.20 是 Windows 7/8 Server 2008/2012 最后一个支持版本
+      image: goreleaser/goreleaser-cross:v1.20
     steps:
+      - run: |
+          git config --global --add safe.directory /__w/ecs/ecs
       - name: Checkout
         uses: actions/checkout@v3
         with:
           fetch-depth: 0
 
       - name: Set up Go
-        uses: actions/setup-go@v3
+        uses: actions/setup-go@v4
         with:
           go-version: 1.22.4
 
@@ -27,12 +32,11 @@ jobs:
           GITHUB_TOKEN: ${{ secrets.GHT }}
 
       - name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v4
+        uses: goreleaser/goreleaser-action@v2
         with:
           distribution: goreleaser
           version: latest
-          args: release --clean
+          args: release
         env:
           GITHUB_TOKEN: ${{ secrets.GHT }}
           GOPRIVATE: github.com/oneclickvirt/security
-          CGO_ENABLED: 0  # 禁用 CGO，强制静态链接

.goreleaser.yaml

@@ -0,0 +1,78 @@
+before:
+  hooks:
+    - go mod tidy -v
+builds:
+  - id: universal
+    env:
+      - CGO_ENABLED=0
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}}
+    goos:
+      - linux
+      - windows
+      - freebsd
+    goarch:
+      - arm
+      - arm64
+      - 386
+      - amd64
+      - mips
+      - mipsle
+      - s390x
+      - riscv64
+    gomips:
+      - softfloat
+    ignore:
+      - goos: windows
+        goarch: arm
+    main: ./
+    binary: goecs
+  - id: darwin-amd64
+    env:
+      - CGO_ENABLED=1
+      - CC=o64-clang
+      - CXX=o64-clang++
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}}
+    goos:
+      - darwin
+    goarch:
+      - amd64
+    main: ./
+    binary: goecs
+  - id: darwin-arm64
+    env:
+      - CGO_ENABLED=1
+      - CC=oa64-clang
+      - CXX=oa64-clang++
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.arch={{.Arch}}
+    goos:
+      - darwin
+    goarch:
+      - arm64
+    main: ./
+    binary: goecs
+universal_binaries:
+  - name_template: "goecs"
+    replace: false
+checksum:
+  name_template: "checksums.txt"
+snapshot:
+  name_template: "goecs"
+archives:
+  - name_template: "goecs_{{ .Os }}_{{ .Arch }}"
+    format: zip
+    files:
+      - none*
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"
+      - "^chore"
+      - Merge pull request
+      - Merge branch
+      - go mod tidy
+      - New translations

README.md

@@ -12,11 +12,17 @@ Shell版本： https://github.com/spiritLHLS/ecs
 
 ## 适配系统和架构
 
-已支持的架构: x86_64、i386、arm64
+编译支持的架构: amd64、arm、arm64、386、s390x、mips、mipsle、s390x、riscv64
 
-待支持的架构(有依赖包不支持该架构): s390x
+测试支持的架构: amd64、arm64 
 
-已支持的系统: Linux、Windows
+更多架构请自行测试
+
+编译支持的系统: Linux、Windows、FreeBSD、OpenBSD
+
+测试支持的系统: Linux、Windows 
+
+更多系统请自行测试
 
 待支持的系统(存在硬件测试BUG未修复): MacOS
 

README_EN.md

@@ -1,4 +1,4 @@
-# ECS
+# ecs
 
 [![release](https://github.com/oneclickvirt/ecs/actions/workflows/main.yaml/badge.svg)](https://github.com/oneclickvirt/ecs/actions/workflows/main.yaml) [![Hits](https://hits.seeyoufarm.com/api/count/incr/badge.svg?url=https%3A%2F%2Fgithub.com%2Foneclickvirt%2Fecs&count_bg=%2357DEFF&title_bg=%23000000&icon=cliqz.svg&icon_color=%23E7E7E7&title=hits&edge_flat=false)](https://www.spiritlhl.net/)
 
@@ -12,13 +12,19 @@ Shell version: https://github.com/spiritLHLS/ecs/blob/main/README_EN.md
 
 ## Supported Systems and Architectures
 
-Supported architectures: x86_64, i386, arm64
+Architectures supported for compilation: amd64、arm、arm64、386、s390x、mips、mipsle、s390x、riscv64
 
-Pending support (due to unsupported dependencies): s390x
+Tested architectures: amd64, arm64
 
-Supported systems: Linux, Windows
+More architectures please test by yourself
 
-Pending support (due to unresolved hardware testing bugs): MacOS
+Compilation support: Linux, Windows, FreeBSD, OpenBSD
+
+Tested on: Linux, Windows
+
+More systems to be tested
+
+Systems to be supported (hardware testing bugs not yet fixed): MacOS
 
 ## Features
 

go.mod

@@ -5,18 +5,18 @@ go 1.22.4
 require (
 	github.com/imroc/req/v3 v3.43.7
 	github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502
-	github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930
+	github.com/oneclickvirt/UnlockTests v0.0.11-20240704101006
 	github.com/oneclickvirt/backtrace v0.0.4-20240702140722
-	github.com/oneclickvirt/basics v0.0.5-20240702055351
+	github.com/oneclickvirt/basics v0.0.5-20240704113233
 	github.com/oneclickvirt/cputest v0.0.8-20240702070215
 	github.com/oneclickvirt/defaultset v0.0.2-20240624082446
-	github.com/oneclickvirt/disktest v0.0.4-20240702071738
+	github.com/oneclickvirt/disktest v0.0.4-20240704095213
 	github.com/oneclickvirt/gostun v0.0.3-20240702054621
 	github.com/oneclickvirt/memorytest v0.0.2-20240702031042
 	github.com/oneclickvirt/nt3 v0.0.3-20240702132013
 	github.com/oneclickvirt/pingtest v0.0.4-20240703142340
 	github.com/oneclickvirt/portchecker v0.0.1-20240624155429
-	github.com/oneclickvirt/security v0.0.4-20240702055848
+	github.com/oneclickvirt/security v0.0.4-20240704114145
 	github.com/oneclickvirt/speedtest v0.0.7-20240704023701
 )
 

go.sum

@@ -77,18 +77,18 @@ github.com/nxtrace/NTrace-core v1.3.1 h1:f4z5UaZEuhUP/g6xElpZ2bo+guWITJVrMKrJTqd
 github.com/nxtrace/NTrace-core v1.3.1/go.mod h1:0Px/Zc60qk6cssmP+yv4kstFxvX9sXqDduoVqBO+qf8=
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502 h1:hRIYJ2uEp2N3AH5bP5X6bwfdwWfZQO/2WoqpUJ8+WsY=
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502/go.mod h1:DAmFPRjFV5p9fEzUUSml5jJGn2f1NZJQCzTxITHDjc4=
-github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930 h1:/Sc4Eas1Pso18ak93wlazkuMKRRElCntITja/0opOpM=
-github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o=
+github.com/oneclickvirt/UnlockTests v0.0.11-20240704101006 h1:dJyfuPFwmueK7x0TC/PZU1jfgB6s15T9VOwjMn13loY=
+github.com/oneclickvirt/UnlockTests v0.0.11-20240704101006/go.mod h1:HP3CvAS+AJWxxY+BVbxIOlvaQ87YOSge89vAMG52b5o=
 github.com/oneclickvirt/backtrace v0.0.4-20240702140722 h1:UJ/VWf+ZbhGarc9HcHMIyenpmX+b2LxkXu0hlLk3Gxs=
 github.com/oneclickvirt/backtrace v0.0.4-20240702140722/go.mod h1:zvsC7xY/WZqs5KL2JB967OVnuqjNbxu9bW6wXRLo5h8=
-github.com/oneclickvirt/basics v0.0.5-20240702055351 h1:Ez9iLNAr+A8AA3EdcDh1aB/XVSWjwSKjhgMUySkcSSY=
-github.com/oneclickvirt/basics v0.0.5-20240702055351/go.mod h1:CjcPkpy/ClTgrwB6YJtBi//lvseHAWYmsbTrOOm+zCs=
+github.com/oneclickvirt/basics v0.0.5-20240704113233 h1:Mu4c/LJKOOyEDRK9r6g6ehpwivvCaeqecg0IgTjYr04=
+github.com/oneclickvirt/basics v0.0.5-20240704113233/go.mod h1:P0+c+E5C+Ewur2Zs9N+U3aZECrFeigXsTTzZOv97ShM=
 github.com/oneclickvirt/cputest v0.0.8-20240702070215 h1:CcFpyVPlQkJ6vjFP17BRuJhh/afiJhOhZ0BW+TtfVDg=
 github.com/oneclickvirt/cputest v0.0.8-20240702070215/go.mod h1:MmaHN9+XMntI3rLycwj8Ne31fG18IfNoa8N2utDK1CY=
 github.com/oneclickvirt/defaultset v0.0.2-20240624082446 h1:5Pg3mK/u/vQvSz7anu0nxzrNdELi/AcDAU1mMsmPzyc=
 github.com/oneclickvirt/defaultset v0.0.2-20240624082446/go.mod h1:e9Jt4tf2sbemCtc84/XgKcHy9EZ2jkc5x2sW1NiJS+E=
-github.com/oneclickvirt/disktest v0.0.4-20240702071738 h1:3rErTS9RwU8jAmGc8LqjtFBBd94lIk+wSWpohI55C/w=
-github.com/oneclickvirt/disktest v0.0.4-20240702071738/go.mod h1:wIZy8G6Mbcy8Op8tc0HmJNpbJQQ5A15fvnUqMJXIdO0=
+github.com/oneclickvirt/disktest v0.0.4-20240704095213 h1:ATIc0VeFBnYvfKjJCtDZS6hTxTU9nTFvUmfzGkr6Clw=
+github.com/oneclickvirt/disktest v0.0.4-20240704095213/go.mod h1:wIZy8G6Mbcy8Op8tc0HmJNpbJQQ5A15fvnUqMJXIdO0=
 github.com/oneclickvirt/gostun v0.0.3-20240702054621 h1:IE89eEYV9TJbF94SakQDAxTLIaqX+Tb6ZhJ/CCIP+90=
 github.com/oneclickvirt/gostun v0.0.3-20240702054621/go.mod h1:f7DPEXAxbmwXSW33dbxtb0/KzqvOBWhTs2Or5xBerQA=
 github.com/oneclickvirt/memorytest v0.0.2-20240702031042 h1:j+LsjOh5glYiidqtSqjZJRw694LYW1PHLMh6AovluTQ=
@@ -99,8 +99,8 @@ github.com/oneclickvirt/pingtest v0.0.4-20240703142340 h1:012W8Ly6ALISwIL5cYFM8O
 github.com/oneclickvirt/pingtest v0.0.4-20240703142340/go.mod h1:IU9RzZpS5tfP2kcFd2sw2fE80BgtiMUK8jp6qnN/0cY=
 github.com/oneclickvirt/portchecker v0.0.1-20240624155429 h1:+wapaOcFrg1iWJDhBKThDzppyIMY7hWxK7F5RBkZg4o=
 github.com/oneclickvirt/portchecker v0.0.1-20240624155429/go.mod h1:HQxSTrqM8/QFqHMTBZ7S8H9eEO5FkUXU1eb7ZX5Mk+k=
-github.com/oneclickvirt/security v0.0.4-20240702055848 h1:UCfjfoslcfKhCvJm37jQmhJ+O8d4lL+uvBJVcLAXc2s=
-github.com/oneclickvirt/security v0.0.4-20240702055848/go.mod h1:YKmO3FRWjhHYJ5rKqz+1H3hB6sCA4gioik7r8GMfyqo=
+github.com/oneclickvirt/security v0.0.4-20240704114145 h1:+3s2foEUS7Br/oYjEAi+VR0y46lE6jMvXHI1vnRX4aE=
+github.com/oneclickvirt/security v0.0.4-20240704114145/go.mod h1:ouSxY43DU46HYncAHCjyWbWqVtnP/YJouB/+TwKXnh8=
 github.com/oneclickvirt/speedtest v0.0.7-20240704023701 h1:F8ChZXf3U1/bUk+dCFt0Gc01LSPLhbBhCeHjkEJ6K88=
 github.com/oneclickvirt/speedtest v0.0.7-20240704023701/go.mod h1:zd5ZgIGslmtQLQehEfRjyumlvgDHTpCSMchKfKXoASI=
 github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=

goecs.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"fmt"
 	"github.com/oneclickvirt/CommonMediaTests/commediatests"
+	unlocktestmodel "github.com/oneclickvirt/UnlockTests/model"
 	backtraceori "github.com/oneclickvirt/backtrace/bk"
 	basicmodel "github.com/oneclickvirt/basics/model"
 	cputestmodel "github.com/oneclickvirt/cputest/model"
@@ -36,7 +37,7 @@ import (
 )
 
 var (
-	ecsVersion                                                        = "v0.0.36"
+	ecsVersion                                                        = "v0.0.48"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string
@@ -85,6 +86,7 @@ func main() {
 	goecsFlag.StringVar(&nt3CheckType, "nt3t", "ipv4", "Set NT3 test type (supported: both, ipv4, ipv6)")
 	goecsFlag.IntVar(&spNum, "spnum", 2, "Set the number of servers per operator for speed test")
 	goecsFlag.BoolVar(&enableLogger, "log", false, "Enable/Disable logging in the current path")
+	goecsFlag.BoolVar(&enabelUpload, "upload", true, "Enable/Disable upload the result")
 	goecsFlag.Parse(os.Args[1:])
 	if help {
 		fmt.Printf("Usage: %s [options]\n", os.Args[0])
@@ -104,6 +106,7 @@ func main() {
 		memorytestmodel.EnableLoger = true
 		disktestmodel.EnableLoger = true
 		commediatests.EnableLoger = true
+		unlocktestmodel.EnableLoger = true
 		ptmodel.EnableLoger = true
 		backtraceori.EnableLoger = true
 		nt3model.EnableLoger = true
@@ -245,16 +248,31 @@ func main() {
 		backtraceStatus = false
 		nt3Status = false
 	}
-	startTime := time.Now()
+	if !enabelUpload {
+		securityTestStatus = false
+	}
 	var (
+		startTime                                     time.Time
 		wg1, wg2                                      sync.WaitGroup
 		basicInfo, securityInfo, emailInfo, mediaInfo string
 		output, tempOutput                            string
 	)
-	// 启动一个goroutine来等待信号
+	// 启动一个goroutine来等待信号，内置计时器
 	go func() {
+		startTime = time.Now()
 		// 等待信号
 		<-sig
+		endTime := time.Now()
+		duration := endTime.Sub(startTime)
+		minutes := int(duration.Minutes())
+		seconds := int(duration.Seconds()) % 60
+		currentTime := time.Now().Format("Mon Jan 2 15:04:05 MST 2006")
+		output = utils.PrintAndCapture(func() {
+			utils.PrintCenteredTitle("", width)
+			fmt.Printf("Cost    Time          : %d min %d sec\n", minutes, seconds)
+			fmt.Printf("Current Time          : %s\n", currentTime)
+			utils.PrintCenteredTitle("", width)
+		}, tempOutput, output)
 		utils.ProcessAndUpload(output, filePath, enabelUpload)
 		os.Exit(1) // 使用非零状态码退出，表示意外退出
 	}()

goecs.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #From https://github.com/oneclickvirt/ecs
-#2024.06.29
+#2024.07.04
 
 # curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
 
@@ -80,7 +80,7 @@ goecs_check() {
     cdn_urls=("https://cdn0.spiritlhl.top/" "http://cdn3.spiritlhl.net/" "http://cdn1.spiritlhl.net/" "http://cdn2.spiritlhl.net/")
     check_cdn_file
     case $os in
-    Linux)
+    Linux|FreeBSD)
         case $arch in
         "x86_64" | "x86" | "amd64" | "x64")
             wget -O goecs.tar.gz "${cdn_success_url}https://github.com/oneclickvirt/ecs/releases/download/v${ECS_VERSION}/ecs_${ECS_VERSION}_linux_amd64.tar.gz"
@@ -126,6 +126,8 @@ goecs_check() {
     rm -rf /usr/bin/goecs
     sleep 1
     cp goecs /usr/bin/goecs
+    rm -rf README_EN.md
+    rm -rf README.md
     echo "goecs version:"
     goecs -v || ./goecs -v
 }
@@ -181,8 +183,7 @@ Check_SysBench() {
         _yellow "Install sysbench successfully!"
     else
         _red "SysBench Moudle install Failure! Try Restart Bench or Manually install it! (/usr/bin/sysbench)"
-        _blue "Will try to test with geekbench5 instead later on"
-        test_cpu_type="gb5"
+        _blue "Will try to test with geekbench5 instead later."
     fi
     sleep 3
 }
@@ -233,10 +234,13 @@ env_check() {
     PACKAGE_INSTALL=("apt-get -y install" "apt-get -y install" "yum -y install" "yum -y install" "yum -y install" "pacman -Sy --noconfirm --needed" "pkg install -y" "apk add")
     PACKAGE_REMOVE=("apt-get -y remove" "apt-get -y remove" "yum -y remove" "yum -y remove" "yum -y remove" "pacman -Rsc --noconfirm" "pkg delete" "apk del")
     PACKAGE_UNINSTALL=("apt-get -y autoremove" "apt-get -y autoremove" "yum -y autoremove" "yum -y autoremove" "yum -y autoremove" "" "pkg autoremove" "apk autoremove")
-    if [ -s /etc/os-release ]; then
+    # 检查系统信息
+    if [ -f /etc/alpine-release ]; then
+        SYS="alpine"
+    elif [ -s /etc/os-release ]; then
         SYS="$(grep -i pretty_name /etc/os-release | cut -d \" -f2)"
     elif [ -x "$(type -p hostnamectl)" ]; then
-      SYS="$(hostnamectl | grep -i system | cut -d : -f2)"
+        SYS="$(hostnamectl | grep -i system | cut -d : -f2 | xargs)"
     elif [ -x "$(type -p lsb_release)" ]; then
         SYS="$(lsb_release -sd)"
     elif [ -s /etc/lsb-release ]; then
@@ -245,45 +249,60 @@ env_check() {
         SYS="$(grep . /etc/redhat-release)"
     elif [ -s /etc/issue ]; then
         SYS="$(grep . /etc/issue | cut -d '\' -f1 | sed '/^[ ]*$/d')"
-    elif [ -f /etc/alpine-release ]; then
-      SYS="alpine"
     else
-      SYS="$(uname -s)}"
+        SYS="$(uname -s)"
     fi
     [[ -n $SYS ]] || exit 1
+    # 匹配操作系统
     for ((int = 0; int < ${#REGEX[@]}; int++)); do
         if [[ $(echo "$SYS" | tr '[:upper:]' '[:lower:]') =~ ${REGEX[int]} ]]; then
             SYSTEM="${RELEASE[int]}"
             [[ -n $SYSTEM ]] && break
         fi
     done
+    # 检查是否成功匹配
+    [[ -n $SYSTEM ]] || exit 1
+    # 根据 SYSTEM 设置相应的包管理命令
+    UPDATE_CMD=${PACKAGE_UPDATE[int]}
+    INSTALL_CMD=${PACKAGE_INSTALL[int]}
+    REMOVE_CMD=${PACKAGE_REMOVE[int]}
+    UNINSTALL_CMD=${PACKAGE_UNINSTALL[int]}
+    echo "System: $SYSTEM"
+    echo "Update command: $UPDATE_CMD"
+    echo "Install command: $INSTALL_CMD"
+    echo "Remove command: $REMOVE_CMD"
+    echo "Uninstall command: $UNINSTALL_CMD"
     cdn_urls=("https://cdn0.spiritlhl.top/" "http://cdn3.spiritlhl.net/" "http://cdn1.spiritlhl.net/" "http://cdn2.spiritlhl.net/")
     check_cdn_file
     _green "Update system manager."
-    $PACKAGE_UPDATE command 2>/dev/null
+    ${PACKAGE_UPDATE[int]} 2>/dev/null
     if ! command -v sudo >/dev/null 2>&1; then
         _green "Installing sudo"
-            $PACKAGE_INSTALL sudo
+        ${PACKAGE_INSTALL[int]} sudo
+    fi
+    if ! command -v wget >/dev/null 2>&1; then
+        _green "Installing wget"
+        ${PACKAGE_INSTALL[int]} wget
     fi
     if ! command -v tar >/dev/null 2>&1; then
         _green "Installing tar"
-        $PACKAGE_INSTALL tar
+        ${PACKAGE_INSTALL[int]} tar
     fi
     if ! command -v unzip >/dev/null 2>&1; then
         _green "Installing unzip"
-        $PACKAGE_INSTALL unzip
+        ${PACKAGE_INSTALL[int]} unzip
     fi
     if ! command -v dd >/dev/null 2>&1; then
         _green "Installing dd"
-        $PACKAGE_INSTALL dd
+        ${PACKAGE_INSTALL[int]} dd
     fi
     if ! command -v fio >/dev/null 2>&1; then
         _green "Installing fio"
-        $PACKAGE_INSTALL fio
+        ${PACKAGE_INSTALL[int]} fio
     fi
     if ! command -v sysbench >/dev/null 2>&1; then
         _green "Installing sysbench"
-        $PACKAGE_INSTALL sysbench
+        ${PACKAGE_INSTALL[int]} sysbench
         if [ $? -ne 0 ]; then
             echo "Unable to download sysbench through the system's package manager, speak to try compiling and installing it..."
             if ! wget -O /tmp/sysbench.zip "${cdn_success_url}https://github.com/akopytov/sysbench/archive/1.0.20.zip"; then
@@ -295,6 +314,7 @@ env_check() {
             fi
             chmod +x /tmp/sysbench.zip
             unzip /tmp/sysbench.zip -d /tmp
+            Check_SysBench
         fi
     fi
     if ! command -v geekbench >/dev/null 2>&1; then
@@ -314,6 +334,7 @@ env_check() {
         curl -L "${cdn_success_url}https://raw.githubusercontent.com/oneclickvirt/speedtest/main/dspt.sh" -o dspt.sh && chmod +x dspt.sh
         bash dspt.sh
         rm -rf dspt.sh
+        rm -rf speedtest.tar.gz
         _blue "if you want to use golang origin speedtest, you can use"
         echo "rm -rf /usr/bin/speedtest"
         echo "rm -rf /usr/bin/speedtest-go"
@@ -350,6 +371,7 @@ Available commands:
 
 ./goecs.sh env             Check and Install package:
                                 sudo  (Almost all unix-like systems have it.)
+                                wget  (Almost all unix-like systems have it.)
                                 tar   (Almost all unix-like systems have it.)
                                 unzip (Almost all unix-like systems have it.)
                                 dd    (Almost all unix-like systems have it.)

update.bat

@@ -8,7 +8,6 @@ git commit -am"update"
 
 :push
 cd %repo_path%
-
 git push -f origin master
 if errorlevel 1 (
     echo Push failed. Retrying in 3 seconds...