[WeChatPay.V3] 支持微信支付公钥

essensoft · Nov 4, 2024 · 2e4976e · 2e4976e
1 parent 7ae77bb
commit 2e4976e
Show file tree

Hide file tree

Showing 26 changed files with 146 additions and 175 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -21,8 +21,8 @@
     <GenerateDocumentationFile Condition="'$(Configuration)' == 'Release'">true</GenerateDocumentationFile>
     <GeneratePackageOnBuild Condition="'$(Configuration)' == 'Release'">true</GeneratePackageOnBuild>
     <LangVersion>latest</LangVersion>
-    <SystemTextJsonPackageVersion>8.0.3</SystemTextJsonPackageVersion>
-    <MicrosoftExtensionsHttpPackageVersion>8.0.0</MicrosoftExtensionsHttpPackageVersion>
+    <SystemTextJsonPackageVersion>8.0.5</SystemTextJsonPackageVersion>
+    <MicrosoftExtensionsHttpPackageVersion>8.0.1</MicrosoftExtensionsHttpPackageVersion>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.204",
+    "version": "8.0.403",
     "rollForward": "latestFeature"
   }
 }
diff --git a/samples/WebApplicationSample/appsettings.Development.json b/samples/WebApplicationSample/appsettings.Development.json
@@ -35,10 +35,13 @@
     // 可为证书文件路径 / 证书文件的base64字符串
     "Certificate": "",
 
-    // 商户API私钥
-    // 当配置了P12格式证书时，已包含私钥，不必再单独配置API私钥。
-    // PEM格式证书，需要单独配置。
-    "APIPrivateKey": "",
+    // 微信支付公钥Id
+    // 使用V3接口微信支付公钥时必填
+    "WeChatPayPublicKeyId": "",
+
+    // 微信支付公钥
+    // 使用V3接口微信支付公钥时必填
+    "WeChatPayPublicKey": "",
 
     // RSA公钥
     // 目前仅调用"企业付款到银行卡API [V2]"时使用，执行本示例中的"获取RSA加密公钥API [V2]"即可获取。

diff --git a/samples/WebApplicationSample/appsettings.json b/samples/WebApplicationSample/appsettings.json
@@ -36,10 +36,13 @@
     // 可为证书文件路径 / 证书文件的base64字符串
     "Certificate": "",
 
-    // 商户API私钥
-    // 当配置了P12格式证书时，已包含私钥，不必再单独配置API私钥。
-    // PEM格式证书，需要单独配置。
-    "APIPrivateKey": "",
+    // 微信支付公钥Id
+    // 使用V3接口微信支付公钥时必填
+    "WeChatPayPublicKeyId": "",
+
+    // 微信支付公钥
+    // 使用V3接口微信支付公钥时必填
+    "WeChatPayPublicKey": "",
 
     // RSA公钥
     // 目前仅调用"企业付款到银行卡API [V2]"时使用，执行本示例中的"获取RSA加密公钥API [V2]"即可获取。

diff --git a/src/Essensoft.Paylink.Security/OaepSHA1WithRSA.cs b/src/Essensoft.Paylink.Security/OaepSHA1WithRSA.cs
@@ -43,35 +43,5 @@ public static string Decrypt(string data, string privateKey)
                 return Encoding.UTF8.GetString(rsa.Decrypt(Convert.FromBase64String(data), RSAEncryptionPadding.OaepSHA1));
             }
         }
-
-        public static string Encrypt(RSA rsa, string data)
-        {
-            if (rsa == null)
-            {
-                throw new ArgumentNullException(nameof(rsa));
-            }
-
-            if (string.IsNullOrEmpty(data))
-            {
-                throw new ArgumentNullException(nameof(data));
-            }
-
-            return Convert.ToBase64String(rsa.Encrypt(Encoding.UTF8.GetBytes(data), RSAEncryptionPadding.OaepSHA1));
-        }
-
-        public static string Decrypt(RSA rsa, string data)
-        {
-            if (rsa == null)
-            {
-                throw new ArgumentNullException(nameof(rsa));
-            }
-
-            if (string.IsNullOrEmpty(data))
-            {
-                throw new ArgumentNullException(nameof(data));
-            }
-
-            return Encoding.UTF8.GetString(rsa.Decrypt(Convert.FromBase64String(data), RSAEncryptionPadding.OaepSHA1));
-        }
     }
 }
