From f54ba4889bd00569d7d8fe4194304b353f01e26e Mon Sep 17 00:00:00 2001 From: Fu Diwei Date: Mon, 9 May 2022 20:43:31 +0800 Subject: [PATCH] style: format --- ...echatTenpayBusinessClientEventVerificationExtensions.cs | 7 +------ ...atTenpayBusinessClientResponseVerificationExtensions.cs | 3 --- .../MSEPayPayments/GetMSEPayPaymentByPaymentIdResponse.cs | 2 +- .../SKIT.FlurlHttpClient.Wechat.TenpayBusiness.csproj | 4 ++-- .../Utilities/Internal/ReflectionUtility.cs | 2 +- .../Utilities/RSAUtility.cs | 3 --- .../WechatTenpayBusinessClientOptions.cs | 2 -- .../WechatTenpayBusinessResponse.cs | 6 +++--- .../ModelSamples/FileUploads/UploadFileResponse.json | 2 +- .../MSEPayAccounts/GetMSEPayAccountBillRequest.json | 2 +- .../MSEPayAccounts/GetMSEPayAccountBillResponse.json | 2 +- .../MSEPayPayments/CloseMSEPayPaymentRequest.json | 2 +- .../MSEPayPayments/CloseMSEPayPaymentResponse.json | 2 +- .../MSEPayPayments/CreateMSEPayPaymentH5PayRequest.json | 2 +- .../MSEPayPayments/CreateMSEPayPaymentH5PayResponse.json | 2 +- .../GetMSEPayPaymentByPaymentIdResponse.json | 2 +- .../CreateMSEPayProductApplicationLinkResponse.json | 2 +- .../CreateMSEPayProductApplicationRequest.json | 2 +- .../CreateMSEPayProductApplicationResponse.json | 2 +- ...GetMSEPayProductApplicationByRequestNumberResponse.json | 2 +- .../MSEPayRedirects/CreateMSEPayRedirectLinkRequest.json | 2 +- .../MSEPayRedirects/CreateMSEPayRedirectLinkResponse.json | 2 +- .../appsettings.json | 2 +- 23 files changed, 23 insertions(+), 36 deletions(-) diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientEventVerificationExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientEventVerificationExtensions.cs index c009e242..748689ca 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientEventVerificationExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientEventVerificationExtensions.cs @@ -1,6 +1,4 @@ -using System; -using System.Linq; -using System.Text; +using System; namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness { @@ -9,7 +7,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness /// /// 验证回调通知事件签名。 /// - /// /// /// /// @@ -73,7 +70,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness /// /// 验证回调通知事件签名。 /// - /// /// /// /// 。 @@ -91,7 +87,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness /// /// 验证回调通知事件签名。 /// - /// /// /// /// 。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientResponseVerificationExtensions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientResponseVerificationExtensions.cs index 96a50079..87856814 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientResponseVerificationExtensions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Extensions/WechatTenpayBusinessClientResponseVerificationExtensions.cs @@ -1,5 +1,4 @@ using System; -using System.Collections.Generic; using System.Linq; using System.Text; @@ -75,7 +74,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness /// /// 验证响应签名。 /// - /// /// /// /// 。 @@ -92,7 +90,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness /// /// 验证响应签名。 /// - /// /// /// /// 。 diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Models/MSEPayPayments/GetMSEPayPaymentByPaymentIdResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Models/MSEPayPayments/GetMSEPayPaymentByPaymentIdResponse.cs index 87974d44..a68c9239 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Models/MSEPayPayments/GetMSEPayPaymentByPaymentIdResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Models/MSEPayPayments/GetMSEPayPaymentByPaymentIdResponse.cs @@ -39,7 +39,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness.Models [System.Text.Json.Serialization.JsonPropertyName("bank_account_number_last4")] public string? BankAccountNumberLast4String { get; set; } } - + public class FailedReason { /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.csproj b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.csproj index b44ccec8..7f104ced 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.csproj +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.csproj @@ -32,7 +32,7 @@ - + @@ -45,4 +45,4 @@ - \ No newline at end of file + diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Utilities/Internal/ReflectionUtility.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Utilities/Internal/ReflectionUtility.cs index 10677cfc..4467aab1 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Utilities/Internal/ReflectionUtility.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Utilities/Internal/ReflectionUtility.cs @@ -98,7 +98,7 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness.Utilities { InnerReplacePropertyStringValue(ref element, replacement); //if (!array.IsReadOnly) - //{ + //{ // array.SetValue(element, i); //} } diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Utilities/RSAUtility.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Utilities/RSAUtility.cs index 5d041cb2..81854341 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Utilities/RSAUtility.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/Utilities/RSAUtility.cs @@ -1,12 +1,9 @@ using System; -using System.IO; using System.Text; using System.Text.RegularExpressions; using Org.BouncyCastle.Crypto; using Org.BouncyCastle.Crypto.Parameters; -using Org.BouncyCastle.OpenSsl; using Org.BouncyCastle.Security; -using Org.BouncyCastle.X509; namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness.Utilities { diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClientOptions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClientOptions.cs index 35ab7b21..87414abc 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClientOptions.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessClientOptions.cs @@ -1,5 +1,3 @@ -using System; - namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness { /// diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessResponse.cs index 3c891e56..f623a242 100644 --- a/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessResponse.cs +++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayBusiness/WechatTenpayBusinessResponse.cs @@ -8,17 +8,17 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayBusiness public abstract class WechatTenpayBusinessResponse : ICommonResponse { /// - /// + /// /// int ICommonResponse.RawStatus { get; set; } /// - /// + /// /// IDictionary ICommonResponse.RawHeaders { get; set; } = default!; /// - /// + /// /// byte[] ICommonResponse.RawBytes { get; set; } = default!; diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/FileUploads/UploadFileResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/FileUploads/UploadFileResponse.json index 43d50e40..017f8c71 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/FileUploads/UploadFileResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/FileUploads/UploadFileResponse.json @@ -1,3 +1,3 @@ { "file_id": "" -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayAccounts/GetMSEPayAccountBillRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayAccounts/GetMSEPayAccountBillRequest.json index 6c7e1a51..5601648f 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayAccounts/GetMSEPayAccountBillRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayAccounts/GetMSEPayAccountBillRequest.json @@ -1,3 +1,3 @@ { "query_date": "2021-01-01" -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayAccounts/GetMSEPayAccountBillResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayAccounts/GetMSEPayAccountBillResponse.json index 85375dd1..e4710293 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayAccounts/GetMSEPayAccountBillResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayAccounts/GetMSEPayAccountBillResponse.json @@ -2,4 +2,4 @@ "download_url": "", "expire_time": "2021-06-08T10:34:56+08:00", "bill_status": "" -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CloseMSEPayPaymentRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CloseMSEPayPaymentRequest.json index 168ed9ee..59fc4c16 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CloseMSEPayPaymentRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CloseMSEPayPaymentRequest.json @@ -1,3 +1,3 @@ { "close_reason": "" -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CloseMSEPayPaymentResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CloseMSEPayPaymentResponse.json index 8d257ec0..56ed009a 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CloseMSEPayPaymentResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CloseMSEPayPaymentResponse.json @@ -3,4 +3,4 @@ "out_payment_id": "", "status": "", "close_time": "2021-06-08T10:34:56+08:00" -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CreateMSEPayPaymentH5PayRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CreateMSEPayPaymentH5PayRequest.json index 52821be6..0c5b0c00 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CreateMSEPayPaymentH5PayRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CreateMSEPayPaymentH5PayRequest.json @@ -30,4 +30,4 @@ "notify_url": { "server_notify_url": "" } -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CreateMSEPayPaymentH5PayResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CreateMSEPayPaymentH5PayResponse.json index d92cc557..2f59c535 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CreateMSEPayPaymentH5PayResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/CreateMSEPayPaymentH5PayResponse.json @@ -11,4 +11,4 @@ }, "pay_status": "", "memo": "" -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/GetMSEPayPaymentByPaymentIdResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/GetMSEPayPaymentByPaymentIdResponse.json index 739fd6fb..48d94ea3 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/GetMSEPayPaymentByPaymentIdResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayPayments/GetMSEPayPaymentByPaymentIdResponse.json @@ -17,4 +17,4 @@ "failed_detail": "" }, "attachment": "" -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationLinkResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationLinkResponse.json index 376b30e5..80871697 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationLinkResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationLinkResponse.json @@ -3,4 +3,4 @@ "url": "", "expire_time": "2020-01-01T01:02:03+08:00" } -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationRequest.json index e1ea51e1..370f4698 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationRequest.json @@ -39,4 +39,4 @@ "web_success_url": "", "web_refresh_url": "" } -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationResponse.json index 5d4ed957..15ebc0b7 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/CreateMSEPayProductApplicationResponse.json @@ -1,4 +1,4 @@ { "request_no": "", "out_request_no": "" -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/GetMSEPayProductApplicationByRequestNumberResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/GetMSEPayProductApplicationByRequestNumberResponse.json index 46a5f3d0..9ede6592 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/GetMSEPayProductApplicationByRequestNumberResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayProductApplications/GetMSEPayProductApplicationByRequestNumberResponse.json @@ -14,4 +14,4 @@ ] } ] -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayRedirects/CreateMSEPayRedirectLinkRequest.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayRedirects/CreateMSEPayRedirectLinkRequest.json index ed3e7828..2433d924 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayRedirects/CreateMSEPayRedirectLinkRequest.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayRedirects/CreateMSEPayRedirectLinkRequest.json @@ -1,3 +1,3 @@ { "id": "" -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayRedirects/CreateMSEPayRedirectLinkResponse.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayRedirects/CreateMSEPayRedirectLinkResponse.json index bfd58d36..4fbfa7ed 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayRedirects/CreateMSEPayRedirectLinkResponse.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/ModelSamples/MSEPayRedirects/CreateMSEPayRedirectLinkResponse.json @@ -16,4 +16,4 @@ "mp_username": "", "expire_time": "2020-01-01T01:02:03+08:00" } -} \ No newline at end of file +} diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/appsettings.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/appsettings.json index 20e7eff0..8db3be97 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/appsettings.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests/appsettings.json @@ -8,4 +8,4 @@ }, "WorkDirectoryForSdk": "请输入当前 SDK 项目所在的目录完整路径,如 C:\\Project\\src\\SKIT.FlurlHttpClient.Wechat.TenpayBusiness\\", "WorkDirectoryForTest": "请输入当前测试项目所在的目录完整路径,如 C:\\Project\\test\\SKIT.FlurlHttpClient.Wechat.TenpayBusiness.UnitTests\\" -} \ No newline at end of file +}