代码清理

Payment.sln

@@ -3,24 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.29009.5
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{59995AF2-2461-4C43-AACE-EB5F36D8BE3A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0-solution-items", "0-solution-items", "{E2D9A588-E676-446B-BE7B-B3AAAD9FC9B6}"
 	ProjectSection(SolutionItems) = preProject
 		Directory.Build.props = Directory.Build.props
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DD8CC860-F3E3-40F4-8A8F-20BF66EA051C}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplicationSample", "samples\WebApplicationSample\WebApplicationSample.csproj", "{53148C9A-E48E-45B1-B382-6485E4DA1006}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplicationSample_V3_0", "samples\WebApplicationSample_V3_0\WebApplicationSample_V3_0.csproj", "{6C90BFFA-2F73-4961-922A-588B589C444C}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "solution-items", "solution-items", "{E2D9A588-E676-446B-BE7B-B3AAAD9FC9B6}"
-	ProjectSection(SolutionItems) = preProject
 		LICENSE = LICENSE
 		README.MD = README.MD
 	EndProjectSection
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D3871E61-CA47-4BD0-8BF9-B64A42B2200D}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1-src", "1-src", "{D3871E61-CA47-4BD0-8BF9-B64A42B2200D}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essensoft.AspNetCore.Payment.Alipay", "src\Essensoft.AspNetCore.Payment.Alipay\Essensoft.AspNetCore.Payment.Alipay.csproj", "{167FAA95-300E-49D5-A29B-EFCFF90A0584}"
 EndProject
