Quellcode durchsuchen

将 WeChatPayObject.ResponseBody\ResponseParameters 改为 WeChatPayObject.Body\Parameters

Roc vor 5 Jahren
Ursprung
Commit
5160a6b470

+ 20 - 20
samples/WebApplicationSample/Controllers/WeChatPayController.cs

@@ -52,7 +52,7 @@ namespace WebApplicationSample.Controllers
                 AuthCode = viewModel.AuthCode
                 AuthCode = viewModel.AuthCode
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -95,11 +95,11 @@ namespace WebApplicationSample.Controllers
 
 
                 // 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
                 // 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
                 ViewData["parameter"] = JsonSerializer.Serialize(parameter);
                 ViewData["parameter"] = JsonSerializer.Serialize(parameter);
-                ViewData["response"] = response.ResponseBody;
+                ViewData["response"] = response.Body;
                 return View();
                 return View();
             }
             }
 
 
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -133,7 +133,7 @@ namespace WebApplicationSample.Controllers
 
 
             // response.CodeUrl 给前端生成二维码
             // response.CodeUrl 给前端生成二维码
             ViewData["qrcode"] = response.CodeUrl;
             ViewData["qrcode"] = response.CodeUrl;
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -175,11 +175,11 @@ namespace WebApplicationSample.Controllers
 
 
                 // 将参数(parameter)给 ios/android端 让他调起微信APP(https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=8_5)
                 // 将参数(parameter)给 ios/android端 让他调起微信APP(https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=8_5)
                 ViewData["parameter"] = JsonSerializer.Serialize(parameter);
                 ViewData["parameter"] = JsonSerializer.Serialize(parameter);
-                ViewData["response"] = response.ResponseBody;
+                ViewData["response"] = response.Body;
                 return View();
                 return View();
             }
             }
 
 
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -254,11 +254,11 @@ namespace WebApplicationSample.Controllers
 
 
                 // 将参数(parameter)给 小程序前端 让他调起支付API(https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=5)
                 // 将参数(parameter)给 小程序前端 让他调起支付API(https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=5)
                 ViewData["parameter"] = JsonSerializer.Serialize(parameter);
                 ViewData["parameter"] = JsonSerializer.Serialize(parameter);
-                ViewData["response"] = response.ResponseBody;
+                ViewData["response"] = response.Body;
                 return View();
                 return View();
             }
             }
 
 
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -284,7 +284,7 @@ namespace WebApplicationSample.Controllers
                 OutTradeNo = viewModel.OutTradeNo
                 OutTradeNo = viewModel.OutTradeNo
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -310,7 +310,7 @@ namespace WebApplicationSample.Controllers
                 OutTradeNo = viewModel.OutTradeNo
                 OutTradeNo = viewModel.OutTradeNo
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -335,7 +335,7 @@ namespace WebApplicationSample.Controllers
                 OutTradeNo = viewModel.OutTradeNo
                 OutTradeNo = viewModel.OutTradeNo
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -366,7 +366,7 @@ namespace WebApplicationSample.Controllers
                 NotifyUrl = viewModel.NotifyUrl
                 NotifyUrl = viewModel.NotifyUrl
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -394,7 +394,7 @@ namespace WebApplicationSample.Controllers
                 OutTradeNo = viewModel.OutTradeNo
                 OutTradeNo = viewModel.OutTradeNo
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -421,7 +421,7 @@ namespace WebApplicationSample.Controllers
                 TarType = viewModel.TarType
                 TarType = viewModel.TarType
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -448,7 +448,7 @@ namespace WebApplicationSample.Controllers
                 TarType = viewModel.TarType
                 TarType = viewModel.TarType
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -479,7 +479,7 @@ namespace WebApplicationSample.Controllers
                 SpBillCreateIp = viewModel.SpBillCreateIp
                 SpBillCreateIp = viewModel.SpBillCreateIp
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -504,7 +504,7 @@ namespace WebApplicationSample.Controllers
                 PartnerTradeNo = viewModel.PartnerTradeNo
                 PartnerTradeNo = viewModel.PartnerTradeNo
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -534,7 +534,7 @@ namespace WebApplicationSample.Controllers
                 Desc = viewModel.Desc
                 Desc = viewModel.Desc
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -559,7 +559,7 @@ namespace WebApplicationSample.Controllers
                 PartnerTradeNo = viewModel.PartnerTradeNo
                 PartnerTradeNo = viewModel.PartnerTradeNo
             };
             };
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
             var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
             return View();
         }
         }
 
 
