fix: 系统基础信息检测合并同功能函数避免重复

.github/workflows/public-build.yml

@@ -28,9 +28,8 @@ jobs:
       run: |
         # 移除 network 包中对 security 的引用
         find . -type f -name "*.go" -exec sed -i 's|"github.com/oneclickvirt/security/network"|"github.com/oneclickvirt/basics/network"|g' {} +
-        
+        # 修改 back/network/network.go
-        # 修改 network/network.go
+        cat > back/network/network.go << 'EOF'
-        cat > network/network.go << 'EOF'
         package network1
 
         import "github.com/oneclickvirt/basics/network"
@@ -77,4 +76,4 @@ jobs:
       run: |
         git add .
         git commit -m "Auto update public version (no security package)" || echo "No changes to commit"
-        git push -f origin public
+        git push -f origin public

Dockerfile

@@ -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"]

README.md

@@ -68,7 +68,7 @@ Shell 版本：[https://github.com/spiritLHLS/ecs](https://github.com/spiritLHLS
 
 #### **一键命令**
 
-将默认安装依赖，默认更新包管理器，默认非互动模式，下面的非一键命令版本可控制是否安装依赖/是否更新包管理器/默认互动模式
+将默认安装依赖，默认更新包管理器，默认非互动模式，下面的**详细说明中的命令可控制是否安装依赖/是否更新包管理器/默认互动模式**
 
 - **国际用户无加速：**
 

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:**
 

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-20250329123504
+	github.com/oneclickvirt/basics v0.0.11-20250401121437
 	github.com/oneclickvirt/cputest v0.0.10-20250329130006
 	github.com/oneclickvirt/defaultset v0.0.2-20240624082446
-	github.com/oneclickvirt/disktest v0.0.5-20250329125941
+	github.com/oneclickvirt/disktest v0.0.5-20250330105204
 	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-20250329124855
+	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

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-20250329123504 h1:zSPz6HMm5I4X1VLbxrpPppOEvhXJJiZ5oPuMKvi+MGs=
+github.com/oneclickvirt/basics v0.0.11-20250401121437 h1:Tdj5y9Y3kbfYebbWe+OTWMJKKSuKlitRZArpBXWVoU0=
-github.com/oneclickvirt/basics v0.0.11-20250329123504/go.mod h1:yN1IEOXN6v/GJqJSA70Pooo6nXBI/6rq72vTY72wJMQ=
+github.com/oneclickvirt/basics v0.0.11-20250401121437/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/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-20250330105204 h1:FBCqQ1oSaOi8K1Xr3T2S1y6OZtdkUxB1NAGmV+lpMFk=
-github.com/oneclickvirt/disktest v0.0.5-20250329125941/go.mod h1:wIZy8G6Mbcy8Op8tc0HmJNpbJQQ5A15fvnUqMJXIdO0=
+github.com/oneclickvirt/disktest v0.0.5-20250330105204/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-20250329124855 h1:LTH4Eg0XpfcY4PUAOuxYNbC9/PL7xNULtuMLE4WIw88=
+github.com/oneclickvirt/security v0.0.4-20250401123241 h1:myeAQ1wOKIHx5r9qs9dCwx/5FepY+hZu/fDNquMwKaw=
-github.com/oneclickvirt/security v0.0.4-20250329124855/go.mod h1:384ZpNE3H6T6rtl0QhA4eQn8xGw7tc0rLD8ZH47qNGc=
+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=

goecs.go

@@ -39,7 +39,7 @@ import (
 )
 
 var (
-	ecsVersion                                                        = "v0.1.21"
+	ecsVersion                                                        = "v0.1.25"
 	menuMode                                                          bool
 	onlyChinaTest                                                     bool
 	input, choice                                                     string

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.21"
+        _yellow "Unable to get version info, using default version 0.1.25"
-        ECS_VERSION="0.1.21"
+        ECS_VERSION="0.1.25"
     fi
     # Check if original goecs command exists
     version_output=""

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