From f3a00a3fc3aa1259397d7f51115e82b177b9b3bb Mon Sep 17 00:00:00 2001 From: Aigio Liu Date: Tue, 27 Apr 2021 21:29:35 +0800 Subject: [PATCH] fix appUpdate&steamauth --- resources/ProjectPathUtil.cs | 3 +++ src/ST.Client/Services/IAppUpdateService.cs | 11 +-------- .../Implementation/AppUpdateServiceImpl.cs | 24 +++++++++++++++++-- .../Models/AppVersionDTO.cs | 2 +- .../SteamAuthenticator.Compat_WinAuth3.cs | 2 +- .../WinAuth/WinAuthSteamClient.cs | 16 ++++++------- 6 files changed, 36 insertions(+), 22 deletions(-) diff --git a/resources/ProjectPathUtil.cs b/resources/ProjectPathUtil.cs index 5474a3312..d90baf659 100644 --- a/resources/ProjectPathUtil.cs +++ b/resources/ProjectPathUtil.cs @@ -21,6 +21,9 @@ namespace System public const string DirPublish = @"\src\" + ProjectDir_AvaloniaApp + @"\bin\Release\Publish"; + public const string DirPublish_ = + @"\src\" + ProjectDir_AvaloniaApp + @"\bin\{0}\Publish"; + public const string DirPublish_Win7Troubleshoot = @"\src\" + ProjectDir_Win7Troubleshoot + @"\bin\Release\Publish\net35"; diff --git a/src/ST.Client/Services/IAppUpdateService.cs b/src/ST.Client/Services/IAppUpdateService.cs index a4d35346c..2f9e94b89 100644 --- a/src/ST.Client/Services/IAppUpdateService.cs +++ b/src/ST.Client/Services/IAppUpdateService.cs @@ -38,16 +38,7 @@ namespace System.Application.Services /// AppVersionDTO? NewVersionInfo { get; } - string NewVersionInfoDesc - { - get - { - var value = NewVersionInfo?.Description; - if (string.IsNullOrWhiteSpace(value)) return string.Empty; - var lines = value.Split(';', StringSplitOptions.RemoveEmptyEntries); - return string.Join(Environment.NewLine, lines); - } - } + string NewVersionInfoDesc { get; } /// /// 检查更新，返回新版本信息 diff --git a/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs b/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs index e9d7d9f5f..7ad05194b 100644 --- a/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs +++ b/src/ST.Client/Services/Implementation/AppUpdateServiceImpl.cs @@ -56,7 +56,27 @@ namespace System.Application.Services.Implementation public bool IsExistUpdate { get; protected set; } - public AppVersionDTO? NewVersionInfo { get; protected set; } + AppVersionDTO? _NewVersionInfo; + public AppVersionDTO? NewVersionInfo + { + get => _NewVersionInfo; + protected set + { + _NewVersionInfo = value; + this.RaisePropertyChanged(nameof(NewVersionInfoDesc)); + } + } + + public string NewVersionInfoDesc + { + get + { + var value = NewVersionInfo?.Description; + if (string.IsNullOrWhiteSpace(value)) return string.Empty; + var lines = value.Split(';', StringSplitOptions.RemoveEmptyEntries); + return string.Join(Environment.NewLine, lines); + } + } /// /// 当存在新的版本时，重写此方法实现弹窗提示用户 @@ -147,7 +167,7 @@ namespace System.Application.Services.Implementation } else if (clear) { - var files = Directory.GetFiles("*" + FileExDownloadCache); + var files = Directory.GetFiles(dirPath, "*" + FileExDownloadCache); foreach (var item in files) { IOPath.FileTryDelete(item); diff --git a/src/ST.Services.CloudService.Models/Models/AppVersionDTO.cs b/src/ST.Services.CloudService.Models/Models/AppVersionDTO.cs index 44dde92a5..88d9c9e53 100644 --- a/src/ST.Services.CloudService.Models/Models/AppVersionDTO.cs +++ b/src/ST.Services.CloudService.Models/Models/AppVersionDTO.cs @@ -91,6 +91,6 @@ namespace System.Application.Models } } - public static string GetRequestUri(string fileId) => $"{Prefix_HTTPS}steampp.net/uploads/publish/files/{fileId}.{FileEx.BIN}"; + public static string GetRequestUri(string fileId) => $"{Prefix_HTTPS}steampp.net/uploads/publish/files/{fileId}{FileEx.BIN}"; } } \ No newline at end of file diff --git a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs index 15c7800e9..ceb683dac 100644 --- a/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs +++ b/src/ST.Services.CloudService/Models/GAPAuthenticators/Values/SteamAuthenticator.Compat_WinAuth3.cs @@ -453,7 +453,7 @@ namespace System.Application.Models data.Add("access_token", state.OAuthToken); response = Request(WEBAPI_BASE + "/ISteamWebUserPresenceOAuth/Logon/v0001", "POST", data); - var sessionid = cookies.GetCookies(new Uri(COMMUNITY_BASE + "/"))["sessionid"].Value; + var sessionid = cookies.GetCookies(new Uri(COMMUNITY_BASE + "/"))?["sessionid"]?.Value; if (state.RequiresActivation == false) { diff --git a/src/ST.Services.CloudService/WinAuth/WinAuthSteamClient.cs b/src/ST.Services.CloudService/WinAuth/WinAuthSteamClient.cs index 4dfa41fe8..7c2bb2d2f 100644 --- a/src/ST.Services.CloudService/WinAuth/WinAuthSteamClient.cs +++ b/src/ST.Services.CloudService/WinAuth/WinAuthSteamClient.cs @@ -1225,14 +1225,14 @@ namespace WinAuth protected byte[]? Request(string url, string method, NameValueCollection? data, NameValueCollection? headers) { byte[]? responsedata; - try - { - responsedata = Request(url, method, data, headers, true); - } - catch (Exception e) - { - Log.Error(nameof(WinAuthSteamClient), e, "Forward Request Fail."); - } + //try + //{ + // responsedata = Request(url, method, data, headers, true); + //} + //catch (Exception e) + //{ + // Log.Error(nameof(WinAuthSteamClient), e, "Forward Request Fail."); + //} responsedata = Request(url, method, data, headers, false);