@@ -574,7 +574,7 @@ namespace WebApplicationSample.Controllers
             {
             {
                 var request = new WeChatPayRiskGetPublicKeyRequest();
                 var request = new WeChatPayRiskGetPublicKeyRequest();
                 var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
                 var response = await _client.ExecuteAsync(request, _optionsAccessor.Value);
-                ViewData["response"] = response.ResponseBody;
+                ViewData["response"] = response.Body;
                 return View();
                 return View();
             }
             }
 
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/Notify/WeChatPayPartnerPAPPayApplyNotify.cs

@@ -204,7 +204,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Notify
         /// </summary>
         /// </summary>
         internal override void Execute()
         internal override void Execute()
         {
         {
-            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(ResponseParameters);
+            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(Parameters);
         }
         }
     }
     }
 }
 }

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/Notify/WeChatPayTransitPartnerPayPayApplyNotify.cs

@@ -210,7 +210,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Notify
         /// </summary>
         /// </summary>
         internal override void Execute()
         internal override void Execute()
         {
         {
-            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(ResponseParameters);
+            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(Parameters);
         }
         }
     }
     }
 }
 }

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/Notify/WeChatPayUnifiedOrderNotify.cs

@@ -198,7 +198,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Notify
         /// </summary>
         /// </summary>
         internal override void Execute()
         internal override void Execute()
         {
         {
-            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(ResponseParameters);
+            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(Parameters);
         }
         }
     }
     }
 }
 }

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/Notify/WeChatPayVehiclePartnerPayPayApplyNotify.cs

@@ -204,7 +204,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Notify
         /// </summary>
         /// </summary>
         internal override void Execute()
         internal override void Execute()
         {
         {
-            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(ResponseParameters);
+            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(Parameters);
         }
         }
     }
     }
 }
 }

+ 4 - 4
src/Essensoft.AspNetCore.Payment.WeChatPay/Parser/WeChatPayXmlParser.cs

@@ -34,8 +34,8 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Parser
                 result = Activator.CreateInstance<T>();
                 result = Activator.CreateInstance<T>();
             }
             }
 
 
-            result.ResponseBody = body;
-            result.ResponseParameters = parameters;
+            result.Body = body;
+            result.Parameters = parameters;
             result.Execute();
             result.Execute();
             return result;
             return result;
         }
         }
@@ -77,8 +77,8 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Parser
                 result = Activator.CreateInstance<T>();
                 result = Activator.CreateInstance<T>();
             }
             }
 
 
-            result.ResponseBody = newBody;
-            result.ResponseParameters = parameters;
+            result.Body = newBody;
+            result.Parameters = parameters;
             result.Execute();
             result.Execute();
 
 
             return result;
             return result;

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/Response/WeChatPayOrderQueryResponse.cs

@@ -211,7 +211,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Response
         /// </summary>
         /// </summary>
         internal override void Execute()
         internal override void Execute()
         {
         {
-            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(ResponseParameters);
+            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(Parameters);
         }
         }
     }
     }
 }
 }

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/Response/WeChatPayPartnerPAPOrderQueryResponse.cs

@@ -205,7 +205,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Response
         /// </summary>
         /// </summary>
         internal override void Execute()
         internal override void Execute()
         {
         {
-            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(ResponseParameters);
+            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(Parameters);
         }
         }
     }
     }
 }
 }

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/Response/WeChatPayRefundQueryResponse.cs

@@ -133,7 +133,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Response
         /// </summary>
         /// </summary>
         internal override void Execute()
         internal override void Execute()
         {
         {
-            RefundInfos = WeChatPayListPropertyParser.Parse<RefundInfo, CouponRefundInfo>(ResponseParameters);
+            RefundInfos = WeChatPayListPropertyParser.Parse<RefundInfo, CouponRefundInfo>(Parameters);
         }
         }
     }
     }
 }
 }

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/Response/WeChatPayRefundResponse.cs

@@ -163,7 +163,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Response
         /// </summary>
         /// </summary>
         internal override void Execute()
         internal override void Execute()
         {
         {
-            CouponRefundInfos = WeChatPayListPropertyParser.Parse<CouponRefundInfo>(ResponseParameters);
+            CouponRefundInfos = WeChatPayListPropertyParser.Parse<CouponRefundInfo>(Parameters);
         }
         }
     }
     }
 }
 }

+ 1 - 1
src/Essensoft.AspNetCore.Payment.WeChatPay/Response/WeChatPayTransitPartnerPayQueryOrderResponse.cs

@@ -199,7 +199,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Response
         /// </summary>
         /// </summary>
         internal override void Execute()
         internal override void Execute()
         {
         {
-            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(ResponseParameters);
+            CouponInfos = WeChatPayListPropertyParser.Parse<CouponInfo>(Parameters);
         }
         }
     }
     }
 }
 }

+ 6 - 6
src/Essensoft.AspNetCore.Payment.WeChatPay/WeChatPayClient.cs

@@ -109,7 +109,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
             }
             }
 
 
             var rsp = Activator.CreateInstance<T>();
             var rsp = Activator.CreateInstance<T>();
