diff --git a/go.mod b/go.mod index 076f6e3b..05064580 100644 --- a/go.mod +++ b/go.mod @@ -11,7 +11,7 @@ require ( github.com/oneclickvirt/defaultset v0.0.2-20240624082446 github.com/oneclickvirt/disktest v0.0.3-20240629152513 github.com/oneclickvirt/memorytest v0.0.1-20240624151629 - github.com/oneclickvirt/nt3 v0.0.1-20240627070009 + github.com/oneclickvirt/nt3 v0.0.1-20240630131017 github.com/oneclickvirt/portchecker v0.0.1-20240624155429 github.com/oneclickvirt/security v0.0.1-20240630101628 github.com/oneclickvirt/speedtest v0.0.6-20240630114816 diff --git a/go.sum b/go.sum index 066c4e93..9deea64e 100644 --- a/go.sum +++ b/go.sum @@ -111,6 +111,8 @@ github.com/oneclickvirt/memorytest v0.0.1-20240624151629 h1:2rJAB3gFGlFPocIb/WRV github.com/oneclickvirt/memorytest v0.0.1-20240624151629/go.mod h1:+YNzy+NeVg61d0kNwSyVDqHyVtKzjuRe1NvMzsDLg0I= github.com/oneclickvirt/nt3 v0.0.1-20240627070009 h1:020pqkdGDnkIIpyNbbS1sjG1uIl3GgjeNgVqJzAw0ng= github.com/oneclickvirt/nt3 v0.0.1-20240627070009/go.mod h1:Vb724PgpP17W09mLw5I2UZZAuYbY8WwGlKZdxRDFr0Y= +github.com/oneclickvirt/nt3 v0.0.1-20240630131017 h1:L9PkTk8ij7J/aN6WZ4VPRc6hALfre/HyHnHj1vVNAZw= +github.com/oneclickvirt/nt3 v0.0.1-20240630131017/go.mod h1:Vb724PgpP17W09mLw5I2UZZAuYbY8WwGlKZdxRDFr0Y= 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.1-20240625075931 h1:Vj1Wq/JVcqYpfqUWRtsITbz3zM4HxnLC0iPxxA6akP0= diff --git a/goecs.txt b/goecs.txt deleted file mode 100644 index 1b0a164e..00000000 --- a/goecs.txt +++ /dev/null @@ -1,108 +0,0 @@ ----------------------------------------融合怪测试---------------------------------------- -版本：2024.06.30 -测评频道: https://t.me/vps_reviews -Go项目地址：https://github.com/oneclickvirt/ecs -Shell项目地址：https://github.com/spiritLHLS/ecs -----------------------------------------基础信息---------------------------------------- - CPU 型号 : AMD Ryzen 7 4700U with Radeon Graphics - CPU 数量 : 8 Physical CPU(s) - CPU 缓存 : L1: null / L2: 4.00 MB / L3: 8.00 MB - VM-x/AMD-V/Hyper-V : ❌ Disabled - 内存 : 10.90 GB / 15.37 GB - Swap : 16.23 GB / 22.12 GB - 硬盘空间 : 213.82 GB / 475.67 GB - 启动盘路径 : C: - 系统 : Microsoft Windows 11 Enterprise 10.0.22631 Build 22631 [x86_64] - 系统在线时间 : 5 days, 02 hours, 41 minutes - 时区 : (UTC+08:00) 北京，重庆，香港特别行政区，乌鲁木齐 - 负载 : 0.50 / 0.00 / 0.00 - 虚拟化架构 : Physical-Machine(Multiprocessor Free) - NAT类型 : Symmetric - IPV4 ASN : AS4538 China Education and Research Network Center - IPV4 Location : Guangzhou / Guangdong / China - IPV6 ASN : AS24357 CERNET2 IX at South China University of Technology - IPV6 Location : Guangzhou / Guangdong / China ----------------------------------CPU测试-通过sysbench测试--------------------------------- -Detected host is Windows, using Winsat for testing. -CPU AES256 加密: 7421.91MB/s -CPU LZW 压缩: 664.76MB/s ----------------------------------内存测试-通过sysbench测试---------------------------------- -Detected host is Windows, using Winsat for testing. -内存性能: 31643.60MB/s -------------------------------------硬盘测试-通过fio测试------------------------------------ -测试的硬盘 随机写入[得分] 顺序读取[得分] 顺序写入[得分] -C: 202.43 MB/s[7.8] 2212.48 MB/s[9.1] 1709.12 MB/s[8.9] ---------------------------------------御三家流媒体解锁-------------------------------------- -----------------Netflix----------------- -[IPV4] -Netflix在您的出口IP所在的国家不提供服务 -[IPV6] -您的网络可能没有正常配置IPv6，或者没有IPv6网络接入 -----------------Youtube----------------- -[IPV4] -Youtube在您的出口IP所在的国家不提供服务 -[IPV6] -Youtube在您的出口IP所在的国家不提供服务 ----------------DisneyPlus--------------- -[IPV4] -当前IPv4出口所在地区即将开通DisneyPlus -[IPV6] -DisneyPlus在您的出口IP所在的国家不提供服务 ---------------------------------------跨国流媒体解锁--------------------------------------- -IPV4: -============[ 跨国平台 ]============ -Dazn NO (UNSUPPORTED_COUNTRY) -Disney+ NO (Can not get assertion) -Netflix Banned -Netflix CDN NO (IP Banned By Netflix) -YouTube Region NO (Network Err) -YouTube CDN NO (Network Err) -Amazon Prime Video NO (Region: CN) -Paramount+ YES [Via DNS] -TVBAnywhere+ NO -IQiYi YES (Region: CN) [Via DNS] -Viu.com YES [Via DNS] -Spotify Registration NO -Steam Store YES (Community Unavailable) (Region: CN) -ChatGPT NO -Wikipedia Editability NO (Network Err) -TikTok NO (Network Err) -Bing Region YES (Only cn.bing.com) (Region: CN) -Instagram Licensed Audio NO (Network Err) -KOCOWA NO -SonyLiv NO -OneTrust YES (Region: CN GUANGDONG) [Via DNS] -GoogleSearch NO (Network Err) ----------------------------------------IP质量检测--------------------------------------- ----------------------------------------邮件端口检测--------------------------------------- -Platform SMTP SMTPS POP3 POP3S IMAP IMAPS -LocalPort ✔ ✔ ✔ ✔ ✔ ✔ -QQ ✔ ✔ ✔ ✘ ✔ ✘ -163 ✔ ✔ ✔ ✘ ✔ ✘ -Sohu ✔ ✔ ✘ ✘ ✔ ✘ -Yandex ✔ ✔ ✔ ✘ ✔ ✘ -Gmail ✘ ✘ ✘ ✘ ✘ ✘ -Outlook ✔ ✘ ✔ ✘ ✔ ✘ -Office365 ✔ ✘ ✔ ✘ ✔ ✘ -Yahoo ✔ ✔ ✘ ✘ ✘ ✘ -MailCOM ✔ ✔ ✔ ✘ ✔ ✘ -MailRU ✔ ✔ ✘ ✘ ✔ ✘ -AOL ✔ ✔ ✘ ✘ ✘ ✘ -GMX ✔ ✘ ✔ ✘ ✔ ✘ -Sina ✔ ✘ ✔ ✘ ✔ ✘ ----------------------------------------就近节点测速--------------------------------------- -位置 上传速度 下载速度 延迟 丢包率 -Speedtest.net 4.32 Mbps 3.54 Mbps 12.205264ms 0.00% (Sent: 402/Dup: 0/Max: 401) -新加坡 18.50 Mbps 23.82 Mbps 51.944512ms N/A -洛杉矶 19.51 Mbps 8.51 Mbps 184.661804ms N/A -日本东京 1.47 Mbps 24.63 Mbps 201.89396ms N/A -法兰克福 19.22 Mbps 23.59 Mbps 245.545712ms N/A -联通Wu Xi -0.00 Mbps -0.00 Mbps 1s N/A -电信合肥5G 19.00 Mbps 24.51 Mbps 24.894272ms N/A -电信浙江 18.60 Mbps 23.93 Mbps 25.354408ms N/A -移动杭州5G 0.08 Mbps 23.74 Mbps 29.578304ms N/A -移动Beijing 18.70 Mbps 23.71 Mbps 40.95098ms N/A ------------------------------------------------------------------------------------- -花费 : 7 分 53 秒 -时间 : Sun Jun 30 20:47:15 CST 2024 ------------------------------------------------------------------------------------- diff --git a/utils/utils.go b/utils/utils.go index e84f998f..824ef02d 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -139,8 +139,7 @@ func CaptureOutput(f func()) string { <-done <-done // 返回捕获的输出字符串 - // stderrBuf.String() - return stdoutBuf.String() + return stdoutBuf.String() + stderrBuf.String() } // PrintAndCapture 捕获函数输出的同时打印内容