Browse Source

BodyModel 改名为 QueryModel

Roc 5 years ago
parent
commit
87c0ec0100

+ 5 - 5
src/Essensoft.AspNetCore.Payment.WeChatPay/IWeChatPayV3PostRequest.cs

@@ -8,14 +8,14 @@
         string GetRequestUrl();
         string GetRequestUrl();
 
 
         /// <summary>
         /// <summary>
-        /// 获取BodyModel
+        /// 获取QueryModel
         /// </summary>
         /// </summary>
-        WeChatPayObject GetBodyModel();
+        WeChatPayObject GetQueryModel();
 
 
         /// <summary>
         /// <summary>
-        /// 设置BodyModel
+        /// 设置QueryModel
         /// </summary>
         /// </summary>
-        /// <param name="bodyModel"></param>
-        void SetBodyModel(WeChatPayObject bodyModel);
+        /// <param name="queryModel"></param>
+        void SetQueryModel(WeChatPayObject queryModel);
     }
     }
 }
 }

+ 5 - 5
src/Essensoft.AspNetCore.Payment.WeChatPay/Request/WeChatPayTransactionsAppRequest.cs

@@ -9,21 +9,21 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Request
     /// </summary>
     /// </summary>
     public class WeChatPayTransactionsAppRequest : IWeChatPayV3PostRequest<WeChatPayTransactionsAppResponse>
     public class WeChatPayTransactionsAppRequest : IWeChatPayV3PostRequest<WeChatPayTransactionsAppResponse>
     {
     {
-        private WeChatPayObject bodyModel;
+        private WeChatPayObject queryModel;
 
 
         public string GetRequestUrl()
         public string GetRequestUrl()
         {
         {
             return "https://api.mch.weixin.qq.com/v3/pay/transactions/app";
             return "https://api.mch.weixin.qq.com/v3/pay/transactions/app";
         }
         }
 
 
-        public WeChatPayObject GetBodyModel()
+        public WeChatPayObject GetQueryModel()
         {
         {
-            return bodyModel;
+            return queryModel;
         }
         }
 
 
-        public void SetBodyModel(WeChatPayObject bodyModel)
+        public void SetQueryModel(WeChatPayObject queryModel)
         {
         {
-            this.bodyModel = bodyModel;
+            this.queryModel = queryModel;
         }
         }
     }
     }
 }
 }

+ 5 - 5
src/Essensoft.AspNetCore.Payment.WeChatPay/Request/WeChatPayTransactionsH5Request.cs

@@ -9,21 +9,21 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Request
     /// </summary>
     /// </summary>
     public class WeChatPayTransactionsH5Request : IWeChatPayV3PostRequest<WeChatPayTransactionsH5Response>
     public class WeChatPayTransactionsH5Request : IWeChatPayV3PostRequest<WeChatPayTransactionsH5Response>
     {
     {
-        private WeChatPayObject bodyModel;
+        private WeChatPayObject queryModel;
 
 
         public string GetRequestUrl()
         public string GetRequestUrl()
         {
         {
             return "https://api.mch.weixin.qq.com/v3/pay/transactions/h5";
             return "https://api.mch.weixin.qq.com/v3/pay/transactions/h5";
         }
         }
 
 
-        public WeChatPayObject GetBodyModel()
+        public WeChatPayObject GetQueryModel()
         {
         {
-            return bodyModel;
+            return queryModel;
         }
         }
 
 
-        public void SetBodyModel(WeChatPayObject bodyModel)
+        public void SetQueryModel(WeChatPayObject queryModel)
         {
         {
-            this.bodyModel = bodyModel;
+            this.queryModel = queryModel;
         }
         }
     }
     }
 }
 }

+ 5 - 5
src/Essensoft.AspNetCore.Payment.WeChatPay/Request/WeChatPayTransactionsJsApiRequest.cs

@@ -9,21 +9,21 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Request
     /// </summary>
     /// </summary>
     public class WeChatPayTransactionsJsApiRequest : IWeChatPayV3PostRequest<WeChatPayTransactionsJsApiResponse>
     public class WeChatPayTransactionsJsApiRequest : IWeChatPayV3PostRequest<WeChatPayTransactionsJsApiResponse>
     {
     {
-        private WeChatPayObject bodyModel;
+        private WeChatPayObject queryModel;
 
 
         public string GetRequestUrl()
         public string GetRequestUrl()
         {
         {
             return "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi";
             return "https://api.mch.weixin.qq.com/v3/pay/transactions/jsapi";
         }
         }
 
 
-        public WeChatPayObject GetBodyModel()
+        public WeChatPayObject GetQueryModel()
         {
         {
-            return bodyModel;
+            return queryModel;
         }
         }
 
 
-        public void SetBodyModel(WeChatPayObject bodyModel)
+        public void SetQueryModel(WeChatPayObject queryModel)
         {
         {
-            this.bodyModel = bodyModel;
+            this.queryModel = queryModel;
         }
         }
     }
     }
 }
 }

