feat: disktest添加原生包含fio的静态编译文件，不再需要额外安装fio依赖

fix: 系统基础信息检测合并同功能函数避免重复
fix: 解决说明歧义
2026-04-21 05:10:32 +08:00 · 2025-04-02 19:20:31 +08:00 · 2025-04-01 20:40:25 +08:00 · 2025-03-31 22:44:10 +08:00 · 2025-03-31 22:36:43 +08:00 · 2025-03-31 22:34:32 +08:00
8 changed files with 26 additions and 34 deletions
--- a/5
+++ b/5
@@ -2,7 +2,8 @@
 FROM alpine:latest
 # 安装必要的工具
 RUN apk add --no-cache wget curl bash
-RUN apk add --no-cache bind-tools --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
+RUN apk add --no-cache bind-tools
+# --repository=http://dl-cdn.alpinelinux.org/alpine/edge/main
 RUN apk add --no-cache grep openssl ca-certificates uuidgen
 RUN export noninteractive=true
 # 下载并执行 goecs.sh 脚本
@@ -11,4 +12,4 @@ RUN curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -
    bash goecs.sh env && \
    bash goecs.sh install
 # 设置 goecs 为入口点
-ENTRYPOINT ["goecs"]
+ENTRYPOINT ["goecs"]
--- a/README.md
+++ b/README.md
@@ -68,7 +68,7 @@ Shell 版本：[https://github.com/spiritLHLS/ecs](https://github.com/spiritLHLS

 #### **一键命令**

-将默认安装依赖，默认更新包管理器，默认非互动模式，下面的非一键命令版本可控制是否安装依赖/是否更新包管理器/默认互动模式
+将默认安装依赖，默认更新包管理器，默认非互动模式，下面的**详细说明中的命令可控制是否安装依赖/是否更新包管理器/默认互动模式**

 - **国际用户无加速：**

--- a/README_EN.md
+++ b/README_EN.md
@@ -68,7 +68,7 @@ Shell version: [https://github.com/spiritLHLS/ecs/blob/main/README_EN.md](https:

 #### **One-click command**

-Will install dependencies by default, update package manager by default, non-interactive mode by default. The non-one-click version below allows control of dependency installation/package manager updates/interactive mode by default.
+Will install dependencies by default, update package manager by default, non-interactive mode by default. The **detailed instructions below allows control of dependency installation/package manager updates/interactive mode by default**.

 - **International users without acceleration:**

--- a/go.mod
+++ b/go.mod
@@ -7,16 +7,16 @@ require (
 	github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841
 	github.com/oneclickvirt/UnlockTests v0.0.26-20250329125926
 	github.com/oneclickvirt/backtrace v0.0.4-20250329130043
-	github.com/oneclickvirt/basics v0.0.11-20250330045822
-	github.com/oneclickvirt/cputest v0.0.10-20250329130006
+	github.com/oneclickvirt/basics v0.0.11-20250401121437
+	github.com/oneclickvirt/cputest v0.0.10-20250401133339
 	github.com/oneclickvirt/defaultset v0.0.2-20240624082446
-	github.com/oneclickvirt/disktest v0.0.5-20250329125941
+	github.com/oneclickvirt/disktest v0.0.6-20250402111439
 	github.com/oneclickvirt/gostun v0.0.3-20250329105202
 	github.com/oneclickvirt/memorytest v0.0.4-20250329125725
 	github.com/oneclickvirt/nt3 v0.0.4-20250329125813
 	github.com/oneclickvirt/pingtest v0.0.6-20250329130728
 	github.com/oneclickvirt/portchecker v0.0.3-20250329125750
-	github.com/oneclickvirt/security v0.0.4-20250330051452
+	github.com/oneclickvirt/security v0.0.4-20250401123241
 	github.com/oneclickvirt/speedtest v0.0.9-20250329130205
 )

@@ -60,7 +60,6 @@ require (
 	github.com/mitchellh/mapstructure v1.5.0 // indirect
 	github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
 	github.com/modern-go/reflect2 v1.0.2 // indirect
-	github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 // indirect
 	github.com/nxtrace/NTrace-core v1.3.7 // indirect
 	github.com/onsi/ginkgo/v2 v2.22.1 // indirect
 	github.com/oschwald/maxminddb-golang v1.13.1 // indirect
--- a/go.sum
+++ b/go.sum
@@ -99,8 +99,6 @@ github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M=
 github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646 h1:zYyBkD/k9seD2A7fsi6Oo2LfFZAehjjQMERAvZLEDnQ=
-github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646/go.mod h1:jpp1/29i3P1S/RLdc7JQKbRpFeM1dOBd8T9ki5s+AY8=
 github.com/nxtrace/NTrace-core v1.3.7 h1:ZnTbPrPqpyeraCvUyNbQTNyl4Gz3NRQDh06WdIIHh90=
 github.com/nxtrace/NTrace-core v1.3.7/go.mod h1:aW2owz9I+W5i+gJEDmnWli75mB+fuO4UTwdOPMcQHpE=
 github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841 h1:Zef93z9UiZQwRAKnnZYALmpBKvvuVaq34MEsuWwk6nc=
@@ -109,14 +107,14 @@ github.com/oneclickvirt/UnlockTests v0.0.26-20250329125926 h1:H5//xwVjDR02bQ1hLa
 github.com/oneclickvirt/UnlockTests v0.0.26-20250329125926/go.mod h1:yXWIZB6iLS88pEd9m4QJi1GENn+7I91zA72y5ONz2Oc=
 github.com/oneclickvirt/backtrace v0.0.4-20250329130043 h1:d3ubN7FTY2xDKN8mmLc1RbvccpTkvfMADtMBvFCRdt0=
 github.com/oneclickvirt/backtrace v0.0.4-20250329130043/go.mod h1:zvsC7xY/WZqs5KL2JB967OVnuqjNbxu9bW6wXRLo5h8=
-github.com/oneclickvirt/basics v0.0.11-20250330045822 h1:lwyIM4s5IIzD55egFh0LZsheL/2xfDSAvJNHazVBTTc=
-github.com/oneclickvirt/basics v0.0.11-20250330045822/go.mod h1:yN1IEOXN6v/GJqJSA70Pooo6nXBI/6rq72vTY72wJMQ=
-github.com/oneclickvirt/cputest v0.0.10-20250329130006 h1:IHt1btk79JfWCohc63TTwhI0vgbx4c2FrfTGT5zBtYg=
-github.com/oneclickvirt/cputest v0.0.10-20250329130006/go.mod h1:MmaHN9+XMntI3rLycwj8Ne31fG18IfNoa8N2utDK1CY=
+github.com/oneclickvirt/basics v0.0.11-20250401121437 h1:Tdj5y9Y3kbfYebbWe+OTWMJKKSuKlitRZArpBXWVoU0=
+github.com/oneclickvirt/basics v0.0.11-20250401121437/go.mod h1:yN1IEOXN6v/GJqJSA70Pooo6nXBI/6rq72vTY72wJMQ=
+github.com/oneclickvirt/cputest v0.0.10-20250401133339 h1:fxWEDAt74Q4Xl0NMde8lDzUXEOgQ9B4eGLR3HkgrOs4=
+github.com/oneclickvirt/cputest v0.0.10-20250401133339/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.5-20250329125941 h1:Fv4yZkYm+m3YtF5hSRjVoyg2Enw6OKkI7+36Bd+abpY=
-github.com/oneclickvirt/disktest v0.0.5-20250329125941/go.mod h1:wIZy8G6Mbcy8Op8tc0HmJNpbJQQ5A15fvnUqMJXIdO0=
+github.com/oneclickvirt/disktest v0.0.6-20250402111439 h1:kTQX9XG9J/4yqzOjh6up0je7bw/YXe5vXRlgJHQjhzQ=
+github.com/oneclickvirt/disktest v0.0.6-20250402111439/go.mod h1:wIZy8G6Mbcy8Op8tc0HmJNpbJQQ5A15fvnUqMJXIdO0=
 github.com/oneclickvirt/gostun v0.0.3-20250329105202 h1:aJ6E91Lp94lq8iWRcCaxpXTjqOOaWvufr5oras6cFtM=
 github.com/oneclickvirt/gostun v0.0.3-20250329105202/go.mod h1:f7DPEXAxbmwXSW33dbxtb0/KzqvOBWhTs2Or5xBerQA=
 github.com/oneclickvirt/memorytest v0.0.4-20250329125725 h1:RTfaO7Ubc8eJz4DUtkO4/v2w/Qr/KITQZatgTr+CqIk=
@@ -127,8 +125,8 @@ github.com/oneclickvirt/pingtest v0.0.6-20250329130728 h1:XYMfpIj32Wuej5G7f7/NB5
 github.com/oneclickvirt/pingtest v0.0.6-20250329130728/go.mod h1:d3Ntx5m9lMll3a/k3+2B+5emj//vgDh4/NHTxs2qQE8=
 github.com/oneclickvirt/portchecker v0.0.3-20250329125750 h1:TTNL0pnQlRsn046kW59I/9UWRpihttFHWnU7Ixycggk=
 github.com/oneclickvirt/portchecker v0.0.3-20250329125750/go.mod h1:HQxSTrqM8/QFqHMTBZ7S8H9eEO5FkUXU1eb7ZX5Mk+k=
-github.com/oneclickvirt/security v0.0.4-20250330051452 h1:ze2T7NM0ukuDNC5IMYH2uDuCuvIBIzx3UHJcZidySwY=
-github.com/oneclickvirt/security v0.0.4-20250330051452/go.mod h1:vrv5JH5K9Phf+N0oe6qRviUG8zc2cnm7B9R5GKoMEmM=
+github.com/oneclickvirt/security v0.0.4-20250401123241 h1:myeAQ1wOKIHx5r9qs9dCwx/5FepY+hZu/fDNquMwKaw=
+github.com/oneclickvirt/security v0.0.4-20250401123241/go.mod h1:Cyo3hwh1irn6yWnTh+YVKtkkVzHlwZgm7t7qR3IPRQA=
 github.com/oneclickvirt/speedtest v0.0.9-20250329130205 h1:XWM6FhObi+2bEkntPcAAKkiS9w7r6j79DOtmlbq4hhs=
 github.com/oneclickvirt/speedtest v0.0.9-20250329130205/go.mod h1:zd5ZgIGslmtQLQehEfRjyumlvgDHTpCSMchKfKXoASI=
 github.com/onsi/ginkgo/v2 v2.22.1 h1:QW7tbJAUDyVDVOM5dFa7qaybo+CRfR7bemlQUN6Z8aM=
--- a/goecs.go
+++ b/goecs.go
@@ -39,7 +39,7 @@ import (
 )

 var (
-	ecsVersion                                                        = "v0.1.22"
+	ecsVersion                                                        = "v0.1.26"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string
--- a/goecs.sh
+++ b/goecs.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 # From https://github.com/oneclickvirt/ecs
-# 2024.12.08
+# 2025.04.02

 # curl -L https://raw.githubusercontent.com/oneclickvirt/ecs/master/goecs.sh -o goecs.sh && chmod +x goecs.sh
 # 或
@@ -139,8 +139,8 @@ goecs_check() {
        sleep 1
    done
    if [ -z "$ECS_VERSION" ]; then
-        _yellow "Unable to get version info, using default version 0.1.22"
-        ECS_VERSION="0.1.22"
+        _yellow "Unable to get version info, using default version 0.1.26"
+        ECS_VERSION="0.1.26"
    fi
    # Check if original goecs command exists
    version_output=""
@@ -531,7 +531,7 @@ env_check() {
        fi
    fi
    # Install necessary commands
-    for cmd in sudo wget tar unzip iproute2 systemd-detect-virt dd fio; do
+    for cmd in sudo wget tar unzip iproute2 systemd-detect-virt dd; do
        if ! command -v "$cmd" >/dev/null 2>&1; then
            _green "Installing $cmd"
            ${INSTALL_CMD} "$cmd"
@@ -573,8 +573,8 @@ env_check() {
    fi
    # MacOS support
    if [ "$(uname -s)" = "Darwin" ]; then
-        echo "Detected MacOS, installing sysbench iproute2mac fio..."
-        brew install --force sysbench iproute2mac fio
+        echo "Detected MacOS, installing sysbench iproute2mac..."
+        brew install --force sysbench iproute2mac
    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
@@ -612,7 +612,7 @@ show_help() {
                          sysbench/geekbench (CPU性能测试必需)
                          
                          可选组件:
-                          sudo, tar, unzip, dd, fio
+                          sudo, tar, unzip, dd
                          speedtest (网络测试)
                          ping (网络连通性测试)
                          systemd-detect-virt/dmidecode (系统信息检测)
@@ -641,7 +641,7 @@ Available commands:
                           sysbench/geekbench (Required for CPU testing)
                           
                           Optional components:
-                           sudo, tar, unzip, dd, fio
+                           sudo, tar, unzip, dd
                           speedtest (Network testing)
                           ping (Network connectivity)
                           systemd-detect-virt/dmidecode (System info detection)
--- a/utils/utils.go
+++ b/utils/utils.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"github.com/imroc/req/v3"
 	"github.com/oneclickvirt/UnlockTests/uts"
-	"github.com/oneclickvirt/basics/ipv6"
 	"github.com/oneclickvirt/basics/system"
 	. "github.com/oneclickvirt/defaultset"
 	"github.com/oneclickvirt/security/network"
@@ -114,12 +113,7 @@ func BasicsAndSecurityCheck(language, nt3CheckType string, securtyCheckStatus bo
 		systemInfo = system.CheckSystemInfo(language)
 	}()
 	wgt.Wait()
-	ipv6Info, errv6 := ipv6.GetIPv6Mask(language)
 	basicInfo := systemInfo + ipInfo
-	if errv6 == nil && ipv6Info != "" {
-		basicInfo += ipv6Info
-		basicInfo += "\n"
-	}
 	if strings.Contains(ipInfo, "IPV4") && strings.Contains(ipInfo, "IPV6") {
 		uts.IPV4 = true
 		uts.IPV6 = true
Author	SHA1	Message	Date
spiritsoul	7ae753a4e2	feat: disktest添加原生包含fio的静态编译文件，不再需要额外安装fio依赖	2025-04-02 19:20:31 +08:00
spiritsoul	3956420ffe	fix: 系统基础信息检测合并同功能函数避免重复	2025-04-01 20:40:25 +08:00
spiritsoul	6ebe25af2d	fix: 解决说明歧义	2025-03-31 22:44:10 +08:00
spiritlhl	fe02bd295a	fix: 非版本问题系源问题	2025-03-31 22:36:43 +08:00
spiritlhl	172b520702	fix: 回退alpine系统版本，最新版本不可用存在环境依赖缺失	2025-03-31 22:34:32 +08:00
spiritlhl	d460e2b167	fix: alpine系统依赖更新	2025-03-31 22:32:17 +08:00
spiritsoul	03f5fd9e48	fix: 修复IPV6的prefixNum检测，去除系统本身的修改，增加多系统适配	2025-03-31 22:01:29 +08:00
spiritsoul	0b0972cc3e	feat: 更新主版本	2025-03-30 20:58:03 +08:00
spiritsoul	8273895def	fix: 修复cidr识别	2025-03-30 20:56:54 +08:00
spiritsoul	3e31671502	fix: 修复硬盘的dd测试在fedora上只出现写测试没有读测试的数据，原因系/dev/null和/tmp不可用	2025-03-30 19:03:31 +08:00