Browse Source

将 AlipayResponse.ResponseBody 改为 AlipayResponse.Body

Roc 5 years ago
parent
commit
9ff9b94207

+ 12 - 12
samples/WebApplicationSample/Controllers/AlipayController.cs

@@ -60,7 +60,7 @@ namespace WebApplicationSample.Controllers
 
             var response = await _client.CertificateExecuteAsync(req, _optionsAccessor.Value);
             ViewData["qrcode"] = response.QrCode;
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
         }
 
@@ -92,7 +92,7 @@ namespace WebApplicationSample.Controllers
             req.SetBizModel(model);
 
             var response = await _client.CertificateExecuteAsync(req, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
         }
 
@@ -124,8 +124,8 @@ namespace WebApplicationSample.Controllers
             req.SetNotifyUrl(viewModel.NotifyUrl);
 
             var response = await _client.SdkExecuteAsync(req, _optionsAccessor.Value);
-            //将response.ResponseBody给 ios/android端 由其去调起支付宝APP(https://docs.open.alipay.com/204/105296/ https://docs.open.alipay.com/204/105295/)
-            ViewData["response"] = response.ResponseBody;
+            //将response.Body给 ios/android端 由其去调起支付宝APP(https://docs.open.alipay.com/204/105296/ https://docs.open.alipay.com/204/105295/)
+            ViewData["response"] = response.Body;
             return View();
         }
 
@@ -159,7 +159,7 @@ namespace WebApplicationSample.Controllers
             req.SetReturnUrl(viewModel.ReturnUrl);
 
             var response = await _client.PageExecuteAsync(req, _optionsAccessor.Value);
-            return Content(response.ResponseBody, "text/html", Encoding.UTF8);
+            return Content(response.Body, "text/html", Encoding.UTF8);
         }
 
         /// <summary>
@@ -191,7 +191,7 @@ namespace WebApplicationSample.Controllers
             req.SetReturnUrl(viewMode.ReturnUrl);
 
             var response = await _client.PageExecuteAsync(req, _optionsAccessor.Value);
-            return Content(response.ResponseBody, "text/html", Encoding.UTF8);
+            return Content(response.Body, "text/html", Encoding.UTF8);
         }
 
         /// <summary>
@@ -219,7 +219,7 @@ namespace WebApplicationSample.Controllers
             req.SetBizModel(model);
 
             var response = await _client.CertificateExecuteAsync(req, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
         }
 
@@ -251,7 +251,7 @@ namespace WebApplicationSample.Controllers
             req.SetBizModel(model);
 
             var response = await _client.CertificateExecuteAsync(req, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
         }
 
@@ -281,7 +281,7 @@ namespace WebApplicationSample.Controllers
             req.SetBizModel(model);
 
             var response = await _client.CertificateExecuteAsync(req, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
         }
 
@@ -312,7 +312,7 @@ namespace WebApplicationSample.Controllers
             var req = new AlipayFundTransUniTransferRequest();
             req.SetBizModel(model);
             var response = await _client.CertificateExecuteAsync(req, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
         }
 
@@ -340,7 +340,7 @@ namespace WebApplicationSample.Controllers
             var req = new AlipayFundTransCommonQueryRequest();
             req.SetBizModel(model);
             var response = await _client.CertificateExecuteAsync(req, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
         }
 
@@ -368,7 +368,7 @@ namespace WebApplicationSample.Controllers
             var req = new AlipayFundAccountQueryRequest();
             req.SetBizModel(model);
             var response = await _client.CertificateExecuteAsync(req, _optionsAccessor.Value);
-            ViewData["response"] = response.ResponseBody;
+            ViewData["response"] = response.Body;
             return View();
         }
 

+ 5 - 5
src/Essensoft.AspNetCore.Payment.Alipay/AlipayClient.cs

@@ -261,9 +261,9 @@ namespace Essensoft.AspNetCore.Payment.Alipay
             return rsp;
         }
 
