修复支付宝接口中文乱码bug

Author: UtilCore

build/version.props

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

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

@@ -38,6 +38,18 @@ public class AlipayConfig {
         /// </summary>
         public string NotifyUrl { get; set; }
 
+        /// <summary>
+        /// 字符编码
+        /// </summary>
+        public string Charset { get; set; } = "utf-8";
+
+        /// <summary>
+        /// 获取支付网关地址
+        /// </summary>
+        public string GetGatewayUrl() {
+            return $"{GatewayUrl}?charset={Charset}";
+        }
+
         /// <summary>
         /// 验证
         /// </summary>

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

@@ -42,7 +42,7 @@ public AlipayParameterBuilder( AlipayConfig config, PayParamBase param = null )
         /// 初始化
         /// </summary>
         private void Init( PayParamBase param ) {
-            Format( "json" ).Charset( "utf-8" ).SignType( "RSA2" ).Timestamp().Version( "1.0" ).AppId( Config.AppId );
+            Format( "json" ).Charset( Config.Charset ).SignType( "RSA2" ).Timestamp().Version( "1.0" ).AppId( Config.AppId );
             if( param == null )
                 return;
             param.Init();

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

@@ -86,7 +86,7 @@ public FormBuilder AddParam( AlipayParameterBuilder builder ) {
         private void AddProperties( AlipayParameterBuilder builder ) {
             AddAttribute( "id", FormId );
             AddAttribute( "name", FormId );
-            AddAttribute( "action", builder.Config.GatewayUrl );
+            AddAttribute( "action", builder.Config.GetGatewayUrl() );
             AddAttribute( "charset", builder.GetValue( AlipayConst.Charset ) );
             AddAttribute( "method", "POST" );
         }

src/Util.Biz.Payments/Alipay/Services/Base/AlipayServiceBase.cs

@@ -103,7 +103,7 @@ protected virtual async Task<string> Request( AlipayConfig config, AlipayParamet
             if( IsSendRequest == false )
                 return string.Empty;
             return await Web.Client()
-                .Post( config.GatewayUrl )
+                .Post( config.GetGatewayUrl() )
                 .Data( builder.GetDictionary() )
                 .ResultAsync();
         }
@@ -123,7 +123,7 @@ protected void WriteLog( AlipayConfig config, AlipayParameterBuilder builder, Al
             log.Class( GetType().FullName )
                 .Caption( "支付宝支付" )
                 .Content( $"支付方式 : {GetPayWay().Description()}" )
-                .Content( $"支付网关 : {config.GatewayUrl}" )
+                .Content( $"支付网关 : {config.GetGatewayUrl()}" )
                 .Content( "请求参数:" )
                 .Content( builder.GetDictionary() )
                 .Content()
@@ -148,7 +148,7 @@ protected void WriteLog( AlipayConfig config, AlipayParameterBuilder builder, st
             log.Class( GetType().FullName )
                 .Caption( "支付宝支付" )
                 .Content( $"支付方式 : {GetPayWay().Description()}" )
-                .Content( $"支付网关 : {config.GatewayUrl}" )
+                .Content( $"支付网关 : {config.GetGatewayUrl()}" )
                 .Content( "请求参数:" )
                 .Content( builder.GetDictionary() )
                 .Content()

test/Util.Biz.Tests.Integration/Payments/Alipay/AlipayPagePayServiceTest.cs

@@ -42,7 +42,7 @@ public void Dispose() {
         public async Task TestPayAsync() {
             Time.SetTime( "2018-5-22 11:11:11" );
             String result = new String();
-            result.Append( "<form action=\"https://openapi.alipaydev.com/gateway.do\" charset=\"utf-8\" id=\"formAlipay\" method=\"POST\" name=\"formAlipay\">" );
+            result.Append( "<form action=\"https://openapi.alipaydev.com/gateway.do?charset=utf-8\" charset=\"utf-8\" id=\"formAlipay\" method=\"POST\" name=\"formAlipay\">" );
             result.Append( "<input name=\"app_id\" value=\"2016090800463464\"></input>" );
             result.Append( "<input name=\"biz_content\" value=\"{'out_trade_no':'59f7caeeab89e009e4a4e1fb','subject':'test','total_amount':'10','timeout_express':'90m'}\"></input>" );
             result.Append( "<input name=\"charset\" value=\"utf-8\"></input>" );

test/Util.Biz.Tests.Integration/Payments/Alipay/AlipayWapPayServiceTest.cs

@@ -42,7 +42,7 @@ public void Dispose() {
         public async Task TestPayAsync() {
             Time.SetTime( "2018-5-22 11:11:11" );
             String result = new String();
-            result.Append( "<form action=\"https://openapi.alipaydev.com/gateway.do\" charset=\"utf-8\" id=\"formAlipay\" method=\"POST\" name=\"formAlipay\">" );
+            result.Append( "<form action=\"https://openapi.alipaydev.com/gateway.do?charset=utf-8\" charset=\"utf-8\" id=\"formAlipay\" method=\"POST\" name=\"formAlipay\">" );
             result.Append( "<input name=\"app_id\" value=\"2016090800463464\"></input>" );
             result.Append( "<input name=\"biz_content\" value=\"{'out_trade_no':'59f7caeeab89e009e4a4e1fb','subject':'test','total_amount':'10','timeout_express':'90m'}\"></input>" );
             result.Append( "<input name=\"charset\" value=\"utf-8\"></input>" );