update

README.md

@@ -25,7 +25,7 @@ Shell版本： https://github.com/spiritLHLS/ecs
 
 - [ ] 测试三网Ping值[借鉴[ecsspeed](https://github.com/spiritLHLS/ecsspeed)的逻辑二次开发]
 
-## 说明
+## Linux/macOS上使用的说明
 
 开发中，勿要使用
 
@@ -35,6 +35,8 @@ Shell版本： https://github.com/spiritLHLS/ecs
 curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
 ```
 
+或
+
 ```
 curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
 ```
@@ -63,9 +65,43 @@ curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/oneclickvirt
 ./goecs.sh delete
 ```
 
+shell脚本的说明
+
 ```
-Usage of goecs:
-  -backtrace windows
+Available commands:
+
+./goecs.sh env             Check and Install package:
+                                tar (Almost all unix-like systems have it.)
+                                unzip (Almost all unix-like systems have it.)
+                                dd (Almost all unix-like systems have it.)
+                                fio (Almost all unix-like systems can be installed through the system's package manager.)
+                                sysbench (Almost all unix-like systems can be installed through the system's package manager.)
+                                geekbench (geekbench5)(Only support IPV4 environment, and memory greater than 1GB network detection, only support amd64 and arm64 architecture.)
+                                speedtest (Use the officially provided binaries for more accurate test results.)
+                           In fact, sysbench/geekbench is the only one of the above dependencies that must be installed, without which the CPU score cannot be tested.
+./goecs.sh install         Install goecs command
+./goecs.sh upgrade         Upgrade goecs command
+./goecs.sh delete          Uninstall goecs command
+./goecs.sh help            Show this message
+```
+
+goecs唤起菜单
+
+```
+goecs
+```
+
+或
+
+```
+./goecs
+```
+
+goecs命令参数化
+
+```
+Usage: goecs [options]
+  -backtrace
         Enable/Disable backtrace test (in 'en' language or on windows it always false) (default true)
   -basic
         Enable/Disable basic test (default true)
@@ -87,6 +123,7 @@ Usage of goecs:
         Set disk test path, e.g., -diskp /root
   -email
         Enable/Disable email port test (default true)
+  -h    Show help information
   -l string
         Set language (supported: en, zh) (default "zh")
   -log
@@ -97,7 +134,7 @@ Usage of goecs:
         Set memory test method (supported: sysbench, dd, winsat) (default "dd")
   -menu
         Enable/Disable menu mode, disable example: -menu=false (default true)
-  -nt3 windows
+  -nt3
         Enable/Disable NT3 test (in 'en' language or on windows it always false) (default true)
   -nt3loc string
         Specify NT3 test location (supported: GZ, SH, BJ, CD for Guangzhou, Shanghai, Beijing, Chengdu) (default "GZ")
@@ -112,4 +149,16 @@ Usage of goecs:
   -ut
         Enable/Disable unlock media test (default true)
   -v    Display version information
-```
+```
+
+## Windows上使用的说明
+
+下载带exe文件的压缩文件
+
+https://github.com/oneclickvirt/ecs/releases
+
+找其中最新的版本，按照对应架构下载对应的 .tar.gz 文件，解压后文件夹内有一个exe文件
+
+选择该exe文件，右键点击选择管理员模式运行(非管理员模式运行无法进行硬件测试)，唤起菜单自选
+
+windows测试无需进行环境安装

go.mod

@@ -4,18 +4,18 @@ go 1.22.4
 
 require (
 	github.com/imroc/req/v3 v3.43.7
-	github.com/oneclickvirt/CommonMediaTests v0.0.2-20240630023003
+	github.com/oneclickvirt/CommonMediaTests v0.0.3-20240702073302
 	github.com/oneclickvirt/UnlockTests v0.0.10-20240630044930
 	github.com/oneclickvirt/backtrace v0.0.4-20240624090335
-	github.com/oneclickvirt/basics v0.0.3-20240701085439
-	github.com/oneclickvirt/cputest v0.0.7-20240701020012
+	github.com/oneclickvirt/basics v0.0.5-20240702055351
+	github.com/oneclickvirt/cputest v0.0.8-20240702070215
 	github.com/oneclickvirt/defaultset v0.0.2-20240624082446
-	github.com/oneclickvirt/disktest v0.0.3-20240629152513
-	github.com/oneclickvirt/gostun v0.0.2-20240625025941
-	github.com/oneclickvirt/memorytest v0.0.1-20240624151629
+	github.com/oneclickvirt/disktest v0.0.4-20240702071738
+	github.com/oneclickvirt/gostun v0.0.3-20240702054621
+	github.com/oneclickvirt/memorytest v0.0.2-20240702031042
 	github.com/oneclickvirt/nt3 v0.0.2-20240630152642
 	github.com/oneclickvirt/portchecker v0.0.1-20240624155429
-	github.com/oneclickvirt/security v0.0.3-20240701065755
+	github.com/oneclickvirt/security v0.0.4-20240702055848
 	github.com/oneclickvirt/speedtest v0.0.6-20240630114816
 )
 

go.sum

@@ -77,28 +77,30 @@ 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.2-20240630023003 h1:8jQFqDK5m7V9xlLBk8rSUYDyi3u5xzf5kqwEx5b+/7g=
 github.com/oneclickvirt/CommonMediaTests v0.0.2-20240630023003/go.mod h1:DAmFPRjFV5p9fEzUUSml5jJGn2f1NZJQCzTxITHDjc4=
+github.com/oneclickvirt/CommonMediaTests v0.0.3-20240702073302 h1:JbgWWVL6WR44H/dqpBLdet0M7lM/YrnwGEG40FmawRo=
+github.com/oneclickvirt/CommonMediaTests v0.0.3-20240702073302/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/backtrace v0.0.4-20240624090335 h1:0LP5KyA6GLlqQAtOF0uyBSAykHJrzOA96Eb87qUhGQw=
 github.com/oneclickvirt/backtrace v0.0.4-20240624090335/go.mod h1:zvsC7xY/WZqs5KL2JB967OVnuqjNbxu9bW6wXRLo5h8=
-github.com/oneclickvirt/basics v0.0.3-20240701085439 h1:1PE7Womqy4AW2c9PlyFdHsBocZXSo02V5uJDSzQLzgs=
-github.com/oneclickvirt/basics v0.0.3-20240701085439/go.mod h1:dTB+/oyFQYfTYX55rFJVWatum5F9g62zjfmHCM6Vj1s=
-github.com/oneclickvirt/cputest v0.0.7-20240701020012 h1:U5cCI+6ZU3pudoAlmb1b3yB9IQNm5AnDXi1TQAZJCIA=
-github.com/oneclickvirt/cputest v0.0.7-20240701020012/go.mod h1:MmaHN9+XMntI3rLycwj8Ne31fG18IfNoa8N2utDK1CY=
+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/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.3-20240629152513 h1:ZW7MBMd2HxQi1ktg/ztVI2A10JzF4ZI6I7ATZvcK9w8=
-github.com/oneclickvirt/disktest v0.0.3-20240629152513/go.mod h1:x7VAJF0Ks05FyE4BI5xedXNKmwbeXfp8GCRALAIlueI=
-github.com/oneclickvirt/gostun v0.0.2-20240625025941 h1:h+ZL8jkjXR6QE0qEX34FjWTv89+lNj2fEkWx5Agpgzc=
-github.com/oneclickvirt/gostun v0.0.2-20240625025941/go.mod h1:f7DPEXAxbmwXSW33dbxtb0/KzqvOBWhTs2Or5xBerQA=
-github.com/oneclickvirt/memorytest v0.0.1-20240624151629 h1:2rJAB3gFGlFPocIb/WRVWYqs4nr2jGYokfDOgqFicD4=
-github.com/oneclickvirt/memorytest v0.0.1-20240624151629/go.mod h1:+YNzy+NeVg61d0kNwSyVDqHyVtKzjuRe1NvMzsDLg0I=
+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/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=
+github.com/oneclickvirt/memorytest v0.0.2-20240702031042/go.mod h1:+YNzy+NeVg61d0kNwSyVDqHyVtKzjuRe1NvMzsDLg0I=
 github.com/oneclickvirt/nt3 v0.0.2-20240630152642 h1:BkpR1j9JaDxMzx7iIwtsnFDxSldjYr2TUYpZE7m8z/Y=
 github.com/oneclickvirt/nt3 v0.0.2-20240630152642/go.mod h1:UojPmtangn17TiQaDccVrZbn6sZwJOtzBgg3idp68cA=
 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.3-20240701065755 h1:eHZDuyvzufOu2yDUIMggK2iRtMWJaFlCzG4+leQn5+0=
-github.com/oneclickvirt/security v0.0.3-20240701065755/go.mod h1:cUNNOldoVQuovyc0EtAVAZlAT4y2xA1e0uA80aj1ly8=
+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/speedtest v0.0.6-20240630114816 h1:gI2hqV0IwcvGqYzLhlt4w2oZvYhCL+73jftUuJYBsuI=
 github.com/oneclickvirt/speedtest v0.0.6-20240630114816/go.mod h1:zd5ZgIGslmtQLQehEfRjyumlvgDHTpCSMchKfKXoASI=
 github.com/onsi/ginkgo/v2 v2.19.0 h1:9Cnnf7UHo57Hy3k6/m5k3dRfGTMXGvxhHFvkDTCTpvA=

goecs.go

@@ -6,6 +6,8 @@ import (
 	"github.com/oneclickvirt/CommonMediaTests/commediatests"
 	backtraceori "github.com/oneclickvirt/backtrace/bk"
 	basicmodel "github.com/oneclickvirt/basics/model"
+	cputestmodel "github.com/oneclickvirt/cputest/model"
+	disktestmodel "github.com/oneclickvirt/disktest/disk"
 	"github.com/oneclickvirt/ecs/backtrace"
 	"github.com/oneclickvirt/ecs/commediatest"
 	"github.com/oneclickvirt/ecs/cputest"
@@ -16,6 +18,7 @@ import (
 	"github.com/oneclickvirt/ecs/unlocktest"
 	"github.com/oneclickvirt/ecs/utils"
 	gostunmodel "github.com/oneclickvirt/gostun/model"
+	memorytestmodel "github.com/oneclickvirt/memorytest/memory"
 	"github.com/oneclickvirt/portchecker/email"
 	speedtestmodel "github.com/oneclickvirt/speedtest/model"
 	"os"
@@ -29,7 +32,7 @@ import (
 )
 
 var (
-	ecsVersion                                                        = "v0.0.27"
+	ecsVersion                                                        = "v0.0.30"
 	menuMode                                                          bool
 	input, choice                                                     string
 	showVersion                                                       bool
@@ -41,7 +44,7 @@ var (
 	diskMultiCheck                                                    bool
 	nt3CheckType, nt3Location                                         string
 	spNum                                                             int
-	width                                                             = 84
+	width                                                             = 82
 	basicStatus, cpuTestStatus, memoryTestStatus, diskTestStatus      bool
 	commTestStatus, utTestStatus, securityTestStatus, emailTestStatus bool
 	backtraceStatus, nt3Status, speedTestStatus                       bool
@@ -64,8 +67,8 @@ func main() {
 	goecsFlag.BoolVar(&utTestStatus, "ut", true, "Enable/Disable unlock media test")
 	goecsFlag.BoolVar(&securityTestStatus, "security", true, "Enable/Disable security test")
 	goecsFlag.BoolVar(&emailTestStatus, "email", true, "Enable/Disable email port test")
-	goecsFlag.BoolVar(&backtraceStatus, "backtrace", true, "Enable/Disable backtrace test (in 'en' language or on `windows` it always false)")
-	goecsFlag.BoolVar(&nt3Status, "nt3", true, "Enable/Disable NT3 test (in 'en' language or on `windows` it always false)")
+	goecsFlag.BoolVar(&backtraceStatus, "backtrace", true, "Enable/Disable backtrace test (in 'en' language or on windows it always false)")
+	goecsFlag.BoolVar(&nt3Status, "nt3", true, "Enable/Disable NT3 test (in 'en' language or on windows it always false)")
 	goecsFlag.BoolVar(&speedTestStatus, "speed", true, "Enable/Disable speed test")
 	goecsFlag.StringVar(&cpuTestMethod, "cpum", "sysbench", "Set CPU test method (supported: sysbench, geekbench, winsat)")
 	goecsFlag.StringVar(&cpuTestThreadMode, "cput", "multi", "Set CPU test thread mode (supported: single, multi)")
@@ -90,11 +93,16 @@ func main() {
 		return
 	}
 	if enableLogger {
-		basicmodel.EnableLoger = true
-		speedtestmodel.EnableLoger = true
 		gostunmodel.EnableLoger = true
+		basicmodel.EnableLoger = true
+		cputestmodel.EnableLoger = true
+		memorytestmodel.EnableLoger = true
+		disktestmodel.EnableLoger = true
 		commediatests.EnableLoger = true
+
 		backtraceori.EnableLoger = true
+
+		speedtestmodel.EnableLoger = true
 	}
 	if menuMode {
 		basicStatus, cpuTestStatus, memoryTestStatus, diskTestStatus = false, false, false, false
@@ -246,7 +254,7 @@ func main() {
 			utils.PrintHead(language, width, ecsVersion)
 			if basicStatus || securityTestStatus {
 				if basicStatus {
-					utils.PrintCenteredTitle("基础信息", width)
+					utils.PrintCenteredTitle("系统基础信息", width)
 				}
 				basicInfo, securityInfo, nt3CheckType = utils.SecurityCheck(language, nt3CheckType, securityTestStatus)
 				if basicStatus {
@@ -315,14 +323,14 @@ func main() {
 		if runtime.GOOS != "windows" {
 			output = utils.PrintAndCapture(func() {
 				if backtraceStatus {
-					utils.PrintCenteredTitle("三网回程", width)
+					utils.PrintCenteredTitle("三网回程线路检测", width)
 					backtrace.BackTrace()
 				}
 			}, tempOutput, output)
 			// nexttrace 在win上不支持检测，报错 bind: An invalid argument was supplied.
 			output = utils.PrintAndCapture(func() {
 				if nt3Status {
-					utils.PrintCenteredTitle("路由检测", width)
+					utils.PrintCenteredTitle("三网回程路由检测", width)
 					ntrace.TraceRoute3(language, nt3Location, nt3CheckType)
 				}
 			}, tempOutput, output)
@@ -358,7 +366,7 @@ func main() {
 			utils.PrintHead(language, width, ecsVersion)
 			if basicStatus || securityTestStatus {
 				if basicStatus {
-					utils.PrintCenteredTitle("Basic Information", width)
+					utils.PrintCenteredTitle("System Basic Information", width)
 				}
 				basicInfo, securityInfo, nt3CheckType = utils.SecurityCheck(language, nt3CheckType, securityTestStatus)
 				if basicStatus {
@@ -393,7 +401,7 @@ func main() {
 		}
 		output = utils.PrintAndCapture(func() {
 			if commTestStatus {
-				utils.PrintCenteredTitle("The Three Families Streaming Media Unlock", width)
+				utils.PrintCenteredTitle("The Three Main Streaming Media Unlock", width)
 				commediatest.ComMediaTest(language)
 			}
 		}, tempOutput, output)
@@ -440,4 +448,8 @@ func main() {
 		fmt.Println("Unsupported language")
 	}
 	utils.ProcessAndUpload(output, filePath, enabelUpload)
+	if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
+		fmt.Println("Press Enter to exit...")
+		fmt.Scanln()
+	}
 }

goecs.sh

@@ -300,6 +300,11 @@ env_check() {
         echo "rm -rf /usr/bin/speedtest-go"
         _blue "to uninstall speedtest and speedtest-go"
     fi
+    if [ "$(uname -s)" = "Darwin" ]; then
+        echo "Detected MacOS. Installing sysbench and fio..."
+        brew install --force sysbench fio dd
+        # 有问题，需要修复，root环境不能brew，brew安装完毕后可能路径不在环境变量中
+    fi
     _green "The environment is ready."
 }