Cleanup Code

samples/WebApplicationSample/Controllers/AlipayController.cs

@@ -10,8 +10,8 @@ namespace WebApplicationSample.Controllers
 {
     public class AlipayController : Controller
     {
-        private readonly IAlipayClient _client = null;
-        private readonly IAlipayNotifyClient _notifyClient = null;
+        private readonly IAlipayClient _client;
+        private readonly IAlipayNotifyClient _notifyClient;
 
         public AlipayController(IAlipayClient client, IAlipayNotifyClient notifyClient)
         {
@@ -34,12 +34,12 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> PreCreate(AlipayTradePreCreateViewModel viewModel)
         {
-            var model = new AlipayTradePrecreateModel()
+            var model = new AlipayTradePrecreateModel
             {
                 OutTradeNo = viewModel.OutTradeNo,
                 Subject = viewModel.Subject,
                 TotalAmount = viewModel.TotalAmount,
-                Body = viewModel.Body,
+                Body = viewModel.Body
             };
             var req = new AlipayTradePrecreateRequest();
             req.SetBizModel(model);
@@ -60,14 +60,14 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Pay(AlipayTradePayViewModel viewModel)
         {
-            var model = new AlipayTradePayModel()
+            var model = new AlipayTradePayModel
             {
                 OutTradeNo = viewModel.OutTradeNo,
                 Subject = viewModel.Subject,
                 Scene = viewModel.Scene,
                 AuthCode = viewModel.AuthCode,
                 TotalAmount = viewModel.TotalAmount,
-                Body = viewModel.Body,
+                Body = viewModel.Body
             };
             var req = new AlipayTradePayRequest();
             req.SetBizModel(model);
@@ -86,13 +86,13 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> AppPay(AlipayTradeAppPayViewModel viewModel)
         {
-            var model = new AlipayTradeAppPayModel()
+            var model = new AlipayTradeAppPayModel
             {
                 OutTradeNo = viewModel.OutTradeNo,
                 Subject = viewModel.Subject,
                 ProductCode = viewModel.ProductCode,
                 TotalAmount = viewModel.TotalAmount,
-                Body = viewModel.Body,
+                Body = viewModel.Body
             };
             var req = new AlipayTradeAppPayRequest();
             req.SetBizModel(model);
@@ -113,13 +113,13 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> PagePay(AlipayTradePagePayViewModel viewModel)
         {
-            var model = new AlipayTradePagePayModel()
+            var model = new AlipayTradePagePayModel
             {
                 Body = viewModel.Body,
                 Subject = viewModel.Subject,
                 TotalAmount = viewModel.TotalAmount,
                 OutTradeNo = viewModel.OutTradeNo,
-                ProductCode = viewModel.ProductCode,
+                ProductCode = viewModel.ProductCode
             };
             var req = new AlipayTradePagePayRequest();
             req.SetBizModel(model);
@@ -139,13 +139,13 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> WapPay(AlipayTradeWapPayViewModel viewMode)
         {
-            var model = new AlipayTradeWapPayModel()
+            var model = new AlipayTradeWapPayModel
             {
                 Body = viewMode.Body,
                 Subject = viewMode.Subject,
                 TotalAmount = viewMode.TotalAmount,
                 OutTradeNo = viewMode.OutTradeNo,
-                ProductCode = viewMode.ProductCode,
+                ProductCode = viewMode.ProductCode
             };
             var req = new AlipayTradeWapPayRequest();
             req.SetBizModel(model);
@@ -165,7 +165,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Query(AlipayTradeQueryViewModel viewMode)
         {
-            var model = new AlipayTradeQueryModel()
+            var model = new AlipayTradeQueryModel
             {
                 OutTradeNo = viewMode.OutTradeNo,
                 TradeNo = viewMode.TradeNo
@@ -188,7 +188,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Refund(AlipayTradeRefundViewModel viewMode)
         {
-            var model = new AlipayTradeRefundModel()
+            var model = new AlipayTradeRefundModel
             {
                 OutTradeNo = viewMode.OutTradeNo,
                 TradeNo = viewMode.TradeNo,
@@ -214,7 +214,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> RefundQuery(AlipayTradeRefundQueryViewModel viewMode)
         {
-            var model = new AlipayTradeFastpayRefundQueryModel()
+            var model = new AlipayTradeFastpayRefundQueryModel
             {
                 OutTradeNo = viewMode.OutTradeNo,
                 TradeNo = viewMode.TradeNo,
@@ -238,7 +238,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Transfer(AlipayTransferViewModel viewMode)
         {
-            var model = new AlipayFundTransToaccountTransferModel()
+            var model = new AlipayFundTransToaccountTransferModel
             {
                 OutBizNo = viewMode.OutBizNo,
                 PayeeType = viewMode.PayeeType,
@@ -262,10 +262,10 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> TransQuery(AlipayTransQueryViewModel viewMode)
         {
-            var model = new AlipayFundTransOrderQueryModel()
+            var model = new AlipayFundTransOrderQueryModel
             {
                 OutBizNo = viewMode.OutBizNo,
-                OrderId = viewMode.OrderId,
+                OrderId = viewMode.OrderId
             };
 
             var req = new AlipayFundTransOrderQueryRequest();
@@ -284,7 +284,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> BillDownloadurlQuery(AlipayBillDownloadurlQueryViewModel viewModel)
         {
-            var model = new AlipayDataDataserviceBillDownloadurlQueryModel()
+            var model = new AlipayDataDataserviceBillDownloadurlQueryModel
             {
                 BillDate = viewModel.BillDate,
                 BillType = viewModel.BillType

samples/WebApplicationSample/Controllers/HomeController.cs

@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Mvc;
+using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc;
 using WebApplicationSample.Models;
-using System.Diagnostics;
 
 namespace WebApplicationSample.Controllers
 {

samples/WebApplicationSample/Controllers/JDPayController.cs

@@ -1,16 +1,16 @@
-using Essensoft.AspNetCore.Payment.JDPay;
+using System.Threading.Tasks;
+using Essensoft.AspNetCore.Payment.JDPay;
 using Essensoft.AspNetCore.Payment.JDPay.Notify;
 using Essensoft.AspNetCore.Payment.JDPay.Request;
 using Microsoft.AspNetCore.Mvc;
 using WebApplicationSample.Models;
-using System.Threading.Tasks;
 
 namespace WebApplicationSample.Controllers
 {
     public class JDPayController : Controller
     {
-        private readonly IJDPayClient _client = null;
-        private readonly IJDPayNotifyClient _notifyClient = null;
+        private readonly IJDPayClient _client;
+        private readonly IJDPayNotifyClient _notifyClient;
 
         public JDPayController(IJDPayClient client, IJDPayNotifyClient notifyClient)
         {
@@ -32,7 +32,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> SaveOrderPC(JDPaySaveOrderViewModel viewModel)
         {
-            var request = new JDPaySaveOrderPCRequest()
+            var request = new JDPaySaveOrderPCRequest
             {
                 TradeNum = viewModel.TradeNum,
                 TradeName = viewModel.TradeName,
@@ -42,7 +42,7 @@ namespace WebApplicationSample.Controllers
                 Currency = viewModel.Currency,
                 CallbackUrl = viewModel.CallbackUrl,
                 NotifyUrl = viewModel.NotifyUrl,
-                UserId = viewModel.UserId,
+                UserId = viewModel.UserId
             };
 
             var response = await _client.PageExecuteAsync(request);
@@ -58,7 +58,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> SaveOrderH5(JDPaySaveOrderViewModel viewModel)
         {
-            var request = new JDPaySaveOrderH5Request()
+            var request = new JDPaySaveOrderH5Request
             {
                 TradeNum = viewModel.TradeNum,
                 TradeName = viewModel.TradeName,
@@ -68,7 +68,7 @@ namespace WebApplicationSample.Controllers
                 Currency = viewModel.Currency,
                 CallbackUrl = viewModel.CallbackUrl,
                 NotifyUrl = viewModel.NotifyUrl,
-                UserId = viewModel.UserId,
+                UserId = viewModel.UserId
             };
 
             var response = await _client.PageExecuteAsync(request);
@@ -84,7 +84,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> QRPay(JDPayUnifiedOrderViewModel viewModel)
         {
-            var request = new JDPayUnifiedOrderRequest()
+            var request = new JDPayUnifiedOrderRequest
             {
                 TradeNum = viewModel.TradeNum,
                 TradeName = viewModel.TradeName,
@@ -93,7 +93,7 @@ namespace WebApplicationSample.Controllers
                 OrderType = viewModel.OrderType,
                 Currency = viewModel.Currency,
                 NotifyUrl = viewModel.NotifyUrl,
-                TradeType = viewModel.TradeType,
+                TradeType = viewModel.TradeType
             };
 
             var response = await _client.ExecuteAsync(request);
@@ -111,11 +111,11 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Query(JDPayQueryViewModel viewModel)
         {
-            var request = new JDPayQueryRequest()
+            var request = new JDPayQueryRequest
             {
                 TradeNum = viewModel.TradeNum,
                 OTradeNum = viewModel.OTradeNum,
-                TradeType = viewModel.TradeType,
+                TradeType = viewModel.TradeType
             };
 
             var response = await _client.ExecuteAsync(request);
@@ -132,7 +132,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Refund(JDPayRefundViewModel viewModel)
         {
-            var request = new JDPayRefundRequest()
+            var request = new JDPayRefundRequest
             {
                 TradeNum = viewModel.TradeNum,
                 OTradeNum = viewModel.OTradeNum,
@@ -155,11 +155,11 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> QueryRefund(JDPayQueryRefundViewModel viewModel)
         {
-            var request = new JDPayQueryRefundRequest()
+            var request = new JDPayQueryRefundRequest
             {
                 TradeNum = viewModel.TradeNum,
                 OTradeNum = viewModel.OTradeNum,
-                TradeType = viewModel.TradeType,
+                TradeType = viewModel.TradeType
             };
 
             var response = await _client.ExecuteAsync(request);
@@ -176,7 +176,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> DefrayPay(JDPayDefrayPayViewModel viewModel)
         {
-            var request = new JDPayDefrayPayRequest()
+            var request = new JDPayDefrayPayRequest
             {
                 RequestDatetime = viewModel.RequestDatetime,
                 OutTradeNo = viewModel.OutTradeNo,
@@ -206,7 +206,7 @@ namespace WebApplicationSample.Controllers
                 ReturnParams = viewModel.ReturnParams,
                 ExtendParams = viewModel.ExtendParams,
                 BankCardInfoType = viewModel.BankCardInfoType,
-                BankCardId = viewModel.BankCardId,
+                BankCardId = viewModel.BankCardId
             };
 
             var response = await _client.ExecuteAsync(request);
@@ -223,12 +223,12 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> TradeQuery(JDPayTradeQueryViewModel viewModel)
         {
-            var request = new JDPayTradeQueryRequest()
+            var request = new JDPayTradeQueryRequest
             {
                 RequestDatetime = viewModel.RequestDatetime,
                 OutTradeNo = viewModel.OutTradeNo,
                 TradeNo = viewModel.TradeNo,
-                TradeType = viewModel.TradeType,
+                TradeType = viewModel.TradeType
             };
 
             var response = await _client.ExecuteAsync(request);

samples/WebApplicationSample/Controllers/LianLianPayController.cs

@@ -9,8 +9,8 @@ namespace WebApplicationSample.Controllers
 {
     public class LianLianPayController : Controller
     {
-        private readonly ILianLianPayClient _client = null;
-        private readonly ILianLianPayNotifyClient _notifyClient = null;
+        private readonly ILianLianPayClient _client;
+        private readonly ILianLianPayNotifyClient _notifyClient;
 
         public LianLianPayController(ILianLianPayClient client, ILianLianPayNotifyClient notifyClient)
         {
@@ -32,7 +32,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> WebQuickPay(LianLianPayWebQuickPayViewModel viewModel)
         {
-            var request = new LianLianPayCreateBillRequest()
+            var request = new LianLianPayCreateBillRequest
             {
                 UserId = viewModel.UserId,
                 NoOrder = viewModel.NoOrder,
@@ -43,7 +43,7 @@ namespace WebApplicationSample.Controllers
                 UrlReturn = viewModel.UrlReturn,
                 RiskItem = viewModel.RiskItem,
                 FlagPayProduct = "0",
-                FlagChnl = "2",
+                FlagChnl = "2"
             };
             var response = await _client.ExecuteAsync(request);
             return Redirect(response.GatewayUrl);
@@ -58,7 +58,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> H5QuickPay(LianLianPayH5QuickPayViewModel viewModel)
         {
-            var request = new LianLianPayCreateBillRequest()
+            var request = new LianLianPayCreateBillRequest
             {
                 UserId = viewModel.UserId,
                 NoOrder = viewModel.NoOrder,
@@ -69,7 +69,7 @@ namespace WebApplicationSample.Controllers
                 UrlReturn = viewModel.UrlReturn,
                 RiskItem = viewModel.RiskItem,
                 FlagPayProduct = "0",
-                FlagChnl = "3",
+                FlagChnl = "3"
             };
             var response = await _client.ExecuteAsync(request);
             return Redirect(response.GatewayUrl);
@@ -84,7 +84,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> OrderQuery(LianLianPayOrderQueryViewModel viewModel)
         {
-            var request = new LianLianPayOrderQueryRequest()
+            var request = new LianLianPayOrderQueryRequest
             {
                 NoOrder = viewModel.NoOrder,
                 DtOrder = viewModel.DtOrder,
@@ -104,7 +104,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Refund(LianLianPayRefundViewModel viewModel)
         {
-            var request = new LianLianPayRefundRequest()
+            var request = new LianLianPayRefundRequest
             {
                 NoRefund = viewModel.NoRefund,
                 DtRefund = viewModel.DtRefund,
@@ -112,7 +112,7 @@ namespace WebApplicationSample.Controllers
                 NoOrder = viewModel.NoOrder,
                 DtOrder = viewModel.DtOrder,
                 OidPaybill = viewModel.OidPayBill,
-                NotifyUrl = viewModel.NotifyUrl,
+                NotifyUrl = viewModel.NotifyUrl
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;
@@ -128,11 +128,11 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> RefundQuery(LianLianPayRefundQueryViewModel viewModel)
         {
-            var request = new LianLianPayRefundQueryRequest()
+            var request = new LianLianPayRefundQueryRequest
             {
                 NoRefund = viewModel.NoRefund,
                 DtRefund = viewModel.DtRefund,
-                OidRefundNo = viewModel.OidRefundNo,
+                OidRefundNo = viewModel.OidRefundNo
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;

samples/WebApplicationSample/Controllers/NotifyController.cs

@@ -13,6 +13,7 @@ using Essensoft.AspNetCore.Payment.UnionPay.Notify;
 using Essensoft.AspNetCore.Payment.WeChatPay;
 using Essensoft.AspNetCore.Payment.WeChatPay.Notify;
 using Microsoft.AspNetCore.Mvc;
+using WebApplicationSample.Helpers;
 
 namespace WebApplicationSample.Controllers
 {
@@ -21,7 +22,8 @@ namespace WebApplicationSample.Controllers
     [Route("notify/alipay")]
     public class AlipayNotifyController : Controller
     {
-        private readonly IAlipayNotifyClient _client = null;
+        private readonly IAlipayNotifyClient _client;
+
         public AlipayNotifyController(IAlipayNotifyClient client)
         {
             _client = client;
@@ -135,7 +137,8 @@ namespace WebApplicationSample.Controllers
     [Route("notify/wechatpay")]
     public class WeChatPayNotifyController : Controller
     {
-        private readonly IWeChatPayNotifyClient _client = null;
+        private readonly IWeChatPayNotifyClient _client;
+
         public WeChatPayNotifyController(IWeChatPayNotifyClient client)
         {
             _client = client;
@@ -204,7 +207,8 @@ namespace WebApplicationSample.Controllers
     [Route("notify/qpay")]
     public class QPayNotifyController : Controller
     {
-        private readonly IQPayNotifyClient _client = null;
+        private readonly IQPayNotifyClient _client;
+
         public QPayNotifyController(IQPayNotifyClient client)
         {
             _client = client;
@@ -266,7 +270,8 @@ namespace WebApplicationSample.Controllers
     [Route("notify/jdpay")]
     public class JDPayNotifyController : Controller
     {
-        private readonly IJDPayNotifyClient _client = null;
+        private readonly IJDPayNotifyClient _client;
+
         public JDPayNotifyController(IJDPayNotifyClient client)
         {
             _client = client;
@@ -312,7 +317,8 @@ namespace WebApplicationSample.Controllers
     [Route("notify/lianlianpay")]
     public class LianLianPayNotifyController : Controller
     {
-        private readonly ILianLianPayNotifyClient _client = null;
+        private readonly ILianLianPayNotifyClient _client;
+
         public LianLianPayNotifyController(ILianLianPayNotifyClient client)
         {
             _client = client;
@@ -358,7 +364,8 @@ namespace WebApplicationSample.Controllers
     [Route("notify/unionpay")]
     public class UnionPayNotifyController : Controller
     {
-        private readonly IUnionPayNotifyClient _client = null;
+        private readonly IUnionPayNotifyClient _client;
+
         public UnionPayNotifyController(IUnionPayNotifyClient client)
         {
             _client = client;

samples/WebApplicationSample/Controllers/QPayController.cs

@@ -8,7 +8,8 @@ namespace WebApplicationSample.Controllers
 {
     public class QPayController : Controller
     {
-        private readonly IQPayClient _client = null;
+        private readonly IQPayClient _client;
+
         public QPayController(IQPayClient client)
         {
             _client = client;
@@ -28,7 +29,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> MicroPay(QPayMicroPayViewModel viewModel)
         {
-            var request = new QPayMicroPayRequest()
+            var request = new QPayMicroPayRequest
             {
                 OutTradeNo = viewModel.OutTradeNo,
                 Body = viewModel.Body,
@@ -38,7 +39,7 @@ namespace WebApplicationSample.Controllers
                 DeviceInfo = viewModel.DeviceInfo,
                 AuthCode = viewModel.AuthCode,
                 TradeType = viewModel.TradeType,
-                NotifyUrl = viewModel.NotifyUrl,
+                NotifyUrl = viewModel.NotifyUrl
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;
@@ -54,7 +55,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> QRPay(QPayUnifiedOrderViewModel viewModel)
         {
-            var request = new QPayUnifiedOrderRequest()
+            var request = new QPayUnifiedOrderRequest
             {
                 OutTradeNo = viewModel.OutTradeNo,
                 Body = viewModel.Body,
@@ -62,7 +63,7 @@ namespace WebApplicationSample.Controllers
                 TotalFee = viewModel.TotalFee,
                 SpbillCreateIp = viewModel.SpbillCreateIp,
                 TradeType = viewModel.TradeType,
-                NotifyUrl = viewModel.NotifyUrl,
+                NotifyUrl = viewModel.NotifyUrl
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["qrcode"] = response.CodeUrl;
@@ -79,7 +80,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> PubPay(QPayUnifiedOrderViewModel viewModel)
         {
-            var request = new QPayUnifiedOrderRequest()
+            var request = new QPayUnifiedOrderRequest
             {
                 OutTradeNo = viewModel.OutTradeNo,
                 Body = viewModel.Body,
@@ -87,7 +88,7 @@ namespace WebApplicationSample.Controllers
                 TotalFee = viewModel.TotalFee,
                 SpbillCreateIp = viewModel.SpbillCreateIp,
                 TradeType = viewModel.TradeType,
-                NotifyUrl = viewModel.NotifyUrl,
+                NotifyUrl = viewModel.NotifyUrl
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;
@@ -103,7 +104,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> AppPay(QPayUnifiedOrderViewModel viewModel)
         {
-            var request = new QPayUnifiedOrderRequest()
+            var request = new QPayUnifiedOrderRequest
             {
                 OutTradeNo = viewModel.OutTradeNo,
                 Body = viewModel.Body,
@@ -111,7 +112,7 @@ namespace WebApplicationSample.Controllers
                 TotalFee = viewModel.TotalFee,
                 SpbillCreateIp = viewModel.SpbillCreateIp,
                 TradeType = viewModel.TradeType,
-                NotifyUrl = viewModel.NotifyUrl,
+                NotifyUrl = viewModel.NotifyUrl
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;
@@ -127,10 +128,10 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> OrderQuery(QPayOrderQueryViewModel viewModel)
         {
-            var request = new QPayOrderQueryRequest()
+            var request = new QPayOrderQueryRequest
             {
                 TransactionId = viewModel.TransactionId,
-                OutTradeNo = viewModel.OutTradeNo,
+                OutTradeNo = viewModel.OutTradeNo
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;
@@ -146,9 +147,9 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Reverse(QPayReverseViewModel viewModel)
         {
-            var request = new QPayReverseRequest()
+            var request = new QPayReverseRequest
             {
-                OutTradeNo = viewModel.OutTradeNo,
+                OutTradeNo = viewModel.OutTradeNo
             };
             var response = await _client.ExecuteAsync(request, "qpayCertificateName");
             ViewData["response"] = response.Body;
@@ -165,9 +166,9 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> CloseOrder(QPayCloseOrderViewModel viewModel)
         {
-            var request = new QPayCloseOrderRequest()
+            var request = new QPayCloseOrderRequest
             {
-                OutTradeNo = viewModel.OutTradeNo,
+                OutTradeNo = viewModel.OutTradeNo
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;
@@ -183,14 +184,14 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Refund(QPayRefundViewModel viewModel)
         {
-            var request = new QPayRefundRequest()
+            var request = new QPayRefundRequest
             {
                 OutRefundNo = viewModel.OutRefundNo,
                 TransactionId = viewModel.TransactionId,
                 OutTradeNo = viewModel.OutTradeNo,
                 RefundFee = viewModel.RefundFee,
                 OpUserId = viewModel.OpUserId,
-                OpUserPasswd = viewModel.OpUserPasswd,
+                OpUserPasswd = viewModel.OpUserPasswd
             };
             var response = await _client.ExecuteAsync(request, "qpayCertificateName");
             ViewData["response"] = response.Body;
@@ -206,12 +207,12 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> RefundQuery(QPayRefundQueryViewModel viewModel)
         {
-            var request = new QPayRefundQueryRequest()
+            var request = new QPayRefundQueryRequest
             {
                 RefundId = viewModel.RefundId,
                 OutRefundNo = viewModel.OutRefundNo,
                 TransactionId = viewModel.TransactionId,
-                OutTradeNo = viewModel.OutTradeNo,
+                OutTradeNo = viewModel.OutTradeNo
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;
@@ -227,11 +228,11 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> StatementDown(QPayStatementDownViewModel viewModel)
         {
-            var request = new QPayStatementDownRequest()
+            var request = new QPayStatementDownRequest
             {
                 BillDate = viewModel.BillDate,
                 BillType = viewModel.BillType,
-                TarType = viewModel.TarType,
+                TarType = viewModel.TarType
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;

samples/WebApplicationSample/Controllers/UnionPayController.cs

@@ -1,16 +1,16 @@
-using Essensoft.AspNetCore.Payment.UnionPay;
+using System.Threading.Tasks;
+using Essensoft.AspNetCore.Payment.UnionPay;
 using Essensoft.AspNetCore.Payment.UnionPay.Notify;
 using Essensoft.AspNetCore.Payment.UnionPay.Request;
 using Microsoft.AspNetCore.Mvc;
 using WebApplicationSample.Models;
-using System.Threading.Tasks;
 
 namespace WebApplicationSample.Controllers
 {
     public class UnionPayController : Controller
     {
-        private readonly IUnionPayClient _client = null;
-        private readonly IUnionPayNotifyClient _notifyClient = null;
+        private readonly IUnionPayClient _client;
+        private readonly IUnionPayNotifyClient _notifyClient;
 
         public UnionPayController(IUnionPayClient client, IUnionPayNotifyClient notifyClient)
         {
@@ -32,7 +32,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> FrontConsume62(UnionPayForm_6_2_FrontConsumeViewModel viewModel)
         {
-            var request = new UnionPayForm_6_2_FrontConsumeRequest()
+            var request = new UnionPayForm_6_2_FrontConsumeRequest
             {
                 TxnType = "01",
                 TxnSubType = "01",
@@ -44,7 +44,7 @@ namespace WebApplicationSample.Controllers
                 CurrencyCode = viewModel.CurrencyCode,
                 PayTimeout = viewModel.PayTimeout,
                 FrontUrl = viewModel.FrontUrl,
-                BackUrl = viewModel.BackUrl,
+                BackUrl = viewModel.BackUrl
             };
             var response = await _client.PageExecuteAsync(request);
             return Content(response.Body, "text/html;charset=utf-8");

samples/WebApplicationSample/Controllers/WeChatPayController.cs

@@ -9,7 +9,8 @@ namespace WebApplicationSample.Controllers
 {
     public class WeChatPayController : Controller
     {
-        private readonly IWeChatPayClient _client = null;
+        private readonly IWeChatPayClient _client;
+
         public WeChatPayController(IWeChatPayClient client)
         {
             _client = client;
@@ -29,7 +30,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> MicroPay(WeChatPayMicroPayViewModel viewModel)
         {
-            var request = new WeChatPayMicroPayRequest()
+            var request = new WeChatPayMicroPayRequest
             {
                 Body = viewModel.Body,
                 OutTradeNo = viewModel.OutTradeNo,
@@ -51,7 +52,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> PubPay(WeChatPayPubPayViewModel viewModel)
         {
-            var request = new WeChatPayUnifiedOrderRequest()
+            var request = new WeChatPayUnifiedOrderRequest
             {
                 Body = viewModel.Body,
                 OutTradeNo = viewModel.OutTradeNo,
@@ -64,9 +65,9 @@ namespace WebApplicationSample.Controllers
             var response = await _client.ExecuteAsync(request);
             if (response.ReturnCode == "SUCCESS" && response.ResultCode == "SUCCESS")
             {
-                var req = new WeChatPayH5CallPaymentRequest()
+                var req = new WeChatPayH5CallPaymentRequest
                 {
-                    Package = "prepay_id=" + response.PrepayId,
+                    Package = "prepay_id=" + response.PrepayId
                 };
                 var parameter = await _client.ExecuteAsync(req);
                 // 将参数(parameter)给 公众号前端 让他在微信内H5调起支付(https://pay.weixin.qq.com/wiki/doc/api/jsapi.php?chapter=7_7&index=6)
@@ -87,14 +88,14 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> QRPay(WeChatPayQRPayViewModel viewModel)
         {
-            var request = new WeChatPayUnifiedOrderRequest()
+            var request = new WeChatPayUnifiedOrderRequest
             {
                 Body = viewModel.Body,
                 OutTradeNo = viewModel.OutTradeNo,
                 TotalFee = viewModel.TotalFee,
                 SpbillCreateIp = viewModel.SpbillCreateIp,
                 NotifyUrl = viewModel.NotifyUrl,
-                TradeType = viewModel.TradeType,
+                TradeType = viewModel.TradeType
             };
             var response = await _client.ExecuteAsync(request);
             // response.CodeUrl 给前端生成二维码
@@ -112,22 +113,22 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> AppPay(WeChatPayAppPayViewModel viewModel)
         {
-            var request = new WeChatPayUnifiedOrderRequest()
+            var request = new WeChatPayUnifiedOrderRequest
             {
                 Body = viewModel.Body,
                 OutTradeNo = viewModel.OutTradeNo,
                 TotalFee = viewModel.TotalFee,
                 SpbillCreateIp = viewModel.SpbillCreateIp,
                 NotifyUrl = viewModel.NotifyUrl,
-                TradeType = viewModel.TradeType,
+                TradeType = viewModel.TradeType
             };
             var response = await _client.ExecuteAsync(request);
 
             if (response.ReturnCode == "SUCCESS" && response.ResultCode == "SUCCESS")
             {
-                var req = new WeChatPayAppCallPaymentRequest()
+                var req = new WeChatPayAppCallPaymentRequest
                 {
-                    PrepayId = response.PrepayId,
+                    PrepayId = response.PrepayId
                 };
                 var parameter = await _client.ExecuteAsync(req);
                 // 将参数(parameter)给 ios/android端 让他调起微信APP(https://pay.weixin.qq.com/wiki/doc/api/app/app.php?chapter=8_5)
@@ -148,14 +149,14 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> H5Pay(WeChatPayH5PayViewModel viewModel)
         {
-            var request = new WeChatPayUnifiedOrderRequest()
+            var request = new WeChatPayUnifiedOrderRequest
             {
                 Body = viewModel.Body,
                 OutTradeNo = viewModel.OutTradeNo,
                 TotalFee = viewModel.TotalFee,
                 SpbillCreateIp = viewModel.SpbillCreateIp,
                 NotifyUrl = viewModel.NotifyUrl,
-                TradeType = viewModel.TradeType,
+                TradeType = viewModel.TradeType
             };
             var response = await _client.ExecuteAsync(request);
 
@@ -172,7 +173,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> LiteAppPay(WeChatPayLiteAppPayViewModel viewModel)
         {
-            var request = new WeChatPayUnifiedOrderRequest()
+            var request = new WeChatPayUnifiedOrderRequest
             {
                 Body = viewModel.Body,
                 OutTradeNo = viewModel.OutTradeNo,
@@ -180,15 +181,15 @@ namespace WebApplicationSample.Controllers
                 SpbillCreateIp = viewModel.SpbillCreateIp,
                 NotifyUrl = viewModel.NotifyUrl,
                 TradeType = viewModel.TradeType,
-                OpenId = viewModel.OpenId,
+                OpenId = viewModel.OpenId
             };
             var response = await _client.ExecuteAsync(request);
 
             if (response.ReturnCode == "SUCCESS" && response.ResultCode == "SUCCESS")
             {
-                var req = new WeChatPayLiteAppCallPaymentRequest()
+                var req = new WeChatPayLiteAppCallPaymentRequest
                 {
-                    Package = "prepay_id=" + response.PrepayId,
+                    Package = "prepay_id=" + response.PrepayId
                 };
                 var parameter = await _client.ExecuteAsync(req);
                 // 将参数(parameter)给 小程序前端 让他调起支付API(https://pay.weixin.qq.com/wiki/doc/api/wxa/wxa_api.php?chapter=7_7&index=5)
@@ -209,10 +210,10 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> OrderQuery(WeChatPayOrderQueryViewModel viewModel)
         {
-            var request = new WeChatPayOrderQueryRequest()
+            var request = new WeChatPayOrderQueryRequest
             {
                 TransactionId = viewModel.TransactionId,
-                OutTradeNo = viewModel.OutTradeNo,
+                OutTradeNo = viewModel.OutTradeNo
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;
@@ -228,10 +229,10 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Reverse(WeChatPayReverseViewModel viewModel)
         {
-            var request = new WeChatPayReverseRequest()
+            var request = new WeChatPayReverseRequest
             {
                 TransactionId = viewModel.TransactionId,
-                OutTradeNo = viewModel.OutTradeNo,
+                OutTradeNo = viewModel.OutTradeNo
             };
             var response = await _client.ExecuteAsync(request, "wechatpayCertificateName");
             ViewData["response"] = response.Body;
@@ -247,9 +248,9 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> CloseOrder(WeChatPayCloseOrderViewModel viewModel)
         {
-            var request = new WeChatPayCloseOrderRequest()
+            var request = new WeChatPayCloseOrderRequest
             {
-                OutTradeNo = viewModel.OutTradeNo,
+                OutTradeNo = viewModel.OutTradeNo
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;
@@ -265,7 +266,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Refund(WeChatPayRefundViewModel viewModel)
         {
-            var request = new WeChatPayRefundRequest()
+            var request = new WeChatPayRefundRequest
             {
                 OutRefundNo = viewModel.OutRefundNo,
                 TransactionId = viewModel.TransactionId,
@@ -273,7 +274,7 @@ namespace WebApplicationSample.Controllers
                 TotalFee = viewModel.TotalFee,
                 RefundFee = viewModel.RefundFee,
                 RefundDesc = viewModel.RefundDesc,
-                NotifyUrl = viewModel.NotifyUrl,
+                NotifyUrl = viewModel.NotifyUrl
             };
             var response = await _client.ExecuteAsync(request, "wechatpayCertificateName");
             ViewData["response"] = response.Body;
@@ -289,12 +290,12 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> RefundQuery(WeChatPayRefundQueryViewModel viewModel)
         {
-            var request = new WeChatPayRefundQueryRequest()
+            var request = new WeChatPayRefundQueryRequest
             {
                 RefundId = viewModel.RefundId,
                 OutRefundNo = viewModel.OutRefundNo,
                 TransactionId = viewModel.TransactionId,
-                OutTradeNo = viewModel.OutTradeNo,
+                OutTradeNo = viewModel.OutTradeNo
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;
@@ -310,11 +311,11 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> DownloadBill(WeChatPayDownloadBillViewModel viewModel)
         {
-            var request = new WeChatPayDownloadBillRequest()
+            var request = new WeChatPayDownloadBillRequest
             {
                 BillDate = viewModel.BillDate,
                 BillType = viewModel.BillType,
-                TarType = viewModel.TarType,
+                TarType = viewModel.TarType
             };
             var response = await _client.ExecuteAsync(request);
             ViewData["response"] = response.Body;
@@ -330,11 +331,11 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> DownloadFundFlow(WeChatPayDownloadFundFlowViewModel viewModel)
         {
-            var request = new WeChatPayDownloadFundFlowRequest()
+            var request = new WeChatPayDownloadFundFlowRequest
             {
                 BillDate = viewModel.BillDate,
                 AccountType = viewModel.AccountType,
-                TarType = viewModel.TarType,
+                TarType = viewModel.TarType
             };
             var response = await _client.ExecuteAsync(request, "wechatpayCertificateName");
             ViewData["response"] = response.Body;
@@ -350,7 +351,7 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> Transfers(WeChatPayTransfersViewModel viewModel)
         {
-            var request = new WeChatPayTransfersRequest()
+            var request = new WeChatPayTransfersRequest
             {
                 PartnerTradeNo = viewModel.PartnerTradeNo,
                 OpenId = viewModel.OpenId,
@@ -374,9 +375,9 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> GetTransferInfo(WeChatPayGetTransferInfoViewModel viewModel)
         {
-            var request = new WeChatPayGetTransferInfoRequest()
+            var request = new WeChatPayGetTransferInfoRequest
             {
-                PartnerTradeNo = viewModel.PartnerTradeNo,
+                PartnerTradeNo = viewModel.PartnerTradeNo
             };
             var response = await _client.ExecuteAsync(request, "wechatpayCertificateName");
             ViewData["response"] = response.Body;
@@ -392,14 +393,14 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> PayBank(WeChatPayPayBankViewModel viewModel)
         {
-            var request = new WeChatPayPayBankRequest()
+            var request = new WeChatPayPayBankRequest
             {
                 PartnerTradeNo = viewModel.PartnerTradeNo,
                 EncBankNo = viewModel.EncBankNo,
                 EncTrueName = viewModel.EncTrueName,
                 BankCode = viewModel.BankCode,
                 Amount = viewModel.Amount,
-                Desc = viewModel.Desc,
+                Desc = viewModel.Desc
             };
             var response = await _client.ExecuteAsync(request, "wechatpayCertificateName");
             ViewData["response"] = response.Body;
@@ -415,9 +416,9 @@ namespace WebApplicationSample.Controllers
         [HttpPost]
         public async Task<IActionResult> QueryBank(WeChatPayQueryBankViewModel viewModel)
         {
-            var request = new WeChatPayQueryBankRequest()
+            var request = new WeChatPayQueryBankRequest
             {
-                PartnerTradeNo = viewModel.PartnerTradeNo,
+                PartnerTradeNo = viewModel.PartnerTradeNo
             };
             var response = await _client.ExecuteAsync(request, "wechatpayCertificateName");
             ViewData["response"] = response.Body;
@@ -435,10 +436,8 @@ namespace WebApplicationSample.Controllers
                 ViewData["response"] = response.Body;
                 return View();
             }
-            else
-            {
-                return View();
-            }
+
+            return View();
         }
     }
 }

samples/WebApplicationSample/Helpers/AlipayNotifyResult.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace WebApplicationSample
+namespace WebApplicationSample.Helpers
 {
     public class AlipayNotifyResult
     {
-        private static readonly ContentResult _success = new ContentResult() { Content = "success", ContentType = "text/plain" };
+        private static readonly ContentResult _success = new ContentResult { Content = "success", ContentType = "text/plain" };
 
         public static IActionResult Success => _success;
     }

samples/WebApplicationSample/Helpers/HMTLHelperExtensions.cs

@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Mvc.Rendering;
 
-namespace WebApplicationSample
+namespace WebApplicationSample.Helpers
 {
     public static class HtmlHelpers
     {
@@ -19,7 +19,7 @@ namespace WebApplicationSample
                 action = actualAction;
             }
 
-            return (controller == actualController && action == actualAction) ? activeClass : string.Empty;
+            return controller == actualController && action == actualAction ? activeClass : string.Empty;
         }
     }
 }

samples/WebApplicationSample/Helpers/JDPayNotifyResult.cs

@@ -1,11 +1,11 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace WebApplicationSample
+namespace WebApplicationSample.Helpers
 {
     public class JDPayNotifyResult
     {
-        private static readonly ContentResult _success = new ContentResult() { Content = "success", ContentType = "text/plain" };
-        private static readonly ContentResult _ok = new ContentResult() { Content = "ok", ContentType = "text/plain" };
+        private static readonly ContentResult _success = new ContentResult { Content = "success", ContentType = "text/plain" };
+        private static readonly ContentResult _ok = new ContentResult { Content = "ok", ContentType = "text/plain" };
 
         public static IActionResult Success => _success;
 

samples/WebApplicationSample/Helpers/LianLianPayNotifyResult.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace WebApplicationSample
+namespace WebApplicationSample.Helpers
 {
     public class LianLianPayNotifyResult
     {
-        private static readonly ContentResult _success = new ContentResult() { Content = "{\"ret_code\":\"0000\",\"ret_msg\":\"交易成功\"}", ContentType = "application/json" };
+        private static readonly ContentResult _success = new ContentResult { Content = "{\"ret_code\":\"0000\",\"ret_msg\":\"交易成功\"}", ContentType = "application/json" };
 
         public static IActionResult Success => _success;
     }

samples/WebApplicationSample/Helpers/QPayNotifyResult.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace WebApplicationSample
+namespace WebApplicationSample.Helpers
 {
     public class QPayNotifyResult
     {
-        private static readonly ContentResult _success = new ContentResult() { Content = "<xml><return_code>SUCCESS</return_code></xml>", ContentType = "text/xml" };
+        private static readonly ContentResult _success = new ContentResult { Content = "<xml><return_code>SUCCESS</return_code></xml>", ContentType = "text/xml" };
 
         public static IActionResult Success => _success;
     }

samples/WebApplicationSample/Helpers/UnionPayNotifyResult.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace WebApplicationSample
+namespace WebApplicationSample.Helpers
 {
     public class UnionPayNotifyResult
     {
-        private static readonly ContentResult _ok = new ContentResult() { Content = "ok", ContentType = "text/plain" };
+        private static readonly ContentResult _ok = new ContentResult { Content = "ok", ContentType = "text/plain" };
 
         public static IActionResult Ok => _ok;
     }

samples/WebApplicationSample/Helpers/WeChatPayNotifyResult.cs

@@ -1,10 +1,10 @@
 using Microsoft.AspNetCore.Mvc;
 
-namespace WebApplicationSample
+namespace WebApplicationSample.Helpers
 {
     public class WeChatPayNotifyResult
     {
-        private static readonly ContentResult _success = new ContentResult() { Content = "<xml><return_code><![CDATA[SUCCESS]]></return_code></xml>", ContentType = "text/xml" };
+        private static readonly ContentResult _success = new ContentResult { Content = "<xml><return_code><![CDATA[SUCCESS]]></return_code></xml>", ContentType = "text/xml" };
 
         public static IActionResult Success => _success;
     }

samples/WebApplicationSample/Models/QPayViewModel.cs

@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.DataAnnotations;
+using System.ComponentModel.DataAnnotations;
 
 namespace WebApplicationSample.Models
 {
@@ -76,7 +75,7 @@ namespace WebApplicationSample.Models
     public class QPayOrderQueryViewModel
     {
         [Display(Name = "transaction_id")]
-        public String TransactionId { get; set; }
+        public string TransactionId { get; set; }
 
         [Display(Name = "out_trade_no")]
         public string OutTradeNo { get; set; }

samples/WebApplicationSample/Models/WeChatPayViewModel.cs

@@ -162,7 +162,7 @@ namespace WebApplicationSample.Models
         [Required]
         [Display(Name = "trade_type")]
         public string TradeType { get; set; }
-    
+
         [Required]
         [Display(Name = "openid")]
         public string OpenId { get; set; }

samples/WebApplicationSample/Program.cs

@@ -10,9 +10,11 @@ namespace WebApplicationSample
             CreateWebHostBuilder(args).Build().Run();
         }
 
-        public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
-            WebHost.CreateDefaultBuilder(args)
+        public static IWebHostBuilder CreateWebHostBuilder(string[] args)
+        {
+            return WebHost.CreateDefaultBuilder(args)
                 .UseUrls("http://*:5000")
                 .UseStartup<Startup>();
+        }
     }
 }

samples/WebApplicationSample/Startup.cs

@@ -99,8 +99,8 @@ namespace WebApplicationSample
             app.UseMvc(routes =>
             {
                 routes.MapRoute(
-                    name: "default",
-                    template: "{controller=Home}/{action=Index}/{id?}");
+                    "default",
+                    "{controller=Home}/{action=Index}/{id?}");
             });
         }
     }

samples/WebApplicationSample/Views/Shared/_Layout.cshtml

@@ -1,4 +1,5 @@
-<!DOCTYPE html>
+@using WebApplicationSample.Helpers
+<!DOCTYPE html>
 <html>
 <head>
     <meta charset="utf-8" />
@@ -19,33 +20,33 @@
 <body>
     <nav class="navbar navbar-expand-lg navbar-light bg-white navbar-shadow">
         <div class="container">
-            <a asp-controller="Home" asp-action="Index" class="navbar-brand @Html.IsActive(controller: "Home", action: "Index", activeClass: "col-blue")">Payment</a>
+            <a asp-controller="Home" asp-action="Index" class="navbar-brand @Html.IsActive("Home", "Index", "col-blue")">Payment</a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbar" aria-controls="navbar" aria-expanded="false" aria-label="Toggle navigation">
                 <span class="navbar-toggler-icon"></span>
             </button>
             <div class="collapse navbar-collapse" id="navbar">
                 <ul class="navbar-nav mr-auto">
-                    <li class="nav-item @Html.IsActive(controller: "Alipay")">
+                    <li class="nav-item @Html.IsActive("Alipay")">
                         <a class="nav-link" asp-controller="Alipay" asp-action="Index">支付宝</a>
                     </li>
-                    <li class="nav-item @Html.IsActive(controller: "WeChatPay")">
+                    <li class="nav-item @Html.IsActive("WeChatPay")">
                         <a class="nav-link" asp-controller="WeChatPay" asp-action="Index">微信支付</a>
                     </li>
-                    <li class="nav-item @Html.IsActive(controller: "QPay")">
+                    <li class="nav-item @Html.IsActive("QPay")">
                         <a class="nav-link" asp-controller="QPay" asp-action="Index">QQ钱包</a>
                     </li>
-                    <li class="nav-item @Html.IsActive(controller: "JDPay")">
+                    <li class="nav-item @Html.IsActive("JDPay")">
                         <a class="nav-link" asp-controller="JDPay" asp-action="Index">京东支付</a>
                     </li>
-                    <li class="nav-item @Html.IsActive(controller: "LianLianPay")">
+                    <li class="nav-item @Html.IsActive("LianLianPay")">
                         <a class="nav-link" asp-controller="LianLianPay" asp-action="Index">连连支付</a>
                     </li>
-                    <li class="nav-item @Html.IsActive(controller: "UnionPay")">
+                    <li class="nav-item @Html.IsActive("UnionPay")">
                         <a class="nav-link" asp-controller="UnionPay" asp-action="Index">银联支付</a>
                     </li>
                 </ul>
                 <ul class="navbar-nav navbar-right">
-                    <li class="nav-item @Html.IsActive(controller: "Home", action: "Gratuity")">
+                    <li class="nav-item @Html.IsActive("Home", "Gratuity")">
                         <a class="nav-link" asp-controller="Home" asp-action="Gratuity">打赏</a>
                     </li>
                 </ul>
@@ -86,6 +87,6 @@
         <script src="~/js/site.min.js" asp-append-version="true"></script>
     </environment>
 
-    @RenderSection("Scripts", required: false)
+    @RenderSection("Scripts", false)
 </body>
 </html>

src/Essensoft.AspNetCore.Payment.Alipay/AlipayClient.cs

@@ -37,12 +37,6 @@ namespace Essensoft.AspNetCore.Payment.Alipay
         private const string APP_AUTH_TOKEN = "app_auth_token";
         private const string RETURN_URL = "return_url";
 
-        public virtual ILogger Logger { get; set; }
-
-        public virtual IHttpClientFactory ClientFactory { get; set; }
-
-        public virtual IOptionsSnapshot<AlipayOptions> OptionsSnapshotAccessor { get; set; }
-
         #region AlipayClient Constructors
 
         public AlipayClient(
@@ -57,6 +51,90 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 
         #endregion
 
+        public virtual ILogger Logger { get; set; }
+
+        public virtual IHttpClientFactory ClientFactory { get; set; }
+
+        public virtual IOptionsSnapshot<AlipayOptions> OptionsSnapshotAccessor { get; set; }
+
+        #region IAlipayClient Members
+
+        public string BuildHtmlRequest(IDictionary<string, string> sParaTemp, string strMethod, AlipayOptions options)
+        {
+            //待请求参数数组
+            var dicPara = new Dictionary<string, string>(sParaTemp);
+
+            var sbHtml = new StringBuilder();
+            sbHtml.Append("<form id='submit' name='submit' action='" + options.ServerUrl + "?charset=" + options.Charset +
+                 "' method='" + strMethod + "' style='display:none;'>");
+
+            foreach (var temp in dicPara)
+            {
+                sbHtml.Append("<input  name='" + temp.Key + "' value='" + temp.Value + "'/>");
+            }
+            sbHtml.Append("<input type='submit' style='display:none;'></form>");
+            //表单实现自动提交
+            sbHtml.Append("<script>document.forms['submit'].submit();</script>");
+
+            return sbHtml.ToString();
+        }
+
+        #endregion
+
+        #region Common Method
+
+        private AlipayDictionary BuildRequestParams<T>(IAlipayRequest<T> request, string accessToken, string appAuthToken, AlipayOptions options) where T : AlipayResponse
+        {
+            var apiVersion = string.IsNullOrEmpty(request.GetApiVersion()) ? options.Version : request.GetApiVersion();
+            var result = new AlipayDictionary(request.GetParameters())
+            {
+                // 序列化BizModel
+                { BIZ_CONTENT, Serialize(request.GetBizModel()) },
+                // 添加协议级请求参数，为空的参数后面会自动过滤，这里不做处理。
+                { METHOD, request.GetApiName() },
+                { VERSION, apiVersion },
+                { APP_ID, options.AppId },
+                { FORMAT, options.Format },
+                { TIMESTAMP, DateTime.Now },
+                { ACCESS_TOKEN, accessToken },
+                { SIGN_TYPE, options.SignType },
+                { TERMINAL_TYPE, request.GetTerminalType() },
+                { TERMINAL_INFO, request.GetTerminalInfo() },
+                { PROD_CODE, request.GetProdCode() },
+                { NOTIFY_URL, request.GetNotifyUrl() },
+                { CHARSET, options.Charset },
+                { RETURN_URL, request.GetReturnUrl() },
+                { APP_AUTH_TOKEN, appAuthToken }
+            };
+
+            if (request.GetNeedEncrypt())
+            {
+                if (string.IsNullOrEmpty(result[BIZ_CONTENT]))
+                {
+                    throw new Exception("api request Fail ! The reason: encrypt request is not supported!");
+                }
+
+                if (string.IsNullOrEmpty(options.EncyptKey) || string.IsNullOrEmpty(options.EncyptType))
+                {
+                    throw new Exception("encryptType or encryptKey must not null!");
+                }
+
+                if (!"AES".Equals(options.EncyptType))
+                {
+                    throw new Exception("api only support Aes!");
+                }
+
+                var encryptContent = AES.Encrypt(result[BIZ_CONTENT], options.EncyptKey, AlipaySignature.AES_IV, AESCipherMode.CBC, AESPaddingMode.PKCS7);
+                result.Remove(BIZ_CONTENT);
+                result.Add(BIZ_CONTENT, encryptContent);
+                result.Add(ENCRYPT_TYPE, options.EncyptType);
+            }
+
+            return result;
+        }
+
+        #endregion
+
         #region IAlipayClient Members
 
         public async Task<T> ExecuteAsync<T>(IAlipayRequest<T> request) where T : AlipayResponse
@@ -296,7 +374,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
                 realContent = respBody;
             }
 
-            var item = new ResponseParseItem()
+            var item = new ResponseParseItem
             {
                 realContent = realContent,
                 respContent = respBody
@@ -313,7 +391,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
                 throw new Exception("sign check fail: Body is Empty!");
             }
 
-            if (!isError || (isError && !string.IsNullOrEmpty(signItem.Sign)))
+            if (!isError || isError && !string.IsNullOrEmpty(signItem.Sign))
             {
                 var rsaCheckContent = AlipaySignature.RSACheckContent(signItem.SignSourceDate, signItem.Sign, parameters, signType);
                 if (!rsaCheckContent)
@@ -338,30 +416,6 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 
         #endregion
 
-        #region IAlipayClient Members
-
-        public string BuildHtmlRequest(IDictionary<string, string> sParaTemp, string strMethod, AlipayOptions options)
-        {
-            //待请求参数数组
-            var dicPara = new Dictionary<string, string>(sParaTemp);
-
-            var sbHtml = new StringBuilder();
-            sbHtml.Append("<form id='submit' name='submit' action='" + options.ServerUrl + "?charset=" + options.Charset +
-                 "' method='" + strMethod + "' style='display:none;'>");
-
-            foreach (var temp in dicPara)
-            {
-                sbHtml.Append("<input  name='" + temp.Key + "' value='" + temp.Value + "'/>");
-            }
-            sbHtml.Append("<input type='submit' style='display:none;'></form>");
-            //表单实现自动提交
-            sbHtml.Append("<script>document.forms['submit'].submit();</script>");
-
-            return sbHtml.ToString();
-        }
-
-        #endregion
-
         #region SDK Execute
 
         public Task<T> SdkExecuteAsync<T>(IAlipayRequest<T> request) where T : AlipayResponse
@@ -398,63 +452,10 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 
         #endregion
 
-        #region Common Method
-
-        private AlipayDictionary BuildRequestParams<T>(IAlipayRequest<T> request, string accessToken, string appAuthToken, AlipayOptions options) where T : AlipayResponse
-        {
-            var apiVersion = string.IsNullOrEmpty(request.GetApiVersion()) ? options.Version : request.GetApiVersion();
-            var result = new AlipayDictionary(request.GetParameters())
-            {
-                // 序列化BizModel
-                { BIZ_CONTENT, Serialize(request.GetBizModel()) },
-                // 添加协议级请求参数，为空的参数后面会自动过滤，这里不做处理。
-                { METHOD, request.GetApiName() },
-                { VERSION, apiVersion },
-                { APP_ID, options.AppId },
-                { FORMAT, options.Format },
-                { TIMESTAMP, DateTime.Now },
-                { ACCESS_TOKEN, accessToken },
-                { SIGN_TYPE, options.SignType },
-                { TERMINAL_TYPE, request.GetTerminalType() },
-                { TERMINAL_INFO, request.GetTerminalInfo() },
-                { PROD_CODE, request.GetProdCode() },
-                { NOTIFY_URL, request.GetNotifyUrl() },
-                { CHARSET, options.Charset },
-                { RETURN_URL, request.GetReturnUrl() },
-                { APP_AUTH_TOKEN, appAuthToken }
-            };
-
-            if (request.GetNeedEncrypt())
-            {
-                if (string.IsNullOrEmpty(result[BIZ_CONTENT]))
-                {
-                    throw new Exception("api request Fail ! The reason: encrypt request is not supported!");
-                }
-
-                if (string.IsNullOrEmpty(options.EncyptKey) || string.IsNullOrEmpty(options.EncyptType))
-                {
-                    throw new Exception("encryptType or encryptKey must not null!");
-                }
-
-                if (!"AES".Equals(options.EncyptType))
-                {
-                    throw new Exception("api only support Aes!");
-                }
-
-                var encryptContent = AES.Encrypt(result[BIZ_CONTENT], options.EncyptKey, AlipaySignature.AES_IV, AESCipherMode.CBC, AESPaddingMode.PKCS7);
-                result.Remove(BIZ_CONTENT);
-                result.Add(BIZ_CONTENT, encryptContent);
-                result.Add(ENCRYPT_TYPE, options.EncyptType);
-            }
-
-            return result;
-        }
-
-        #endregion
-
         #region Model Serialize
 
         private static readonly JsonSerializerSettings jsonSerializerSettings = new JsonSerializerSettings { NullValueHandling = NullValueHandling.Ignore };
+
         private string Serialize(AlipayObject bizModel)
         {
             return bizModel == null ? string.Empty : JsonConvert.SerializeObject(bizModel, jsonSerializerSettings);

src/Essensoft.AspNetCore.Payment.Alipay/AlipayNotifyClient.cs

@@ -13,10 +13,6 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 {
     public class AlipayNotifyClient : IAlipayNotifyClient
     {
-        public virtual ILogger Logger { get; set; }
-
-        public virtual IOptionsSnapshot<AlipayOptions> OptionsSnapshotAccessor { get; set; }
-
         #region AlipayNotifyClient Constructors
 
         public AlipayNotifyClient(
@@ -29,6 +25,10 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 
         #endregion
 
+        public virtual ILogger Logger { get; set; }
+
+        public virtual IOptionsSnapshot<AlipayOptions> OptionsSnapshotAccessor { get; set; }
+
         #region IAlipayNotifyClient Members
 
         public async Task<T> ExecuteAsync<T>(HttpRequest request) where T : AlipayNotifyResponse

src/Essensoft.AspNetCore.Payment.Alipay/AlipayNotifyResponse.cs

@@ -1,6 +1,5 @@
 namespace Essensoft.AspNetCore.Payment.Alipay
 {
     public abstract class AlipayNotifyResponse : AlipayObject
-    {
-    }
+    {}
 }

src/Essensoft.AspNetCore.Payment.Alipay/AlipayObject.cs

@@ -7,6 +7,5 @@ namespace Essensoft.AspNetCore.Payment.Alipay
     /// </summary>
     [Serializable]
     public abstract class AlipayObject
-    {
-    }
+    {}
 }

src/Essensoft.AspNetCore.Payment.Alipay/AlipayOptions.cs

@@ -6,21 +6,26 @@ namespace Essensoft.AspNetCore.Payment.Alipay
     public class AlipayOptions
     {
         /// <summary>
-        /// 应用ID
+        /// 应用私钥
         /// </summary>
-        public string AppId { get; set; }
+        internal RSAParameters PrivateRSAParameters;
 
         /// <summary>
         /// 支付宝公钥
         /// </summary>
         internal RSAParameters PublicRSAParameters;
+
+        private string rsaPrivateKey;
         private string rsaPublicKey;
+
+        /// <summary>
+        /// 应用ID
+        /// </summary>
+        public string AppId { get; set; }
+
         public string RsaPublicKey
         {
-            get
-            {
-                return rsaPublicKey;
-            }
+            get => rsaPublicKey;
             set
             {
                 rsaPublicKey = value;
@@ -31,17 +36,9 @@ namespace Essensoft.AspNetCore.Payment.Alipay
             }
         }
 
-        /// <summary>
-        /// 应用私钥
-        /// </summary>
-        internal RSAParameters PrivateRSAParameters;
-        private string rsaPrivateKey;
         public string RsaPrivateKey
         {
-            get
-            {
-                return rsaPrivateKey;
-            }
+            get => rsaPrivateKey;
             set
             {
                 rsaPrivateKey = value;

src/Essensoft.AspNetCore.Payment.Alipay/AlipayResponse.cs

@@ -51,12 +51,6 @@ namespace Essensoft.AspNetCore.Payment.Alipay
         /// </summary>
         [JsonIgnore]
         [XmlIgnore]
-        public bool IsError
-        {
-            get
-            {
-                return !string.IsNullOrEmpty(SubCode);
-            }
-        }
+        public bool IsError => !string.IsNullOrEmpty(SubCode);
     }
 }

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccDetailModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccPayeeInfo.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccTransDetail.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccessOrdersFeedBack.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccessOrdersFeedBackResult.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccessParams.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccessProduceOrder.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccessProduceQrcode.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccessPurchaseOrder.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccessPurchaseOrderSend.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccessPurchaseOrderSendResult.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccessReturnQrcode.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccessReturnQrcodeResult.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/Account.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccountFreeze.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AccountRecord.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/ActivityAuditDTO.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/ActivityOrderDTO.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/ActivityPlanInfo.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AddressInfo.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/Advert.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AdvertItem.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AdviceVO.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AgreementParams.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AgreementSignParams.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AiOcrTableContext.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AiOcrTableRow.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AliTrustAlipayCert.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AliTrustCert.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AliTrustRiskIdentify.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AliTrustScore.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAccount.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAccountExrateAdviceAcceptModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAccountExrateAllclientrateQueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAccountExrateCollectcoreDataSendModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAccountExratePricingNotifyModel.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAccountExrateRatequeryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAccountExrateSentimentDataSendModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAccountExrateTraderequestCreateModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAccountFinriskInstriskmonitorKeywordsBatchqueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAssetCardNewtemplateCreateModel.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAssetCardReturnRefundModel.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAssetPointAccountlogQueryModel.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAssetPointOrderCreateModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAssetPointOrderQueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayAssetVoucherprodChargeSendModel.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayBossBaseProcessInstanceCancelModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayBossBaseProcessInstanceCreateModel.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayBossBaseProcessInstanceQueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayBossBaseProcessSignVerifyModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayBossBaseProcessTaskProcessModel.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayBossCsChannelQueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayBossCsCssocialYqmessageQueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayBossCsDatacollectSendModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayBossProdSubmerchantCreateModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayBossProdSubmerchantModifyModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayBossProdSubmerchantQueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayChinareModelResult.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCodeRecoResult.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceAirXfgDsgModifyModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceBusinessorderQueryModel.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorDepositCancelModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorDepositConfirmModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorDepositQueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorFunctionQueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorScriptQueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorStationQueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorVoucherBatchqueryModel.cs

@@ -1,7 +1,7 @@
 using System;
-using Newtonsoft.Json;
-using System.Xml.Serialization;
 using System.Collections.Generic;
+using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorVoucherCancelModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorVoucherConfirmModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorVoucherGenerateModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorVoucherQueryModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorVoucherRefundModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {

src/Essensoft.AspNetCore.Payment.Alipay/Domain/AlipayCommerceCityfacilitatorVoucherUploadModel.cs

@@ -1,6 +1,6 @@
 using System;
-using Newtonsoft.Json;
 using System.Xml.Serialization;
+using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.Alipay.Domain
 {