😘简化配置选项部分代码

Admin.NET/Admin.NET.Application/Configuration/Wechat.json

@@ -5,13 +5,9 @@
         // 公众号
         "WechatAppId": "",
         "WechatAppSecret": "",
-        "EncodingAESKey": "",
-        "Token": "",
         // 小程序
         "WxOpenAppId": "",
-        "WxOpenAppSecret": "",
-        "WxOpenToken": "",
-        "WxOpenEncodingAESKey": ""
+        "WxOpenAppSecret": ""
     },
     // 微信支付
     "WechatPay": {

Admin.NET/Admin.NET.Core/Admin.NET.Core.xml

@@ -3698,16 +3698,6 @@
             微信配置
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.OAuthOptionItem.ClientId">
-            <summary>
-            ClientId
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.OAuthOptionItem.ClientSecret">
-            <summary>
-            ClientSecret
-            </summary>
-        </member>
         <member name="T:Admin.NET.Core.OSSProviderOptions">
             <summary>
             对象存储配置选项
@@ -3819,31 +3809,6 @@
             微信公众平台AppId、开放平台AppId、小程序AppId、企业微信CorpId
             </summary>
         </member>
-        <member name="P:Admin.NET.Core.WechatPayOptions.MerchantId">
-             <summary>
-            商户平台的商户号
-             </summary>
-        </member>
-        <member name="P:Admin.NET.Core.WechatPayOptions.MerchantV3Secret">
-            <summary>
-            商户平台的APIv3密钥
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.WechatPayOptions.MerchantCertificateSerialNumber">
-            <summary>
-            商户平台的证书序列号
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.WechatPayOptions.MerchantCertificatePrivateKey">
-            <summary>
-            商户平台的API证书私钥(apiclient_key.pem文件内容)
-            </summary>
-        </member>
-        <member name="P:Admin.NET.Core.WechatPayOptions.RsaPublicKey">
-            <summary>
-            RSA公钥 仅调用"企业付款到银行卡API"时使用
-            </summary>
-        </member>
         <member name="T:Admin.NET.Core.SysConfigSeedData">
             <summary>
             系统配置表种子数据

Admin.NET/Admin.NET.Core/Option/OAuthOptions.cs

@@ -8,18 +8,5 @@ public sealed class OAuthOptions : IConfigurableOptions
     /// <summary>
     /// 微信配置
     /// </summary>
-    public OAuthOptionItem Weixin { get; set; }
-}
-
-public class OAuthOptionItem
-{
-    /// <summary>
-    /// ClientId
-    /// </summary>
-    public string ClientId { get; set; }
-
-    /// <summary>
-    /// ClientSecret
-    /// </summary>
-    public string ClientSecret { get; set; }
+    public Microsoft.AspNetCore.Authentication.OAuth.OAuthOptions Weixin { get; set; }
 }

Admin.NET/Admin.NET.Core/Option/WechatOptions.cs

@@ -10,16 +10,8 @@ public sealed class WechatOptions : IConfigurableOptions
 
     public string WechatAppSecret { get; set; }
 
-    public string EncodingAESKey { get; set; }
-
-    public string Token { get; set; }
-
     //小程序
     public string WxOpenAppId { get; set; }
 
     public string WxOpenAppSecret { get; set; }
-
-    public string WxOpenToken { get; set; }
-
-    public string WxOpenEncodingAESKey { get; set; }
 }

Admin.NET/Admin.NET.Core/Option/WechatPayOptions.cs

@@ -3,35 +3,10 @@
 /// <summary>
 /// 微信支付配置选项
 /// </summary>
-public sealed class WechatPayOptions : IConfigurableOptions
+public sealed class WechatPayOptions : WechatTenpayClientOptions, IConfigurableOptions
 {
     /// <summary>
     /// 微信公众平台AppId、开放平台AppId、小程序AppId、企业微信CorpId
     /// </summary>
     public string AppId { get; set; }
-
-    /// <summary>
-    ///商户平台的商户号
-    /// </summary>
-    public string MerchantId { get; set; }
-
-    /// <summary>
-    /// 商户平台的APIv3密钥
-    /// </summary>
-    public string MerchantV3Secret { get; set; }
-
-    /// <summary>
-    /// 商户平台的证书序列号
-    /// </summary>
-    public string MerchantCertificateSerialNumber { get; set; }
-
-    /// <summary>
-    /// 商户平台的API证书私钥(apiclient_key.pem文件内容)
-    /// </summary>
-    public string MerchantCertificatePrivateKey { get; set; }
-
-    /// <summary>
-    /// RSA公钥 仅调用"企业付款到银行卡API"时使用
-    /// </summary>
-    public string RsaPublicKey { get; set; }
 }