-            rsp.ResponseBody = url;
+            rsp.Body = url;
             return Task.FromResult(rsp);
             return Task.FromResult(rsp);
         }
         }
 
 
@@ -210,24 +210,24 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
 
 
         private void CheckResponseSign(WeChatPayResponse response, WeChatPayOptions options, WeChatPaySignType signType)
         private void CheckResponseSign(WeChatPayResponse response, WeChatPayOptions options, WeChatPaySignType signType)
         {
         {
-            if (string.IsNullOrEmpty(response.ResponseBody))
+            if (string.IsNullOrEmpty(response.Body))
             {
             {
                 throw new WeChatPayException("sign check fail: Body is Empty!");
                 throw new WeChatPayException("sign check fail: Body is Empty!");
             }
             }
 
 
-            if (response.ResponseParameters.Count == 0)
+            if (response.Parameters.Count == 0)
             {
             {
                 throw new WeChatPayException("sign check fail: Parameters is Empty!");
                 throw new WeChatPayException("sign check fail: Parameters is Empty!");
             }
             }
 
 
-            if (response.ResponseParameters["return_code"] == "SUCCESS")
+            if (response.Parameters["return_code"] == "SUCCESS")
             {
             {
-                if (!response.ResponseParameters.TryGetValue("sign", out var sign))
+                if (!response.Parameters.TryGetValue("sign", out var sign))
                 {
                 {
                     throw new WeChatPayException("sign check fail: sign is Empty!");
                     throw new WeChatPayException("sign check fail: sign is Empty!");
                 }
                 }
 
 
-                var cal_sign = WeChatPaySignature.SignWithKey(response.ResponseParameters, options.Key, signType);
+                var cal_sign = WeChatPaySignature.SignWithKey(response.Parameters, options.Key, signType);
                 if (cal_sign != sign)
                 if (cal_sign != sign)
                 {
                 {
                     throw new WeChatPayException("sign check fail: check Sign and Data Fail!");
                     throw new WeChatPayException("sign check fail: check Sign and Data Fail!");

+ 4 - 4
src/Essensoft.AspNetCore.Payment.WeChatPay/WeChatPayNotifyClient.cs

@@ -66,22 +66,22 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
 
 
         private void CheckNotifySign(WeChatPayNotify notify, WeChatPayOptions options)
         private void CheckNotifySign(WeChatPayNotify notify, WeChatPayOptions options)
         {
         {
-            if (string.IsNullOrEmpty(notify.ResponseBody))
+            if (string.IsNullOrEmpty(notify.Body))
             {
             {
                 throw new WeChatPayException("sign check fail: Body is Empty!");
                 throw new WeChatPayException("sign check fail: Body is Empty!");
             }
             }
 
 
-            if (notify.ResponseParameters.Count == 0)
+            if (notify.Parameters.Count == 0)
             {
             {
                 throw new WeChatPayException("sign check fail: Parameters is Empty!");
                 throw new WeChatPayException("sign check fail: Parameters is Empty!");
             }
             }
 
 
-            if (!notify.ResponseParameters.TryGetValue("sign", out var sign))
+            if (!notify.Parameters.TryGetValue("sign", out var sign))
             {
             {
                 throw new WeChatPayException("sign check fail: sign is Empty!");
                 throw new WeChatPayException("sign check fail: sign is Empty!");
             }
             }
 
 
-            var cal_sign = WeChatPaySignature.SignWithKey(notify.ResponseParameters, options.Key, WeChatPaySignType.MD5);
+            var cal_sign = WeChatPaySignature.SignWithKey(notify.Parameters, options.Key, WeChatPaySignType.MD5);
             if (cal_sign != sign)
             if (cal_sign != sign)
             {
             {
                 throw new WeChatPayException("sign check fail: check Sign and Data Fail!");
                 throw new WeChatPayException("sign check fail: check Sign and Data Fail!");

+ 2 - 2
src/Essensoft.AspNetCore.Payment.WeChatPay/WeChatPayObject.cs

@@ -8,13 +8,13 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
         /// 原始内容
         /// 原始内容
         /// </summary>
         /// </summary>
         [XmlIgnore]
         [XmlIgnore]
-        public string ResponseBody { get; set; }
+        public string Body { get; set; }
 
 
         /// <summary>
         /// <summary>
         /// 原始参数
         /// 原始参数
         /// </summary>
         /// </summary>
         [XmlIgnore]
         [XmlIgnore]
-        public WeChatPayDictionary ResponseParameters { get; internal set; }
+        public WeChatPayDictionary Parameters { get; internal set; }
 
 
         /// <summary>
         /// <summary>
         /// 处理 _$n / _$n_$m
         /// 处理 _$n / _$n_$m