diff --git a/SKIT.FlurlHttpClient.Wechat.sln b/SKIT.FlurlHttpClient.Wechat.sln
index cb7efc1f..242e7be7 100644
--- a/SKIT.FlurlHttpClient.Wechat.sln
+++ b/SKIT.FlurlHttpClient.Wechat.sln
@@ -38,9 +38,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SKIT.FlurlHttpClient.Wechat
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{35C901ED-C234-4A91-9561-AD89B3BB788D}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5", "samples\SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5\SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5.csproj", "{D1B321C9-3004-4645-A78D-A85C152062FA}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6", "samples\SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6\SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6.csproj", "{D1B321C9-3004-4645-A78D-A85C152062FA}"
EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5", "samples\SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5\SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.csproj", "{65E51735-73CE-4E9B-AA65-4BF5E4C8A705}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6", "samples\SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6\SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6.csproj", "{65E51735-73CE-4E9B-AA65-4BF5E4C8A705}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/docs/WechatApi/Sample.md b/docs/WechatApi/Sample.md
index e11f72e4..45b7c66a 100644
--- a/docs/WechatApi/Sample.md
+++ b/docs/WechatApi/Sample.md
@@ -2,9 +2,9 @@
---
-示例项目位于 _samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5_。
+示例项目位于 _samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6_。
-示例项目基于 .NET 5.0 实现，依赖以下第三方库：
+示例项目基于 .NET 6.0 实现，依赖以下第三方库：
- [`DistributedLock`](https://github.com/madelson/DistributedLock)：分布式锁。
diff --git a/docs/WechatTenpayV3/Sample.md b/docs/WechatTenpayV3/Sample.md
index 685dbafc..e80f7338 100644
--- a/docs/WechatTenpayV3/Sample.md
+++ b/docs/WechatTenpayV3/Sample.md
@@ -2,9 +2,9 @@
---
-示例项目位于 _samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5_。
+示例项目位于 _samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6_。
-示例项目基于 .NET 5.0 实现。
+示例项目基于 .NET 6.0 实现。
示例项目实现了以下功能：
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Controllers/WechatNotifyController.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Controllers/WechatNotifyController.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Controllers/WechatNotifyController.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Controllers/WechatNotifyController.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Controllers/WechatUserController.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Controllers/WechatUserController.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Controllers/WechatUserController.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Controllers/WechatUserController.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Models/WechatAccessTokenEntity.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Models/WechatAccessTokenEntity.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Models/WechatAccessTokenEntity.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Models/WechatAccessTokenEntity.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Options/WechatOptions.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Options/WechatOptions.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Options/WechatOptions.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Options/WechatOptions.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Program.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Program.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Program.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Program.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Properties/launchSettings.json b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Properties/launchSettings.json
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Properties/launchSettings.json
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Properties/launchSettings.json
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5.csproj b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6.csproj
similarity index 92%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5.csproj
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6.csproj
index 8054d2ee..88cadd5f 100644
--- a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5.csproj
+++ b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<NullableReferenceTypes>true</NullableReferenceTypes>
</PropertyGroup>
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/BackgroundServices/WechatAccessTokenRefreshingBackgroundService.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/BackgroundServices/WechatAccessTokenRefreshingBackgroundService.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/BackgroundServices/WechatAccessTokenRefreshingBackgroundService.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/BackgroundServices/WechatAccessTokenRefreshingBackgroundService.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/DistributedLock/IDistributedLockFactory.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/DistributedLock/IDistributedLockFactory.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/DistributedLock/IDistributedLockFactory.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/DistributedLock/IDistributedLockFactory.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/DistributedLock/Implements/DistributedLockFactory.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/DistributedLock/Implements/DistributedLockFactory.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/DistributedLock/Implements/DistributedLockFactory.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/DistributedLock/Implements/DistributedLockFactory.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/HttpClients/IWechatApiHttpClientFactory.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/HttpClients/IWechatApiHttpClientFactory.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/HttpClients/IWechatApiHttpClientFactory.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/HttpClients/IWechatApiHttpClientFactory.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/HttpClients/Implements/WechatApiHttpClientFactory.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/HttpClients/Implements/WechatApiHttpClientFactory.cs
similarity index 87%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/HttpClients/Implements/WechatApiHttpClientFactory.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/HttpClients/Implements/WechatApiHttpClientFactory.cs
index 51f8dca4..12e257ff 100644
--- a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/HttpClients/Implements/WechatApiHttpClientFactory.cs
+++ b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/HttpClients/Implements/WechatApiHttpClientFactory.cs
@@ -26,14 +26,14 @@ namespace SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5.Services.HttpClients.Imple
public WechatApiClient Create(string appId)
{
- var wechatAccount = _wechatOptions.Accounts?.FirstOrDefault(e => string.Equals(appId, e.AppId));
- if (wechatAccount == null)
+ var wechatAccountOptions = _wechatOptions.Accounts?.FirstOrDefault(e => string.Equals(appId, e.AppId));
+ if (wechatAccountOptions == null)
throw new Exception("未在配置项中找到该 AppId 对应的微信账号。");
return new WechatApiClient(new WechatApiClientOptions()
{
- AppId = wechatAccount.AppId,
- AppSecret = wechatAccount.AppSecret
+ AppId = wechatAccountOptions.AppId,
+ AppSecret = wechatAccountOptions.AppSecret
});
}
}
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/Repositories/IWechatAccessTokenEntityRepository.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/Repositories/IWechatAccessTokenEntityRepository.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/Repositories/IWechatAccessTokenEntityRepository.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/Repositories/IWechatAccessTokenEntityRepository.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/Repositories/Implements/GlobalDatabase.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/Repositories/Implements/GlobalDatabase.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/Repositories/Implements/GlobalDatabase.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/Repositories/Implements/GlobalDatabase.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/Repositories/Implements/WechatAccessTokenEntityRepository.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/Repositories/Implements/WechatAccessTokenEntityRepository.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Services/Repositories/Implements/WechatAccessTokenEntityRepository.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Services/Repositories/Implements/WechatAccessTokenEntityRepository.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Startup.cs b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Startup.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/Startup.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/Startup.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/appsettings.json b/samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/appsettings.json
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net5/appsettings.json
rename to samples/SKIT.FlurlHttpClient.Wechat.Api.Sample_Net6/appsettings.json
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Controllers/TenpayNotifyController.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Controllers/TenpayNotifyController.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Controllers/TenpayNotifyController.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Controllers/TenpayNotifyController.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Controllers/TenpayOrderController.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Controllers/TenpayOrderController.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Controllers/TenpayOrderController.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Controllers/TenpayOrderController.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Controllers/TenpayRefundController.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Controllers/TenpayRefundController.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Controllers/TenpayRefundController.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Controllers/TenpayRefundController.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Models/CreateOrderByJsapiRequest.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Models/CreateOrderByJsapiRequest.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Models/CreateOrderByJsapiRequest.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Models/CreateOrderByJsapiRequest.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Models/CreateRefundRequest.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Models/CreateRefundRequest.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Models/CreateRefundRequest.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Models/CreateRefundRequest.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Options/TenpayOptions.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Options/TenpayOptions.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Options/TenpayOptions.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Options/TenpayOptions.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Program.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Program.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Program.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Program.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Properties/launchSettings.json b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Properties/launchSettings.json
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Properties/launchSettings.json
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Properties/launchSettings.json
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.csproj b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6.csproj
similarity index 87%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.csproj
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6.csproj
index 2ce0db86..c0edd2f5 100644
--- a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.csproj
+++ b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6.csproj
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.Web">
<PropertyGroup>
- <TargetFramework>net5.0</TargetFramework>
+ <TargetFramework>net6.0</TargetFramework>
<Nullable>enable</Nullable>
<NullableReferenceTypes>true</NullableReferenceTypes>
</PropertyGroup>
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/BackgroundServices/TenpayCertificateRefreshingBackgroundService.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/BackgroundServices/TenpayCertificateRefreshingBackgroundService.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/BackgroundServices/TenpayCertificateRefreshingBackgroundService.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/BackgroundServices/TenpayCertificateRefreshingBackgroundService.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/HttpClients/IWechatTenpayCertificateManagerFactory.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/IWechatTenpayCertificateManagerFactory.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/HttpClients/IWechatTenpayCertificateManagerFactory.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/IWechatTenpayCertificateManagerFactory.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/HttpClients/IWechatTenpayHttpClientFactory.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/IWechatTenpayHttpClientFactory.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/HttpClients/IWechatTenpayHttpClientFactory.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/IWechatTenpayHttpClientFactory.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/HttpClients/Implements/WechatTenpayCertificateManagerFactory.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/Implements/WechatTenpayCertificateManagerFactory.cs
similarity index 79%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/HttpClients/Implements/WechatTenpayCertificateManagerFactory.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/Implements/WechatTenpayCertificateManagerFactory.cs
index 19143ede..8e6fe020 100644
--- a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/HttpClients/Implements/WechatTenpayCertificateManagerFactory.cs
+++ b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/Implements/WechatTenpayCertificateManagerFactory.cs
@@ -15,6 +15,8 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.Services.HttpClients.
public CertificateManager Create(string merchantId)
{
+ // 注意：这里的工厂方法是为了演示多租户而存在的；如果你的项目只存在唯一一个租户，那么直接注入 `CertificateManager` 就可以
+
return _dict.GetOrAdd(merchantId, new InMemoryCertificateManager());
}
}
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/HttpClients/Implements/WechatTenpayHttpClientFactory.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/Implements/WechatTenpayHttpClientFactory.cs
similarity index 77%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/HttpClients/Implements/WechatTenpayHttpClientFactory.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/Implements/WechatTenpayHttpClientFactory.cs
index 12846b89..9c7b5937 100644
--- a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Services/HttpClients/Implements/WechatTenpayHttpClientFactory.cs
+++ b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Services/HttpClients/Implements/WechatTenpayHttpClientFactory.cs
@@ -29,17 +29,19 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5.Services.HttpClients.
public WechatTenpayClient Create(string merchantId)
{
- var merchantOptions = _tenpayOptions.Merchants?.FirstOrDefault(e => string.Equals(merchantId, e.MerchantId));
- if (merchantOptions == null)
+ // 注意：这里的工厂方法是为了演示多租户而存在的；如果你的项目只存在唯一一个租户，那么直接注入 `WechatTenpayClient` 就可以
+
+ var tenpayMerchantOptions = _tenpayOptions.Merchants?.FirstOrDefault(e => string.Equals(merchantId, e.MerchantId));
+ if (tenpayMerchantOptions == null)
throw new Exception("未在配置项中找到该 MerchantId 对应的微信商户号。");
return new WechatTenpayClient(new WechatTenpayClientOptions()
{
- MerchantId = merchantOptions.MerchantId,
- MerchantV3Secret = merchantOptions.SecretV3,
- MerchantCertSerialNumber = merchantOptions.CertSerialNumber,
- MerchantCertPrivateKey = merchantOptions.CertPrivateKey,
- CertificateManager = _tenpayCertificateManagerFactory.Create(merchantOptions.MerchantId),
+ MerchantId = tenpayMerchantOptions.MerchantId,
+ MerchantV3Secret = tenpayMerchantOptions.SecretV3,
+ MerchantCertSerialNumber = tenpayMerchantOptions.CertSerialNumber,
+ MerchantCertPrivateKey = tenpayMerchantOptions.CertPrivateKey,
+ CertificateManager = _tenpayCertificateManagerFactory.Create(tenpayMerchantOptions.MerchantId),
AutoEncryptRequestSensitiveProperty = true,
AutoDecryptResponseSensitiveProperty = true
});
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Startup.cs b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Startup.cs
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/Startup.cs
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/Startup.cs
diff --git a/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/appsettings.json b/samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/appsettings.json
similarity index 100%
rename from samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net5/appsettings.json
rename to samples/SKIT.FlurlHttpClient.Wechat.TenpayV3.Sample_Net6/appsettings.json