From 512e50b6cb73e4a7c8ca55dfc736bae4a94ec313 Mon Sep 17 00:00:00 2001 From: Kevin <1985088337@qq.com> Date: Mon, 13 Feb 2017 23:16:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OSS.Http.NET45.sln | 4 ++-- OSS.Http.sln | 4 ++-- OSS.Http/Mos/OsHttpRequest.cs | 5 +++++ OSS.Http/OSS.Http.csproj | 1 + OSS.Http/OsRest.cs | 6 +++--- OSS.Http/Properties/AssemblyInfo.cs | 15 +++++++++------ OSS.Http/RestUtil.cs | 4 +++- Tests/OSS.Http.Test/Program.cs | 2 ++ 8 files changed, 27 insertions(+), 14 deletions(-) diff --git a/OSS.Http.NET45.sln b/OSS.Http.NET45.sln index 5b5ea50..66188c6 100644 --- a/OSS.Http.NET45.sln +++ b/OSS.Http.NET45.sln @@ -13,8 +13,8 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5A831C5B-8D82-4A6A-A555-3E04847455D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5A831C5B-8D82-4A6A-A555-3E04847455D1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5A831C5B-8D82-4A6A-A555-3E04847455D1}.Debug|Any CPU.ActiveCfg = Release|Any CPU + {5A831C5B-8D82-4A6A-A555-3E04847455D1}.Debug|Any CPU.Build.0 = Release|Any CPU {5A831C5B-8D82-4A6A-A555-3E04847455D1}.Release|Any CPU.ActiveCfg = Release|Any CPU {5A831C5B-8D82-4A6A-A555-3E04847455D1}.Release|Any CPU.Build.0 = Release|Any CPU {F65B8EA8-36E8-42A2-A931-086F6ADA4836}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/OSS.Http.sln b/OSS.Http.sln index 31e4a51..8d87711 100644 --- a/OSS.Http.sln +++ b/OSS.Http.sln @@ -13,8 +13,8 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7AE49C75-D715-4688-8E11-A8334C461608}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7AE49C75-D715-4688-8E11-A8334C461608}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7AE49C75-D715-4688-8E11-A8334C461608}.Debug|Any CPU.ActiveCfg = Release|Any CPU + {7AE49C75-D715-4688-8E11-A8334C461608}.Debug|Any CPU.Build.0 = Release|Any CPU {7AE49C75-D715-4688-8E11-A8334C461608}.Release|Any CPU.ActiveCfg = Release|Any CPU {7AE49C75-D715-4688-8E11-A8334C461608}.Release|Any CPU.Build.0 = Release|Any CPU {1706C612-6932-4844-9B54-62765D23387F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU diff --git a/OSS.Http/Mos/OsHttpRequest.cs b/OSS.Http/Mos/OsHttpRequest.cs index 596ba3e..9ee303a 100644 --- a/OSS.Http/Mos/OsHttpRequest.cs +++ b/OSS.Http/Mos/OsHttpRequest.cs @@ -33,6 +33,11 @@ namespace OSS.Http.Mos /// public Uri Uri{ get; set; } + /// + /// 如果此值设置，则忽略 Uri 值 + /// + public string AddressUrl { get; set; } + /// /// 请求方式 /// diff --git a/OSS.Http/OSS.Http.csproj b/OSS.Http/OSS.Http.csproj index f9cb5ba..e25eeb1 100644 --- a/OSS.Http/OSS.Http.csproj +++ b/OSS.Http/OSS.Http.csproj @@ -33,6 +33,7 @@ TRACE prompt 4 + bin\Release\OSS.Http.XML diff --git a/OSS.Http/OsRest.cs b/OSS.Http/OsRest.cs index a0e6cf6..0e044fa 100644 --- a/OSS.Http/OsRest.cs +++ b/OSS.Http/OsRest.cs @@ -58,7 +58,7 @@ namespace OSS.Http if (request.TimeOutMilSeconds > 0) this.Timeout = TimeSpan.FromMilliseconds(request.TimeOutMilSeconds); - + return SendAsync(reqMsg, completionOption, cancellationToken); } @@ -72,10 +72,10 @@ namespace OSS.Http { var reqMsg = new HttpRequestMessage(); - reqMsg.RequestUri = request.Uri; + reqMsg.RequestUri = string.IsNullOrEmpty(request.AddressUrl) ? request.Uri : new Uri(request.AddressUrl); reqMsg.Method = new HttpMethod(request.HttpMothed.ToString()); - ConfigReqContent(reqMsg,request); // 配置内容 + ConfigReqContent(reqMsg, request); // 配置内容 return reqMsg; } diff --git a/OSS.Http/Properties/AssemblyInfo.cs b/OSS.Http/Properties/AssemblyInfo.cs index 6cee874..c19c3a0 100644 --- a/OSS.Http/Properties/AssemblyInfo.cs +++ b/OSS.Http/Properties/AssemblyInfo.cs @@ -1,16 +1,19 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; // General Information about an assembly is controlled through the following // set of attributes. Change these attribute values to modify the information // associated with an assembly. [assembly: AssemblyTitle("OSS.Http")] -[assembly: AssemblyDescription("")] +#if NET45 +[assembly: AssemblyDescription("通用 Http请求 Framework 版本实现")] +#else +[assembly: AssemblyDescription("通用 Http请求 Standard 版本实现")] +#endif [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] +[assembly: AssemblyCompany("OSS")] [assembly: AssemblyProduct("OSS.Http")] -[assembly: AssemblyCopyright("Copyright © 2013")] +[assembly: AssemblyCopyright("版权所有(C) OSS开源系列 2013")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] @@ -32,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("1.2.8")] -[assembly: AssemblyFileVersion("1.2.8")] +[assembly: AssemblyVersion("2.0.0")] +[assembly: AssemblyFileVersion("2.0.0")] diff --git a/OSS.Http/RestUtil.cs b/OSS.Http/RestUtil.cs index 50e7fcf..d2ebf12 100644 --- a/OSS.Http/RestUtil.cs +++ b/OSS.Http/RestUtil.cs @@ -37,8 +37,10 @@ namespace OSS.Http /// 同步的请求方式 /// /// 请求的参数 + /// /// 自定义的Response结果 - public static Task RestSend(this OsHttpRequest request,HttpCompletionOption completionOption=HttpCompletionOption.ResponseContentRead) + public static Task RestSend(this OsHttpRequest request, + HttpCompletionOption completionOption=HttpCompletionOption.ResponseContentRead) { if (m_Client==null) { diff --git a/Tests/OSS.Http.Test/Program.cs b/Tests/OSS.Http.Test/Program.cs index ea1fd95..4102e41 100644 --- a/Tests/OSS.Http.Test/Program.cs +++ b/Tests/OSS.Http.Test/Program.cs @@ -1,5 +1,6 @@ using System; using System.Net.Http; +using System.Net.Http.Headers; using OSS.Http.Mos; namespace OSS.Http.Test @@ -9,6 +10,7 @@ namespace OSS.Http.Test private static void Main(string[] args) { var req = new OsHttpRequest(); + req.RequestSet = msg => msg.Content.Headers.ContentType = new MediaTypeHeaderValue("application/json"); req.Uri = new Uri("http://www.baidu.com");