Merge pull request #226 from qiniu/fix/dotnetcore2_0

支持新版分片上传

Author: xwen-winnie

src/Qiniu/Http/HttpManager.cs

@@ -530,7 +530,7 @@ public HttpResult PostJson(string url, string data, string token, bool binaryMod
                 wReq.UserAgent = userAgent;
                 wReq.AllowAutoRedirect = allowAutoRedirect;
                 wReq.ServicePoint.Expect100Continue = false;
-
+                
                 if (data != null)
                 {
                     wReq.AllowWriteStreamBuffering = true;
@@ -1210,6 +1210,128 @@ public HttpResult PostMultipart(string url, byte[] data, string boundary, string
             return result;
         }
 
+        /// <summary>
+        /// HTTP-PUT方法(包含body数据, headers)
+        /// </summary>
+        /// <param name="url">请求目标URL</param>
+        /// <param name="data">主体数据(字节数据)</param>
+        /// <param name="headers">上传设置的headers</param>
+        /// <param name="token">令牌(凭证)[可选->设置为null]</param>
+        /// <param name="binaryMode">是否以二进制模式读取响应内容(默认:否，即表示以文本方式读取)</param>
+        /// <returns>HTTP-PUT的响应结果</returns>
+        public HttpResult PutDataWithHeaders(string url, byte[] data, Dictionary<string, string> headers, bool binaryMode = false)
+        {
+            HttpResult result = new HttpResult();
+
+            HttpWebRequest wReq = null;
+
+            try
+            {
+                wReq = WebRequest.Create(url) as HttpWebRequest;
+                wReq.Method = "PUT";
+                wReq.ContentType = ContentType.APPLICATION_OCTET_STREAM;
+                wReq.UserAgent = userAgent;
+                wReq.AllowAutoRedirect = allowAutoRedirect;
+                wReq.ServicePoint.Expect100Continue = false;
+
+                foreach(KeyValuePair<string, string> header in headers)
+                {
+                    if (!string.IsNullOrEmpty(header.Value)) 
+                    {
+                        wReq.Headers.Add(header.Key, header.Value);
+                    }
+                }
+                
+                if (data != null)
+                {
+                    wReq.AllowWriteStreamBuffering = true;
+                    using (Stream sReq = wReq.GetRequestStream())
+                    {
+                        sReq.Write(data, 0, data.Length);
+                        sReq.Flush();
+                    }
+                }
+
+                HttpWebResponse wResp = wReq.GetResponse() as HttpWebResponse;
+
+                if (wResp != null)
+                {
+                    result.Code = (int)wResp.StatusCode;
+                    result.RefCode = (int)wResp.StatusCode;
+
+                    getHeaders(ref result, wResp);
+
+                    if (binaryMode)
+                    {
+                        int len = (int)wResp.ContentLength;
+                        result.Data = new byte[len];
+                        int bytesLeft = len;
+                        int bytesRead = 0;
+
+                        using (BinaryReader br = new BinaryReader(wResp.GetResponseStream()))
+                        {
+                            while (bytesLeft > 0)
+                            {
+                                bytesRead = br.Read(result.Data, len - bytesLeft, bytesLeft);
+                                bytesLeft -= bytesRead;
+                            }
+                        }
+                    }
+                    else
+                    {
+                        using (StreamReader sr = new StreamReader(wResp.GetResponseStream()))
+                        {
+                            result.Text = sr.ReadToEnd();
+                        }
+                    }
+
+                    wResp.Close();
+                }
+            }
+            catch (WebException wex)
+            {
+                HttpWebResponse xResp = wex.Response as HttpWebResponse;
+                if (xResp != null)
+                {
+                    result.Code = (int)xResp.StatusCode;
+                    result.RefCode = (int)xResp.StatusCode;
+
+                    getHeaders(ref result, xResp);
+
+                    using (StreamReader sr = new StreamReader(xResp.GetResponseStream()))
+                    {
+                        result.Text = sr.ReadToEnd();
+                    }
+
+                    xResp.Close();
+                }
+            }
+            catch (Exception ex)
+            {
+                StringBuilder sb = new StringBuilder();
+                sb.AppendFormat("[{0}] [{1}] [HTTP-PUT-BIN] Error:  ", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"),userAgent);
+                Exception e = ex;
+                while (e != null)
+                {
+                    sb.Append(e.Message + " ");
+                    e = e.InnerException;
+                }
+                sb.AppendLine();
+
+                result.RefCode = (int)HttpCode.USER_UNDEF;
+                result.RefText += sb.ToString();
+            }
+            finally
+            {
+                if (wReq != null)
+                {
+                    wReq.Abort();
+                }
+            }
+
+            return result;
+        }
+
         /// <summary>
         /// 获取返回信息头
         /// </summary>

src/Qiniu/Storage/PutExtra.cs

@@ -37,5 +37,15 @@ public class PutExtra
         /// 块并发上传的线程数量
         /// </summary>
         public int BlockUploadThreads { set; get; }
-    }
+
+        /// <summary>
+        /// 分片上传版本 目前支持v1/v2版本 默认v1
+        /// </summary>
+        public string Version = "v1";
+
+        /// <summary>
+        /// 分片上传v2字段 默认大小为4MB 分片大小范围为1 MB - 1 GB
+        /// </summary>
+        public int PartSize = 4 * 1024 * 1024;
 }
+}