From 80e5ac19609d99dc33b294e11f2b19ea0bd3abbc Mon Sep 17 00:00:00 2001
From: Kevin <1985088337@qq.com>
Date: Fri, 17 Feb 2017 02:34:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E4=B8=8A=E4=BC=A0=E6=96=87?=
 =?UTF-8?q?=E4=BB=B6=E6=97=B6=E7=9A=84ContentType=E8=B5=8B=E5=80=BC?=
 =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 OSS.Http/OsRest.cs                  | 8 +++++---
 OSS.Http/Properties/AssemblyInfo.cs | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/OSS.Http/OsRest.cs b/OSS.Http/OsRest.cs
index 994bf2b..8b298b3 100644
--- a/OSS.Http/OsRest.cs
+++ b/OSS.Http/OsRest.cs
@@ -94,12 +94,13 @@ namespace OSS.Http
             {
                 string boundary = GetBoundary();
                 var content= new MultipartFormDataContent(boundary);
-                content.Headers.TryAddWithoutValidation("Content-Type", $"multipart/form-data;boundary={boundary}");
-
+                
                 WriteMultipartFormContent(content, req.FormParameters);
                 WriteMultipartFormFileContent(content, req.FileParameters);
 
                 reqMsg.Content = content;
+                req.RequestSet?.Invoke(reqMsg);   //  位置不能变，防止外部修改 Content-Type
+                reqMsg.Content.Headers.TryAddWithoutValidation("Content-Type", $"multipart/form-data;boundary={boundary}");
             }
             else
             {
@@ -107,8 +108,9 @@ namespace OSS.Http
                
                 reqMsg.Content = new StringContent(data);
                 reqMsg.Content.Headers.ContentType = new MediaTypeHeaderValue("application/x-www-form-urlencoded");
+                req.RequestSet?.Invoke(reqMsg);
             }
-            req.RequestSet?.Invoke(reqMsg);
+  
         }
 
 
diff --git a/OSS.Http/Properties/AssemblyInfo.cs b/OSS.Http/Properties/AssemblyInfo.cs
index c4df87d..1cac5bf 100644
--- a/OSS.Http/Properties/AssemblyInfo.cs
+++ b/OSS.Http/Properties/AssemblyInfo.cs
@@ -35,5 +35,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.0")]
-[assembly: AssemblyFileVersion("2.1.0")]
+[assembly: AssemblyVersion("2.1.1")]
+[assembly: AssemblyFileVersion("2.1.1")]