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")]