From 7b541485b72f6de779bec7c0e6205c1656bb9dfe Mon Sep 17 00:00:00 2001
From: Fu Diwei <fudiwei@sina.com>
Date: Tue, 8 Nov 2022 16:51:40 +0800
Subject: [PATCH] =?UTF-8?q?feat(tenpayv3):=20=E7=A7=BB=E9=99=A4=E9=83=A8?=
 =?UTF-8?q?=E5=88=86=E5=B7=B2=E6=A0=87=E8=AE=B0=E4=B8=BA=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WechatTenpayClientOptions.cs              | 20 +------------------
 .../WechatTenpayRequest.cs                    | 10 +---------
 .../WechatTenpayResponse.cs                   | 10 +---------
 3 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs
index 508e73f7..3dd6378b 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayClientOptions.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Reflection;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
@@ -48,23 +48,11 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
         /// </summary>
         public string MerchantV3Secret { get; set; } = default!;
 
-        /// <summary>
-        /// <i>（本参数已废弃，请使用 <see cref="MerchantCertificateSerialNumber"/> 参数）</i>
-        /// </summary>
-        [Obsolete("本参数已废弃，请使用 `MerchantCertificateSerialNumber` 参数", error: true)]
-        public string MerchantCertSerialNumber { get { return MerchantCertificateSerialNumber; } set { MerchantCertificateSerialNumber = value; } }
-
         /// <summary>
         /// 获取或设置微信支付商户 API 证书序列号。
         /// </summary>
         public string MerchantCertificateSerialNumber { get; set; } = default!;
 
-        /// <summary>
-        /// <i>（本参数已废弃，请使用 <see cref="MerchantCertificatePrivateKey"/> 参数）</i>
-        /// </summary>
-        [Obsolete("本参数已废弃，请使用 `MerchantCertificatePrivateKey` 参数", error: true)]
-        public string MerchantCertPrivateKey { get { return MerchantCertificatePrivateKey; } set { MerchantCertificatePrivateKey = value; } }
-
         /// <summary>
         /// 获取或设置微信支付商户 API 证书私钥（通常为 `apiclient_key.pem` 文件内容）。
         /// </summary>
@@ -82,12 +70,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
         /// </summary>
         public bool AutoDecryptResponseSensitiveProperty { get; set; }
 
-        /// <summary>
-        /// <i>（本参数已废弃，请使用 <see cref="PlatformCertificateManager"/> 参数）</i>
-        /// </summary>
-        [Obsolete("本参数已废弃，请使用 `PlatformCertificateManager` 参数", error: true)]
-        public Settings.CertificateManager CertificateManager { get { return PlatformCertificateManager; } set { PlatformCertificateManager = value; } }
-
         /// <summary>
         /// 获取或设置微信支付平台证书管理器。
         /// <para>默认值：<see cref="Settings.InMemoryCertificateManager"/></para>
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayRequest.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayRequest.cs
index 31cf23f8..3dbf1537 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayRequest.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayRequest.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
 {
@@ -14,14 +14,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
         [System.Text.Json.Serialization.JsonIgnore]
         public virtual int? Timeout { get; set; }
 
-        /// <summary>
-        /// <i>（本参数已废弃，请使用 <see cref="WechatpayCertificateSerialNumber"/> 参数）</i>
-        /// </summary>
-        [Obsolete("本参数已废弃，请使用 `WechatpayCertificateSerialNumber` 参数", error: true)]
-        [Newtonsoft.Json.JsonIgnore]
-        [System.Text.Json.Serialization.JsonIgnore]
-        public string? WechatpayCertSerialNumber { get { return WechatpayCertificateSerialNumber; } set { WechatpayCertificateSerialNumber = value; } }
-
         /// <summary>
         /// 获取或设置微信请求使用的微信支付平台证书序列号。
         /// </summary>
diff --git a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayResponse.cs b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayResponse.cs
index 74db9f0d..28528014 100644
--- a/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayResponse.cs
+++ b/src/SKIT.FlurlHttpClient.Wechat.TenpayV3/WechatTenpayResponse.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 
 namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
@@ -84,14 +84,6 @@ namespace SKIT.FlurlHttpClient.Wechat.TenpayV3
         [System.Text.Json.Serialization.JsonIgnore]
         public string WechatpaySignature { get; internal set; } = default!;
 
-        /// <summary>
-        /// <i>（本参数已废弃，请使用 <see cref="WechatpayCertificateSerialNumber"/> 参数）</i>
-        /// </summary>
-        [Obsolete("本参数已废弃，请使用 `WechatpayCertificateSerialNumber` 参数", error: true)]
-        [Newtonsoft.Json.JsonIgnore]
-        [System.Text.Json.Serialization.JsonIgnore]
-        public string WechatpayCertSerialNumber { get { return WechatpayCertificateSerialNumber; } set { WechatpayCertificateSerialNumber = value; } }
-
         /// <summary>
         /// 获取微信应答签名使用的微信支付平台证书序列号。
         /// </summary>