新增支付宝电脑网站支付和手机网站支付服务

Author: UtilCore

build/version.props

@@ -3,7 +3,7 @@
 		<VersionMajor>1</VersionMajor>
 		<VersionMinor>0</VersionMinor>
 		<VersionPatch>11</VersionPatch>
-		<VersionQuality>20180520-1</VersionQuality>
+		<VersionQuality>20180522-1</VersionQuality>
 		<VersionPrefix>$(VersionMajor).$(VersionMinor).$(VersionPatch)</VersionPrefix>
 		<VersionSuffix>preview-$(VersionQuality)</VersionSuffix>
 	</PropertyGroup>

readme.md

@@ -450,6 +450,8 @@ https://github.com/dotnetcore/util/
   - 地址 [已发布]
 - 支付操作
   - 支付宝条码支付 [已发布]
+  - 支付宝电脑网站支付 [已发布]
+  - 支付宝手机网站支付 [已发布]
 
 ## 更新列表
 
@@ -507,3 +509,4 @@ https://github.com/dotnetcore/util/
 - 2018年4月16日，更新了树型表格组件(Util.Ui.Angular/Prime/TreeTables)，树型控制器，树型服务。
 - 2018年4月20日，更新了颜色选择器组件(Util.Ui.Angular/Prime/ColorPickers)。
 - 2018年4月23日，更新了富文本框编辑器组件(Util.Ui.Angular/CkEditor)。
+- 2018年5月22日，更新了支付宝电脑网站支付和手机网站支付操作。

sample/Util.Samples.Webs/Startup.cs

@@ -6,6 +6,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Swashbuckle.AspNetCore.Swagger;
+using Util.Biz.Payments.Extensions;
 using Util.Datas.Ef;
 using Util.Events.Default;
 using Util.Logs.Extensions;

sample/Util.Samples.Webs/Util.Samples.Webs.csproj

@@ -33,6 +33,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Util.Applications\06-Util.Applications.csproj" />
+    <ProjectReference Include="..\..\src\Util.Biz.Payments\02-Util.Biz.Payments.csproj" />
     <ProjectReference Include="..\..\src\Util.Biz\01-Util.Biz.csproj" />
     <ProjectReference Include="..\..\src\Util.Datas\05-Util.Datas.csproj" />
     <ProjectReference Include="..\..\src\Util.Events\04-Util.Events.csproj" />

src/Util.Biz.Payments/02-Util.Biz.Payments.csproj

@@ -31,14 +31,16 @@ Util是一个.net core平台下的应用框架，旨在提升小型团队的开
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Remove="Extensions\**" />
     <Compile Remove="WeChatPay\**" />
-    <EmbeddedResource Remove="Extensions\**" />
     <EmbeddedResource Remove="WeChatPay\**" />
-    <None Remove="Extensions\**" />
     <None Remove="WeChatPay\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.ViewFeatures" Version="2.1.0-rc1-final" />
+    <PackageReference Include="Microsoft.AspNetCore.Razor" Version="2.1.0-rc1-final" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Util.Logs\03-Util.Logs.csproj" />
     <ProjectReference Include="..\Util\01-Util.csproj" />

src/Util.Biz.Payments/Alipay/Abstractions/IAlipayPagePayService.cs

@@ -0,0 +1,20 @@
+using System.Threading.Tasks;
+using Util.Biz.Payments.Alipay.Parameters.Requests;
+
+namespace Util.Biz.Payments.Alipay.Abstractions {
+    /// <summary>
+    /// 支付宝电脑网站支付服务
+    /// </summary>
+    public interface IAlipayPagePayService {
+        /// <summary>
+        /// 支付,返回表单html
+        /// </summary>
+        /// <param name="request">电脑网站支付参数</param>
+        Task<string> PayAsync( AlipayPagePayRequest request );
+        /// <summary>
+        /// 跳转到支付宝收银台
+        /// </summary>
+        /// <param name="request">电脑网站支付参数</param>
+        Task RedirectAsync( AlipayPagePayRequest request );
+    }
+}

src/Util.Biz.Payments/Alipay/Abstractions/IAlipayWapPayService.cs

@@ -0,0 +1,20 @@
+using System.Threading.Tasks;
+using Util.Biz.Payments.Alipay.Parameters.Requests;
+
+namespace Util.Biz.Payments.Alipay.Abstractions {
+    /// <summary>
+    /// 支付宝手机网站支付服务
+    /// </summary>
+    public interface IAlipayWapPayService {
+        /// <summary>
+        /// 支付,返回表单html
+        /// </summary>
+        /// <param name="request">手机网站支付参数</param>
+        Task<string> PayAsync( AlipayWapPayRequest request );
+        /// <summary>
+        /// 跳转到支付宝收银台
+        /// </summary>
+        /// <param name="request">手机网站支付参数</param>
+        Task RedirectAsync( AlipayWapPayRequest request );
+    }
+}

