update

2025-09-27 11:42:23 +08:00 · 2024-07-04 18:53:30 +08:00 · 2024-07-04 18:53:11 +08:00 · 2024-07-04 18:42:32 +08:00 · 2024-07-04 18:41:51 +08:00 · 2024-07-04 18:36:18 +08:00
13 changed files with 792 additions and 167 deletions
--- a/.github/workflows/ci.yaml_back
+++ b/.github/workflows/ci.yaml_back
--- a/.github/workflows/main.yaml
+++ b/.github/workflows/main.yaml
@@ -35,4 +35,3 @@ jobs:
        env:
          GITHUB_TOKEN: ${{ secrets.GHT }}
          GOPRIVATE: github.com/oneclickvirt/security
-          CGO_ENABLED: 0  # 禁用 CGO，强制静态链接
--- a/.goreleaser.yaml
+++ b/.goreleaser.yaml
@@ -0,0 +1,50 @@
+before:
+  hooks:
+    - go mod download
+    - go generate ./...
+builds:
+  - env:
+      - CGO_ENABLED=0 # 禁用 CGO，强制静态链接
+    goos:
+      - linux
+      - windows
+      - darwin
+      - openbsd
+      - freebsd
+    goarch:
+      - amd64
+      - arm
+      - arm64
+      - 386
+      - s390x
+      - ppc64
+      - ppc64le
+      - riscv64
+      - mips
+      - mips64
+      - mipsle
+      - mips64le
+      - loong64
+    goarm:
+      - 5
+      - 6
+      - 7
+    gomips:
+      - hardfloat
+      - softfloat
+    ldflags:
+      - -s -w -X main.version={{.Version}} -X main.commit={{.ShortCommit}} -X main.date={{ .CommitDate }}
+archives:
+  - name_template: >-
+      {{ .ProjectName }}_{{ .Version }}_{{ if eq .Os "openbsd" }}OpenBSD{{ else }}{{ title .Os }}{{ end }}_{{ if eq .Arch "386" }}i386{{ else if eq .Arch "amd64" }}x86_64{{ else }}{{ .Arch }}{{ end }}{{ with .Arm }}v{{ . }}{{ end }}{{ with .Mips }}_{{ . }}{{ end }}{{ if not (eq .Amd64 "v1") }}{{ .Amd64 }}{{ end }}
+
+checksum:
+  name_template: 'checksums.txt'
+snapshot:
+  name_template: "{{ .Tag }}-next"
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - '^docs:'
+      - '^test:'
--- a/README.md
+++ b/README.md
@@ -1,11 +1,25 @@
 # ecs

