Browse Source

改为私有

Roc 7 years ago
parent
commit
151c16e299

+ 16 - 18
src/Essensoft.AspNetCore.Payment.Alipay/AlipayClient.cs

@@ -43,18 +43,16 @@ namespace Essensoft.AspNetCore.Payment.Alipay
             IHttpClientFactory clientFactory,
             IOptionsSnapshot<AlipayOptions> optionsAccessor)
         {
-            Logger = logger;
-            ClientFactory = clientFactory;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _clientFactory = clientFactory;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IHttpClientFactory ClientFactory { get; set; }
-
-        public IOptionsSnapshot<AlipayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IHttpClientFactory _clientFactory;
+        private IOptionsSnapshot<AlipayOptions> _optionsSnapshotAccessor;
 
         #region IAlipayClient Members
 
@@ -98,7 +96,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 
         public async Task<T> PageExecuteAsync<T>(IAlipayRequest<T> request, string optionsName, string accessToken, string reqMethod) where T : AlipayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             var apiVersion = string.IsNullOrEmpty(request.GetApiVersion()) ? options.Version : request.GetApiVersion();
             var txtParams = new AlipayDictionary(request.GetParameters())
             {
@@ -129,7 +127,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
             {
                 var fileParams = AlipayUtility.CleanupDictionary(uRequest.GetFileParameters());
 
-                using (var client = ClientFactory.CreateClient())
+                using (var client = _clientFactory.CreateClient())
                 {
                     body = await client.DoPostAsync(options.ServerUrl, txtParams, fileParams);
                 }
@@ -152,13 +150,13 @@ namespace Essensoft.AspNetCore.Payment.Alipay
                         }
                     }
                     body = tmpUrl;
-                    Logger.Log(options.LogLevel, "Request Url:{body}", body);
+                    _logger.Log(options.LogLevel, "Request Url:{body}", body);
                 }
                 else
                 {
                     //输出post表单
                     body = BuildHtmlRequest(txtParams, reqMethod, options);
-                    Logger.Log(options.LogLevel, "Request Html:{body}", body);
+                    _logger.Log(options.LogLevel, "Request Html:{body}", body);
                 }
             }
 