@@ -36,20 +26,18 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essensoft.AspNetCore.Paymen
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Essensoft.AspNetCore.Payment.JDPay", "src\Essensoft.AspNetCore.Payment.JDPay\Essensoft.AspNetCore.Payment.JDPay.csproj", "{A57153DC-67DE-4141-A13C-216CE6C5129C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2-samples", "2-samples", "{DD8CC860-F3E3-40F4-8A8F-20BF66EA051C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplicationSample", "samples\WebApplicationSample\WebApplicationSample.csproj", "{53148C9A-E48E-45B1-B382-6485E4DA1006}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebApplicationSample_V3_0", "samples\WebApplicationSample_V3_0\WebApplicationSample_V3_0.csproj", "{6C90BFFA-2F73-4961-922A-588B589C444C}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{53148C9A-E48E-45B1-B382-6485E4DA1006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{53148C9A-E48E-45B1-B382-6485E4DA1006}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{53148C9A-E48E-45B1-B382-6485E4DA1006}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{53148C9A-E48E-45B1-B382-6485E4DA1006}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6C90BFFA-2F73-4961-922A-588B589C444C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6C90BFFA-2F73-4961-922A-588B589C444C}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6C90BFFA-2F73-4961-922A-588B589C444C}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6C90BFFA-2F73-4961-922A-588B589C444C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{167FAA95-300E-49D5-A29B-EFCFF90A0584}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{167FAA95-300E-49D5-A29B-EFCFF90A0584}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{167FAA95-300E-49D5-A29B-EFCFF90A0584}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -78,13 +66,19 @@ Global
 		{A57153DC-67DE-4141-A13C-216CE6C5129C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{A57153DC-67DE-4141-A13C-216CE6C5129C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{A57153DC-67DE-4141-A13C-216CE6C5129C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{53148C9A-E48E-45B1-B382-6485E4DA1006}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{53148C9A-E48E-45B1-B382-6485E4DA1006}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{53148C9A-E48E-45B1-B382-6485E4DA1006}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{53148C9A-E48E-45B1-B382-6485E4DA1006}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6C90BFFA-2F73-4961-922A-588B589C444C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6C90BFFA-2F73-4961-922A-588B589C444C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6C90BFFA-2F73-4961-922A-588B589C444C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6C90BFFA-2F73-4961-922A-588B589C444C}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
-		{53148C9A-E48E-45B1-B382-6485E4DA1006} = {DD8CC860-F3E3-40F4-8A8F-20BF66EA051C}
-		{6C90BFFA-2F73-4961-922A-588B589C444C} = {DD8CC860-F3E3-40F4-8A8F-20BF66EA051C}
 		{167FAA95-300E-49D5-A29B-EFCFF90A0584} = {D3871E61-CA47-4BD0-8BF9-B64A42B2200D}
 		{071D1073-EEE3-45F1-ADC6-95CF90A64DD3} = {D3871E61-CA47-4BD0-8BF9-B64A42B2200D}
 		{3578E08D-A08E-4C4A-A5DE-8D31C21F7D66} = {D3871E61-CA47-4BD0-8BF9-B64A42B2200D}
@@ -92,6 +86,8 @@ Global
 		{66655C56-A98C-4F67-9F41-FECF0AFFA28E} = {D3871E61-CA47-4BD0-8BF9-B64A42B2200D}
 		{16843D79-807F-4973-AF26-66FF7141BAAD} = {D3871E61-CA47-4BD0-8BF9-B64A42B2200D}
 		{A57153DC-67DE-4141-A13C-216CE6C5129C} = {D3871E61-CA47-4BD0-8BF9-B64A42B2200D}
+		{53148C9A-E48E-45B1-B382-6485E4DA1006} = {DD8CC860-F3E3-40F4-8A8F-20BF66EA051C}
+		{6C90BFFA-2F73-4961-922A-588B589C444C} = {DD8CC860-F3E3-40F4-8A8F-20BF66EA051C}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {C5BE9B18-CD29-4490-84EA-68EDEEF75428}

src/Essensoft.AspNetCore.Payment.JDPay/Response/JDPaySaveOrderResponse.cs

@@ -1,5 +1,5 @@
 namespace Essensoft.AspNetCore.Payment.JDPay.Response
 {
     public class JDPaySaveOrderResponse : JDPayResponse
-    {}
+    { }
 }

src/Essensoft.AspNetCore.Payment.LianLianPay/LianLianPayClient.cs

@@ -6,12 +6,11 @@ using Essensoft.AspNetCore.Payment.LianLianPay.Parser;
 using Essensoft.AspNetCore.Payment.LianLianPay.Request;
 using Essensoft.AspNetCore.Payment.LianLianPay.Utility;
 using Essensoft.AspNetCore.Payment.Security;
-using Microsoft.Extensions.Logging;
 using Newtonsoft.Json;
 
 namespace Essensoft.AspNetCore.Payment.LianLianPay
 {
-       /// <summary>
+    /// <summary>
     /// LianLianPay 客户端。
     /// </summary>
     public class LianLianPayClient : ILianLianPayClient

src/Essensoft.AspNetCore.Payment.LianLianPay/LianLianPayNotifyClient.cs

@@ -1,12 +1,9 @@
-using System;
-using System.IO;
+using System.IO;
 using System.Threading.Tasks;
 using Essensoft.AspNetCore.Payment.LianLianPay.Parser;
 using Essensoft.AspNetCore.Payment.LianLianPay.Utility;
 using Essensoft.AspNetCore.Payment.Security;
 using Microsoft.AspNetCore.Http;
-using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Options;
 
 namespace Essensoft.AspNetCore.Payment.LianLianPay
 {

src/Essensoft.AspNetCore.Payment.LianLianPay/LianLianPayOptions.cs

@@ -1,5 +1,4 @@
 using Essensoft.AspNetCore.Payment.Security;
-using Microsoft.Extensions.Logging;
 using Org.BouncyCastle.Crypto;
 
 namespace Essensoft.AspNetCore.Payment.LianLianPay

src/Essensoft.AspNetCore.Payment.QPay/QPayOptions.cs

@@ -31,14 +31,8 @@ namespace Essensoft.AspNetCore.Payment.QPay
         /// </summary>
         public string CertificatePassword
         {
-            get
-            {
-                return string.IsNullOrEmpty(certificatePassword) ? MchId : certificatePassword;
-            }
-            set
-            {
-                certificatePassword = value;
-            }
+            get => string.IsNullOrEmpty(certificatePassword) ? MchId : certificatePassword;
+            set => certificatePassword = value;
         }
 
         public string GetCertificateHash()

src/Essensoft.AspNetCore.Payment.UnionPay/Request/UnionPayMobileControlPayPreauthFinishUndoRequest.cs

@@ -67,7 +67,7 @@ namespace Essensoft.AspNetCore.Payment.UnionPay.Request
         /// 二级商户名称
         /// </summary>
         public string SubMerName { get; set; }
-        
+
         /// <summary>
         /// 保留域
         /// </summary>

src/Essensoft.AspNetCore.Payment.WeChatPay/WeChatPayOptions.cs

@@ -36,14 +36,8 @@ namespace Essensoft.AspNetCore.Payment.WeChatPay
         /// </summary>
         public string CertificatePassword
         {
-            get
-            {
-                return string.IsNullOrEmpty(certificatePassword) ? MchId : certificatePassword;
-            }
-            set
-            {
-                certificatePassword = value;
-            }
+            get => string.IsNullOrEmpty(certificatePassword) ? MchId : certificatePassword;
+            set => certificatePassword = value;
         }
 
         /// <summary>