diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Options/TenpayOptions.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Options/TenpayOptions.cs index f864bb3d..50b5b010 100644 --- a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Options/TenpayOptions.cs +++ b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Options/TenpayOptions.cs @@ -1,4 +1,4 @@ -using System; +using System; using Microsoft.Extensions.Options; namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample.Options @@ -22,9 +22,9 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample.Options public string SecretV3 { get; set; } = string.Empty; - public string CertSerialNumber { get; set; } = string.Empty; + public string CertificateSerialNumber { get; set; } = string.Empty; - public string CertPrivateKey { get; set; } = string.Empty; + public string CertificatePrivateKey { get; set; } = string.Empty; } } } diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/Implements/WechatTenpayHttpClientFactory.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/Implements/WechatTenpayHttpClientFactory.cs index 1cd4d56e..112afb42 100644 --- a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/Implements/WechatTenpayHttpClientFactory.cs +++ b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/Implements/WechatTenpayHttpClientFactory.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Linq; using System.Net.Http; using Microsoft.Extensions.Options; @@ -35,8 +35,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample.Services.HttpClients.Imple { MerchantId = tenpayMerchantConfig.MerchantId, MerchantV3Secret = tenpayMerchantConfig.SecretV3, - MerchantCertificateSerialNumber = tenpayMerchantConfig.CertSerialNumber, - MerchantCertificatePrivateKey = tenpayMerchantConfig.CertPrivateKey, + MerchantCertificateSerialNumber = tenpayMerchantConfig.CertificateSerialNumber, + MerchantCertificatePrivateKey = tenpayMerchantConfig.CertificatePrivateKey, PlatformCertificateManager = _tenpayCertificateManagerFactory.Create(tenpayMerchantConfig.MerchantId), AutoEncryptRequestSensitiveProperty = true, AutoDecryptResponseSensitiveProperty = true diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/appsettings.json b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/appsettings.json index 7f584a02..b21440cd 100644 --- a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/appsettings.json +++ b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/appsettings.json @@ -1,4 +1,4 @@ -{ +{ "Logging": { "LogLevel": { "Default": "Information", @@ -14,8 +14,8 @@ { "MerchantId": "填写商户号", "SecretV3": "填写商户 V3 API 密钥", - "CertSerialNumber": "填写商户证书序列号", - "CertPrivateKey": "填写商户证书文件内容" + "CertificateSerialNumber": "填写商户证书序列号", + "CertificatePrivateKey": "填写商户证书文件内容" } ], "NotifyUrl": "https://localhost:5001" diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_NetFramework47/Options/TenpayOptions.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_NetFramework47/Options/TenpayOptions.cs index 36b51d82..2fb90162 100644 --- a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_NetFramework47/Options/TenpayOptions.cs +++ b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_NetFramework47/Options/TenpayOptions.cs @@ -1,4 +1,4 @@ -namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample.Options +namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample.Options { public partial class TenpayOptions { @@ -17,8 +17,8 @@ { MerchantId = WebConfigurationManager.AppSettings[$"TenpayOptions_Merchant_{i}_MerchantId"], SecretV3 = WebConfigurationManager.AppSettings[$"TenpayOptions_Merchant_{i}_SecretV3"], - CertSerialNumber = WebConfigurationManager.AppSettings[$"TenpayOptions_Merchant_{i}_CertSerialNumber"], - CertPrivateKey = WebConfigurationManager.AppSettings[$"TenpayOptions_Merchant_{i}_CertPrivateKey"], + CertificateSerialNumber = WebConfigurationManager.AppSettings[$"TenpayOptions_Merchant_{i}_CertificateSerialNumber"], + CertificatePrivateKey = WebConfigurationManager.AppSettings[$"TenpayOptions_Merchant_{i}_CertificatePrivateKey"], }) .ToArray(), NotifyUrl = WebConfigurationManager.AppSettings[$"TenpayOptions_NotifyUrl"] @@ -43,9 +43,9 @@ public string SecretV3 { get; set; } = string.Empty; - public string CertSerialNumber { get; set; } = string.Empty; + public string CertificateSerialNumber { get; set; } = string.Empty; - public string CertPrivateKey { get; set; } = string.Empty; + public string CertificatePrivateKey { get; set; } = string.Empty; } } } diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_NetFramework47/Web.config b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_NetFramework47/Web.config index a639dec4..ee89e2cd 100644 --- a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_NetFramework47/Web.config +++ b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_NetFramework47/Web.config @@ -1,10 +1,10 @@ - + - - + + diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs index 42e39bc8..566eef45 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestCase_ResponseDecryptionTests.cs @@ -26,8 +26,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests { MerchantId = TestConfigs.WechatMerchantId, MerchantV3Secret = TestConfigs.WechatMerchantSecret, - MerchantCertificateSerialNumber = TestConfigs.WechatMerchantCertSerialNumber, - MerchantCertificatePrivateKey = TestConfigs.WechatMerchantCertPrivateKey, + MerchantCertificateSerialNumber = TestConfigs.WechatMerchantCertificateSerialNumber, + MerchantCertificatePrivateKey = TestConfigs.WechatMerchantCertificatePrivateKey, AutoEncryptRequestSensitiveProperty = true, AutoDecryptResponseSensitiveProperty = true }); @@ -39,8 +39,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests { MerchantId = TestConfigs.WechatMerchantId, MerchantV3Secret = TestConfigs.WechatMerchantSecret, - MerchantCertificateSerialNumber = TestConfigs.WechatMerchantCertSerialNumber, - MerchantCertificatePrivateKey = TestConfigs.WechatMerchantCertPrivateKey, + MerchantCertificateSerialNumber = TestConfigs.WechatMerchantCertificateSerialNumber, + MerchantCertificatePrivateKey = TestConfigs.WechatMerchantCertificatePrivateKey, AutoEncryptRequestSensitiveProperty = false, AutoDecryptResponseSensitiveProperty = false }); diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestClients.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestClients.cs index e8520d11..05debe66 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestClients.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestClients.cs @@ -1,3 +1,4 @@ +using System; using System.Threading.Tasks; namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests @@ -11,8 +12,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests { MerchantId = TestConfigs.WechatMerchantId, MerchantV3Secret = TestConfigs.WechatMerchantSecret, - MerchantCertificateSerialNumber = TestConfigs.WechatMerchantCertSerialNumber, - MerchantCertificatePrivateKey = TestConfigs.WechatMerchantCertPrivateKey, + MerchantCertificateSerialNumber = TestConfigs.WechatMerchantCertificateSerialNumber, + MerchantCertificatePrivateKey = TestConfigs.WechatMerchantCertificatePrivateKey, PlatformCertificateManager = certificateManager }); } @@ -21,6 +22,10 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests { var request = new Models.QueryCertificatesRequest(); var response = await Instance.ExecuteQueryCertificatesAsync(request); + + if (!response.IsSuccessful()) + throw new Exception(); + foreach (var certificate in Instance.DecryptResponseSensitiveProperty(response).CertificateList) { Instance.PlatformCertificateManager.AddEntry(new Settings.CertificateEntry(certificate)); diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestConfigs.cs b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestConfigs.cs index c493e278..9b0856dc 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestConfigs.cs +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/TestConfigs.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.IO; using System.Text.Json; @@ -19,8 +19,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests var config = jdoc.RootElement.GetProperty("TestConfig"); WechatMerchantId = config.GetProperty("MerchantId").GetString()!; WechatMerchantSecret = config.GetProperty("MerchantSecret").GetString()!; - WechatMerchantCertSerialNumber = config.GetProperty("MerchantCertSerialNumber").GetString()!; - WechatMerchantCertPrivateKey = config.GetProperty("MerchantCertPrivateKey").GetString()!; + WechatMerchantCertificateSerialNumber = config.GetProperty("MerchantCertificateSerialNumber").GetString()!; + WechatMerchantCertificatePrivateKey = config.GetProperty("MerchantCertificatePrivateKey").GetString()!; WechatAppId = config.GetProperty("AppId").GetString()!; WechatOpenId = config.GetProperty("OpenId").GetString()!; @@ -35,8 +35,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests public static readonly string WechatMerchantId; public static readonly string WechatMerchantSecret; - public static readonly string WechatMerchantCertSerialNumber; - public static readonly string WechatMerchantCertPrivateKey; + public static readonly string WechatMerchantCertificateSerialNumber; + public static readonly string WechatMerchantCertificatePrivateKey; public static readonly string WechatAppId; public static readonly string WechatOpenId; diff --git a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/appsettings.json b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/appsettings.json index 908103f1..245d1957 100644 --- a/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/appsettings.json +++ b/test/SKIT.FlurlHttpClient.Wechat.TenpayV3.UnitTests/appsettings.json @@ -1,9 +1,9 @@ -{ +{ "TestConfig": { "MerchantId": "请在此填写用于测试的微信商户号", "MerchantSecret": "请在此填写用于测试的微信商户 API v3 密钥", - "MerchantCertSerialNumber": "请在此填写用于测试的微信商户 API 证书序列号", - "MerchantCertPrivateKey": "请在此填写用于测试的微信商户 API 证书私钥(字符串格式)", + "MerchantCertificateSerialNumber": "请在此填写用于测试的微信商户 API 证书序列号", + "MerchantCertificatePrivateKey": "请在此填写用于测试的微信商户 API 证书私钥(字符串格式)", "AppId": "请在此填写用于测试的微信 AppId", "OpenId": "请在此填写用于测试的微信用户唯一标识" },