diff --git a/README.md b/README.md index 56621a1..f26047a 100644 --- a/README.md +++ b/README.md @@ -55,7 +55,6 @@ Shell 版本:[https://github.com/spiritLHLS/ecs](https://github.com/spiritLHLS - CPU 测试:[cputest](https://github.com/oneclickvirt/cputest),支持 sysbench(lua/golang版本)、geekbench、winsat - 内存测试:[memorytest](https://github.com/oneclickvirt/memorytest),支持 sysbench、dd、winsat、mbw、stream - 硬盘测试:[disktest](https://github.com/oneclickvirt/disktest),支持 dd、fio、winsat -- 流媒体解锁信息并发查询:[netflix-verify](https://github.com/sjlleo/netflix-verify) 等逻辑,开发至 [CommonMediaTests](https://github.com/oneclickvirt/CommonMediaTests) - 常见流媒体测试并发查询:[UnlockTests](https://github.com/oneclickvirt/UnlockTests),逻辑借鉴 [RegionRestrictionCheck](https://github.com/lmc999/RegionRestrictionCheck) 等 - IP 质量/安全信息并发查询:二进制文件编译至 [securityCheck](https://github.com/oneclickvirt/securityCheck) - 邮件端口测试:[portchecker](https://github.com/oneclickvirt/portchecker) diff --git a/README_EN.md b/README_EN.md index ff716cc..734792e 100644 --- a/README_EN.md +++ b/README_EN.md @@ -55,7 +55,6 @@ Shell version: [https://github.com/spiritLHLS/ecs/blob/main/README_EN.md](https: - CPU test: Self-developed [cputest](https://github.com/oneclickvirt/cputest) supporting sysbench(lua/golang version), geekbench, winsat - Memory test: Self-developed [memorytest](https://github.com/oneclickvirt/memorytest) supporting sysbench, dd, winsat, mbw, stream - Disk test: Self-developed [disktest](https://github.com/oneclickvirt/disktest) supporting dd, fio, winsat -- Streaming media unlock information concurrent query: Modified from [netflix-verify](https://github.com/sjlleo/netflix-verify) and more to [CommonMediaTests](https://github.com/oneclickvirt/CommonMediaTests) - Common streaming media tests concurrent query: Self-developed to [UnlockTests](https://github.com/oneclickvirt/UnlockTests), logic modified from [RegionRestrictionCheck](https://github.com/lmc999/RegionRestrictionCheck) and others - IP quality/security information concurrent query: Self-developed, binary files compiled in [securityCheck](https://github.com/oneclickvirt/securityCheck) - Email port test: Self-developed [portchecker](https://github.com/oneclickvirt/portchecker) diff --git a/README_NEW_USER.md b/README_NEW_USER.md index 39e190d..d5e4089 100644 --- a/README_NEW_USER.md +++ b/README_NEW_USER.md @@ -220,7 +220,7 @@ AMD的7950x单核满血性能得分在6500左右,AMD的5950x单核满血性能 ### **流媒体解锁** -依赖项目:[https://github.com/oneclickvirt/CommonMediaTests](https://github.com/oneclickvirt/CommonMediaTests) [https://github.com/oneclickvirt/UnlockTests](https://github.com/oneclickvirt/UnlockTests) +依赖项目:[https://github.com/oneclickvirt/UnlockTests](https://github.com/oneclickvirt/UnlockTests) 默认只检测跨国流媒体解锁。 @@ -660,7 +660,7 @@ Note: This tests real IO, limited to this project. IO tests from other projects ### Streaming Media Unlocking -Dependency project: [https://github.com/oneclickvirt/CommonMediaTests](https://github.com/oneclickvirt/CommonMediaTests) [https://github.com/oneclickvirt/UnlockTests](https://github.com/oneclickvirt/UnlockTests) +Dependency project: [https://github.com/oneclickvirt/UnlockTests](https://github.com/oneclickvirt/UnlockTests) Default only checks cross-border streaming media unlocking. @@ -994,7 +994,7 @@ NVMe SSDの1M (IOPS)値 < 1GB/s の場合、深刻なリソースオーバーセ ### ストリーミングメディアロック解除 -依存プロジェクト:[https://github.com/oneclickvirt/CommonMediaTests](https://github.com/oneclickvirt/CommonMediaTests) [https://github.com/lmc999/RegionRestrictionCheck](https://github.com/lmc999/RegionRestrictionCheck) +依存プロジェクト:[https://github.com/oneclickvirt/UnlockTests](https://github.com/oneclickvirt/UnlockTests) デフォルトでは国境を越えるストリーミングメディアのロック解除のみをチェックします。 diff --git a/go.mod b/go.mod index daf8c96..e5de233 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.25.3 require ( github.com/imroc/req/v3 v3.54.0 - github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841 github.com/oneclickvirt/UnlockTests v0.0.30-20251109035206 github.com/oneclickvirt/backtrace v0.0.8-20251102140847 github.com/oneclickvirt/basics v0.0.16-20251030093657 diff --git a/go.sum b/go.sum index 7539c8d..57e1859 100644 --- a/go.sum +++ b/go.sum @@ -94,8 +94,6 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= github.com/nxtrace/NTrace-core v1.4.3-rc.1 h1:V19tkw3kKAMQOOh7Ibb/jZFBk4kMUfQYmpxxtsOfYWo= github.com/nxtrace/NTrace-core v1.4.3-rc.1/go.mod h1:lGhfZ916pEUJh+VzWZTYu7bKBo06pAn+/gXb0A/7gGg= -github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841 h1:Zef93z9UiZQwRAKnnZYALmpBKvvuVaq34MEsuWwk6nc= -github.com/oneclickvirt/CommonMediaTests v0.0.4-20250329123841/go.mod h1:DAmFPRjFV5p9fEzUUSml5jJGn2f1NZJQCzTxITHDjc4= github.com/oneclickvirt/UnlockTests v0.0.30-20251109035206 h1:c5mUPst0P0K54N5bNbNdme8C2wajSCJxZ/5+p42s7ZY= github.com/oneclickvirt/UnlockTests v0.0.30-20251109035206/go.mod h1:oOa6wj/qECtRMxwBO6D7o0L0F0Q/5sQ747OCnFQqoGE= github.com/oneclickvirt/backtrace v0.0.8-20251102140847 h1:OiwD06+Mql3pYP8jJFFdP3OUlCrx/qJT7y2YCd/OMiI= diff --git a/goecs.go b/goecs.go index 9644f48..3775e47 100644 --- a/goecs.go +++ b/goecs.go @@ -10,7 +10,6 @@ import ( "syscall" "time" - "github.com/oneclickvirt/CommonMediaTests/commediatests" unlocktestmodel "github.com/oneclickvirt/UnlockTests/model" backtracemodel "github.com/oneclickvirt/backtrace/model" basicmodel "github.com/oneclickvirt/basics/model" @@ -40,7 +39,6 @@ func initLogger() { cputestmodel.EnableLoger = true memorytestmodel.EnableLoger = true disktestmodel.EnableLoger = true - commediatests.EnableLoger = true unlocktestmodel.EnableLoger = true ptmodel.EnableLoger = true backtracemodel.EnableLoger = true diff --git a/internal/menu/menu.go b/internal/menu/menu.go index 72db38d..d4e2d10 100644 --- a/internal/menu/menu.go +++ b/internal/menu/menu.go @@ -167,7 +167,6 @@ func HandleMenuMode(preCheck utils.NetCheckResult, config *params.Config) { config.CpuTestStatus = false config.MemoryTestStatus = false config.DiskTestStatus = false - config.CommTestStatus = false config.UtTestStatus = false config.SecurityTestStatus = false config.EmailTestStatus = false @@ -246,7 +245,6 @@ func SetFullTestStatus(preCheck utils.NetCheckResult, config *params.Config) { config.MemoryTestStatus = true config.DiskTestStatus = true if preCheck.Connected { - config.CommTestStatus = true config.UtTestStatus = true config.SecurityTestStatus = true config.EmailTestStatus = true @@ -302,7 +300,6 @@ func SetUnlockFocusedTestStatus(preCheck utils.NetCheckResult, config *params.Co config.MemoryTestStatus = true config.DiskTestStatus = true if preCheck.Connected { - config.CommTestStatus = true config.UtTestStatus = true config.SpeedTestStatus = true } @@ -323,7 +320,6 @@ func SetNetworkOnlyTestStatus(config *params.Config) { // SetUnlockOnlyTestStatus sets unlock-only test configuration func SetUnlockOnlyTestStatus(config *params.Config) { config.OnlyIpInfoCheck = true - config.CommTestStatus = true config.UtTestStatus = true } diff --git a/internal/params/params.go b/internal/params/params.go index 363d34d..511d052 100644 --- a/internal/params/params.go +++ b/internal/params/params.go @@ -29,7 +29,6 @@ type Config struct { CpuTestStatus bool MemoryTestStatus bool DiskTestStatus bool - CommTestStatus bool UtTestStatus bool SecurityTestStatus bool EmailTestStatus bool @@ -65,7 +64,6 @@ func NewConfig(version string) *Config { CpuTestStatus: true, MemoryTestStatus: true, DiskTestStatus: true, - CommTestStatus: true, UtTestStatus: true, SecurityTestStatus: true, EmailTestStatus: true, @@ -94,7 +92,6 @@ func (c *Config) ParseFlags(args []string) { c.GoecsFlag.BoolVar(&c.CpuTestStatus, "cpu", true, "Enable/Disable CPU test") c.GoecsFlag.BoolVar(&c.MemoryTestStatus, "memory", true, "Enable/Disable memory test") c.GoecsFlag.BoolVar(&c.DiskTestStatus, "disk", true, "Enable/Disable disk test") - c.GoecsFlag.BoolVar(&c.CommTestStatus, "comm", true, "Enable/Disable common media test") c.GoecsFlag.BoolVar(&c.UtTestStatus, "ut", true, "Enable/Disable unlock media test") c.GoecsFlag.BoolVar(&c.SecurityTestStatus, "security", true, "Enable/Disable security test") c.GoecsFlag.BoolVar(&c.EmailTestStatus, "email", true, "Enable/Disable email port test") @@ -152,9 +149,6 @@ func (c *Config) SaveUserSetParams() map[string]interface{} { if c.UserSetFlags["disk"] { saved["disk"] = c.DiskTestStatus } - if c.UserSetFlags["comm"] { - saved["comm"] = c.CommTestStatus - } if c.UserSetFlags["ut"] { saved["ut"] = c.UtTestStatus } @@ -227,9 +221,6 @@ func (c *Config) RestoreUserSetParams(saved map[string]interface{}) { if val, ok := saved["disk"]; ok { c.DiskTestStatus = val.(bool) } - if val, ok := saved["comm"]; ok { - c.CommTestStatus = val.(bool) - } if val, ok := saved["ut"]; ok { c.UtTestStatus = val.(bool) } diff --git a/internal/runner/runner.go b/internal/runner/runner.go index 7f0d2d0..90af4aa 100644 --- a/internal/runner/runner.go +++ b/internal/runner/runner.go @@ -9,7 +9,6 @@ import ( "sync" "time" - "github.com/oneclickvirt/CommonMediaTests/commediatests" "github.com/oneclickvirt/ecs/internal/params" "github.com/oneclickvirt/ecs/internal/tests" "github.com/oneclickvirt/ecs/utils" @@ -223,12 +222,6 @@ func RunStreamingTests(config *params.Config, wg1 *sync.WaitGroup, mediaInfo *st outputMutex.Lock() defer outputMutex.Unlock() return utils.PrintAndCapture(func() { - if config.Language == "zh" { - if config.CommTestStatus && !config.OnlyChinaTest { - utils.PrintCenteredTitle("御三家流媒体解锁", config.Width) - fmt.Printf("%s", commediatests.MediaTests(config.Language)) - } - } if config.UtTestStatus && (config.Language == "zh" && !config.OnlyChinaTest || config.Language == "en") { wg1.Wait() if config.Language == "zh" {