-[![goreleaser](https://github.com/oneclickvirt/ecs/actions/workflows/main.yaml/badge.svg)](https://github.com/oneclickvirt/ecs/actions/workflows/main.yaml)
+[![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/)

-融合怪测评脚本 - GO重构版本
+融合怪测评脚本 - GO重构版本 - 由于未正式发版，如有问题请issues反馈

 Shell版本： https://github.com/spiritLHLS/ecs

+## 语言
+
+[中文文档](README.md) | [English Docs](README_EN.md)
+
+## 适配系统和架构
+
+已支持的架构: x86_64、i386、arm64
+
+待支持的架构(有依赖包不支持该架构): s390x
+
+已支持的系统: Linux、Windows
+
+待支持的系统(存在硬件测试BUG未修复): MacOS
+
 ## 功能

 - [x] 系统基础信息查询[自研[basics](https://github.com/oneclickvirt/basics)、[gostun](https://github.com/oneclickvirt/gostun)]
@@ -20,15 +34,156 @@ Shell版本： https://github.com/spiritLHLS/ecs
 - [x] 三网回程测试[借鉴[zhanghanyun/backtrace](https://github.com/zhanghanyun/backtrace)二次开发至于[oneclickvirt/backtrace](https://github.com/oneclickvirt/backtrace)]
 - [x] 三网路由测试[借鉴[NTrace-core](https://github.com/nxtrace/NTrace-core)二次开发至于[nt3](https://github.com/oneclickvirt/nt3)]
 - [x] 测试网速[基于[speedtest.net-爬虫](https://github.com/spiritLHLS/speedtest.net-CN-ID)、[speedtest.cn-爬虫](https://github.com/spiritLHLS/speedtest.cn-CN-ID)的数据，借鉴[speedtest-go](https://github.com/showwin/speedtest-go)二次开发至于[oneclickvirt/speedtest](https://github.com/oneclickvirt/speedtest)]
+- [x] 测试三网Ping值[借鉴[ecsspeed](https://github.com/spiritLHLS/ecsspeed)的逻辑二次开发至于[pingtest](https://github.com/oneclickvirt/pingtest)]

-## TODO
+## Linux上使用的说明

- [ ] 测试三网Ping值[借鉴[ecsspeed](https://github.com/spiritLHLS/ecsspeed)的逻辑二次开发]
+### 一键命令

-## 说明
+```
+curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs
+```

-开发中，勿要使用
+或
+
+```
+curl -L https://cdn.spiritlhl.net/https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs
+```
+
+### 详细说明
+
+下载脚本

 ```
 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
+```
+
+安装环境
+
+```
+./goecs.sh env
+```
+
+安装goecs
+
+```
+./goecs.sh install
+```
+
+升级goecs
+
+```
+./goecs.sh upgrade
+```
+
+卸载goecs
+
+```
+./goecs.sh delete
+```
+
+shell脚本的说明
+
+```
+Available commands:
+
+./goecs.sh env             Check and Install package:
+                                sudo (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.)
+                                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.)
+                                ping (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)
+  -comm
+        Enable/Disable common media test (default true)
+  -cpu
+        Enable/Disable CPU test (default true)
+  -cpum string
+        Set CPU test method (supported: sysbench, geekbench, winsat) (default "sysbench")
+  -cput string
+        Set CPU test thread mode (supported: single, multi) (default "multi")
+  -disk
+        Enable/Disable disk test (default true)
+  -diskm string
+        Set disk test method (supported: fio, dd, winsat) (default "fio")
+  -diskmc
+        Enable/Disable multiple disk checks, e.g., -diskmc=false
+  -diskp string
+        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
+        Enable/Disable logging in the current path
+  -memory
+        Enable/Disable memory test (default true)
+  -memorym string
+        Set memory test method (supported: sysbench, dd, winsat) (default "dd")
+  -menu
+        Enable/Disable menu mode, disable example: -menu=false (default true)
+  -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")
+  -nt3t string
+        Set NT3 test type (supported: both, ipv4, ipv6) (default "ipv4")
+  -security
+        Enable/Disable security test (default true)
+  -speed
+        Enable/Disable speed test (default true)
+  -spnum int
+        Set the number of servers per operator for speed test (default 2)
+  -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测试无需进行环境安装
--- a/README_EN.md
+++ b/README_EN.md
@@ -0,0 +1,177 @@
+# 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/)
+
+Fusion Monster Evaluation Script - GO Refactored Version - Since it has not been officially released, please report any issues via issues.
+
+Shell version: https://github.com/spiritLHLS/ecs/blob/main/README_EN.md
+
+## Language
+
+[中文文档](README.md) | [English Docs](README_EN.md)
+
+## Supported Systems and Architectures
+
+Supported architectures: x86_64, i386, arm64
+
+Pending support (due to unsupported dependencies): s390x
+
+Supported systems: Linux, Windows
+
+Pending support (due to unresolved hardware testing bugs): MacOS
+
+## Features
+
+- [x] System basic information query [Self-developed [basics](https://github.com/oneclickvirt/basics), [gostun](https://github.com/oneclickvirt/gostun)]
+- [x] Concurrent IP basic information query [Self-developed [basics](https://github.com/oneclickvirt/basics)]
+- [x] CPU test [Self-developed [cputest](https://github.com/oneclickvirt/cputest) supporting sysbench, geekbench, winsat]
+- [x] Memory test [Self-developed [memorytest](https://github.com/oneclickvirt/memorytest) supporting sysbench, dd]
+- [x] Disk test [Self-developed [disktest](https://github.com/oneclickvirt/disktest) supporting dd, fio, winsat]
+- [x] Concurrent streaming media unlock information query for three major platforms [Modified from [netflix-verify](https://github.com/sjlleo/netflix-verify), [VerifyDisneyPlus](https://github.com/sjlleo/VerifyDisneyPlus), [TubeCheck](https://github.com/sjlleo/TubeCheck) to [CommonMediaTests](https://github.com/oneclickvirt/CommonMediaTests)]
+- [x] Concurrent common streaming media tests [Self-developed code, logic modified from [RegionRestrictionCheck](https://github.com/lmc999/RegionRestrictionCheck), [MediaUnlockTest](https://github.com/HsukqiLee/MediaUnlockTest) to [UnlockTests](https://github.com/oneclickvirt/UnlockTests)]
+- [x] Concurrent IP quality/security information query [Self-developed, due to testing with key information, privately developed, but binary files compiled in [securityCheck](https://github.com/oneclickvirt/securityCheck)]
+- [x] Email port test [Self-developed [portchecker](https://github.com/oneclickvirt/portchecker)]
+- [x] Three-network return path test [Modified from [zhanghanyun/backtrace](https://github.com/zhanghanyun/backtrace) to [oneclickvirt/backtrace](https://github.com/oneclickvirt/backtrace)]
+- [x] Three-network route test [Modified from [NTrace-core](https://github.com/nxtrace/NTrace-core) to [nt3](https://github.com/oneclickvirt/nt3)]
+- [x] Speed test [Based on data from [speedtest.net-crawler](https://github.com/spiritLHLS/speedtest.net-CN-ID), [speedtest.cn-crawler](https://github.com/spiritLHLS/speedtest.cn-CN-ID), modified from [speedtest-go](https://github.com/showwin/speedtest-go) to [oneclickvirt/speedtest](https://github.com/oneclickvirt/speedtest)]
+- [x] Three-network Ping test [Modified from [ecsspeed](https://github.com/spiritLHLS/ecsspeed) logic to [pingtest](https://github.com/oneclickvirt/pingtest)]
+
+## Instructions for Use on Linux
+
+### one-click command
+
+```
+curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh && bash goecs.sh env && bash goecs.sh install && goecs
+```
+
+### explain in detail
+
+Download the script
+
+```
+curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
+```
+
+Install environment
+
+```
+./goecs.sh env
+```
+
+Install goecs
+
+```
+./goecs.sh install
+```
+
+Upgrade goecs
+
+```
+./goecs.sh upgrade
+```
+
+Uninstall goecs
+
+```
+./goecs.sh delete
+```
+
+Explanation of the shell script
+
+```
+Available commands:
+
+./goecs.sh env             Check and Install package:
+                                sudo (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.)
+                                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.)
+                                ping (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
+```
+
+Invoke the goecs menu
+
+```
+goecs
+```
+
+or
+
+```
+./goecs
+```
+
+Parameterized goecs command
+
+```
+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)
+  -comm
+        Enable/Disable common media test (default true)
+  -cpu
+        Enable/Disable CPU test (default true)
+  -cpum string
+        Set CPU test method (supported: sysbench, geekbench, winsat) (default "sysbench")
+  -cput string
+        Set CPU test thread mode (supported: single, multi) (default "multi")
+  -disk
+        Enable/Disable disk test (default true)
+  -diskm string
+        Set disk test method (supported: fio, dd, winsat) (default "fio")
+  -diskmc
+        Enable/Disable multiple disk checks, e.g., -diskmc=false
+  -diskp string
+        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
+        Enable/Disable logging in the current path
+  -memory
+        Enable/Disable memory test (default true)
+  -memorym string
+        Set memory test method (supported: sysbench, dd, winsat) (default "dd")
+  -menu
+        Enable/Disable menu mode, disable example: -menu=false (default true)
+  -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")
+  -nt3t string
+        Set NT3 test type (supported: both, ipv4, ipv6) (default "ipv4")
+  -security
+        Enable/Disable security test (default true)
+  -speed
+        Enable/Disable speed test (default true)
+  -spnum int
+        Set the number of servers per operator for speed test (default 2)
+  -ut
+        Enable/Disable unlock media test (default true)
+  -v    Display version information
+```
+
+## Instructions for Use on Windows
+
+Download the compressed file with the exe file
+
+https://github.com/oneclickvirt/ecs/releases
+
+Find the latest version, download the .tar.gz file corresponding to your architecture, and unzip it to get an exe file.
+
+Right-click the exe file and select Run as administrator (running without administrator mode will not allow hardware testing), and invoke the menu to choose.
+
+No environment installation is required for Windows testing.
--- a/go.mod
+++ b/go.mod
@@ -4,19 +4,20 @@ go 1.22.4

 require (
 	github.com/imroc/req/v3 v3.43.7
-	github.com/oneclickvirt/CommonMediaTests v0.0.2-20240630023003
-	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/CommonMediaTests v0.0.4-20240704024502
+	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/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/nt3 v0.0.2-20240630152642
+	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.3-20240701065755
-	github.com/oneclickvirt/speedtest v0.0.6-20240630114816
+	github.com/oneclickvirt/security v0.0.4-20240702055848
+	github.com/oneclickvirt/speedtest v0.0.7-20240704023701
 )

 require (
@@ -45,6 +46,7 @@ require (
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
+	github.com/mattn/go-runewidth v0.0.15 // indirect
 	github.com/mitchellh/colorstring v0.0.0-20190213212951-d06e56a500db // indirect
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/nxtrace/NTrace-core v1.3.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -75,36 +75,34 @@ github.com/mitchellh/mapstructure v1.5.0 h1:jeMsZIYE/09sWLaz43PL7Gy6RuMjD2eJVyua
 github.com/mitchellh/mapstructure v1.5.0/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/nxtrace/NTrace-core v1.3.1 h1:f4z5UaZEuhUP/g6xElpZ2bo+guWITJVrMKrJTqd27oc=
 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/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-20240625075226 h1:K9VriCHIYnXPZXBSn9PRQX+jBS6AIFH8tBVb/i8VGAw=
-github.com/oneclickvirt/basics v0.0.3-20240625075226/go.mod h1:dTB+/oyFQYfTYX55rFJVWatum5F9g62zjfmHCM6Vj1s=
-github.com/oneclickvirt/basics v0.0.3-20240701085006 h1:wYimtnZuVmWxncwDevEzo4JZ/Xc2hj07vvbX3jgQLME=
-github.com/oneclickvirt/basics v0.0.3-20240701085006/go.mod h1:dTB+/oyFQYfTYX55rFJVWatum5F9g62zjfmHCM6Vj1s=
-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/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.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/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/nt3 v0.0.2-20240630152642 h1:BkpR1j9JaDxMzx7iIwtsnFDxSldjYr2TUYpZE7m8z/Y=
-github.com/oneclickvirt/nt3 v0.0.2-20240630152642/go.mod h1:UojPmtangn17TiQaDccVrZbn6sZwJOtzBgg3idp68cA=
+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=
+github.com/oneclickvirt/memorytest v0.0.2-20240702031042/go.mod h1:+YNzy+NeVg61d0kNwSyVDqHyVtKzjuRe1NvMzsDLg0I=
+github.com/oneclickvirt/nt3 v0.0.3-20240702132013 h1:zPI/zqqCraIVwRnYz07hMkBKDRJVkEBb6gZpZ4M9CjI=
+github.com/oneclickvirt/nt3 v0.0.3-20240702132013/go.mod h1:UojPmtangn17TiQaDccVrZbn6sZwJOtzBgg3idp68cA=
+github.com/oneclickvirt/pingtest v0.0.4-20240703142340 h1:012W8Ly6ALISwIL5cYFM8O1ZLSc9l+Z2hHUCscMemms=
+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.3-20240701065755 h1:eHZDuyvzufOu2yDUIMggK2iRtMWJaFlCzG4+leQn5+0=
-github.com/oneclickvirt/security v0.0.3-20240701065755/go.mod h1:cUNNOldoVQuovyc0EtAVAZlAT4y2xA1e0uA80aj1ly8=
-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/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.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=
 github.com/onsi/ginkgo/v2 v2.19.0/go.mod h1:rlwLi9PilAFJ8jCg9UE1QP6VBpd6/xj3SRC0d6TU0To=
 github.com/onsi/gomega v1.33.1 h1:dsYjIxxSR755MDmKVsaFQTE22ChNBcuuTWgkUDSubOk=
--- a/goecs.go
+++ b/goecs.go
@@ -4,8 +4,11 @@ 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"
+	disktestmodel "github.com/oneclickvirt/disktest/disk"
 	"github.com/oneclickvirt/ecs/backtrace"
 	"github.com/oneclickvirt/ecs/commediatest"
 	"github.com/oneclickvirt/ecs/cputest"
@@ -16,8 +19,13 @@ import (
 	"github.com/oneclickvirt/ecs/unlocktest"
 	"github.com/oneclickvirt/ecs/utils"
 	gostunmodel "github.com/oneclickvirt/gostun/model"
+	memorytestmodel "github.com/oneclickvirt/memorytest/memory"
+	nt3model "github.com/oneclickvirt/nt3/model"
+	ptmodel "github.com/oneclickvirt/pingtest/model"
+	"github.com/oneclickvirt/pingtest/pt"
 	"github.com/oneclickvirt/portchecker/email"
 	speedtestmodel "github.com/oneclickvirt/speedtest/model"
+	"net/http"
 	"os"
 	"os/signal"
 	"regexp"
@@ -29,8 +37,9 @@ import (
 )

 var (
-	ecsVersion                                                        = "v0.0.21"
+	ecsVersion                                                        = "v0.0.40"
 	menuMode                                                          bool
+	onlyChinaTest                                                     bool
 	input, choice                                                     string
 	showVersion                                                       bool
 	enableLogger                                                      bool
@@ -41,40 +50,49 @@ 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
+	backtraceStatus, nt3Status, speedTestStatus, pingTestStatus       bool
 	filePath                                                          = "goecs.txt"
 	enabelUpload                                                      = true
+	help                                                              bool
+	goecsFlag                                                         = flag.NewFlagSet("goecs", flag.ContinueOnError)
 )

 func main() {
-	flag.BoolVar(&showVersion, "v", false, "Display version information")
-	flag.BoolVar(&menuMode, "menu", true, "Enable/Disable menu mode, disable example: -menu=false") // true 默认启用菜单栏模式
-	flag.StringVar(&language, "l", "zh", "Set language (supported: en, zh)")
-	flag.BoolVar(&basicStatus, "basic", true, "Enable/Disable basic test")
-	flag.BoolVar(&cpuTestStatus, "cpu", true, "Enable/Disable CPU test")
-	flag.BoolVar(&memoryTestStatus, "memory", true, "Enable/Disable memory test")
-	flag.BoolVar(&diskTestStatus, "disk", true, "Enable/Disable disk test")
-	flag.BoolVar(&commTestStatus, "comm", true, "Enable/Disable common media test")
-	flag.BoolVar(&utTestStatus, "ut", true, "Enable/Disable unlock media test")
-	flag.BoolVar(&securityTestStatus, "security", true, "Enable/Disable security test")
-	flag.BoolVar(&emailTestStatus, "email", true, "Enable/Disable email port test")
-	flag.BoolVar(&backtraceStatus, "backtrace", true, "Enable/Disable backtrace test (in 'en' language or on `windows` it always false)")
-	flag.BoolVar(&nt3Status, "nt3", true, "Enable/Disable NT3 test (in 'en' language or on `windows` it always false)")
-	flag.BoolVar(&speedTestStatus, "speed", true, "Enable/Disable speed test")
-	flag.StringVar(&cpuTestMethod, "cpum", "sysbench", "Set CPU test method (supported: sysbench, geekbench, winsat)")
-	flag.StringVar(&cpuTestThreadMode, "cput", "multi", "Set CPU test thread mode (supported: single, multi)")
-	flag.StringVar(&memoryTestMethod, "memorym", "dd", "Set memory test method (supported: sysbench, dd, winsat)")
-	flag.StringVar(&diskTestMethod, "diskm", "fio", "Set disk test method (supported: fio, dd, winsat)")
-	flag.StringVar(&diskTestPath, "diskp", "", "Set disk test path, e.g., -diskp /root")
-	flag.BoolVar(&diskMultiCheck, "diskmc", false, "Enable/Disable multiple disk checks, e.g., -diskmc=false")
-	flag.StringVar(&nt3Location, "nt3loc", "GZ", "Specify NT3 test location (supported: GZ, SH, BJ, CD for Guangzhou, Shanghai, Beijing, Chengdu)")
-	flag.StringVar(&nt3CheckType, "nt3t", "ipv4", "Set NT3 test type (supported: both, ipv4, ipv6)")
-	flag.IntVar(&spNum, "spnum", 2, "Set the number of servers per operator for speed test")
-	flag.BoolVar(&enableLogger, "log", false, "Enable/Disable logging in the current path")
-	flag.Parse()
+	goecsFlag.BoolVar(&help, "h", false, "Show help information")
+	goecsFlag.BoolVar(&showVersion, "v", false, "Display version information")
+	goecsFlag.BoolVar(&menuMode, "menu", true, "Enable/Disable menu mode, disable example: -menu=false") // true 默认启用菜单栏模式
+	goecsFlag.StringVar(&language, "l", "zh", "Set language (supported: en, zh)")
+	goecsFlag.BoolVar(&basicStatus, "basic", true, "Enable/Disable basic test")
+	goecsFlag.BoolVar(&cpuTestStatus, "cpu", true, "Enable/Disable CPU test")
+	goecsFlag.BoolVar(&memoryTestStatus, "memory", true, "Enable/Disable memory test")
+	goecsFlag.BoolVar(&diskTestStatus, "disk", true, "Enable/Disable disk test")
+	goecsFlag.BoolVar(&commTestStatus, "comm", true, "Enable/Disable common media test")
+	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(&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)")
+	goecsFlag.StringVar(&memoryTestMethod, "memorym", "dd", "Set memory test method (supported: sysbench, dd, winsat)")
+	goecsFlag.StringVar(&diskTestMethod, "diskm", "fio", "Set disk test method (supported: fio, dd, winsat)")
+	goecsFlag.StringVar(&diskTestPath, "diskp", "", "Set disk test path, e.g., -diskp /root")
+	goecsFlag.BoolVar(&diskMultiCheck, "diskmc", false, "Enable/Disable multiple disk checks, e.g., -diskmc=false")
+	goecsFlag.StringVar(&nt3Location, "nt3loc", "GZ", "Specify NT3 test location (supported: GZ, SH, BJ, CD for Guangzhou, Shanghai, Beijing, Chengdu)")
+	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])
+		goecsFlag.PrintDefaults()
+		return
+	}
 	sig := make(chan os.Signal, 1)
 	signal.Notify(sig, os.Interrupt, syscall.SIGINT, syscall.SIGTERM)
 	if showVersion {
@@ -82,18 +100,28 @@ 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
+		unlocktestmodel.EnableLoger = true
+		ptmodel.EnableLoger = true
 		backtraceori.EnableLoger = true
+		nt3model.EnableLoger = true
+		speedtestmodel.EnableLoger = true
 	}
+	go func() {
+		http.Get("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")
+	}()
 	if menuMode {
 		basicStatus, cpuTestStatus, memoryTestStatus, diskTestStatus = false, false, false, false
 		commTestStatus, utTestStatus, securityTestStatus, emailTestStatus = false, false, false, false
 		backtraceStatus, nt3Status, speedTestStatus = false, false, false
 		switch language {
 		case "zh":
+			fmt.Println("VPS融合怪版本: ", ecsVersion)
 			fmt.Println("1. 融合怪完全体")
 			fmt.Println("2. 极简版(系统信息+CPU+内存+磁盘+测速节点5个)")
 			fmt.Println("3. 精简版(系统信息+CPU+内存+磁盘+御三家+常用流媒体+回程+路由+测速节点5个)")
@@ -105,6 +133,7 @@ func main() {
 			fmt.Println("9. IP质量检测(15个数据库的IP检测+邮件端口检测)")
 			fmt.Println("10. 三网回程线路+广州三网路由+全国三网延迟")
 		case "en":
+			fmt.Println("VPS Fusion Monster Test Version: ", ecsVersion)
 			fmt.Println("1. VPS Fusion Monster Test Comprehensive Test Suite")
 			fmt.Println("2. Minimal Test Suite (System Info + CPU + Memory + Disk + 5 Speed Test Nodes)")
 			fmt.Println("3. Standard Test Suite (System Info + CPU + Memory + Disk + Basic Unlock Tests + Common Streaming Services + 5 Speed Test Nodes)")
@@ -137,6 +166,7 @@ func main() {
 					backtraceStatus = true
 					nt3Status = true
 					speedTestStatus = true
+					onlyChinaTest = utils.CheckChina(enableLogger)
 					break Loop
 				case "2":
 					basicStatus = true
@@ -196,6 +226,7 @@ func main() {
 					backtraceStatus = true
 					nt3Status = true
 					speedTestStatus = true
+					pingTestStatus = true
 					break Loop
 				default:
 					if language == "zh" {
@@ -217,174 +248,243 @@ 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) // 使用非零状态码退出，表示意外退出
 	}()
-	output = utils.PrintAndCapture(func() {
-		switch language {
-		case "zh":
+	switch language {
+	case "zh":
+		output = utils.PrintAndCapture(func() {
 			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 {
 					fmt.Printf(basicInfo)
 				}
 			}
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
 			if cpuTestStatus {
 				utils.PrintCenteredTitle(fmt.Sprintf("CPU测试-通过%s测试", cpuTestMethod), width)
 				cputest.CpuTest(language, cpuTestMethod, cpuTestThreadMode)
 			}
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
 			if memoryTestStatus {
 				utils.PrintCenteredTitle(fmt.Sprintf("内存测试-通过%s测试", cpuTestMethod), width)
 				memorytest.MemoryTest(language, memoryTestMethod)
 			}
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
 			if diskTestStatus {
 				utils.PrintCenteredTitle(fmt.Sprintf("硬盘测试-通过%s测试", diskTestMethod), width)
 				disktest.DiskTest(language, diskTestMethod, diskTestPath, diskMultiCheck)
 			}
-			if emailTestStatus {
-				wg2.Add(1)
-				go func() {
-					defer wg2.Done()
-					emailInfo = email.EmailCheck()
-				}()
-			}
-			if utTestStatus {
-				wg1.Add(1)
-				go func() {
-					defer wg1.Done()
-					mediaInfo = unlocktest.MediaTest(language)
-				}()
-			}
-			if commTestStatus {
+		}, tempOutput, output)
+		if emailTestStatus {
+			wg2.Add(1)
+			go func() {
+				defer wg2.Done()
+				emailInfo = email.EmailCheck()
+			}()
+		}
+		if utTestStatus && !onlyChinaTest {
+			wg1.Add(1)
+			go func() {
+				defer wg1.Done()
+				mediaInfo = unlocktest.MediaTest(language)
+			}()
+		}
+		output = utils.PrintAndCapture(func() {
+			if commTestStatus && !onlyChinaTest {
 				utils.PrintCenteredTitle("御三家流媒体解锁", width)
 				commediatest.ComMediaTest(language)
 			}
-			if utTestStatus {
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
+			if utTestStatus && !onlyChinaTest {
 				utils.PrintCenteredTitle("跨国流媒体解锁", width)
 				wg1.Wait()
 				fmt.Printf(mediaInfo)
 			}
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
 			if securityTestStatus {
 				utils.PrintCenteredTitle("IP质量检测", width)
 				fmt.Printf(securityInfo)
 			}
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
 			if emailTestStatus {
 				utils.PrintCenteredTitle("邮件端口检测", width)
 				wg2.Wait()
 				fmt.Println(emailInfo)
 			}
-			if runtime.GOOS != "windows" {
-				if backtraceStatus {
-					utils.PrintCenteredTitle("三网回程", width)
+		}, tempOutput, output)
+		if runtime.GOOS != "windows" {
+			output = utils.PrintAndCapture(func() {
+				if backtraceStatus && !onlyChinaTest {
+					utils.PrintCenteredTitle("三网回程线路检测", width)
 					backtrace.BackTrace()
 				}
-				// nexttrace 在win上不支持检测，报错 bind: An invalid argument was supplied.
-				if nt3Status {
-					utils.PrintCenteredTitle("路由检测", width)
+			}, tempOutput, output)
+			// nexttrace 在win上不支持检测，报错 bind: An invalid argument was supplied.
+			output = utils.PrintAndCapture(func() {
+				if nt3Status && !onlyChinaTest {
+					utils.PrintCenteredTitle("三网回程路由检测", width)
 					ntrace.TraceRoute3(language, nt3Location, nt3CheckType)
 				}
-			}
+			}, tempOutput, output)
+			output = utils.PrintAndCapture(func() {
+				if onlyChinaTest || pingTestStatus {
+					utils.PrintCenteredTitle("三网ICMP的PING值检测", width)
+					pt.PingTest()
+				}
+			}, tempOutput, output)
+		}
+		output = utils.PrintAndCapture(func() {
 			if speedTestStatus {
 				utils.PrintCenteredTitle("就近节点测速", width)
 				speedtest.ShowHead(language)
 				if (menuMode && choice == "1") || !menuMode {
 					speedtest.NearbySP()
-					speedtest.CustomSP("net", "global", 2)
-					speedtest.CustomSP("net", "cu", spNum)
-					speedtest.CustomSP("net", "ct", spNum)
-					speedtest.CustomSP("net", "cmcc", spNum)
+					speedtest.CustomSP("net", "global", 2, language)
+					speedtest.CustomSP("net", "cu", spNum, language)
+					speedtest.CustomSP("net", "ct", spNum, language)
+					speedtest.CustomSP("net", "cmcc", spNum, language)
 				} else if menuMode && choice == "2" || choice == "3" || choice == "4" || choice == "5" {
-					speedtest.CustomSP("net", "global", 4)
+					speedtest.CustomSP("net", "global", 4, language)
 				}
 			}
+		}, tempOutput, output)
+		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)
-			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")
 			fmt.Printf("花费          : %d 分 %d 秒\n", minutes, seconds)
 			fmt.Printf("时间          : %s\n", currentTime)
 			utils.PrintCenteredTitle("", width)
-		case "en":
+		}, tempOutput, output)
+	case "en":
+		output = utils.PrintAndCapture(func() {
 			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 {
 					fmt.Printf(basicInfo)
 				}
 			}
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
 			if cpuTestStatus {
-				utils.PrintCenteredTitle(fmt.Sprintf("CPU Test - %s Method", cpuTestMethod), width)
+				utils.PrintCenteredTitle(fmt.Sprintf("CPU-Test--%s-Method", cpuTestMethod), width)
 				cputest.CpuTest(language, cpuTestMethod, cpuTestThreadMode)
 			}
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
 			if memoryTestStatus {
-				utils.PrintCenteredTitle(fmt.Sprintf("Memory Test - %s Method", memoryTestMethod), width)
+				utils.PrintCenteredTitle(fmt.Sprintf("Memory-Test--%s-Method", memoryTestMethod), width)
 				memorytest.MemoryTest(language, memoryTestMethod)
 			}
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
 			if diskTestStatus {
-				utils.PrintCenteredTitle(fmt.Sprintf("Disk Test - %s Method", diskTestMethod), width)
+				utils.PrintCenteredTitle(fmt.Sprintf("Disk-Test--%s-Method", diskTestMethod), width)
 				disktest.DiskTest(language, diskTestMethod, diskTestPath, diskMultiCheck)
 			}
-			if emailTestStatus {
-				wg1.Add(1)
-				go func() {
-					defer wg1.Done()
-					emailInfo = email.EmailCheck()
-				}()
-			}
-			if commTestStatus {
-				utils.PrintCenteredTitle("The Three Families Streaming Media Unlock", width)
-				commediatest.ComMediaTest(language)
-			}
+		}, tempOutput, output)
+		if utTestStatus {
+			wg1.Add(1)
+			go func() {
+				defer wg1.Done()
+				mediaInfo = unlocktest.MediaTest(language)
+			}()
+		}
+		if emailTestStatus {
+			wg2.Add(1)
+			go func() {
+				defer wg2.Done()
+				emailInfo = email.EmailCheck()
+			}()
+		}
+		output = utils.PrintAndCapture(func() {
 			if utTestStatus {
-				utils.PrintCenteredTitle("Cross-Border Streaming Media Unlock", width)
-				unlocktest.MediaTest(language)
+				utils.PrintCenteredTitle("Cross-Border-Streaming-Media-Unlock", width)
+				wg1.Wait()
+				fmt.Printf(mediaInfo)
 			}
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
 			if securityTestStatus {
-				utils.PrintCenteredTitle("IP Quality Check", width)
+				utils.PrintCenteredTitle("IP-Quality-Check", width)
 				fmt.Printf(securityInfo)
 			}
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
 			if emailTestStatus {
-				utils.PrintCenteredTitle("Email Port Check", width)
-				wg1.Wait()
+				utils.PrintCenteredTitle("Email-Port-Check", width)
+				wg2.Wait()
 				fmt.Println(emailInfo)
 			}
+		}, tempOutput, output)
+		output = utils.PrintAndCapture(func() {
 			if speedTestStatus {
-				utils.PrintCenteredTitle("Nearby Node Speed Test", width)
+				utils.PrintCenteredTitle("Speed-Test", width)
 				speedtest.ShowHead(language)
 				speedtest.NearbySP()
-				speedtest.CustomSP("net", "global", -1)
+				speedtest.CustomSP("net", "global", -1, language)
 			}
+		}, tempOutput, output)
+		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)
-			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")
-			fmt.Printf("Cost    Time          : %d 分 %d 秒\n", minutes, seconds)
+			fmt.Printf("Cost    Time          : %d min %d sec\n", minutes, seconds)
 			fmt.Printf("Current Time          : %s\n", currentTime)
 			utils.PrintCenteredTitle("", width)
-		default:
-			fmt.Println("Unsupported language")
-		}
-	}, tempOutput, output)
+		}, tempOutput, output)
+	default:
+		fmt.Println("Unsupported language")
+	}
 	utils.ProcessAndUpload(output, filePath, enabelUpload)
+	if runtime.GOOS == "windows" || runtime.GOOS == "darwin" {
+		fmt.Println("Press Enter to exit...")
+		fmt.Scanln()
+	}
 }
--- a/goecs.sh
+++ b/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

@@ -61,7 +61,7 @@ goecs_check() {
    # 检测原始goecs命令是否存在，若存在则升级，不存在则安装
    version_output=$(goecs -v command 2>/dev/null || ./goecs -v command 2>/dev/null)
    if [ $? -eq 0 ]; then
-        extracted_version=$(echo "${version_output//v/}")
+        extracted_version=${version_output//v/}
        if [ -n "$extracted_version" ]; then
            ecs_version=$ECS_VERSION
            if [[ "$(echo -e "$extracted_version\n$ecs_version" | sort -V | tail -n 1)" == "$extracted_version" ]]; then
@@ -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,38 +234,75 @@ 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")
-    CMD=("$(grep -i pretty_name /etc/os-release 2>/dev/null | cut -d \" -f2)" "$(hostnamectl 2>/dev/null | grep -i system | cut -d : -f2)" "$(lsb_release -sd 2>/dev/null)" "$(grep -i description /etc/lsb-release 2>/dev/null | cut -d \" -f2)" "$(grep . /etc/redhat-release 2>/dev/null)" "$(grep . /etc/issue 2>/dev/null | cut -d \\ -f1 | sed '/^[ ]*$/d')" "$(grep -i pretty_name /etc/os-release 2>/dev/null | cut -d \" -f2)" "$(uname -s)" "$(uname -s)")
-    SYS="${CMD[0]}"
+    # 检查系统信息
+    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 | xargs)"
+    elif [ -x "$(type -p lsb_release)" ]; then
+        SYS="$(lsb_release -sd)"
+    elif [ -s /etc/lsb-release ]; then
+        SYS="$(grep -i description /etc/lsb-release | cut -d \" -f2)"
+    elif [ -s /etc/redhat-release ]; then
+        SYS="$(grep . /etc/redhat-release)"
+    elif [ -s /etc/issue ]; then
+        SYS="$(grep . /etc/issue | cut -d '\' -f1 | sed '/^[ ]*$/d')"
+    else
+        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[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
@@ -276,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
@@ -295,17 +334,35 @@ 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"
        _blue "to uninstall speedtest and speedtest-go"
    fi
+    if ! command -v ping >/dev/null 2>&1; then
+        _green "Installing ping"
+        ${PACKAGE_INSTALL[int]} iputils-ping >/dev/null 2>&1
+        ${PACKAGE_INSTALL[int]} ping >/dev/null 2>&1
+    fi
+    if [ "$(uname -s)" = "Darwin" ]; then
+        echo "Detected MacOS. Installing sysbench and fio..."
+        brew install --force sysbench fio dd
+        # 有问题，需要修复，root环境不能brew，brew安装完毕后可能路径不在环境变量中
+    else
+        if ! grep -q "^net.ipv4.ping_group_range = 0 2147483647$" /etc/sysctl.conf; then
+            echo "net.ipv4.ping_group_range = 0 2147483647" >> /etc/sysctl.conf
+            sysctl -p
+        fi
+    fi
    _green "The environment is ready."
+    _green "The next command is: ./goecs.sh install"
 }

 delete_goecs() {
  rm -rf /root/goecs
  rm -rf /usr/bin/goecs
+  _green "The command (goecs) has been deleted."
 }

 show_help() {
@@ -313,13 +370,16 @@ show_help() {
 Available commands:

 ./goecs.sh env             Check and Install package:
-                                tar (Almost all unix-like systems have it.)
+                                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.)
-                                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.)
+                                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.)
+                                ping (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
--- a/发布版本.bat
+++ b/发布版本.bat
--- a/speedtest/sp.go
+++ b/speedtest/sp.go
@@ -19,7 +19,7 @@ func NearbySP() {
 	}
 }

-func CustomSP(platform, operator string, num int) {
+func CustomSP(platform, operator string, num int, language string) {
 	var url, parseType string
 	if strings.ToLower(platform) == "cn" {
 		if strings.ToLower(operator) == "cmcc" {
@@ -59,8 +59,8 @@ func CustomSP(platform, operator string, num int) {
 		parseType = "id"
 	}
 	if runtime.GOOS == "windows" || sp.OfficialAvailableTest() != nil {
-		sp.CustomSpeedTest(url, parseType, num)
+		sp.CustomSpeedTest(url, parseType, num, language)
 	} else {
-		sp.OfficialCustomSpeedTest(url, parseType, num)
+		sp.OfficialCustomSpeedTest(url, parseType, num, language)
 	}
 }
--- a/上传所有源码.bat
+++ b/上传所有源码.bat
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -6,6 +6,7 @@ import (
 	"github.com/imroc/req/v3"
 	"github.com/oneclickvirt/UnlockTests/uts"
 	"github.com/oneclickvirt/basics/system"
+	. "github.com/oneclickvirt/defaultset"
 	"github.com/oneclickvirt/security/network"
 	"io"
 	"os"
@@ -44,6 +45,89 @@ func PrintHead(language string, width int, ecsVersion string) {
 	}
 }

+func CheckChina(enableLogger bool) bool {
+	if enableLogger {
+		InitLogger()
+		defer Logger.Sync()
+	}
+	var selectChina bool
+	client := req.C()
+	client.SetTimeout(6 * time.Second)
+	client.R().
+		SetRetryCount(2).
+		SetRetryBackoffInterval(1*time.Second, 3*time.Second).
+		SetRetryFixedInterval(2 * time.Second)
+	ipapiURL := "https://ipapi.co/json"
+	cipccURL := "http://cip.cc"
+	ipapiResp, err := client.R().Get(ipapiURL)
+	if err != nil {
+		if enableLogger {
+			Logger.Info("无法获取IP信息:" + err.Error())
+		}
+	} else {
+		defer ipapiResp.Body.Close()
+		var ipapiBody string
+		ipapiBody, err = ipapiResp.ToString()
+		if err != nil {
+			if enableLogger {
+				Logger.Info("无法读取IP信息响应:" + err.Error())
+			}
+		} else {
+			isInChina := strings.Contains(ipapiBody, "China")
+			if isInChina {
+				fmt.Println("根据ipapi.co提供的信息，当前IP可能在中国")
+				var input string
+				fmt.Print("是否选用中国专项测试(无流媒体测试，有三网Ping值测试)? ([y]/n) ")
+				fmt.Scanln(&input)
+				switch strings.ToLower(input) {
+				case "yes", "y":
+					fmt.Println("使用中国专项测试")
+					selectChina = true
+				case "no", "n":
+					fmt.Println("不使用中国专项测试")
+				default:
+					fmt.Println("使用中国专项测试")
+					selectChina = true
+				}
+				return selectChina
+			}
+		}
+	}
+	cipccResp, err := client.R().Get(cipccURL)
+	if err != nil {
+		if enableLogger {
+			Logger.Info("无法获取IP信息:" + err.Error())
+		}
+		return false
+	}
+	defer cipccResp.Body.Close()
+	cipccBody, err := cipccResp.ToString()
+	if err != nil {
+		if enableLogger {
+			Logger.Info("无法读取IP信息响应:" + err.Error())
+		}
+		return false
+	}
+	isInChina := strings.Contains(cipccBody, "中国")
+	if isInChina {
+		fmt.Println("根据cip.cc提供的信息，当前IP可能在中国")
+		var input string
+		fmt.Print("是否选用中国专项测试(无流媒体测试，有三网Ping值测试)? ([y]/n) ")
+		fmt.Scanln(&input)
+		switch strings.ToLower(input) {
+		case "yes", "y":
+			fmt.Println("使用中国专项测试")
+			selectChina = true
+		case "no", "n":
+			fmt.Println("不使用中国专项测试")
+		default:
+			fmt.Println("不使用中国专项测试")
+			selectChina = true
+		}
+	}
+	return selectChina
+}
+
 // SecurityCheck 执行安全检查
 func SecurityCheck(language, nt3CheckType string, securtyCheckStatus bool) (string, string, string) {
 	var wgt sync.WaitGroup
Author	SHA1	Message	Date
spiritysdx	955b887039	update	2024-07-04 18:53:30 +08:00
spiritysdx	ac3839a8eb	update	2024-07-04 18:53:11 +08:00
spiritysdx	4d2c89dc96	update	2024-07-04 18:42:32 +08:00
spiritysdx	e773e4d0fd	update	2024-07-04 18:41:51 +08:00
spiritysdx	d0814ee1da	update	2024-07-04 18:36:18 +08:00
spiritysdx	c31c978fc8	update	2024-07-04 18:29:46 +08:00
spiritysdx	040a3db6e2	update	2024-07-04 18:26:05 +08:00
spiritysdx	cd68643df8	update	2024-07-04 18:14:04 +08:00
spiritysdx	5ad59dcd36	update	2024-07-04 18:04:54 +08:00
spiritysdx	476ae5d25f	update	2024-07-04 17:53:52 +08:00
spiritysdx	369ae42139	update	2024-07-04 15:54:48 +08:00
spiritysdx	676973d946	update	2024-07-04 13:18:02 +08:00
spiritysdx	3ce8b69065	update	2024-07-04 13:13:37 +08:00
spiritysdx	d752a2fb7f	update	2024-07-04 13:11:43 +08:00
spiritysdx	95fba10d0f	update	2024-07-04 12:59:56 +08:00
spiritysdx	acebe04732	update	2024-07-04 12:59:36 +08:00
spiritysdx	226f751655	update	2024-07-04 11:53:05 +08:00
spiritysdx	18a0de4c4e	update	2024-07-04 11:52:21 +08:00
spiritysdx	e5f29dc46c	update	2024-07-04 11:22:22 +08:00
spiritysdx	c94d0133fc	update	2024-07-04 11:13:04 +08:00
spiritysdx	7cd1e9190b	update	2024-07-04 11:09:05 +08:00
spiritysdx	df735880fe	update	2024-07-04 11:04:22 +08:00
spiritysdx	f0b89d4168	update	2024-07-04 10:59:03 +08:00
spiritysdx	8af46d4bfb	update	2024-07-03 23:20:43 +08:00
spiritysdx	e8fdbee3e4	update	2024-07-03 20:21:25 +08:00
spiritysdx	6cbd20fc90	update	2024-07-03 20:01:14 +08:00
spiritysdx	25c0b2ba95	update	2024-07-03 10:48:40 +08:00
spiritysdx	f16c0e7bcf	update	2024-07-02 23:24:48 +08:00
spiritysdx	12e29bc105	update	2024-07-02 23:23:05 +08:00
spiritysdx	f7a7e34b34	update	2024-07-02 23:17:18 +08:00
spiritysdx	4d7049c9b8	update	2024-07-02 23:13:38 +08:00
spiritysdx	ad61caf1d2	update	2024-07-02 23:03:24 +08:00
spiritysdx	f84cbe2078	update	2024-07-02 22:33:29 +08:00
spiritysdx	a9df37f216	update	2024-07-02 22:12:57 +08:00
spiritysdx	60bec3d46c	update	2024-07-02 22:10:44 +08:00
spiritysdx	3c1e1f19c4	update	2024-07-02 21:50:39 +08:00
spiritysdx	207d8ff746	update	2024-07-02 21:32:17 +08:00
spiritysdx	835dc7a0fd	update	2024-07-02 20:10:49 +08:00
spiritysdx	cdfb956211	update	2024-07-02 16:22:01 +08:00
spiritysdx	d5ba31e5d7	update	2024-07-02 15:21:36 +08:00
spiritysdx	e80ec4f063	update	2024-07-02 14:14:37 +08:00
spiritysdx	cdb8d8681e	update	2024-07-02 11:35:51 +08:00
spiritysdx	d6d0abeb1c	update	2024-07-02 11:33:31 +08:00
spiritysdx	9565248f95	update	2024-07-02 11:20:34 +08:00
spiritysdx	1d6cd5984b	update	2024-07-02 00:18:59 +08:00
spiritysdx	63b857c915	update	2024-07-01 19:46:16 +08:00
spiritysdx	6811f19db4	update	2024-07-01 19:38:06 +08:00
spiritysdx	847e1c0d6e	update	2024-07-01 18:40:23 +08:00
spiritysdx	99a8448d53	update	2024-07-01 18:38:16 +08:00
spiritysdx	4fe9cd21ef	update	2024-07-01 18:31:21 +08:00
spiritysdx	bdb53ac436	update	2024-07-01 18:26:09 +08:00
spiritysdx	01b9ee4505	update	2024-07-01 18:13:57 +08:00
spiritysdx	fadbf9c6aa	update	2024-07-01 17:59:40 +08:00
spiritysdx	60e235e4d7	update	2024-07-01 17:59:24 +08:00
spiritysdx	da4b431761	update	2024-07-01 17:48:40 +08:00
spiritysdx	7fff30521e	update	2024-07-01 17:46:33 +08:00
spiritysdx	e7c78774ca	update	2024-07-01 17:43:35 +08:00
spiritysdx	fb6f9da14c	update	2024-07-01 17:40:45 +08:00
spiritysdx	7b1773c5f0	update	2024-07-01 17:40:08 +08:00
spiritysdx	7b15a74448	update	2024-07-01 17:33:09 +08:00