diff --git a/src/Essensoft.Paylink.Security/SHA256WithRSA.cs b/src/Essensoft.Paylink.Security/SHA256WithRSA.cs
@@ -48,40 +48,5 @@ public static bool Verify(string data, string sign, string publicKey)
                 return rsa.VerifyData(Encoding.UTF8.GetBytes(data), Convert.FromBase64String(sign), HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
             }
         }
-
-        public static string Sign(RSA rsa, string data)
-        {
-            if (rsa == null)
-            {
-                throw new ArgumentNullException(nameof(rsa));
-            }
-
-            if (string.IsNullOrEmpty(data))
-            {
-                throw new ArgumentNullException(nameof(data));
-            }
-
-            return Convert.ToBase64String(rsa.SignData(Encoding.UTF8.GetBytes(data), HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1));
-        }
-
-        public static bool Verify(RSA rsa, string data, string sign)
-        {
-            if (rsa == null)
-            {
-                throw new ArgumentNullException(nameof(rsa));
-            }
-
-            if (string.IsNullOrEmpty(data))
-            {
-                throw new ArgumentNullException(nameof(data));
-            }
-
-            if (string.IsNullOrEmpty(sign))
-            {
-                throw new ArgumentNullException(nameof(sign));
-            }
-
-            return rsa.VerifyData(Encoding.UTF8.GetBytes(data), Convert.FromBase64String(sign), HashAlgorithmName.SHA256, RSASignaturePadding.Pkcs1);
-        }
     }
 }
diff --git a/src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayTransitPayPayApplyRequest.cs b/src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayTransitPayPayApplyRequest.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using Essensoft.Paylink.WeChatPay.V2.Response;
 
 namespace Essensoft.Paylink.WeChatPay.V2.Request

diff --git a/src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayTransitPayQueryStateRequest.cs b/src/Essensoft.Paylink.WeChatPay/V2/Request/WeChatPayTransitPayQueryStateRequest.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using Essensoft.Paylink.WeChatPay.V2.Response;
 
 namespace Essensoft.Paylink.WeChatPay.V2.Request

