修改 ReturnJsonBase.Signed -> ReturnJsonBase.VerifySignSuccess

michaeljxf · Aug 23, 2021 · 5ff1475 · 5ff1475
1 parent 8412649
commit 5ff1475
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/...s/net6-mvc/Senparc.Weixin.Sample.Net6/Controllers/Weixin/TenPay/TenPayRealV3Controller.cs b/...s/net6-mvc/Senparc.Weixin.Sample.Net6/Controllers/Weixin/TenPay/TenPayRealV3Controller.cs
@@ -268,7 +268,7 @@ public async Task<IActionResult> PayNotifyUrl()
                 //}
 
                 //验证请求是否从微信发过来（安全）
-                if (orderReturnJson.Signed == true && trade_state == "SUCCESS")
+                if (orderReturnJson.VerifySignSuccess == true && trade_state == "SUCCESS")
                 {
                     res = "success";//正确的订单处理
                                     //直到这里，才能认为交易真正成功了，可以进行数据库操作，但是别忘了返回规定格式的消息！

diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3.Test/Apis/BasePay/BasePayApisTests.cs b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3.Test/Apis/BasePay/BasePayApisTests.cs
@@ -42,7 +42,7 @@ public void JsAPiAsyncTest()
 
             Assert.IsNotNull(result);
             Assert.IsTrue(result.ResultCode.Success);
-            Assert.IsTrue(result.Signed == true);//通过验证
+            Assert.IsTrue(result.VerifySignSuccess == true);//通过验证
 
         }
 
@@ -54,7 +54,7 @@ public void CertificatesTest()
             Assert.IsNotNull(certs);
             Console.WriteLine(certs.ToJson(true));
             Assert.IsTrue(certs.ResultCode.Success);
-            Assert.IsNull(certs.Signed);//不参与验证
+            Assert.IsNull(certs.VerifySignSuccess);//不参与验证
 
             Console.WriteLine();
 

diff --git a/....Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/BasePay/Entities/ReturnJson/ReturnJsonBase.cs b/....Weixin.TenPay/Senparc.Weixin.TenPayV3/Apis/BasePay/Entities/ReturnJson/ReturnJsonBase.cs
@@ -50,6 +50,6 @@ public class ReturnJsonBase
         /// <summary>
         /// 回复签名是否正确 在有错误的情况下，或不要求验证签名时 为null
         /// </summary>
-        public bool? Signed { get; set; } = null;
+        public bool? VerifySignSuccess { get; set; } = null;
     }
 }
diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/HttpHandlers/TenPayApiRequest.cs b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/HttpHandlers/TenPayApiRequest.cs
@@ -200,7 +200,7 @@ public async Task<T> RequestAsync<T>(string url, object data, int timeOut = Conf
                         try
                         {
                             var pubKey = await TenPayV3InfoCollection.GetAPIv3PublicKeyAsync(this._tenpayV3Setting, wechatpaySerial);
-                            result.Signed = TenPaySignHelper.VerifyTenpaySign(wechatpayTimestamp, wechatpayNonce, wechatpaySignatureBase64, content, pubKey);
+                            result.VerifySignSuccess = TenPaySignHelper.VerifyTenpaySign(wechatpayTimestamp, wechatpayNonce, wechatpaySignatureBase64, content, pubKey);
                         }
                         catch (Exception ex)
                         {

diff --git a/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/TenPayNotifyHandler.cs b/src/Senparc.Weixin.TenPay/Senparc.Weixin.TenPayV3/TenPayNotifyHandler.cs
@@ -120,7 +120,7 @@ public async Task<T> AesGcmDecryptGetObjectAsync<T>(string aes_key = null, strin
             var wechatpayNonce = _httpContext.Request.Headers?["Wechatpay-Nonce"];
             var wechatpaySignature = _httpContext.Request.Headers?["Wechatpay-Signature"];
 
-            result.Signed = await TenPaySignHelper.VerifyTenpaySign(wechatpayTimestamp, wechatpayNonce, wechatpaySignature, Body, this._tenpayV3Setting);
+            result.VerifySignSuccess = await TenPaySignHelper.VerifyTenpaySign(wechatpayTimestamp, wechatpayNonce, wechatpaySignature, Body, this._tenpayV3Setting);
             result.ResultCode = null;
 
             return result;