diff --git a/resources/RewardRecord.json b/resources/RewardRecord.json index cdd34cd65..c0283bb0a 100644 --- a/resources/RewardRecord.json +++ b/resources/RewardRecord.json @@ -254,5 +254,21 @@ "PayType": 1, "Remark": "", "PayTime": "2021-01-07 12:25:59" + }, + { + "Name": "素年", + "Amount": 5, + "OrderNumber": "", + "PayType": 2, + "Remark": "不闪退了。支持一下", + "PayTime": "2021-01-08 22:37:11" + }, + { + "Name": "kingburial", + "Amount": 1, + "OrderNumber": "", + "PayType": 2, + "Remark": "不是很常用,但是切换账号就很方便。谢谢啦", + "PayTime": "2021-01-08 10:16:04" } ] diff --git a/source/SteamTool.Core/Common/CertificateEx.cs b/source/SteamTool.Core/Common/CertificateEx.cs index fb7eba970..a3dd75bb3 100644 --- a/source/SteamTool.Core/Common/CertificateEx.cs +++ b/source/SteamTool.Core/Common/CertificateEx.cs @@ -24,7 +24,6 @@ namespace SteamTool.Proxy Convert.ToBase64String(@this.RawData, Base64FormattingOptions.InsertLineBreaks)); builder.AppendLine("-----END CERTIFICATE-----"); builder.AppendLine(Const.HOST_TAG); - return builder.ToString(); } @@ -33,7 +32,7 @@ namespace SteamTool.Proxy RSACryptoServiceProvider pkey = (RSACryptoServiceProvider)@this.PrivateKey; AsymmetricCipherKeyPair keyPair = DotNetUtilities.GetRsaKeyPair(pkey); - using TextWriter tw = new StreamWriter(Path.Combine(AppContext.BaseDirectory, @this.IssuerName.Name + ".key")); + using TextWriter tw = new StreamWriter(Path.Combine(AppContext.BaseDirectory, @this.IssuerName.Name + ".key"), false, new UTF8Encoding(false)); PemWriter pw = new PemWriter(tw); pw.WriteObject(keyPair.Private); tw.Flush(); @@ -71,7 +70,7 @@ namespace SteamTool.Proxy Convert.ToBase64String(@this.Export(X509ContentType.Cert), Base64FormattingOptions.InsertLineBreaks)); builder.AppendLine("-----END CERTIFICATE-----"); - File.WriteAllText(pathOrName, builder.ToString(), Encoding.UTF8); + File.WriteAllText(pathOrName, builder.ToString(), new UTF8Encoding(false)); } } } diff --git a/source/SteamTools/App.xaml.cs b/source/SteamTools/App.xaml.cs index c7950677f..59d947bf9 100644 --- a/source/SteamTools/App.xaml.cs +++ b/source/SteamTools/App.xaml.cs @@ -103,9 +103,9 @@ namespace SteamTools GeneralSettings.Culture.Subscribe(x => ResourceService.Current.ChangeCulture(x)).AddTo(this); WindowService.Current.AddTo(this).Initialize(); - AuthService.Current.Initialize(); ProxyService.Current.Initialize(); SteamConnectService.Current.Initialize(); + AuthService.Current.Initialize(); if (GeneralSettings.IsAutoCheckUpdate.Value) { AutoUpdateService.Current.CheckUpdate();