From cb69b31b1cabc3bf01c3e7f1753bbdbe44f58871 Mon Sep 17 00:00:00 2001 From: SALTWOOD <105980161+SALTWOOD@users.noreply.github.com> Date: Tue, 17 Sep 2024 16:46:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E9=87=8D=E5=AE=9A=E5=90=91=E8=AE=B0?= =?UTF-8?q?=E5=BD=95=E6=B2=A1=E6=9C=89=E8=AE=B0=E5=BD=95=E5=88=9D=E5=A7=8B?= =?UTF-8?q?=20URL=20feat:=20=E5=9C=A8=E8=A6=86=E5=86=99=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E7=BA=BF=E7=A8=8B=E6=95=B0=E6=97=B6=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CSharp-OpenBMCLAPI/Modules/Cluster.cs | 7 +++++++ CSharp-OpenBMCLAPI/Modules/HttpRequest.cs | 3 ++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/CSharp-OpenBMCLAPI/Modules/Cluster.cs b/CSharp-OpenBMCLAPI/Modules/Cluster.cs index 819fa59..011109e 100644 --- a/CSharp-OpenBMCLAPI/Modules/Cluster.cs +++ b/CSharp-OpenBMCLAPI/Modules/Cluster.cs @@ -434,6 +434,12 @@ protected async Task CheckFiles(bool skipCheck, FileVerificationMode mode) this.files = updatedFiles; } + if (this.Configuration.Sync.Concurrency < requiredData.maxThreadCount) + { + Logger.Instance.LogWarn($"WARNING: 同步策略的线程数小于下载文件线程数，强制覆写线程数为 {requiredData.maxThreadCount}"); + Logger.Instance.LogWarn($"WARNING: 覆写同步线程数为开发测试功能，无必要请勿使用！"); + } + Console.WriteLine($"总文件大小：{Utils.GetLength(this.files.Sum(f => f.size))}，总文件数：{this.files.Count}"); object countLock = new(); @@ -650,6 +656,7 @@ internal async Task FetchFileFromCenter(string hash, bool force = false) internal (HttpResponseMessage?, List, Exception?) GetRedirectUrls(string url) { var redirectUrls = new List(); + redirectUrls.Add(url); HttpResponseMessage? response = null; HttpClient requestClient = new HttpClient(new HttpClientHandler { diff --git a/CSharp-OpenBMCLAPI/Modules/HttpRequest.cs b/CSharp-OpenBMCLAPI/Modules/HttpRequest.cs index 6bf4057..2936e56 100644 --- a/CSharp-OpenBMCLAPI/Modules/HttpRequest.cs +++ b/CSharp-OpenBMCLAPI/Modules/HttpRequest.cs @@ -14,7 +14,8 @@ static HttpRequest() BaseAddress = new Uri(ClusterRequiredData.Config.CenterServerAddress) }; // 添加UserAgent，用于标识请求来源 - string ua = $"openbmclapi-cluster/{ClusterRequiredData.Config.clusterVersion} (CSharp-OpenBMCLAPI; .NET runtime v{Environment.Version}; {Environment.OSVersion}, {System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture}; {System.Globalization.CultureInfo.InstalledUICulture.Name})"; + //string ua = $"openbmclapi-cluster/{ClusterRequiredData.Config.clusterVersion} (CSharp-OpenBMCLAPI; .NET runtime v{Environment.Version}; {Environment.OSVersion}, {System.Runtime.InteropServices.RuntimeInformation.ProcessArchitecture}; {System.Globalization.CultureInfo.InstalledUICulture.Name})"; + string ua = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/128.0.0.0 Safari/537.36 Edg/128.0.0.0"; client.DefaultRequestHeaders.Add("User-Agent", ua); Console.WriteLine($"User-Agent: {ua}"); }