From 3b48344946e6d71d2c303acfab784fd854be7ba2 Mon Sep 17 00:00:00 2001 From: Space Time Date: Mon, 21 Oct 2024 12:00:26 +0800 Subject: [PATCH] =?UTF-8?q?1.1.2=20->=201.1.3=20=E7=AC=AC20=E6=AC=A1?= =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Wins/MainWin.xaml.cs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Wins/MainWin.xaml.cs b/Wins/MainWin.xaml.cs index b89bcf6..ca298f2 100644 --- a/Wins/MainWin.xaml.cs +++ b/Wins/MainWin.xaml.cs @@ -7,6 +7,7 @@ using System.Net.Sockets; using System.Security.Cryptography; using System.Security.Cryptography.X509Certificates; +using System.Text; using System.Text.Json; using System.Threading.Tasks; using System.Windows; @@ -371,16 +372,17 @@ private void EditConfButton_Click(object sender, RoutedEventArgs e) } private async void UpdateUpstreamHostButton_Click(object sender, RoutedEventArgs e) { - string upstreamUpstreamHostUrl = (MainPres!.UpstreamUrl.StartsWith("http://") || MainPres.UpstreamUrl.StartsWith("https://") ? string.Empty : "https://") + MainPres.UpstreamUrl; - string upstreamUpstreamHostString = await Http.GetAsync(upstreamUpstreamHostUrl, MainClient); - string localUpstreamHostString; - if (!File.Exists(MainConst.UpstreamHostPath)) File.Create(MainConst.UpstreamHostPath).Dispose(); - localUpstreamHostString = File.ReadAllText(MainConst.UpstreamHostPath); + string upstreamUpstreamHostUrl = (MainPres!.UpstreamUrl.StartsWith("http://") || MainPres.UpstreamUrl.StartsWith("https://") ? string.Empty : "https://") + MainPres.UpstreamUrl; + string upstreamUpstreamHostString = await Http.GetAsync(upstreamUpstreamHostUrl, MainClient); + string localUpstreamHostString = File.ReadAllText(MainConst.UpstreamHostPath); + + try { upstreamUpstreamHostString = Encoding.UTF8.GetString(Convert.FromBase64String(upstreamUpstreamHostString)); } + catch { } - if (localUpstreamHostString.Replace("\r", string.Empty) == upstreamUpstreamHostString) + if (localUpstreamHostString == upstreamUpstreamHostString || localUpstreamHostString.Replace("\r", string.Empty) == upstreamUpstreamHostString) MessageBox.Show(MainConst._UpstreamHostUtdMsg); else {