+ 5 - 5
src/Essensoft.AspNetCore.Payment.WeChatPay/Request/WeChatPayTransactionsNativeRequest.cs

@@ -9,21 +9,21 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Request
     /// </summary>
     /// </summary>
     public class WeChatPayTransactionsNativeRequest : IWeChatPayV3PostRequest<WeChatPayTransactionsNativeResponse>
     public class WeChatPayTransactionsNativeRequest : IWeChatPayV3PostRequest<WeChatPayTransactionsNativeResponse>
     {
     {
-        private WeChatPayObject bodyModel;
+        private WeChatPayObject queryModel;
 
 
         public string GetRequestUrl()
         public string GetRequestUrl()
         {
         {
             return "https://api.mch.weixin.qq.com/v3/pay/transactions/native";
             return "https://api.mch.weixin.qq.com/v3/pay/transactions/native";
         }
         }
 
 
-        public WeChatPayObject GetBodyModel()
+        public WeChatPayObject GetQueryModel()
         {
         {
-            return bodyModel;
+            return queryModel;
         }
         }
 
 
-        public void SetBodyModel(WeChatPayObject bodyModel)
+        public void SetQueryModel(WeChatPayObject queryModel)
         {
         {
-            this.bodyModel = bodyModel;
+            this.queryModel = queryModel;
         }
         }
     }
     }
 }
 }

+ 5 - 5
src/Essensoft.AspNetCore.Payment.WeChatPay/Request/WeChatPayTransactionsOutTradeNoCloseRequest.cs

@@ -17,21 +17,21 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Request
         /// </summary>
         /// </summary>
         public string OutTradeNo { get; set; }
         public string OutTradeNo { get; set; }
 
 
-        private WeChatPayObject bodyModel;
+        private WeChatPayObject queryModel;
 
 
         public string GetRequestUrl()
         public string GetRequestUrl()
         {
         {
             return $"https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{OutTradeNo}/close";
             return $"https://api.mch.weixin.qq.com/v3/pay/transactions/out-trade-no/{OutTradeNo}/close";
         }
         }
 
 
-        public WeChatPayObject GetBodyModel()
+        public WeChatPayObject GetQueryModel()
         {
         {
-            return bodyModel;
+            return queryModel;
         }
         }
 
 
-        public void SetBodyModel(WeChatPayObject bodyModel)
+        public void SetQueryModel(WeChatPayObject queryModel)
         {
         {
-            this.bodyModel = bodyModel;
+            this.queryModel = queryModel;
         }
         }
     }
     }
 }
 }

+ 6 - 6
src/Essensoft.AspNetCore.Payment.WeChatPay/Utility/HttpClientExtensions.cs

@@ -66,7 +66,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Utility
         public static async Task<(string serial, string timestamp, string nonce, string signature, string body, int statusCode)> PostAsync<T>(this HttpClient client, IWeChatPayV3PostRequest<T> request, WeChatPayOptions options) where T : WeChatPayV3Response
         public static async Task<(string serial, string timestamp, string nonce, string signature, string body, int statusCode)> PostAsync<T>(this HttpClient client, IWeChatPayV3PostRequest<T> request, WeChatPayOptions options) where T : WeChatPayV3Response
         {
         {
             var url = request.GetRequestUrl();
             var url = request.GetRequestUrl();
-            var content = SerializeBodyModel(request);
+            var content = SerializeQueryModel(request);
             var token = BuildToken(url, "POST", content, options);
             var token = BuildToken(url, "POST", content, options);
             client.DefaultRequestHeaders.Add(WeChatPayConsts.Wechatpay_Serial, options.CertificateSerialNo);
             client.DefaultRequestHeaders.Add(WeChatPayConsts.Wechatpay_Serial, options.CertificateSerialNo);
             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("WECHATPAY2-SHA256-RSA2048", token);
             client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("WECHATPAY2-SHA256-RSA2048", token);
@@ -88,15 +88,15 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay.Utility
             }
             }
         }
         }
 
 
-        private static string SerializeBodyModel<T>(IWeChatPayV3PostRequest<T> request) where T : WeChatPayV3Response
+        private static string SerializeQueryModel<T>(IWeChatPayV3PostRequest<T> request) where T : WeChatPayV3Response
         {
         {
-            var bodyModel = request.GetBodyModel();
-            if (bodyModel != null)
+            var queryModel = request.GetQueryModel();
+            if (queryModel != null)
             {
             {
-                return JsonSerializer.Serialize(bodyModel, bodyModel.GetType(), jsonSerializerOptions);
+                return JsonSerializer.Serialize(queryModel, queryModel.GetType(), jsonSerializerOptions);
             }
             }
 
 
-            throw new WeChatPayException("BodyModel is null!");
+            throw new WeChatPayException("QueryModel is null!");
         }
         }
 
 
         private static string BuildToken(string url, string method, string body, WeChatPayOptions options)
         private static string BuildToken(string url, string method, string body, WeChatPayOptions options)