diff --git a/src/Essensoft.Paylink.WeChatPay/V2/Response/WeChatPayTransitPayQueryStateResponse.cs b/src/Essensoft.Paylink.WeChatPay/V2/Response/WeChatPayTransitPayQueryStateResponse.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Xml.Serialization;
+using System.Xml.Serialization;
 
 namespace Essensoft.Paylink.WeChatPay.V2.Response
 {

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Domain/AccountCertInfo.cs b/src/Essensoft.Paylink.WeChatPay/V3/Domain/AccountCertInfo.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace Essensoft.Paylink.WeChatPay.V3.Domain

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Domain/AppInfo.cs b/src/Essensoft.Paylink.WeChatPay/V3/Domain/AppInfo.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace Essensoft.Paylink.WeChatPay.V3.Domain

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Domain/BizStoreInfo.cs b/src/Essensoft.Paylink.WeChatPay/V3/Domain/BizStoreInfo.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.Json;
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace Essensoft.Paylink.WeChatPay.V3.Domain

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Domain/MiniProgramInfo.cs b/src/Essensoft.Paylink.WeChatPay/V3/Domain/MiniProgramInfo.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace Essensoft.Paylink.WeChatPay.V3.Domain

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Domain/MpInfo.cs b/src/Essensoft.Paylink.WeChatPay/V3/Domain/MpInfo.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace Essensoft.Paylink.WeChatPay.V3.Domain

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Domain/SaleInfo.cs b/src/Essensoft.Paylink.WeChatPay/V3/Domain/SaleInfo.cs
@@ -1,6 +1,4 @@
-using System;
 using System.Collections.Generic;
-using System.Text;
 using System.Text.Json.Serialization;
 
 namespace Essensoft.Paylink.WeChatPay.V3.Domain

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Domain/WeWorkInfo.cs b/src/Essensoft.Paylink.WeChatPay/V3/Domain/WeWorkInfo.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
+using System.Collections.Generic;
 using System.Text.Json.Serialization;
 
 namespace Essensoft.Paylink.WeChatPay.V3.Domain

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Domain/WebInfo.cs b/src/Essensoft.Paylink.WeChatPay/V3/Domain/WebInfo.cs
@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Essensoft.Paylink.WeChatPay.V3.Domain
 {

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Extensions/HttpClientExtensions.cs b/src/Essensoft.Paylink.WeChatPay/V3/Extensions/HttpClientExtensions.cs
@@ -195,7 +195,7 @@ private static string BuildToken(string url, string method, string body, WeChatP
             var timestamp = WeChatPayUtility.GetTimeStamp();
             var nonce = WeChatPayUtility.GenerateNonceStr();
             var message = BuildMessage(method, uri, timestamp, nonce, body);
-            var signature = SHA256WithRSA.Sign(options.RSAPrivateKey, message);
+            var signature = SHA256WithRSA.Sign(message, options.RSAPrivateKey);
 
             return $"mchid=\"{options.MchId}\",nonce_str=\"{nonce}\",timestamp=\"{timestamp}\",serial_no=\"{options.CertificateSerialNo}\",signature=\"{signature}\"";
         }

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayAppSdkRequest.cs b/src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayAppSdkRequest.cs
@@ -58,7 +58,7 @@ public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions
             sortedTxtParams.Add(WeChatPayConsts.timestamp, WeChatPayUtility.GetTimeStamp());
 
             var signatureSourceData = BuildSignatureSourceData(sortedTxtParams);
-            sortedTxtParams.Add(WeChatPayConsts.sign, SHA256WithRSA.Sign(options.RSAPrivateKey, signatureSourceData));
+            sortedTxtParams.Add(WeChatPayConsts.sign, SHA256WithRSA.Sign(signatureSourceData, options.RSAPrivateKey));
         }
 
         private static string BuildSignatureSourceData(WeChatPayDictionary sortedTxtParams)

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayJsApiSdkRequest.cs b/src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayJsApiSdkRequest.cs
@@ -47,7 +47,7 @@ public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions
             sortedTxtParams.Add(WeChatPayConsts.signType, WeChatPayConsts.RSA);
 
             var signatureSourceData = BuildSignatureSourceData(sortedTxtParams);
-            sortedTxtParams.Add(WeChatPayConsts.paySign, SHA256WithRSA.Sign(options.RSAPrivateKey, signatureSourceData));
+            sortedTxtParams.Add(WeChatPayConsts.paySign, SHA256WithRSA.Sign(signatureSourceData, options.RSAPrivateKey));
         }
 
         private static string BuildSignatureSourceData(WeChatPayDictionary sortedTxtParams)

diff --git a/src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayMiniProgramSdkRequest.cs b/src/Essensoft.Paylink.WeChatPay/V3/Request/WeChatPayMiniProgramSdkRequest.cs
@@ -47,7 +47,7 @@ public void PrimaryHandler(WeChatPayDictionary sortedTxtParams, WeChatPayOptions
             sortedTxtParams.Add(WeChatPayConsts.signType, WeChatPayConsts.RSA);
 
             var signatureSourceData = BuildSignatureSourceData(sortedTxtParams);
-            sortedTxtParams.Add(WeChatPayConsts.paySign, SHA256WithRSA.Sign(options.RSAPrivateKey, signatureSourceData));
+            sortedTxtParams.Add(WeChatPayConsts.paySign, SHA256WithRSA.Sign(signatureSourceData, options.RSAPrivateKey));
         }
 
         private static string BuildSignatureSourceData(WeChatPayDictionary sortedTxtParams)