src/Util.Biz.Payments/Alipay/Configs/AlipayConfigProvider.cs

@@ -0,0 +1,28 @@
+using System.Threading.Tasks;
+
+namespace Util.Biz.Payments.Alipay.Configs {
+    /// <summary>
+    /// 支付宝配置提供器
+    /// </summary>
+    public class AlipayConfigProvider : IAlipayConfigProvider {
+        /// <summary>
+        /// 配置
+        /// </summary>
+        private readonly AlipayConfig _config;
+
+        /// <summary>
+        /// 初始化支付宝配置提供器
+        /// </summary>
+        /// <param name="config">支付宝配置</param>
+        public AlipayConfigProvider( AlipayConfig config ) {
+            _config = config;
+        }
+
+        /// <summary>
+        /// 获取配置
+        /// </summary>
+        public Task<AlipayConfig> GetConfigAsync() {
+            return Task.FromResult( _config );
+        }
+    }
+}

src/Util.Biz.Payments/Alipay/Parameters/AlipayParameterBuilder.cs

@@ -26,13 +26,18 @@ public AlipayParameterBuilder( AlipayConfig config ) {
             config.CheckNull( nameof( config ) );
             _config = config;
             _builder = new UrlParameterBuilder();
-            Config();
+            InitConfig();
         }
 
         /// <summary>
-        /// 设置配置
+        /// 配置
+        /// </summary>
+        public AlipayConfig Config => _config;
+
+        /// <summary>
+        /// 初始化配置
         /// </summary>