@@ -183,7 +181,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 
         public async Task<T> ExecuteAsync<T>(IAlipayRequest<T> request, string optionsName, string accessToken, string appAuthToken) where T : AlipayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             var apiVersion = string.IsNullOrEmpty(request.GetApiVersion()) ? options.Version : request.GetApiVersion();
             var txtParams = new AlipayDictionary(request.GetParameters())
             {
@@ -241,11 +239,11 @@ namespace Essensoft.AspNetCore.Payment.Alipay
             txtParams.Add(SIGN, AlipaySignature.RSASignContent(signContent, options.PrivateRSAParameters, options.SignType));
 
             var query = AlipayUtility.BuildQuery(txtParams);
-            Logger.Log(options.LogLevel, "Request:{query}", query);
+            _logger.Log(options.LogLevel, "Request:{query}", query);
 
             // 是否需要上传文件
             var body = string.Empty;
-            using (var client = ClientFactory.CreateClient())
+            using (var client = _clientFactory.CreateClient())
             {
                 if (request is IAlipayUploadRequest<T> uRequest)
                 {
@@ -259,7 +257,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
                 }
             }
 
-            Logger.Log(options.LogLevel, "Response:{body}", body);
+            _logger.Log(options.LogLevel, "Response:{body}", body);
 
             T rsp = null;
             IAlipayParser<T> parser = null;
@@ -339,7 +337,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 
         #region Common Method
 
-        public string BuildHtmlRequest(IDictionary<string, string> sParaTemp, string strMethod, AlipayOptions options)
+        private string BuildHtmlRequest(IDictionary<string, string> sParaTemp, string strMethod, AlipayOptions options)
         {
             //待请求参数数组
             var dicPara = new Dictionary<string, string>(sParaTemp);
@@ -420,7 +418,7 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 
         public Task<T> SdkExecuteAsync<T>(IAlipayRequest<T> request, string optionsName) where T : AlipayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
 
             // 构造请求参数
             var requestParams = BuildRequestParams(request, null, null, options);

+ 6 - 7
src/Essensoft.AspNetCore.Payment.Alipay/AlipayNotifyClient.cs

@@ -19,15 +19,14 @@ namespace Essensoft.AspNetCore.Payment.Alipay
             ILogger<AlipayNotifyClient> logger,
             IOptionsSnapshot<AlipayOptions> optionsAccessor)
         {
-            Logger = logger;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IOptionsSnapshot<AlipayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IOptionsSnapshot<AlipayOptions> _optionsSnapshotAccessor;
 
         #region IAlipayNotifyClient Members
 
@@ -38,10 +37,10 @@ namespace Essensoft.AspNetCore.Payment.Alipay
 
         public async Task<T> ExecuteAsync<T>(HttpRequest request, string optionsName) where T : AlipayNotifyResponse
         {
-            var options = OptionsSnapshotAccessor.Get(optionsName);
+            var options = _optionsSnapshotAccessor.Get(optionsName);
             var parameters = await GetParametersAsync(request);
             var query = AlipayUtility.BuildQuery(parameters);
-            Logger.Log(options.LogLevel, "Request:{query}", query);
+            _logger.Log(options.LogLevel, "Request:{query}", query);
 
             var parser = new AlipayDictionaryParser<T>();
             var rsp = parser.Parse(parameters);

+ 16 - 18
src/Essensoft.AspNetCore.Payment.JDPay/JDPayClient.cs

@@ -23,18 +23,16 @@ namespace Essensoft.AspNetCore.Payment.JDPay
             IHttpClientFactory clientFactory,
             IOptionsSnapshot<JDPayOptions> optionsAccessor)
         {
-            Logger = logger;
-            ClientFactory = clientFactory;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _clientFactory = clientFactory;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IHttpClientFactory ClientFactory { get; set; }
-
-        public IOptionsSnapshot<JDPayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IHttpClientFactory _clientFactory;
+        private IOptionsSnapshot<JDPayOptions> _optionsSnapshotAccessor;
 
         #region IJDPayClient Members
 
@@ -45,17 +43,17 @@ namespace Essensoft.AspNetCore.Payment.JDPay
 
         public async Task<T> ExecuteAsync<T>(IJDPayRequest<T> request, string optionsName) where T : JDPayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             // 字典排序
             var sortedTxtParams = new JDPayDictionary(request.GetParameters());
 
             var content = BuildEncryptXml(request, sortedTxtParams, options);
-            Logger.Log(options.LogLevel, "Request:{content}", content);
+            _logger.Log(options.LogLevel, "Request:{content}", content);
 
-            using (var client = ClientFactory.CreateClient())
+            using (var client = _clientFactory.CreateClient())
             {
                 var body = await client.DoPostAsync(request.GetRequestUrl(), content);
-                Logger.Log(options.LogLevel, "Response:{content}", body);
+                _logger.Log(options.LogLevel, "Response:{content}", body);
 
                 var parser = new JDPayXmlParser<T>();
                 var rsp = parser.Parse(JDPayUtility.FotmatXmlString(body));
@@ -64,7 +62,7 @@ namespace Essensoft.AspNetCore.Payment.JDPay
                     var encrypt = rsp.Encrypt;
                     var base64EncryptStr = Encoding.UTF8.GetString(Convert.FromBase64String(encrypt));
                     var reqBody = JDPaySecurity.DecryptECB(base64EncryptStr, options.DesKeyBase64);
-                    Logger.Log(options.LogLevel, "Encrypt Content:{body}", reqBody);
+                    _logger.Log(options.LogLevel, "Encrypt Content:{body}", reqBody);
 
                     var reqBodyDoc = new XmlDocument { XmlResolver = null };
                     reqBodyDoc.LoadXml(reqBody);
@@ -108,7 +106,7 @@ namespace Essensoft.AspNetCore.Payment.JDPay
 
         public Task<T> PageExecuteAsync<T>(IJDPayRequest<T> request, string optionsName) where T : JDPayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             // 字典排序
             var sortedTxtParams = new JDPayDictionary(request.GetParameters());
             var encyptParams = BuildEncryptDic(request, sortedTxtParams, options);
@@ -130,7 +128,7 @@ namespace Essensoft.AspNetCore.Payment.JDPay
 
         public async Task<T> ExecuteAsync<T>(IJDPayNPP10Request<T> request, string optionsName) where T : JDPayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             var sortedTxtParams = new JDPayDictionary(request.GetParameters())
             {
                 { JDPayContants.CUSTOMER_NO, options.CustomerNo },
@@ -147,12 +145,12 @@ namespace Essensoft.AspNetCore.Payment.JDPay
             var encryptDic = JDPaySecurity.EncryptData(options.PrivateCret, options.Password, options.PublicCert, sortedTxtParams, options.SingKey, options.EncryptType, isEncrypt);
 
             var content = JDPayUtility.BuildQuery(encryptDic);
-            Logger.Log(options.LogLevel, "Request:{content}", content);
+            _logger.Log(options.LogLevel, "Request:{content}", content);
 
-            using (var client = ClientFactory.CreateClient())
+            using (var client = _clientFactory.CreateClient())
             {
                 var body = await client.DoPostAsync(request.GetRequestUrl(), content, "application/x-www-form-urlencoded");
-                Logger.Log(options.LogLevel, "Response:{content}", body);
+                _logger.Log(options.LogLevel, "Response:{content}", body);
 
                 var rsp = JsonConvert.DeserializeObject<T>(body);
 

+ 8 - 9
src/Essensoft.AspNetCore.Payment.JDPay/JDPayNotifyClient.cs

@@ -21,15 +21,14 @@ namespace Essensoft.AspNetCore.Payment.JDPay
             ILogger<JDPayNotifyClient> logger,
             IOptionsSnapshot<JDPayOptions> optionsAccessor)
         {
-            Logger = logger;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IOptionsSnapshot<JDPayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IOptionsSnapshot<JDPayOptions> _optionsSnapshotAccessor;
 
         #region IJDPayNotifyClient Members
 
@@ -40,7 +39,7 @@ namespace Essensoft.AspNetCore.Payment.JDPay
 
         public async Task<T> ExecuteAsync<T>(HttpRequest request, string optionsName) where T : JDPayNotifyResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             if (request.HasFormContentType || request.Method == "GET")
             {
                 var rspInstance = Activator.CreateInstance<T>();
@@ -48,7 +47,7 @@ namespace Essensoft.AspNetCore.Payment.JDPay
                 var parameters = GetParameters(request, options, !(rspInstance is JDPayDefrayPayNotifyResponse));
 
                 var query = JDPayUtility.BuildQuery(parameters);
-                Logger.Log(options.LogLevel, "Request:{query}", query);
+                _logger.Log(options.LogLevel, "Request:{query}", query);
 
                 var parser = new JDPayDictionaryParser<T>();
                 var rsp = parser.Parse(parameters);
@@ -68,7 +67,7 @@ namespace Essensoft.AspNetCore.Payment.JDPay
             if (request.HasTextXmlContentType())
             {
                 var body = await new StreamReader(request.Body).ReadToEndAsync();
-                Logger.Log(options.LogLevel, "Request:{body}", body);
+                _logger.Log(options.LogLevel, "Request:{body}", body);
 
                 var parser = new JDPayXmlParser<T>();
                 var rsp = parser.Parse(JDPayUtility.FotmatXmlString(body));
@@ -77,7 +76,7 @@ namespace Essensoft.AspNetCore.Payment.JDPay
                     var encrypt = rsp.Encrypt;
                     var base64EncryptStr = Encoding.UTF8.GetString(Convert.FromBase64String(encrypt));
                     var reqBody = JDPaySecurity.DecryptECB(base64EncryptStr, options.DesKeyBase64);
-                    Logger.Log(options.LogLevel, "Encrypt Content:{reqBody}", reqBody);
+                    _logger.Log(options.LogLevel, "Encrypt Content:{reqBody}", reqBody);
 
                     var reqBodyDoc = new XmlDocument { XmlResolver = null };
                     reqBodyDoc.LoadXml(reqBody);

+ 10 - 12
src/Essensoft.AspNetCore.Payment.LianLianPay/LianLianPayClient.cs

@@ -28,18 +28,16 @@ namespace Essensoft.AspNetCore.Payment.LianLianPay
             IHttpClientFactory clientFactory,
             IOptionsSnapshot<LianLianPayOptions> optionsAccessor)
         {
-            Logger = logger;
-            ClientFactory = clientFactory;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _clientFactory = clientFactory;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IHttpClientFactory ClientFactory { get; set; }
-
-        public IOptionsSnapshot<LianLianPayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IHttpClientFactory _clientFactory;
+        private IOptionsSnapshot<LianLianPayOptions> _optionsSnapshotAccessor;
 
         #region ILianLianPayClient Members
 
@@ -50,7 +48,7 @@ namespace Essensoft.AspNetCore.Payment.LianLianPay
 
         public async Task<T> ExecuteAsync<T>(ILianLianPayRequest<T> request, string optionsName) where T : LianLianPayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             // 字典排序
             var txtParams = new LianLianPayDictionary(request.GetParameters())
             {
@@ -79,12 +77,12 @@ namespace Essensoft.AspNetCore.Payment.LianLianPay
             {
                 content = Serialize(txtParams);
             }
-            Logger.Log(options.LogLevel, "Request:{content}", content);
+            _logger.Log(options.LogLevel, "Request:{content}", content);
 
-            using (var client = ClientFactory.CreateClient())
+            using (var client = _clientFactory.CreateClient())
             {
                 var body = await client.DoPostAsync(request.GetRequestUrl(), content);
-                Logger.Log(options.LogLevel, "Response:{body}", body);
+                _logger.Log(options.LogLevel, "Response:{body}", body);
 
                 var parser = new LianLianPayJsonParser<T>();
                 var rsp = parser.Parse(body);

+ 7 - 8
src/Essensoft.AspNetCore.Payment.LianLianPay/LianLianPayNotifyClient.cs

@@ -18,15 +18,14 @@ namespace Essensoft.AspNetCore.Payment.LianLianPay
             ILogger<LianLianPayClient> logger,
             IOptionsSnapshot<LianLianPayOptions> optionsAccessor)
         {
-            Logger = logger;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IOptionsSnapshot<LianLianPayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IOptionsSnapshot<LianLianPayOptions> _optionsSnapshotAccessor;
 
         #region ILianLianPayNotifyClient Members
 
@@ -37,12 +36,12 @@ namespace Essensoft.AspNetCore.Payment.LianLianPay
 
         public async Task<T> ExecuteAsync<T>(HttpRequest request, string optionsName) where T : LianLianPayNotifyResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             if (request.HasFormContentType)
             {
                 var parameters = await GetParametersAsync(request);
                 var query = LianLianPayUtility.BuildQuery(parameters);
-                Logger.Log(options.LogLevel, "Request:{query}", query);
+                _logger.Log(options.LogLevel, "Request:{query}", query);
 
                 var parser = new LianLianPayDictionaryParser<T>();
                 var rsp = parser.Parse(parameters);
@@ -53,7 +52,7 @@ namespace Essensoft.AspNetCore.Payment.LianLianPay
             if (request.HasTextJsonContentType())
             {
                 var body = await new StreamReader(request.Body).ReadToEndAsync();
-                Logger.Log(options.LogLevel, "Request:{body}", body);
+                _logger.Log(options.LogLevel, "Request:{body}", body);
 
                 var parser = new LianLianPayJsonParser<T>();
                 var rsp = parser.Parse(body);

+ 14 - 16
src/Essensoft.AspNetCore.Payment.QPay/QPayClient.cs

@@ -22,18 +22,16 @@ namespace Essensoft.AspNetCore.Payment.QPay
             IHttpClientFactory clientFactory,
             IOptionsSnapshot<QPayOptions> optionsAccessor)
         {
-            Logger = logger;
-            ClientFactory = clientFactory;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _clientFactory = clientFactory;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IHttpClientFactory ClientFactory { get; set; }
-
-        public IOptionsSnapshot<QPayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IHttpClientFactory _clientFactory;
+        private IOptionsSnapshot<QPayOptions> _optionsSnapshotAccessor;
 
         #region IQPayClient Members
 
@@ -44,7 +42,7 @@ namespace Essensoft.AspNetCore.Payment.QPay
 
         public async Task<T> ExecuteAsync<T>(IQPayRequest<T> request, string optionsName) where T : QPayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             // 字典排序
             var sortedTxtParams = new QPayDictionary(request.GetParameters())
             {
@@ -60,12 +58,12 @@ namespace Essensoft.AspNetCore.Payment.QPay
             sortedTxtParams.Add(SIGN, QPaySignature.SignWithKey(sortedTxtParams, options.Key));
 
             var content = QPayUtility.BuildContent(sortedTxtParams);
-            Logger.Log(options.LogLevel, "Request:{content}", content);
+            _logger.Log(options.LogLevel, "Request:{content}", content);
 
-            using (var client = ClientFactory.CreateClient())
+            using (var client = _clientFactory.CreateClient())
             {
                 var body = await client.DoPostAsync(request.GetRequestUrl(), content);
-                Logger.Log(options.LogLevel, "Response:{body}", body);
+                _logger.Log(options.LogLevel, "Response:{body}", body);
 
                 var parser = new QPayXmlParser<T>();
                 var rsp = parser.Parse(body);
@@ -85,7 +83,7 @@ namespace Essensoft.AspNetCore.Payment.QPay
 
         public async Task<T> ExecuteAsync<T>(IQPayCertificateRequest<T> request, string optionsName, string certificateName) where T : QPayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             // 字典排序
             var sortedTxtParams = new QPayDictionary(request.GetParameters())
             {
@@ -100,11 +98,11 @@ namespace Essensoft.AspNetCore.Payment.QPay
 
             sortedTxtParams.Add(SIGN, QPaySignature.SignWithKey(sortedTxtParams, options.Key));
             var content = QPayUtility.BuildContent(sortedTxtParams);
-            Logger.Log(options.LogLevel, "Request:{content}", content);
-            using (var client = string.IsNullOrEmpty(certificateName) ? ClientFactory.CreateClient() : ClientFactory.CreateClient(certificateName))
+            _logger.Log(options.LogLevel, "Request:{content}", content);
+            using (var client = string.IsNullOrEmpty(certificateName) ? _clientFactory.CreateClient() : _clientFactory.CreateClient(certificateName))
             {
                 var body = await client.DoPostAsync(request.GetRequestUrl(), content);
-                Logger.Log(options.LogLevel, "Response:{body}", body);
+                _logger.Log(options.LogLevel, "Response:{body}", body);
 
                 var parser = new QPayXmlParser<T>();
                 var rsp = parser.Parse(body);

+ 6 - 7
src/Essensoft.AspNetCore.Payment.QPay/QPayNotifyClient.cs

@@ -18,15 +18,14 @@ namespace Essensoft.AspNetCore.Payment.QPay
             ILogger<QPayNotifyClient> logger,
             IOptionsSnapshot<QPayOptions> optionsAccessor)
         {
-            Logger = logger;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IOptionsSnapshot<QPayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IOptionsSnapshot<QPayOptions> _optionsSnapshotAccessor;
 
         #region IQPayNotifyClient Members
 
@@ -37,9 +36,9 @@ namespace Essensoft.AspNetCore.Payment.QPay
 
         public async Task<T> ExecuteAsync<T>(HttpRequest request, string optionsName) where T : QPayNotifyResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             var body = await new StreamReader(request.Body, Encoding.UTF8).ReadToEndAsync();
-            Logger.Log(options.LogLevel, "Request:{body}", body);
+            _logger.Log(options.LogLevel, "Request:{body}", body);
 
             var parser = new QPayXmlParser<T>();
             var rsp = parser.Parse(body);

+ 11 - 13
src/Essensoft.AspNetCore.Payment.UnionPay/UnionPayClient.cs

@@ -28,18 +28,16 @@ namespace Essensoft.AspNetCore.Payment.UnionPay
             IHttpClientFactory clientFactory,
             IOptionsSnapshot<UnionPayOptions> optionsAccessor)
         {
-            Logger = logger;
-            ClientFactory = clientFactory;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _clientFactory = clientFactory;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IHttpClientFactory ClientFactory { get; set; }
-
-        public IOptionsSnapshot<UnionPayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IHttpClientFactory _clientFactory;
+        private IOptionsSnapshot<UnionPayOptions> _optionsSnapshotAccessor;
 
         #region IUnionPayClient Members
 
@@ -50,7 +48,7 @@ namespace Essensoft.AspNetCore.Payment.UnionPay
 
         public async Task<T> ExecuteAsync<T>(IUnionPayRequest<T> request, string optionsName) where T : UnionPayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             var version = string.IsNullOrEmpty(request.GetApiVersion()) ? options.Version : request.GetApiVersion();
 
             var merId = options.MerId;
@@ -85,12 +83,12 @@ namespace Essensoft.AspNetCore.Payment.UnionPay
             UnionPaySignature.Sign(txtParams, options.SignCertificate.certId, options.SignCertificate.key, options.SecureKey);
 
             var query = UnionPayUtility.BuildQuery(txtParams);
-            Logger.Log(options.LogLevel, "Request:{query}", query);
+            _logger.Log(options.LogLevel, "Request:{query}", query);
 
-            using (var client = ClientFactory.CreateClient())
+            using (var client = _clientFactory.CreateClient())
             {
                 var body = await client.DoPostAsync(request.GetRequestUrl(options.TestMode), query);
-                Logger.Log(options.LogLevel, "Response:{content}", body);
+                _logger.Log(options.LogLevel, "Response:{content}", body);
 
                 var dic = ParseQueryString(body);
 
@@ -123,7 +121,7 @@ namespace Essensoft.AspNetCore.Payment.UnionPay
 
         public Task<T> PageExecuteAsync<T>(IUnionPayRequest<T> request, string optionsName) where T : UnionPayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             var version = string.IsNullOrEmpty(request.GetApiVersion()) ? options.Version : request.GetApiVersion();
             var merId = options.MerId;
 

+ 6 - 7
src/Essensoft.AspNetCore.Payment.UnionPay/UnionPayNotifyClient.cs

@@ -16,15 +16,14 @@ namespace Essensoft.AspNetCore.Payment.UnionPay
             ILogger<UnionPayNotifyClient> logger,
             IOptionsSnapshot<UnionPayOptions> optionsAccessor)
         {
-            Logger = logger;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IOptionsSnapshot<UnionPayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IOptionsSnapshot<UnionPayOptions> _optionsSnapshotAccessor;
 
         #region IUnionPayNotifyClient Members
 
@@ -35,11 +34,11 @@ namespace Essensoft.AspNetCore.Payment.UnionPay
 
         public async Task<T> ExecuteAsync<T>(HttpRequest request, string optionsName) where T : UnionPayNotifyResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             var parameters = await GetParametersAsync(request);
 
             var query = UnionPayUtility.BuildQuery(parameters);
-            Logger.Log(options.LogLevel, "Request:{query}", query);
+            _logger.Log(options.LogLevel, "Request:{query}", query);
 
             var parser = new UnionPayDictionaryParser<T>();
             var rsp = parser.Parse(parameters);

+ 15 - 17
src/Essensoft.AspNetCore.Payment.WeChatPay/WeChatPayClient.cs

@@ -38,18 +38,16 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
             IHttpClientFactory clientFactory,
             IOptionsSnapshot<WeChatPayOptions> optionsAccessor)
         {
-            Logger = logger;
-            ClientFactory = clientFactory;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _clientFactory = clientFactory;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IHttpClientFactory ClientFactory { get; set; }
-
-        public IOptionsSnapshot<WeChatPayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IHttpClientFactory _clientFactory;
+        private IOptionsSnapshot<WeChatPayOptions> _optionsSnapshotAccessor;
 
         #region IWeChatPayClient Members
 
@@ -60,7 +58,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
 
         public async Task<T> ExecuteAsync<T>(IWeChatPayRequest<T> request, string optionsName) where T : WeChatPayResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             // 字典排序
             var sortedTxtParams = new WeChatPayDictionary(request.GetParameters())
             {
@@ -75,12 +73,12 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
 
             sortedTxtParams.Add(sign, WeChatPaySignature.SignWithKey(sortedTxtParams, options.Key));
             var content = WeChatPayUtility.BuildContent(sortedTxtParams);
-            Logger.Log(options.LogLevel, "Request:{content}", content);
+            _logger.Log(options.LogLevel, "Request:{content}", content);
 
-            using (var client = ClientFactory.CreateClient())
+            using (var client = _clientFactory.CreateClient())
             {
                 var body = await client.DoPostAsync(request.GetRequestUrl(), content);
-                Logger.Log(options.LogLevel, "Response:{body}", body);
+                _logger.Log(options.LogLevel, "Response:{body}", body);
 
                 var parser = new WeChatPayXmlParser<T>();
                 var rsp = parser.Parse(body);
@@ -102,7 +100,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
         {
             var signType = true; // ture:MD5,false:HMAC-SHA256
             var excludeSignType = true;
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             // 字典排序
             var sortedTxtParams = new WeChatPayDictionary(request.GetParameters());
             if (request is WeChatPayTransfersRequest)
@@ -193,13 +191,13 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
             sortedTxtParams.Add(sign, WeChatPaySignature.SignWithKey(sortedTxtParams, options.Key, signType, excludeSignType));
 
             var content = WeChatPayUtility.BuildContent(sortedTxtParams);
-            Logger.Log(options.LogLevel, "Request:{content}", content);
+            _logger.Log(options.LogLevel, "Request:{content}", content);
 
-            using (var client = ClientFactory.CreateClient(certificateName))
+            using (var client = _clientFactory.CreateClient(certificateName))
             {
                 var body = await client.DoPostAsync(request.GetRequestUrl(), content);
 
-                Logger.Log(options.LogLevel, "Response:{body}", body);
+                _logger.Log(options.LogLevel, "Response:{body}", body);
 
                 var parser = new WeChatPayXmlParser<T>();
                 var rsp = parser.Parse(body);
@@ -219,7 +217,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
 
         public Task<WeChatPayDictionary> ExecuteAsync(IWeChatPayCallRequest request, string optionsName)
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             var sortedTxtParams = new WeChatPayDictionary(request.GetParameters());
 
             if (request is WeChatPayAppCallPaymentRequest)

+ 7 - 8
src/Essensoft.AspNetCore.Payment.WeChatPay/WeChatPayNotifyClient.cs

@@ -20,15 +20,14 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
             ILogger<WeChatPayNotifyClient> logger,
             IOptionsSnapshot<WeChatPayOptions> optionsAccessor)
         {
-            Logger = logger;
-            OptionsSnapshotAccessor = optionsAccessor;
+            _logger = logger;
+            _optionsSnapshotAccessor = optionsAccessor;
         }
 
         #endregion
 
-        public ILogger Logger { get; set; }
-
-        public IOptionsSnapshot<WeChatPayOptions> OptionsSnapshotAccessor { get; set; }
+        private ILogger _logger;
+        private IOptionsSnapshot<WeChatPayOptions> _optionsSnapshotAccessor;
 
         #region IWeChatPayNotifyClient Members
 
@@ -39,9 +38,9 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
 
         public async Task<T> ExecuteAsync<T>(HttpRequest request, string optionsName) where T : WeChatPayNotifyResponse
         {
-            var options = string.IsNullOrEmpty(optionsName) ? OptionsSnapshotAccessor.Value : OptionsSnapshotAccessor.Get(optionsName);
+            var options = string.IsNullOrEmpty(optionsName) ? _optionsSnapshotAccessor.Value : _optionsSnapshotAccessor.Get(optionsName);
             var body = await new StreamReader(request.Body, Encoding.UTF8).ReadToEndAsync();
-            Logger.Log(options.LogLevel, "Request:{body}", body);
+            _logger.Log(options.LogLevel, "Request:{body}", body);
 
             var parser = new WeChatPayXmlParser<T>();
             var rsp = parser.Parse(body);
@@ -49,7 +48,7 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
             {
                 var key = MD5.Compute(options.Key).ToLower();
                 var data = AES.Decrypt((rsp as WeChatPayRefundNotifyResponse).ReqInfo, key, AESCipherMode.ECB, AESPaddingMode.PKCS7);
-                Logger.Log(options.LogLevel, "Decrypt Content:{data}", data); // AES-256-ECB
+                _logger.Log(options.LogLevel, "Decrypt Content:{data}", data); // AES-256-ECB
                 rsp = parser.Parse(body, data);
             }
             else