From a8366005dc18065d3a2de05261cda1bfc960c8b0 Mon Sep 17 00:00:00 2001 From: spiritsoul <97792170+spiritysdx@users.noreply.github.com> Date: Sun, 23 Feb 2025 11:39:52 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=20Apple=20=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E5=A4=8D=20Instagram=20=E6=A3=80=E6=B5=8B?= =?UTF-8?q?=EF=BC=8C=E5=8E=BB=E9=99=A4=20cip.cc=20=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- go.mod | 2 +- go.sum | 4 ++-- goecs.go | 2 +- utils/utils.go | 45 +++++---------------------------------------- 4 files changed, 9 insertions(+), 44 deletions(-) diff --git a/go.mod b/go.mod index 8ad74ae5..a15cc2db 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.23.4 require ( github.com/imroc/req/v3 v3.49.0 github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502 - github.com/oneclickvirt/UnlockTests v0.0.25-20250204100855 + github.com/oneclickvirt/UnlockTests v0.0.26-20250223032805 github.com/oneclickvirt/backtrace v0.0.4-20240702140722 github.com/oneclickvirt/basics v0.0.9-20250205131258 github.com/oneclickvirt/cputest v0.0.9-20250103063414 diff --git a/go.sum b/go.sum index 091a1bce..4bc15604 100644 --- a/go.sum +++ b/go.sum @@ -103,8 +103,8 @@ github.com/nxtrace/NTrace-core v1.3.7 h1:ZnTbPrPqpyeraCvUyNbQTNyl4Gz3NRQDh06WdII github.com/nxtrace/NTrace-core v1.3.7/go.mod h1:aW2owz9I+W5i+gJEDmnWli75mB+fuO4UTwdOPMcQHpE= github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502 h1:hRIYJ2uEp2N3AH5bP5X6bwfdwWfZQO/2WoqpUJ8+WsY= github.com/oneclickvirt/CommonMediaTests v0.0.4-20240704024502/go.mod h1:DAmFPRjFV5p9fEzUUSml5jJGn2f1NZJQCzTxITHDjc4= -github.com/oneclickvirt/UnlockTests v0.0.25-20250204100855 h1:ZJQJ2fz4vzTE4aiHcvCRFKMb7RwRmaDWk6MZNRtJKg0= -github.com/oneclickvirt/UnlockTests v0.0.25-20250204100855/go.mod h1:yXWIZB6iLS88pEd9m4QJi1GENn+7I91zA72y5ONz2Oc= +github.com/oneclickvirt/UnlockTests v0.0.26-20250223032805 h1:OF5jIg4atL3AEZMBTgX2tX+q5Q8lJ3vV4+EUvjDFIsA= +github.com/oneclickvirt/UnlockTests v0.0.26-20250223032805/go.mod h1:yXWIZB6iLS88pEd9m4QJi1GENn+7I91zA72y5ONz2Oc= github.com/oneclickvirt/backtrace v0.0.4-20240702140722 h1:UJ/VWf+ZbhGarc9HcHMIyenpmX+b2LxkXu0hlLk3Gxs= github.com/oneclickvirt/backtrace v0.0.4-20240702140722/go.mod h1:zvsC7xY/WZqs5KL2JB967OVnuqjNbxu9bW6wXRLo5h8= github.com/oneclickvirt/basics v0.0.9-20250205131258 h1:LytqWIVlzT1ZS/thB8ZXk7tEpoaj+i6pBQBtACziBjc= diff --git a/goecs.go b/goecs.go index f6f53dbc..aee42b07 100644 --- a/goecs.go +++ b/goecs.go @@ -39,7 +39,7 @@ import ( ) var ( - ecsVersion = "v0.1.13" + ecsVersion = "v0.1.14" menuMode bool onlyChinaTest bool input, choice string diff --git a/utils/utils.go b/utils/utils.go index ed87d364..3922581c 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -60,59 +60,24 @@ func CheckChina(enableLogger bool) bool { SetRetryBackoffInterval(1*time.Second, 3*time.Second). SetRetryFixedInterval(2 * time.Second) ipapiURL := "https://ipapi.co/json" - cipccURL := "http://cip.cc" ipapiResp, err := client.R().Get(ipapiURL) - if err != nil { - if enableLogger { - Logger.Info("无法获取IP信息:" + err.Error()) - } - } else { - defer ipapiResp.Body.Close() - var ipapiBody string - ipapiBody, err = ipapiResp.ToString() - if err != nil { - if enableLogger { - Logger.Info("无法读取IP信息响应:" + err.Error()) - } - } else { - isInChina := strings.Contains(ipapiBody, "China") - if isInChina { - fmt.Println("根据ipapi.co提供的信息，当前IP可能在中国") - var input string - fmt.Print("是否选用中国专项测试(无流媒体测试，有三网Ping值测试)? ([y]/n) ") - fmt.Scanln(&input) - switch strings.ToLower(input) { - case "yes", "y": - fmt.Println("使用中国专项测试") - selectChina = true - case "no", "n": - fmt.Println("不使用中国专项测试") - default: - fmt.Println("使用中国专项测试") - selectChina = true - } - return selectChina - } - } - } - cipccResp, err := client.R().Get(cipccURL) if err != nil { if enableLogger { Logger.Info("无法获取IP信息:" + err.Error()) } return false } - defer cipccResp.Body.Close() - cipccBody, err := cipccResp.ToString() + defer ipapiResp.Body.Close() + ipapiBody, err := ipapiResp.ToString() if err != nil { if enableLogger { Logger.Info("无法读取IP信息响应:" + err.Error()) } return false } - isInChina := strings.Contains(cipccBody, "中国") + isInChina := strings.Contains(ipapiBody, "China") if isInChina { - fmt.Println("根据cip.cc提供的信息，当前IP可能在中国") + fmt.Println("根据 ipapi.co 提供的信息，当前IP可能在中国") var input string fmt.Print("是否选用中国专项测试(无流媒体测试，有三网Ping值测试)? ([y]/n) ") fmt.Scanln(&input) @@ -123,7 +88,7 @@ func CheckChina(enableLogger bool) bool { case "no", "n": fmt.Println("不使用中国专项测试") default: - fmt.Println("不使用中国专项测试") + fmt.Println("使用中国专项测试") selectChina = true } }