-        private void Config() {
+        private void InitConfig() {
             Format( "json" ).Charset( "utf-8" ).SignType( "RSA2" ).Timestamp().Version( "1.0" ).AppId( _config.AppId );
         }
 
@@ -111,8 +116,9 @@ public AlipayParameterBuilder Content( string content ) {
         /// 设置内容
         /// </summary>
         /// <param name="builder">内容参数生成器</param>
-        public AlipayParameterBuilder Content( AlipayContentBuilder builder ) {
-            return Content( builder.ToJson() );
+        /// <param name="isConvertToSingleQuotes">是否将双引号转成单引号</param>
+        public AlipayParameterBuilder Content( AlipayContentBuilder builder, bool isConvertToSingleQuotes = false ) {
+            return Content( builder.ToJson( isConvertToSingleQuotes ) );
         }
 
         /// <summary>
@@ -139,6 +145,14 @@ private string GetSign() {
             return signManager.Sign();
         }
 
+        /// <summary>
+        /// 获取值
+        /// </summary>
+        /// <param name="name">参数名</param>
+        public string GetValue( string name ) {
+            return _builder.GetValue( name );
+        }
+
         /// <summary>
         /// 输出结果
         /// </summary>

src/Util.Biz.Payments/Alipay/Parameters/FormBuilder.cs

@@ -0,0 +1,150 @@
+using System.IO;
+using Microsoft.AspNetCore.Mvc.Rendering;
+using Microsoft.AspNetCore.Razor.TagHelpers;
+using Util.Biz.Payments.Alipay.Configs;
+
+namespace Util.Biz.Payments.Alipay.Parameters {
+    /// <summary>
+    /// 支付宝表单生成器
+    /// </summary>
+    public class FormBuilder {
+        /// <summary>
+        /// 表单生成器
+        /// </summary>
+        private readonly TagBuilder _builder;
+
+        /// <summary>
+        /// 初始化支付宝表单生成器
+        /// </summary>
+        public FormBuilder() {
+            _builder = new TagBuilder( "form" );
+        }
+
+        /// <summary>
+        /// 表单标识
+        /// </summary>
+        public string FormId { get; set; } = "formAlipay";
+
+        /// <summary>
+        /// 是否自动提交
+        /// </summary>
+        public bool IsAutoSubmit { get; set; } = true;
+
+        /// <summary>
+        /// 添加属性,当属性名已存在则忽略，也可进行替换
+        /// </summary>
+        /// <param name="name">属性名</param>
+        /// <param name="value">属性值</param>
+        /// <param name="replaceExisting">是否替换已存在的属性</param>
+        public FormBuilder Attribute( string name, string value, bool replaceExisting = false ) {
+            _builder.MergeAttribute( name, value, replaceExisting );
+            return this;
+        }
+
+        /// <summary>
+        /// 添加属性,当属性名已存在则忽略
+        /// </summary>
+        /// <param name="name">属性名</param>
+        /// <param name="value">属性值</param>
+        public FormBuilder AddAttribute( string name, string value ) {
+            if( string.IsNullOrWhiteSpace( value ) )
+                return this;
+            Attribute( name, value );
+            return this;
+        }
+
+        /// <summary>
+        /// 添加input标签
+        /// </summary>
+        /// <param name="name">属性名</param>
+        /// <param name="value">属性值</param>
+        public FormBuilder AddInput( string name, string value ) {
+            if( string.IsNullOrWhiteSpace( value ) )
+                return this;
+            var inputBuilder = new TagBuilder( "input" );
+            inputBuilder.MergeAttribute( "name", name );
+            inputBuilder.MergeAttribute( "value", value );
+            _builder.InnerHtml.AppendHtml( inputBuilder );
+            return this;
+        }
+
+        /// <summary>
+        /// 添加参数生成器
+        /// </summary>
+        /// <param name="builder">参数生成器</param>
+        public FormBuilder AddParam( AlipayParameterBuilder builder ) {
+            builder.CheckNull( nameof( builder ) );
+            AddProperties( builder );
+            AddInputs( builder );
+            AddSubmitButton();
+            return this;
+        }
+
+        /// <summary>
+        /// 添加属性列表
+        /// </summary>
+        private void AddProperties( AlipayParameterBuilder builder ) {
+            AddAttribute( "id", FormId );
+            AddAttribute( "name", FormId );
+            AddAttribute( "action", builder.Config.GatewayUrl );
+            AddAttribute( "charset", builder.GetValue( AlipayConst.Charset ) );
+            AddAttribute( "method", "POST" );
+        }
+
+        /// <summary>
+        /// 添加input列表
+        /// </summary>
+        private void AddInputs( AlipayParameterBuilder builder ) {
+            foreach( var item in builder.GetDictionary() )
+                AddInput( item.Key, item.Value );
+        }
+
+        /// <summary>
+        /// 添加交按钮
+        /// </summary>
+        private void AddSubmitButton() {
+            _builder.InnerHtml.AppendHtml( CreateSubmitButton() );
+        }
+
+        /// <summary>
+        /// 创建提交按钮
+        /// </summary>
+        private TagBuilder CreateSubmitButton() {
+            var builder = new TagBuilder( "input" );
+            builder.MergeAttribute( "type", "submit" );
+            builder.MergeAttribute( "value", "提交" );
+            builder.MergeAttribute( "style", "display:none;" );
+            return builder;
+        }
+
+        /// <summary>
+        /// 获取结果
+        /// </summary>
+        public string Result() {
+            using( var writer = new StringWriter() ) {
+                _builder.WriteTo( writer, NullHtmlEncoder.Default );
+                if ( IsAutoSubmit ) {
+                    var scriptBuilder = CreateScript();
+                    scriptBuilder.WriteTo( writer, NullHtmlEncoder.Default );
+                }
+                return writer.ToString();
+            }
+        }
+
+        /// <summary>
+        /// 创建提交脚本
+        /// </summary>
+        private TagBuilder CreateScript() {
+            var builder = new TagBuilder( "script" );
+            builder.InnerHtml.AppendHtml( $"document.forms['{FormId}'].submit();" );
+            return builder;
+        }
+
+        /// <summary>
+        /// 获取Html结果
+        /// </summary>
+        public override string ToString() {
+            return Result();
+        }
+    }
+}

src/Util.Biz.Payments/Alipay/Parameters/Requests/AlipayBarcodePayRequest.cs

@@ -1,5 +1,4 @@
 using Util.Biz.Payments.Core;
-using Util.Maps;
 
 namespace Util.Biz.Payments.Alipay.Parameters.Requests {
     /// <summary>
@@ -10,12 +9,5 @@ public class AlipayBarcodePayRequest : PayParamBase {
         /// 用户付款授权码
         /// </summary>
         public string AuthCode { get; set; }
-
-        /// <summary>
-        /// 转换为支付参数
-        /// </summary>
-        public PayParam ToParam() {
-            return this.MapTo<PayParam>();
-        }
     }
 }

src/Util.Biz.Payments/Alipay/Parameters/Requests/AlipayPagePayRequest.cs

@@ -0,0 +1,9 @@
+using Util.Biz.Payments.Core;
+
+namespace Util.Biz.Payments.Alipay.Parameters.Requests {
+    /// <summary>
+    /// 电脑网站支付参数
+    /// </summary>
+    public class AlipayPagePayRequest : PayParamBase {
+    }
+}

src/Util.Biz.Payments/Alipay/Parameters/Requests/AlipayWapPayRequest.cs

@@ -0,0 +1,9 @@
+using Util.Biz.Payments.Core;
+
+namespace Util.Biz.Payments.Alipay.Parameters.Requests {
+    /// <summary>
+    /// 手机网站支付参数
+    /// </summary>
+    public class AlipayWapPayRequest : PayParamBase {
+    }
+}