-        private void CheckResponseSign<T>(IAlipayRequest<T> request, string responseBody, bool isError, IAlipayParser<T> parser, AlipayOptions options) where T : AlipayResponse
+        private void CheckResponseSign<T>(IAlipayRequest<T> request, string body, bool isError, IAlipayParser<T> parser, AlipayOptions options) where T : AlipayResponse
         {
-            var signItem = parser.GetSignItem(request, responseBody);
+            var signItem = parser.GetSignItem(request, body);
             if (signItem == null)
             {
                 throw new AlipayException("sign check fail: Body is Empty!");
@@ -431,9 +431,9 @@ namespace Essensoft.AspNetCore.Payment.Alipay
             return rsp;
         }
 
-        private async Task CheckResponseCertSignAsync<T>(IAlipayRequest<T> request, string responseBody, bool isError, IAlipayParser<T> parser, AlipayOptions options) where T : AlipayResponse
+        private async Task CheckResponseCertSignAsync<T>(IAlipayRequest<T> request, string body, bool isError, IAlipayParser<T> parser, AlipayOptions options) where T : AlipayResponse
         {
-            var certItem = parser.GetCertItem(request, responseBody);
+            var certItem = parser.GetCertItem(request, body);
             if (certItem == null)
             {
                 throw new AlipayException("cert check fail: Body is Empty!");
@@ -648,7 +648,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 
             // 构造结果
             var rsp = Activator.CreateInstance<T>();
-            rsp.ResponseBody = signedResult;
+            rsp.Body = signedResult;
             return Task.FromResult(rsp);
         }
 

+ 1 - 1
src/Essensoft.AspNetCore.Payment.Alipay/AlipayResponse.cs

@@ -39,7 +39,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
         /// 响应原始内容
         /// </summary>
         [JsonIgnore]
-        public virtual string ResponseBody { get; set; }
+        public virtual string Body { get; set; }
 
         /// <summary>
         /// 响应结果是否错误

+ 9 - 9
src/Essensoft.AspNetCore.Payment.Alipay/Parser/AlipayJsonParser.cs

@@ -169,41 +169,41 @@ namespace Essensoft.AspNetCore.Payment.Alipay.Parser
 
             if (rsp != null)
             {
-                rsp.ResponseBody = body;
+                rsp.Body = body;
             }
 
             return rsp;
         }
 
-        public SignItem GetSignItem(IAlipayRequest<T> request, string responseBody)
+        public SignItem GetSignItem(IAlipayRequest<T> request, string body)
         {
-            if (string.IsNullOrEmpty(responseBody))
+            if (string.IsNullOrEmpty(body))
             {
                 return null;
             }
 
             var signItem = new SignItem
             {
-                Sign = GetSign(responseBody),
-                SignSourceDate = GetSignSourceData(request, responseBody)
+                Sign = GetSign(body),
+                SignSourceDate = GetSignSourceData(request, body)
             };
 
             return signItem;
         }
 
-        public CertItem GetCertItem(IAlipayRequest<T> request, string responseBody)
+        public CertItem GetCertItem(IAlipayRequest<T> request, string body)
         {
-            if (string.IsNullOrEmpty(responseBody))
+            if (string.IsNullOrEmpty(body))
             {
                 return null;
             }
 
-            var json = JsonSerializer.Deserialize<IDictionary>(responseBody, jsonSerializerOptions);
+            var json = JsonSerializer.Deserialize<IDictionary>(body, jsonSerializerOptions);
             var certItem = new CertItem()
             {
                 Sign = json[AlipayConstants.SIGN]?.ToString(),
                 CertSN = json[AlipayConstants.ALIPAY_CERT_SN]?.ToString(),
-                SignSourceDate = GetSignSourceData(request, responseBody)
+                SignSourceDate = GetSignSourceData(request, body)
             };
 
             return certItem;

+ 4 - 4
src/Essensoft.AspNetCore.Payment.Alipay/Parser/IAlipayParser.cs

@@ -17,15 +17,15 @@
         /// 解析签名内容
         /// </summary>
         /// <param name="request"></param>
-        /// <param name="responseBody"></param>
-        SignItem GetSignItem(IAlipayRequest<T> request, string responseBody);
+        /// <param name="body"></param>
+        SignItem GetSignItem(IAlipayRequest<T> request, string body);
 
         /// <summary>
         /// 解析证书以及签名内容
         /// </summary>
         /// <param name="request"></param>
-        /// <param name="responseBody"></param>
-        CertItem GetCertItem(IAlipayRequest<T> request, string responseBody);
+        /// <param name="body"></param>
+        CertItem GetCertItem(IAlipayRequest<T> request, string body);
 
         /// <summary>
         /// 将响应串解密

+ 1 - 1
src/Essensoft.AspNetCore.Payment.Alipay/Response/AlipayOpenRequestBatchSendResponse.cs

@@ -11,6 +11,6 @@ namespace Essensoft.AspNetCore.Payment.Alipay.Response
         /// 批量请求中子业务接口的响应拼接报文:  {  "alipay_trade_query_response":{"code":"10000","msg":"Success","out_trade_no":"2018232"}}#S#{  "alipay_trade_query_response":{"code":"10000","msg":"Success","out_trade_no":"2018232"}}
         /// </summary>
         [JsonPropertyName("response_body")]
-        public new string ResponseBody { get; set; }
+        public string ResponseBody { get; set; }
     }
 }

+ 1 - 1
src/Essensoft.AspNetCore.Payment.Alipay/Response/AlipayTradeQueryResponse.cs

@@ -31,7 +31,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay.Response
         /// 订单描述;  只在间连场景下返回;
         /// </summary>
         [JsonPropertyName("body")]
-        public string Body { get; set; }
+        public new string Body { get; set; }
 
         /// <summary>
         /// 买家支付宝账号