From 75cc86d2a2262fae5695fc7bbc1914b14364a122 Mon Sep 17 00:00:00 2001 From: tangge233 Date: Fri, 8 Nov 2024 22:09:52 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E8=87=AA=E5=B7=B1=E4=B8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Plain Craft Launcher 2/Controls/MyImage.vb | 4 +++- Plain Craft Launcher 2/Modules/Base/ModNet.vb | 4 ++-- Plain Craft Launcher 2/Modules/ModSecret.vb | 12 ++++-------- 3 files changed, 9 insertions(+), 11 deletions(-) diff --git a/Plain Craft Launcher 2/Controls/MyImage.vb b/Plain Craft Launcher 2/Controls/MyImage.vb index 943dfd0..5329e03 100644 --- a/Plain Craft Launcher 2/Controls/MyImage.vb +++ b/Plain Craft Launcher 2/Controls/MyImage.vb @@ -128,7 +128,9 @@ RetryStart: '下载 ActualSource = LoadingSource '显示加载中图片 TempDownloadingPath = TempPath & RandomInteger(0, 10000000) - NetDownload(Url, TempDownloadingPath, True, False) + Using Client As New System.Net.WebClient + Client.DownloadFile(Url, TempDownloadingPath) + End Using If Url <> Source AndAlso Url <> FallbackSource Then '已经更换了地址 File.Delete(TempDownloadingPath) diff --git a/Plain Craft Launcher 2/Modules/Base/ModNet.vb b/Plain Craft Launcher 2/Modules/Base/ModNet.vb index 7b59375..9dc6705 100644 --- a/Plain Craft Launcher 2/Modules/Base/ModNet.vb +++ b/Plain Craft Launcher 2/Modules/Base/ModNet.vb @@ -252,7 +252,7 @@ RequestFinished: ''' ''' 网络 Url。 ''' 下载的本地地址。 - Public Sub NetDownload(Url As String, LocalFile As String, Optional UseBrowserUserAgent As Boolean = False, Optional AddReferer As Boolean = True) + Public Sub NetDownload(Url As String, LocalFile As String, Optional UseBrowserUserAgent As Boolean = False) Log("[Net] 直接下载文件：" & Url) '初始化 @@ -268,7 +268,7 @@ RequestFinished: '下载 Using Client As New WebClient Try - SecretHeadersSign(Url, Client, UseBrowserUserAgent, AddReferer) + SecretHeadersSign(Url, Client, UseBrowserUserAgent) Client.DownloadFile(Url, LocalFile) Catch ex As Exception File.Delete(LocalFile) diff --git a/Plain Craft Launcher 2/Modules/ModSecret.vb b/Plain Craft Launcher 2/Modules/ModSecret.vb index c00b32f..f5c2c24 100644 --- a/Plain Craft Launcher 2/Modules/ModSecret.vb +++ b/Plain Craft Launcher 2/Modules/ModSecret.vb @@ -100,7 +100,7 @@ Friend Module ModSecret ''' ''' 设置 Headers 的 UA、Referer。 ''' - Friend Sub SecretHeadersSign(Url As String, ByRef Client As WebClient, Optional UseBrowserUserAgent As Boolean = False, Optional AddReferer As Boolean = True) + Friend Sub SecretHeadersSign(Url As String, ByRef Client As WebClient, Optional UseBrowserUserAgent As Boolean = False) If Url.Contains("baidupcs.com") OrElse Url.Contains("baidu.com") Then Client.Headers("User-Agent") = "LogStatistic" '#4951 ElseIf UseBrowserUserAgent Then @@ -108,9 +108,7 @@ Friend Module ModSecret Else Client.Headers("User-Agent") = "PCL2/" & VersionStandardCode End If - If AddReferer Then - Client.Headers("Referer") = "http://" & VersionCode & ".pcl2.open.server/" - End If + Client.Headers("Referer") = "http://" & VersionCode & ".pcl2.open.server/" If Url.Contains("api.curseforge") Then Client.Headers("x-api-key") = CurseForgeAPIKey End If @@ -118,7 +116,7 @@ Friend Module ModSecret ''' ''' 设置 Headers 的 UA、Referer。 ''' - Friend Sub SecretHeadersSign(Url As String, ByRef Request As HttpWebRequest, Optional UseBrowserUserAgent As Boolean = False, Optional AddReferer As Boolean = True) + Friend Sub SecretHeadersSign(Url As String, ByRef Request As HttpWebRequest, Optional UseBrowserUserAgent As Boolean = False) If Url.Contains("baidupcs.com") OrElse Url.Contains("baidu.com") Then Request.UserAgent = "LogStatistic" '#4951 ElseIf UseBrowserUserAgent Then @@ -126,9 +124,7 @@ Friend Module ModSecret Else Request.UserAgent = "PCL2/" & VersionStandardCode End If - If AddReferer Then - Request.Referer = "http://" & VersionCode & ".pcl2.open.server/" - End If + Request.Referer = "http://" & VersionCode & ".pcl2.open.server/" If Url.Contains("api.curseforge") Then Request.Headers("x-api-key") = CurseForgeAPIKey End If