diff --git a/basics b/basics new file mode 100755 index 0000000..15559c3 Binary files /dev/null and b/basics differ diff --git a/go.mod b/go.mod index 8ffdcbd..770491e 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,7 @@ require ( github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841 github.com/oneclickvirt/UnlockTests v0.0.27-20250628125053 github.com/oneclickvirt/backtrace v0.0.5-20250629024536 - github.com/oneclickvirt/basics v0.0.15-20250726093106 + github.com/oneclickvirt/basics v0.0.15-20250727020910 github.com/oneclickvirt/cputest v0.0.12-20250720122317 github.com/oneclickvirt/defaultset v0.0.2-20240624082446 github.com/oneclickvirt/disktest v0.0.8-20250701092629 diff --git a/go.sum b/go.sum index 2714b6f..96d038c 100644 --- a/go.sum +++ b/go.sum @@ -103,8 +103,8 @@ github.com/oneclickvirt/UnlockTests v0.0.27-20250628125053 h1:Ug8kySZR1weRUcsnGO github.com/oneclickvirt/UnlockTests v0.0.27-20250628125053/go.mod h1:yXWIZB6iLS88pEd9m4QJi1GENn+7I91zA72y5ONz2Oc= github.com/oneclickvirt/backtrace v0.0.5-20250629024536 h1:caHCa0DHmbYWBFN1bqKxpvPnN0wOxDEqJv1VDvDdLWs= github.com/oneclickvirt/backtrace v0.0.5-20250629024536/go.mod h1:5AH00bo41hH3d2/JVuCTlBkZUs3AXX4nlKVXb6piZcI= -github.com/oneclickvirt/basics v0.0.15-20250726093106 h1:FXCBa3xJLf0eotMoOghEEicRjsHuWFn4AePDt3NBpls= -github.com/oneclickvirt/basics v0.0.15-20250726093106/go.mod h1:vAUF4VBvMUf1Uy4DBMa2Zim3x4BUN1KYzqTuec2O53I= +github.com/oneclickvirt/basics v0.0.15-20250727020910 h1:mDHQVjRvVGcz0YEABlFvDm+B++Zx1qAEMueMXLMVGUw= +github.com/oneclickvirt/basics v0.0.15-20250727020910/go.mod h1:vAUF4VBvMUf1Uy4DBMa2Zim3x4BUN1KYzqTuec2O53I= github.com/oneclickvirt/cputest v0.0.12-20250720122317 h1:toiwAK1hZE5b8klu2mOQ7J4sv5yV9lpPKwgPahfRYBQ= github.com/oneclickvirt/cputest v0.0.12-20250720122317/go.mod h1:vjlH8tkPFft1tlLOpeNskXVvurxkHaJ3+dgFxQGLXY4= github.com/oneclickvirt/dd v0.0.2-20250701085922 h1:WiWZwcnCPhRc8hLZdvkjD2kOEpnqn1S31z1j0x3V4l0= diff --git a/goecs.go b/goecs.go index 035125d..255852b 100644 --- a/goecs.go +++ b/goecs.go @@ -17,6 +17,7 @@ import ( "github.com/oneclickvirt/CommonMediaTests/commediatests" unlocktestmodel "github.com/oneclickvirt/UnlockTests/model" + "github.com/oneclickvirt/UnlockTests/uts" backtrace "github.com/oneclickvirt/backtrace/bk" backtracemodel "github.com/oneclickvirt/backtrace/model" basicmodel "github.com/oneclickvirt/basics/model" @@ -39,7 +40,7 @@ import ( ) var ( - ecsVersion = "v0.1.69" + ecsVersion = "v0.1.70" menuMode bool onlyChinaTest bool input, choice string @@ -691,7 +692,7 @@ func runNetworkTests(wg3 *sync.WaitGroup, ptInfo *string, output, tempOutput str output = utils.PrintAndCapture(func() { if backtraceStatus && !onlyChinaTest { utils.PrintCenteredTitle("三网回程线路检测", width) - if strings.Contains(output, "IPV6") { + if uts.IPV6 { backtrace.BackTrace(true) } else { backtrace.BackTrace(false) diff --git a/utils/utils.go b/utils/utils.go index 9bd660c..0366b49 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -19,6 +19,7 @@ import ( "github.com/imroc/req/v3" "github.com/oneclickvirt/UnlockTests/uts" "github.com/oneclickvirt/basics/system" + butils "github.com/oneclickvirt/basics/utils" . "github.com/oneclickvirt/defaultset" "github.com/oneclickvirt/security/network" ) @@ -483,6 +484,7 @@ result: stack = "IPv6" } StackType = stack + butils.CheckPublicAccess(3 * time.Second) // 设置basics检测,避免部分测试未启用 return NetCheckResult{ HasIPv4: hasV4, HasIPv6: hasV6, diff --git a/utils/utils_test.go b/utils/utils_test.go index 5add1fe..06fa341 100644 --- a/utils/utils_test.go +++ b/utils/utils_test.go @@ -6,7 +6,17 @@ import ( "time" ) -func TestCheckPublicAccess(t *testing.T) { +// func TestCheckPublicAccess(t *testing.T) { +// timeout := 3 * time.Second +// result := CheckPublicAccess(timeout) +// if result.Connected { +// fmt.Printf("✅ 本机有公网连接,类型: %s\n", result.StackType) +// } else { +// fmt.Println("❌ 本机未检测到公网连接") +// } +// } + +func TestBasicsAndSecurityCheck(t *testing.T) { timeout := 3 * time.Second result := CheckPublicAccess(timeout) if result.Connected { @@ -14,4 +24,8 @@ func TestCheckPublicAccess(t *testing.T) { } else { fmt.Println("❌ 本机未检测到公网连接") } + basicInfo, securityInfo, nt3CheckType := BasicsAndSecurityCheck("zh", "ipv4", false) + fmt.Println(basicInfo) + fmt.Println(securityInfo) + fmt.Println(nt3CheckType) }