diff --git a/CHANGELOG.md b/CHANGELOG.md
index 11a46964..427373c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,13 @@
+**2017-01-17**
+
+最新版本v7.2.5，适用于.NET Framework 2.0+ 和.NET Core
+
+修复：因不同系统对于HTTP换行处理(CRLF)导致部署到Linux下的程序使用表单上传失败的问题
+
+更新：部分类、属性、方法等名称修改，请参见文档或者指南
+
+* * *
+
 **2017-01-12**
 
 最新版本v7.2.4，适用于.NET Framework 2.0+ 和.NET Core
diff --git a/README.md b/README.md
index d3c9ecee..11aaf2d0 100644
--- a/README.md
+++ b/README.md
@@ -8,15 +8,15 @@
 
 以下文档用于检索SDK接口、属性说明，它将有助于您理解SDK的结构。
 
-* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.4/index.html)
+* [HTML在线浏览](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.5/index.html)
 
-* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.4.chm)
+* [CHM文件下载](http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.5.chm)
 
 以下文档/链接提供一些基本示例，参考这些示例可以帮助您更快熟悉如何使用这套SDK。
 
 * [github | csharp-sdk-examples](https://github.com/fengyhack/csharp-sdk-examples)
 
-* [C# SDK使用指南 | 代码示例](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.4/index.html)
+* [C# SDK使用指南 | 代码示例](http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.5/index.html)
 
 ##如何安装
 
diff --git a/doc/README.html b/doc/README.html
index f99feeca..ed29277f 100644
--- a/doc/README.html
+++ b/doc/README.html
@@ -17,14 +17,14 @@ <h2 id="sdk文档">SDK文档</h2>
 
 <p>以下文档用于检索SDK接口、属性说明，它将有助于您理解SDK的结构。</p>
 
-<ul><li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.4/index.html" target="_blank">HTML在线浏览</a></p></li>
-<li><p><a href="http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.4.chm" target="_blank">CHM文件下载</a></p></li>
+<ul><li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-ref-v7.2.5/index.html" target="_blank">HTML在线浏览</a></p></li>
+<li><p><a href="http://oiy037d6a.bkt.clouddn.com/QiniuCSharpSDK-Ref-v7.2.5.chm" target="_blank">CHM文件下载</a></p></li>
 </ul>
 
 <p>以下文档/链接提供一些基本示例，参考这些示例可以帮助您更快熟悉如何使用这套SDK。</p>
 
 <ul><li><p><a href="https://github.com/fengyhack/csharp-sdk-shared-examples" target="_blank">github | csharp-sdk-examples</a></p></li>
-<li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.4/index.html" target="_blank">C# SDK使用指南 | 代码示例</a></p></li>
+<li><p><a href="http://oiy037d6a.bkt.clouddn.com/csharp-sdk-man-v7.2.5/index.html" target="_blank">C# SDK使用指南 | 代码示例</a></p></li>
 </ul>
 
 
diff --git a/doc/README.pdf b/doc/README.pdf
index 8afbe8dd..bef7decc 100644
Binary files a/doc/README.pdf and b/doc/README.pdf differ
diff --git a/src/Qiniu/CDN/CdnManager.cs b/src/Qiniu/CDN/CdnManager.cs
new file mode 100644
index 00000000..41fd7023
--- /dev/null
+++ b/src/Qiniu/CDN/CdnManager.cs
@@ -0,0 +1,376 @@
+using System;
+using System.Text;
+using Qiniu.Common;
+using Qiniu.Util;
+using Qiniu.Http;
+using Qiniu.CDN.Model;
+
+namespace Qiniu.CDN
+{
+    /// <summary>
+    /// 融合CDN加速-功能模块： 缓存刷新、文件预取、流量/带宽查询、日志查询、时间戳防盗链
+    /// 另请参阅 http://developer.qiniu.com/article/index.html#fusion-api-handbook
+    /// 关于时间戳防盗链可参阅 https://support.qiniu.com/question/195128
+    /// </summary>
+    public class CdnManager
+    {
+        private Auth auth;
+        private HttpManager httpManager;
+
+        /// <summary>
+        /// 初始化FusionManager
+        /// </summary>
+        /// <param name="mac">账户访问控制(密钥)</param>
+        public CdnManager(Mac mac)
+        {
+            auth = new Auth(mac);
+            httpManager = new HttpManager();
+        }
+
+        private string refreshEntry()
+        {
+            return string.Format("{0}/v2/tune/refresh", Config.FUSION_API_HOST);
+        }
+
+        private string prefetchEntry()
+        {
+            return string.Format("{0}/v2/tune/prefetch", Config.FUSION_API_HOST);
+        }
+
+        private string bandwidthEntry()
+        {
+            return string.Format("{0}/v2/tune/bandwidth", Config.FUSION_API_HOST);
+        }
+
+        private string fluxEntry()
+        {
+            return string.Format("{0}/v2/tune/flux", Config.FUSION_API_HOST);
+        }
+
+        private string loglistEntry()
+        {
+            return string.Format("{0}/v2/tune/log/list", Config.FUSION_API_HOST);
+        }
+
+        /// <summary>
+        /// 缓存刷新，是指删除客户资源在 CDN 节点的缓存，以便更新新的资源。
+        /// 具体做法是客户提交资源 url 到 CDN，由 CDN 来操作刷新。
+        /// 另请参阅 http://developer.qiniu.com/article/fusion/api/refresh.html
+        /// </summary>
+        /// <param name="request">“缓存刷新”请求，详情请参见该类型的说明</param>
+        /// <returns>缓存刷新的结果</returns>
+        public RefreshResult refreshUrlsAndDirs(RefreshRequest request)
+        {
+            RefreshResult result = new RefreshResult();
+
+            try
+            {
+                string url = refreshEntry();
+                string body = request.ToJsonStr();
+                string token = auth.createManageToken(url);
+
+                HttpResult hr = httpManager.postJson(url, body, token);
+                result.shadow(hr);
+            }
+            catch (Exception ex)
+            {
+                StringBuilder sb = new StringBuilder("[Refresh] Error: ");
+                Exception e = ex;
+                while (e != null)
+                {
+                    sb.Append(e.Message + " ");
+                    e = e.InnerException;
+                }
+
+                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
+                result.RefText += sb.ToString();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 缓存刷新
+        /// </summary>
+        /// <param name="urls">要刷新的URL列表</param>
+        /// <returns>刷新的结果</returns>
+        public RefreshResult refreshUrls(string[] urls)
+        {
+            RefreshRequest request = new RefreshRequest(urls, null);
+            return refreshUrlsAndDirs(request);
+        }
+
+        /// <summary>
+        /// 缓存刷新
+        /// </summary>
+        /// <param name="dirs">要刷新的URL目录列表</param>
+        /// <returns></returns>
+        public RefreshResult refreshDirs(string[] dirs)
+        {
+            RefreshRequest request = new RefreshRequest(null,dirs);
+            return refreshUrlsAndDirs(request);
+        }
+
+        /// <summary>
+        /// 缓存刷新
+        /// </summary>
+        /// <param name="urls">要刷新的URL列表</param>
+        /// <param name="dirs">要刷新的URL目录列表</param>
+        /// <returns>刷新的结果</returns>
+        public RefreshResult refreshUrlsAndDirs(string[] urls,string[] dirs)
+        {
+            RefreshRequest request = new RefreshRequest(urls, dirs);
+            return refreshUrlsAndDirs(request);
+        }
+
+        /// <summary>
+        /// 文件预取，也可称为预加热或预缓存，是指客户新资源提前由 CDN 拉取到 CDN 缓存节点。
+        /// 具体做法是客户提交资源 url 到 CDN，由 CDN 来操作预取。
+        /// 另请参阅 http://developer.qiniu.com/article/fusion/api/prefetch.html
+        /// </summary>
+        /// <param name="request">“文件预取”请求，详情请参阅该类型的说明</param>
+        /// <returns>文件预取操作的结果</returns>
+        public PrefetchResult prefetchUrls(PrefetchRequest request)
+        {
+            PrefetchResult result = new PrefetchResult();
+
+            try
+            {
+                string url = prefetchEntry();
+                string body = request.ToJsonStr();
+                string token = auth.createManageToken(url);
+
+                HttpResult hr = httpManager.postJson(url, body, token);
+                result.shadow(hr);                
+            }
+            catch (Exception ex)
+            {
+                StringBuilder sb = new StringBuilder("[Prefetch] Error: ");
+                Exception e = ex;
+                while (e != null)
+                {
+                    sb.Append(e.Message + " ");
+                    e = e.InnerException;
+                }
+
+                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
+                result.RefText += sb.ToString();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 文件预取
+        /// </summary>
+        /// <param name="urls">待预取的文件URL列表</param>
+        /// <returns>文件预取结果</returns>
+        public PrefetchResult prefetchUrls(string[] urls)
+        {
+            PrefetchRequest request = new PrefetchRequest(urls);
+            return prefetchUrls(request);
+        }
+
+        /// <summary>
+        /// 批量查询 cdn 带宽，另请参阅
+        /// http://developer.qiniu.com/article/fusion/api/traffic-bandwidth.html#batch-bandwidth
+        /// </summary>
+        /// <param name="request">“带宽查询”请求，详情请参阅该类型的说明</param>
+        /// <returns>带宽查询结果</returns>
+        public BandwidthResult getBandwidthData(BandwidthRequest request)
+        {
+            BandwidthResult result = new BandwidthResult();
+
+            try
+            {
+                string url = bandwidthEntry();
+                string body = request.ToJsonStr();
+                string token = auth.createManageToken(url);
+
+                HttpResult hr = httpManager.postJson(url, body, token);
+                result.shadow(hr);                
+            }
+            catch (Exception ex)
+            {
+                StringBuilder sb = new StringBuilder("[Bandwidth] Error: ");
+                Exception e = ex;
+                while (e != null)
+                {
+                    sb.Append(e.Message + " ");
+                    e = e.InnerException;
+                }
+
+                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
+                result.RefText += sb.ToString();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 批量查询 cdn 带宽
+        /// </summary>
+        /// <param name="domains">域名列表</param>
+        /// <param name="startDate">起始日期，如2017-01-01</param>
+        /// <param name="endDate">结束日期，如2017-01-02</param>
+        /// <param name="granularity">时间粒度，如day</param>
+        /// <returns>带宽数居</returns>
+        public BandwidthResult getBandwidthData(string[] domains,string startDate,string endDate,string granularity)
+        {
+            BandwidthRequest request = new BandwidthRequest(startDate, endDate, granularity, StringHelper.join(domains, ";"));
+            return getBandwidthData(request);
+        }
+
+        /// <summary>
+        /// 批量查询 cdn 流量，另请参阅
+        /// http://developer.qiniu.com/article/fusion/api/traffic-bandwidth.html#batch-flux
+        /// </summary>
+        /// <param name="request">“流量查询”请求，详情请参阅该类型的说明</param>
+        /// <returns>流量查询结果</returns>
+        public FluxResult getFluxData(FluxRequest request)
+        {
+            FluxResult result = new FluxResult();
+
+            try
+            {
+                string url = fluxEntry();
+                string body = request.ToJsonStr();
+                string token = auth.createManageToken(url);
+
+                HttpResult hr = httpManager.postJson(url, body, token);
+                result.shadow(hr);
+            }
+            catch (Exception ex)
+            {
+                StringBuilder sb = new StringBuilder("[Flux] Error: ");
+                Exception e = ex;
+                while (e != null)
+                {
+                    sb.Append(e.Message + " ");
+                    e = e.InnerException;
+                }
+
+                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
+                result.RefText += sb.ToString();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 批量查询 cdn 流量
+        /// </summary>
+        /// <param name="domains">域名列表</param>
+        /// <param name="startDate">起始日期，如2017-01-01</param>
+        /// <param name="endDate">结束日期，如2017-01-02</param>
+        /// <param name="granularity">时间粒度，如day</param>
+        /// <returns>流量数据</returns>
+        public FluxResult getFluxData(string[] domains, string startDate, string endDate, string granularity)
+        {
+            FluxRequest request = new FluxRequest(startDate, endDate, granularity, StringHelper.join(domains, ";"));
+            return getFluxData(request);
+        }
+
+        /// <summary>
+        /// 日志下载(查询)接口可以查询域名日志列表，获取日志的下载外链，只提供 30 个自然日内的日志下载。
+        /// 例如当前日期为 2016-08-31，则只提供 2016-08-01 ~ 2016-08-30 的日志。
+        /// 另请参阅 http://developer.qiniu.com/article/fusion/api/log.html
+        /// </summary>
+        /// <param name="request">“日志查询”请求，详情请参阅该类型的说明</param>
+        /// <returns>日志列表</returns>
+        public LogListResult getCdnLogList(LogListRequest request)
+        {
+            LogListResult result = new LogListResult();
+
+            try
+            {
+                string url = loglistEntry();
+                string body = request.ToJsonStr();
+                string token = auth.createManageToken(url);
+
+                HttpResult hr = httpManager.postJson(url, body, token);
+                result.shadow(hr);
+            }
+            catch (Exception ex)
+            {
+                StringBuilder sb = new StringBuilder("[LogList] Error: ");
+                Exception e = ex;
+                while (e != null)
+                {
+                    sb.Append(e.Message + " ");
+                    e = e.InnerException;
+                }
+
+                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
+                result.RefText += sb.ToString();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 查询日志列表
+        /// </summary>
+        /// <param name="domains">域名列表</param>
+        /// <param name="date">指定日期，如2017-01-01</param>
+        /// <returns>日志列表</returns>
+        public LogListResult getCdnLogList(string[] domains,string date)
+        {
+            LogListRequest request = new LogListRequest(date, StringHelper.join(domains, ";"));
+            return getCdnLogList(request);
+        }
+
+        /// <summary>
+        /// 时间戳防盗链
+        /// 另请参阅https://support.qiniu.com/question/195128
+        /// </summary>
+        /// <param name="request">“时间戳防盗链”请求，详情请参阅该类型的说明</param>
+        /// <returns>已授权链接(包含过期时间戳)</returns>
+        public string createTimestampAntiLeechUrl(HotLinkRequest request)
+        {
+            string RAW = request.RawUrl;
+
+            string key = request.Key;
+            string path = Uri.EscapeUriString(request.Path);
+            string file = request.File;
+            string ts = (int.Parse(request.Timestamp)).ToString("x");
+            string SIGN = Hashing.calcMD5(key + path + file + ts);
+
+            return string.Format("{0}&sign={1}&t={2}", RAW, SIGN, ts);
+        }
+
+        /// <summary>
+        /// 时间戳防盗链
+        /// </summary>
+        /// <param name="host">主机，如http://domain.com</param>
+        /// <param name="path">路径，如/dir1/dir2/</param>
+        /// <param name="fileName">文件名，如1.jpg</param>
+        /// <param name="query">请求参数，如?v=1.1</param>
+        /// <param name="encryptKey">后台提供的key</param>
+        /// <param name="expireInSeconds">链接有效时长</param>
+        /// <returns>已授权链接(包含过期时间戳)</returns>
+        public string createTimestampAntiLeechUrl(string host, string path, string fileName, string query, string encryptKey, int expireInSeconds)
+        {
+            HotLinkRequest request = new HotLinkRequest();
+            request.Host = host;
+            request.Path = path;
+            request.File = fileName;
+            request.Query = query;
+            request.Key = encryptKey;
+            request.SetLinkExpire(expireInSeconds);
+
+            return createTimestampAntiLeechUrl(request);
+        }
+
+    }
+}
diff --git a/src/Qiniu/CDN/Model/BandwidthResult.cs b/src/Qiniu/CDN/Model/BandwidthResult.cs
index 6abf8c83..720ac0e7 100644
--- a/src/Qiniu/CDN/Model/BandwidthResult.cs
+++ b/src/Qiniu/CDN/Model/BandwidthResult.cs
@@ -17,7 +17,7 @@ public BandwidthInfo Result
             get
             {
                 BandwidthInfo info = null;
-                if ((Code == HttpHelper.STATUS_CODE_OK) && (!string.IsNullOrEmpty(Text)))
+                if ((Code == (int)HttpCode.OK) && (!string.IsNullOrEmpty(Text)))
                 {
                     info = JsonConvert.DeserializeObject<BandwidthInfo>(Text);
                 }
diff --git a/src/Qiniu/CDN/Model/FluxResult.cs b/src/Qiniu/CDN/Model/FluxResult.cs
index 505b7809..3d50fcd0 100644
--- a/src/Qiniu/CDN/Model/FluxResult.cs
+++ b/src/Qiniu/CDN/Model/FluxResult.cs
@@ -17,7 +17,7 @@ public FluxInfo Result
             get
             {
                 FluxInfo info = null;
-                if ((Code == HttpHelper.STATUS_CODE_OK) && (!string.IsNullOrEmpty(Text)))
+                if ((Code == (int)HttpCode.OK) && (!string.IsNullOrEmpty(Text)))
                 {
                     info = JsonConvert.DeserializeObject<FluxInfo>(Text);
                 }
diff --git a/src/Qiniu/CDN/Model/HotLinkRequest.cs b/src/Qiniu/CDN/Model/HotLinkRequest.cs
index f7462d8e..12084d20 100644
--- a/src/Qiniu/CDN/Model/HotLinkRequest.cs
+++ b/src/Qiniu/CDN/Model/HotLinkRequest.cs
@@ -1,5 +1,5 @@
 using System;
-using Qiniu.Http;
+using Qiniu.Util;
 
 namespace Qiniu.CDN.Model
 {
diff --git a/src/Qiniu/CDN/Model/LogListResult.cs b/src/Qiniu/CDN/Model/LogListResult.cs
index f29a399d..3120b381 100644
--- a/src/Qiniu/CDN/Model/LogListResult.cs
+++ b/src/Qiniu/CDN/Model/LogListResult.cs
@@ -17,7 +17,7 @@ public LogListInfo Result
             get
             {
                 LogListInfo info = null;
-                if ((Code == HttpHelper.STATUS_CODE_OK) && (!string.IsNullOrEmpty(Text)))
+                if ((Code == (int)HttpCode.OK) && (!string.IsNullOrEmpty(Text)))
                 {
                     info = JsonConvert.DeserializeObject<LogListInfo>(Text);
                 }
diff --git a/src/Qiniu/CDN/Model/PrefetchResult.cs b/src/Qiniu/CDN/Model/PrefetchResult.cs
index da7c288a..62be924d 100644
--- a/src/Qiniu/CDN/Model/PrefetchResult.cs
+++ b/src/Qiniu/CDN/Model/PrefetchResult.cs
@@ -17,7 +17,7 @@ public PrefetchInfo Result
             get
             {
                 PrefetchInfo info = null;
-                if ((Code == HttpHelper.STATUS_CODE_OK) && (!string.IsNullOrEmpty(Text)))
+                if ((Code == (int)HttpCode.OK) && (!string.IsNullOrEmpty(Text)))
                 {
                     info = JsonConvert.DeserializeObject<PrefetchInfo>(Text);
                 }
diff --git a/src/Qiniu/CDN/Model/RefreshResult.cs b/src/Qiniu/CDN/Model/RefreshResult.cs
index 4243c9d8..3a9de0af 100644
--- a/src/Qiniu/CDN/Model/RefreshResult.cs
+++ b/src/Qiniu/CDN/Model/RefreshResult.cs
@@ -17,7 +17,7 @@ public RefreshInfo Result
             get
             {
                 RefreshInfo info = null;
-                if ((Code == HttpHelper.STATUS_CODE_OK) && (!string.IsNullOrEmpty(Text)))
+                if ((Code == (int)HttpCode.OK) && (!string.IsNullOrEmpty(Text)))
                 {
                     info = JsonConvert.DeserializeObject<RefreshInfo>(Text);
                 }
diff --git a/src/Qiniu/Common/Config.cs b/src/Qiniu/Common/Config.cs
index ff1bda87..f3c364b6 100644
--- a/src/Qiniu/Common/Config.cs
+++ b/src/Qiniu/Common/Config.cs
@@ -23,6 +23,11 @@ public class Config
         /// </summary>
         public const string DFOP_API_HOST = "http://api.qiniu.com";
 
+        /// <summary>
+        /// PILI API Host
+        /// </summary>
+        public const string PILI_API_HOST = "http://pili.qiniuapi.com";
+
         /// <summary>
         /// 根据Zone配置对应参数(RS_HOST,API_HOST等)
         /// </summary>
diff --git a/src/Qiniu/Common/ZoneHelper.cs b/src/Qiniu/Common/ZoneHelper.cs
index 50563fb6..0f20a112 100644
--- a/src/Qiniu/Common/ZoneHelper.cs
+++ b/src/Qiniu/Common/ZoneHelper.cs
@@ -35,21 +35,19 @@ public static ZoneID queryZone(string accessKey, string bucket)
             try
             {
                 // HTTP/GET https://uc.qbox.me/v1/query?ak=(AK)&bucket=(Bucket)
-                // 该请求的返回数据参见后面的 QueryResponse 结构
-                // 根据response消息提取出upHost
                 string queryUrl = string.Format("https://uc.qbox.me/v1/query?ak={0}&bucket={1}", accessKey, bucket);
 
-                HttpManager httpManager = new Http.HttpManager();
+                HttpManager httpManager = new HttpManager();
                 var hr = httpManager.get(queryUrl, null);
-                if (hr.Code == HttpHelper.STATUS_CODE_OK)
+                if (hr.Code == (int)HttpCode.OK)
                 {
-                    QueryResponse qr = JsonConvert.DeserializeObject<QueryResponse>(hr.Text);
-                    string upHost = qr.HTTP.UP[0];
+                    ZoneInfo zInfo = JsonConvert.DeserializeObject<ZoneInfo>(hr.Text);
+                    string upHost = zInfo.HTTP.UP[0];
                     zoneId = ZONE_DICT[upHost];
                 }
                 else
                 {
-                    throw new Exception(hr.RefText);
+                    throw new Exception("text: " + hr.Text + ", ref-text:" + hr.RefText);
                 }
             }
             catch (Exception ex)
@@ -70,54 +68,6 @@ public static ZoneID queryZone(string accessKey, string bucket)
             return zoneId;
         }
 
-        #region UC_QUERY_RESPONSE
-
-        // 从uc.qbox.me返回的消息，使用Json解析
-        // 以下是一个response示例
-        // {
-        //     "ttl" : 86400,
-        //     "http" : {
-        //         "up" : [
-        //                     "http://up.qiniu.com",
-        //                     "http://upload.qiniu.com",
-        //                     "-H up.qiniu.com http://183.136.139.16"
-        //                 ],
-        //        "io" : [
-        //                      "http://iovip.qbox.me"
-        //                ]
-        //             },
-        //     "https" : {
-        //          "io" : [
-        //                     "https://iovip.qbox.me"
-        //                  ],
-        //         "up" : [
-        //                     "https://up.qbox.me"
-        //                  ]
-        //                  }
-        // }
-
-        /// <summary>
-        /// 从uc.qbox.me返回的消息
-        /// </summary>
-        private class QueryResponse
-        {
-            public string TTL { get; set; }
-            public HttpBulk HTTP { get; set; }
-
-            public HttpBulk HTTPS { get; set; }
-        }
-
-        /// <summary>
-        /// HttpBulk作为QueryResponse的成员
-        /// 包含uploadHost和iovip等
-        /// </summary>
-        private class HttpBulk
-        {
-            public string[] UP { get; set; }
-            public string[] IO { get; set; }
-        }
-
-        #endregion UC_QUERY_RESPONSE  
     }
 
 }
diff --git a/src/Qiniu/Common/ZoneInfo.cs b/src/Qiniu/Common/ZoneInfo.cs
new file mode 100644
index 00000000..061047c6
--- /dev/null
+++ b/src/Qiniu/Common/ZoneInfo.cs
@@ -0,0 +1,23 @@
+namespace Qiniu.Common
+{
+    /// <summary>
+    /// 从uc.qbox.me返回的消息
+    /// </summary>
+    internal class ZoneInfo
+    {
+        public string TTL { get; set; }
+
+        public OBulk HTTP { get; set; }
+
+        public OBulk HTTPS { get; set; }
+    }
+
+    /// <summary>
+    /// 包含uploadHost和iovip等
+    /// </summary>
+    internal class OBulk
+    {
+        public string[] UP { get; set; }
+        public string[] IO { get; set; }
+    }
+}
diff --git a/src/Qiniu/Http/ContentType.cs b/src/Qiniu/Http/ContentType.cs
new file mode 100644
index 00000000..132a48e6
--- /dev/null
+++ b/src/Qiniu/Http/ContentType.cs
@@ -0,0 +1,33 @@
+namespace Qiniu.Http
+{
+    /// <summary>
+    /// HTTP 内容类型(Content-Type)
+    /// </summary>
+    public class ContentType
+    {
+        /// <summary>
+        /// 资源类型：普通文本
+        /// </summary>
+        public static string TEXT_PLAIN = "text/plain";
+
+        /// <summary>
+        /// 资源类型：JSON字符串
+        /// </summary>
+        public static string APPLICATION_JSON = "application/json";
+
+        /// <summary>
+        /// 资源类型：未知类型(数据流)
+        /// </summary>
+        public static string APPLICATION_OCTET_STREAM = "application/octet-stream";
+
+        /// <summary>
+        /// 资源类型：表单数据(键值对)
+        /// </summary>
+        public static string WWW_FORM_URLENC = "application/x-www-form-urlencoded";
+
+        /// <summary>
+        /// 资源类型：多分部数据
+        /// </summary>
+        public static string MULTIPART_FORM_DATA = "multipart/form-data";
+    }
+}
diff --git a/src/Qiniu/Http/HttpCode.cs b/src/Qiniu/Http/HttpCode.cs
new file mode 100644
index 00000000..f73d402b
--- /dev/null
+++ b/src/Qiniu/Http/HttpCode.cs
@@ -0,0 +1,99 @@
+namespace Qiniu.Http
+{
+    /// <summary>
+    /// HTTP 状态码
+    /// </summary>
+    public enum HttpCode
+    {
+        /// <summary>
+        /// 成功
+        /// </summary>
+        OK = 200,
+
+        /// <summary>
+        /// 部分OK
+        /// </summary>
+        PARTLY_OK = 298,
+
+        /// <summary>
+        /// 请求错误
+        /// </summary>
+        BAD_REQUEST = 400,
+
+        /// <summary>
+        /// 无效凭证
+        /// </summary>
+        BAD_TOKEN = 401,
+
+        /// <summary>
+        /// 上传文件大小超限
+        /// </summary>
+        SIZE_EXCEEDS = 413,
+
+        /// <summary>
+        /// 回调失败
+        /// </summary>
+        CALLBACK_FAILED = 579,
+
+        /// <summary>
+        /// 服务端操作失败
+        /// </summary>
+        SERVER_FAILED = 599,        
+
+        /// <summary>
+        /// 文件不存在
+        /// </summary>
+        FILE_NOT_EXIST = 612,
+
+        /// <summary>
+        /// 文件已存在
+        /// </summary>
+        FILE_EXISTS = 614,
+
+        /// <summary>
+        /// 空间或者文件不存在
+        /// </summary>
+        BUCKET_NOT_EXIST = 631,
+
+        /// <summary>
+        /// 资源Context已过期
+        /// </summary>
+        CONTEXT_EXPIRED = 701,
+
+        #region _USR_
+
+        /// <summary>
+        /// 自定义HTTP状态码 (默认值)
+        /// </summary>
+        USER_UNDEF = -256,
+
+        /// <summary>
+        /// 自定义HTTP状态码 (用户取消)
+        /// </summary>
+        USER_CANCELED = -255,
+
+        /// <summary>
+        /// 自定义HTTP状态码 (用户暂停)
+        /// </summary>
+        USER_PAUSED = -254,
+
+        /// <summary>
+        /// 自定义HTTP状态码 (用户继续)
+        /// </summary>
+        USER_RESUMED = -253,
+
+        /// <summary>
+        /// 自定义HTTP状态码 (需要重试)
+        /// </summary>
+        USER_NEED_RETRY = -252,
+
+        /// <summary>
+        /// 自定义HTTP状态码 (异常或错误)
+        /// </summary>
+        USER_EXCEPTION = -252,
+
+        #endregion _USR_
+
+    }
+
+}
diff --git a/src/Qiniu/Http/HttpManager.cs b/src/Qiniu/Http/HttpManager.cs
index aea5969c..0a21ee5f 100644
--- a/src/Qiniu/Http/HttpManager.cs
+++ b/src/Qiniu/Http/HttpManager.cs
@@ -5,6 +5,7 @@
 using System.Text;
 using System.IO;
 using System.Net;
+using Qiniu.Util;
 
 namespace Qiniu.Http
 {
@@ -13,6 +14,36 @@ namespace Qiniu.Http
     /// </summary>
     public class HttpManager
     {
+        private string userAgent;
+
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        public HttpManager()
+        {
+            userAgent = getUserAgent();
+        }
+
+        /// <summary>
+        /// 客户端标识
+        /// </summary>
+        /// <returns>客户端标识UA</returns>
+        public static string getUserAgent()
+        {
+            string osDesc = Environment.OSVersion.Platform + "; " + Environment.OSVersion.Version;
+            return string.Format("{0}/{1} ({2})", QiniuCSharpSDK.ALIAS, QiniuCSharpSDK.VERSION, osDesc);
+        }
+
+        /// <summary>
+        /// 多部分表单数据(multi-part form-data)的分界(boundary)标识
+        /// </summary>
+        /// <returns>多部分表单数据的boundary</returns>
+        public static string createFormDataBoundary()
+        {
+            string now = DateTime.UtcNow.Ticks.ToString();
+            return string.Format("-------{0}Boundary{1}", QiniuCSharpSDK.ALIAS, Hashing.calcMD5(now));
+        }
+
         /// <summary>
         /// HTTP-GET方法
         /// </summary>
@@ -34,7 +65,7 @@ public HttpResult get(string url, string token, bool binaryMode = false)
                 {
                     wReq.Headers.Add("Authorization", token);
                 }
-                wReq.UserAgent = HttpHelper.getUserAgent();
+                wReq.UserAgent = userAgent;
 
                 HttpWebResponse wResp = wReq.GetResponse() as HttpWebResponse;
 
@@ -102,7 +133,7 @@ public HttpResult get(string url, string token, bool binaryMode = false)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -137,7 +168,7 @@ public HttpResult post(string url, string token, bool binaryMode = false)
                 {
                     wReq.Headers.Add("Authorization", token);
                 }
-                wReq.UserAgent = HttpHelper.getUserAgent();
+                wReq.UserAgent = userAgent;
 
                 HttpWebResponse wResp = wReq.GetResponse() as HttpWebResponse;
 
@@ -205,7 +236,7 @@ public HttpResult post(string url, string token, bool binaryMode = false)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -241,8 +272,8 @@ public HttpResult postData(string url, byte[] data, string token, bool binaryMod
                 {
                     wReq.Headers.Add("Authorization", token);
                 }
-                wReq.ContentType = HttpHelper.CONTENT_TYPE_APP_OCTET;
-                wReq.UserAgent = HttpHelper.getUserAgent();
+                wReq.ContentType = ContentType.APPLICATION_OCTET_STREAM;
+                wReq.UserAgent = userAgent;
 
                 if (data != null)
                 {
@@ -320,7 +351,7 @@ public HttpResult postData(string url, byte[] data, string token, bool binaryMod
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -356,8 +387,8 @@ public HttpResult postJson(string url, string data, string token, bool binaryMod
                 {
                     wReq.Headers.Add("Authorization", token);
                 }
-                wReq.ContentType = HttpHelper.CONTENT_TYPE_APP_JSON;
-                wReq.UserAgent = HttpHelper.getUserAgent();
+                wReq.ContentType = ContentType.APPLICATION_JSON;
+                wReq.UserAgent = userAgent;
 
                 if (data != null)
                 {
@@ -435,7 +466,7 @@ public HttpResult postJson(string url, string data, string token, bool binaryMod
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -471,8 +502,8 @@ public HttpResult postForm(string url, Dictionary<string, string> kvData, string
                 {
                     wReq.Headers.Add("Authorization", token);
                 }
-                wReq.ContentType = HttpHelper.CONTENT_TYPE_WWW_FORM;
-                wReq.UserAgent = HttpHelper.getUserAgent();
+                wReq.ContentType = ContentType.WWW_FORM_URLENC;
+                wReq.UserAgent = userAgent;
 
                 if (kvData != null)
                 {
@@ -556,7 +587,7 @@ public HttpResult postForm(string url, Dictionary<string, string> kvData, string
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -592,8 +623,8 @@ public HttpResult postForm(string url, string data, string token, bool binaryMod
                 {
                     wReq.Headers.Add("Authorization", token);
                 }
-                wReq.ContentType = HttpHelper.CONTENT_TYPE_WWW_FORM;
-                wReq.UserAgent = HttpHelper.getUserAgent();
+                wReq.ContentType = ContentType.WWW_FORM_URLENC;
+                wReq.UserAgent = userAgent;
 
                 if (!string.IsNullOrEmpty(data))
                 {
@@ -671,7 +702,7 @@ public HttpResult postForm(string url, string data, string token, bool binaryMod
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -707,8 +738,8 @@ public HttpResult postForm(string url, byte[] data, string token, bool binaryMod
                 {
                     wReq.Headers.Add("Authorization", token);
                 }
-                wReq.ContentType = HttpHelper.CONTENT_TYPE_WWW_FORM;
-                wReq.UserAgent = HttpHelper.getUserAgent();
+                wReq.ContentType = ContentType.WWW_FORM_URLENC;
+                wReq.UserAgent = userAgent;
 
                 if (data != null)
                 {
@@ -786,7 +817,7 @@ public HttpResult postForm(string url, byte[] data, string token, bool binaryMod
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -823,8 +854,8 @@ public HttpResult postMultipart(string url, byte[] data, string boundary, string
                 {
                     wReq.Headers.Add("Authorization", token);
                 }
-                wReq.ContentType = string.Format("{0}; boundary={1}", HttpHelper.CONTENT_TYPE_MULTIPART, boundary);
-                wReq.UserAgent = HttpHelper.getUserAgent();
+                wReq.ContentType = string.Format("{0}; boundary={1}", ContentType.MULTIPART_FORM_DATA, boundary);
+                wReq.UserAgent = userAgent;
 
                 wReq.AllowWriteStreamBuffering = true;
                 using (Stream sReq = wReq.GetRequestStream())
@@ -899,7 +930,7 @@ public HttpResult postMultipart(string url, byte[] data, string boundary, string
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -971,6 +1002,7 @@ private void getHeaders(ref HttpResult hr, HttpWebResponse resp)
 using System.Text;
 using System.Net.Http;
 using System.Net.Http.Headers;
+using Qiniu.Util;
 
 namespace Qiniu.Http
 {
@@ -993,12 +1025,12 @@ public class HttpManager
         public int TIMEOUT_MAX_SEC = 60;
 
         /// <summary>
-        /// 
+        /// 初始化
         /// </summary>
         public HttpManager()
         {
             client = new HttpClient();
-            userAgent = HttpHelper.getUserAgent();
+            userAgent = getUserAgent();
         }
 
         /// <summary>
@@ -1010,6 +1042,69 @@ public HttpManager()
             client = null;
         }
 
+        /// <summary>
+        /// 客户端标识
+        /// </summary>
+        /// <returns>客户端标识UA</returns>
+        public static string getUserAgent()
+        {
+#if NetStandard
+            string osDesc = "";
+
+            var windows = System.Runtime.InteropServices.OSPlatform.Windows;
+            var linux = System.Runtime.InteropServices.OSPlatform.Linux;
+            var osx = System.Runtime.InteropServices.OSPlatform.OSX;
+            bool isWindows = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(windows);
+            bool isLinux = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(linux);
+            bool isOSX = System.Runtime.InteropServices.RuntimeInformation.IsOSPlatform(osx);
+
+            
+            if (isWindows)
+            {
+                osDesc = "Windows;";
+            }
+            else if (isLinux)
+            {
+                osDesc = "Linux;";
+            }
+            else if (isOSX)
+            {
+                osDesc = "OSX;";
+            }
+            else
+            {
+                osDesc = "Other;";
+            }
+            
+            if (isWindows)
+            {
+                osDesc += " " + System.Runtime.InteropServices.RuntimeInformation.OSDescription.TrimEnd();
+            }
+            else
+            {
+                string[] oss = System.Runtime.InteropServices.RuntimeInformation.OSDescription.Split(' ');
+                for (int i = 0; i < oss.Length && i < 2; ++i)
+                {
+                    osDesc += " " + oss[i];
+                }
+            }
+
+#else
+            string osDesc = Environment.OSVersion.Platform + "; " + Environment.OSVersion.Version;
+#endif
+            return string.Format("{0}/{1} ({2})", QiniuCSharpSDK.ALIAS, QiniuCSharpSDK.VERSION, osDesc);
+        }
+
+        /// <summary>
+        /// 多部分表单数据(multi-part form-data)的分界(boundary)标识
+        /// </summary>
+        /// <returns>多部分表单数据的boundary</returns>
+        public static string createFormDataBoundary()
+        {
+            string now = DateTime.UtcNow.Ticks.ToString();
+            return string.Format("-------{0}Boundary{1}", QiniuCSharpSDK.ALIAS, Hashing.calcMD5(now));
+        }
+
         /// <summary>
         /// 设置HTTP超时间隔
         /// </summary>
@@ -1069,7 +1164,7 @@ public HttpResult get(string url, string token, bool binaryMode = false)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1123,7 +1218,7 @@ public HttpResult post(string url, string token, bool binaryMode = false)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1153,7 +1248,7 @@ public HttpResult postData(string url, byte[] data, string token, bool binaryMod
 
                 var content = new ByteArrayContent(data);
                 req.Content = content;
-				req.Content.Headers.ContentType = new MediaTypeHeaderValue(HttpHelper.CONTENT_TYPE_APP_OCTET);
+				req.Content.Headers.ContentType = new MediaTypeHeaderValue(ContentType.APPLICATION_OCTET_STREAM);
 
                 var msg = client.SendAsync(req).Result;
                 result.Code = (int)msg.StatusCode;
@@ -1182,7 +1277,7 @@ public HttpResult postData(string url, byte[] data, string token, bool binaryMod
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1212,7 +1307,7 @@ public HttpResult postJson(string url, string data, string token, bool binaryMod
 
                 var content = new StringContent(data);
                 req.Content = content;
-                req.Content.Headers.ContentType = new MediaTypeHeaderValue(HttpHelper.CONTENT_TYPE_APP_JSON);
+                req.Content.Headers.ContentType = new MediaTypeHeaderValue(ContentType.APPLICATION_JSON);
 
                 var msg = client.SendAsync(req).Result;
                 result.Code = (int)msg.StatusCode;
@@ -1241,7 +1336,7 @@ public HttpResult postJson(string url, string data, string token, bool binaryMod
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1271,7 +1366,7 @@ public HttpResult postForm(string url, Dictionary<string, string> kvData, string
 
                 var content = new FormUrlEncodedContent(kvData);
                 req.Content = content;
-				req.Content.Headers.ContentType = new MediaTypeHeaderValue(HttpHelper.CONTENT_TYPE_WWW_FORM);
+				req.Content.Headers.ContentType = new MediaTypeHeaderValue(ContentType.WWW_FORM_URLENC);
 
                 var msg = client.SendAsync(req).Result;
                 result.Code = (int)msg.StatusCode;
@@ -1300,7 +1395,7 @@ public HttpResult postForm(string url, Dictionary<string, string> kvData, string
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1330,7 +1425,7 @@ public HttpResult postForm(string url, string data, string token, bool binaryMod
 
                 var content = new StringContent(data);
                 req.Content = content;
-                req.Content.Headers.ContentType = new MediaTypeHeaderValue(HttpHelper.CONTENT_TYPE_WWW_FORM);
+                req.Content.Headers.ContentType = new MediaTypeHeaderValue(ContentType.WWW_FORM_URLENC);
 
                 var msg = client.SendAsync(req).Result;
                 result.Code = (int)msg.StatusCode;
@@ -1359,7 +1454,7 @@ public HttpResult postForm(string url, string data, string token, bool binaryMod
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1389,7 +1484,7 @@ public HttpResult postForm(string url, byte[] data, string token, bool binaryMod
 
                 var content = new ByteArrayContent(data);
                 req.Content = content;
-				req.Content.Headers.ContentType = new MediaTypeHeaderValue(HttpHelper.CONTENT_TYPE_WWW_FORM);				
+				req.Content.Headers.ContentType = new MediaTypeHeaderValue(ContentType.WWW_FORM_URLENC);				
 				
                 var msg = client.SendAsync(req).Result;
                 result.Code = (int)msg.StatusCode;
@@ -1418,7 +1513,7 @@ public HttpResult postForm(string url, byte[] data, string token, bool binaryMod
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1450,7 +1545,7 @@ public HttpResult postMultipart(string url, byte[] data, string boundary, string
 
                 var content = new ByteArrayContent(data);
                 req.Content = content;
-				string ct = string.Format("{0}; boundary={1}", HttpHelper.CONTENT_TYPE_MULTIPART, boundary);
+				string ct = string.Format("{0}; boundary={1}", ContentType.MULTIPART_FORM_DATA, boundary);
                 req.Content.Headers.Add("Content-Type", ct);
                 
                 var msg = client.SendAsync(req).Result;
@@ -1480,7 +1575,7 @@ public HttpResult postMultipart(string url, byte[] data, string boundary, string
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
diff --git a/src/Qiniu/Http/HttpResult.cs b/src/Qiniu/Http/HttpResult.cs
index ea34e275..469dbfaf 100644
--- a/src/Qiniu/Http/HttpResult.cs
+++ b/src/Qiniu/Http/HttpResult.cs
@@ -43,11 +43,11 @@ public class HttpResult
         /// </summary>
         public HttpResult()
         {
-            Code = HttpHelper.STATUS_CODE_UNDEF;
+            Code = (int)HttpCode.USER_UNDEF;
             Text = null;
             Data = null;
 
-            RefCode = HttpHelper.STATUS_CODE_UNDEF;
+            RefCode = (int)HttpCode.USER_UNDEF;
             RefInfo = null;
         }
 
diff --git a/src/Qiniu/IO/DownloadManager.cs b/src/Qiniu/IO/DownloadManager.cs
index caae2483..32f3819b 100644
--- a/src/Qiniu/IO/DownloadManager.cs
+++ b/src/Qiniu/IO/DownloadManager.cs
@@ -1,7 +1,7 @@
 using System;
 using System.IO;
 using System.Text;
-using Qiniu.Common;
+using Qiniu.Util;
 using Qiniu.Http;
 
 namespace Qiniu.IO
@@ -12,38 +12,16 @@ namespace Qiniu.IO
     /// </summary>
     public class DownloadManager
     {
-        private Signature signature;
-        private HttpManager httpManager;
-
-        /// <summary>
-        /// 下载管理
-        /// </summary>
-        /// <param name="mac">账户访问控制(密钥)</param>
-        public DownloadManager(Mac mac)
-        {
-            signature = new Signature(mac);
-            httpManager = new HttpManager();
-        }
-
-        /// <summary>
-        /// 生成下载凭证
-        /// </summary>
-        /// <param name="url">资源URL</param>
-        /// <returns>下载凭证</returns>
-        public string createDownloadToken(string url)
-        {
-            return signature.sign(url);
-        }
-
         /// <summary>
         /// 生成授权的下载链接(访问私有空间中的文件时需要使用)
         /// </summary>
+        /// <param name="mac">账号</param>
         /// <param name="url">初始链接</param>
         /// <param name="expireInSeconds">下载有效时间(单位:秒)</param>
         /// <returns>包含过期时间的已授权的下载链接</returns>
-        public string createSignedUrl(string url, int expireInSeconds = 3600)
+        public static string createSignedUrl(Mac mac, string url, int expireInSeconds = 3600)
         {
-            string deadline = Util.StringHelper.calcUnixTimestamp(expireInSeconds);
+            string deadline = StringHelper.calcUnixTimestamp(expireInSeconds);
 
             StringBuilder sb = new StringBuilder(url);
             if (url.Contains("?"))
@@ -54,82 +32,36 @@ public string createSignedUrl(string url, int expireInSeconds = 3600)
             {
                 sb.AppendFormat("?e={0}", deadline);
             }
-            string token = createDownloadToken(sb.ToString());
+            
+            string token = Auth.createDownloadToken(mac, sb.ToString());
             sb.AppendFormat("&token={0}", token);
 
             return sb.ToString();
         }
 
         /// <summary>
-        /// 下载(私有文件,附带token授权的链接)文件到本地
+        /// 下载文件到本地
         /// </summary>
-        /// <param name="signedUrl">(可访问的)链接</param>
+        /// <param name="url">(可访问的)链接</param>
         /// <param name="saveasFile">(另存为)本地文件名</param>
         /// <returns>下载资源(私有文件)的结果</returns>
-        public HttpResult downloadPriv(string signedUrl,string saveasFile)
-        {
-            HttpResult result = new HttpResult();
-             
-            try
-            {
-                result = httpManager.get(signedUrl, null, true);
-                if (result.Code == HttpHelper.STATUS_CODE_OK)
-                {
-                    using (FileStream fs = File.Create(saveasFile, result.Data.Length))
-                    {
-                        fs.Write(result.Data, 0, result.Data.Length);
-                        fs.Flush();
-                    }
-                    result.RefText += string.Format("[Download] Success: (Remote file) ==> \"{0}\" @{1}\n",
-                        saveasFile, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
-                }
-                else
-                {
-                    result.RefText += string.Format("[Download] Error: @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
-                }
-            }
-            catch(Exception ex)
-            {
-                StringBuilder sb = new StringBuilder("Download Error: ");
-                Exception e = ex;
-                while (e != null)
-                {
-                    sb.Append(e.Message + " ");
-                    e = e.InnerException;
-                }
-
-                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
-
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
-                result.RefText += sb.ToString();
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// 下载文件(通用)
-        /// </summary>
-        /// <param name="url">公开可访问的资源下载URL</param>
-        /// <param name="saveasFile">(另存为)本地文件名</param>
-        /// <returns>下载资源(公开文件)的结果</returns>
         public static HttpResult download(string url,string saveasFile)
         {
             HttpResult result = new HttpResult();
-
+             
             try
             {
                 HttpManager httpManager = new HttpManager();
 
                 result = httpManager.get(url, null, true);
-                if (result.Code == HttpHelper.STATUS_CODE_OK)
+                if (result.Code == (int)HttpCode.OK)
                 {
                     using (FileStream fs = File.Create(saveasFile, result.Data.Length))
                     {
                         fs.Write(result.Data, 0, result.Data.Length);
                         fs.Flush();
                     }
-                    result.RefText += string.Format("[Download] Success: (Remote file) ==> \"{0}\" @{1}\n", 
+                    result.RefText += string.Format("[Download] Success: (Remote file) ==> \"{0}\" @{1}\n",
                         saveasFile, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
                 }
                 else
@@ -137,7 +69,7 @@ public static HttpResult download(string url,string saveasFile)
                     result.RefText += string.Format("[Download] Error: @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
                 }
             }
-            catch (Exception ex)
+            catch(Exception ex)
             {
                 StringBuilder sb = new StringBuilder("Download Error: ");
                 Exception e = ex;
@@ -149,12 +81,11 @@ public static HttpResult download(string url,string saveasFile)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
             return result;
         }
-
     }
 }
diff --git a/src/Qiniu/IO/FormUploader.cs b/src/Qiniu/IO/FormUploader.cs
new file mode 100644
index 00000000..525b2134
--- /dev/null
+++ b/src/Qiniu/IO/FormUploader.cs
@@ -0,0 +1,347 @@
+using System;
+using System.IO;
+using System.Text;
+using System.Collections.Generic;
+using Qiniu.Common;
+using Qiniu.Http;
+
+namespace Qiniu.IO
+{
+    /// <summary>
+    /// 简单上传，适合于以下情形(1)
+    /// 
+    /// (1)网络较好并且待上传的文件体积较小时使用简单上传
+    /// 
+    /// (2)文件较大或者网络状况不理想时请使用分片上传
+    /// 
+    /// (3)文件较大上传需要花费较长时间，建议使用断点续上传
+    /// </summary>
+    public class FormUploader
+    {
+        // 上传域名，默认Config.ZONE.upHost
+        private string uploadHost;
+
+        private HttpManager httpManager;
+
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        /// <param name="uploadFromCDN">是否从CDN上传</param>
+        public FormUploader(bool uploadFromCDN = false)
+        {
+            httpManager = new HttpManager();
+
+            uploadHost = uploadFromCDN ? Config.ZONE.UploadHost : Config.ZONE.UpHost;
+        }
+
+        /// <summary>
+        /// 上传文件
+        /// 需要提供正确的上传凭证(参阅[1]，另关于上传策略请参阅[2])
+        /// [1] http://developer.qiniu.com/article/developer/security/upload-token.html
+        /// [2] http://developer.qiniu.com/article/developer/security/put-policy.html
+        /// </summary>
+        /// <param name="localFile">待上传的本地文件</param>
+        /// <param name="saveKey">要保存的目标文件名称</param>
+        /// <param name="token">上传凭证</param>
+        /// <returns>上传结果</returns>
+        public HttpResult uploadFile(string localFile, string saveKey, string token)
+        {
+            HttpResult result = new HttpResult();
+
+            try
+            {
+                string boundary = HttpManager.createFormDataBoundary();
+                string sep = "--" + boundary;
+
+                StringBuilder sbp1 = new StringBuilder();
+
+                sbp1.AppendLine(sep);
+
+                sbp1.AppendLine("Content-Disposition: form-data; name=key");
+                sbp1.AppendLine();
+                sbp1.AppendLine(saveKey);
+                sbp1.AppendLine(sep);
+
+                sbp1.AppendLine("Content-Disposition: form-data; name=token");
+                sbp1.AppendLine();
+                sbp1.AppendLine(token);
+                sbp1.AppendLine(sep);
+
+                string filename = Path.GetFileName(localFile);
+                sbp1.AppendFormat("Content-Disposition: form-data; name=file; filename={0}", filename);
+                sbp1.AppendLine();
+                sbp1.AppendLine();
+
+                StringBuilder sbp3 = new StringBuilder();
+                sbp3.AppendLine();
+                sbp3.AppendLine(sep + "--");
+
+                byte[] partData1 = Encoding.UTF8.GetBytes(sbp1.ToString());
+                byte[] partData2 = File.ReadAllBytes(localFile);
+                byte[] partData3 = Encoding.UTF8.GetBytes(sbp3.ToString());
+
+                MemoryStream ms = new MemoryStream();
+                ms.Write(partData1, 0, partData1.Length);
+                ms.Write(partData2, 0, partData2.Length);
+                ms.Write(partData3, 0, partData3.Length);
+
+                result = httpManager.postMultipart(uploadHost, ms.ToArray(), boundary, null);
+                result.RefText += string.Format("[SimpleUpload] Uploaded: \"{0}\" ==> \"{1}\", @{2}\n",
+                    localFile, saveKey, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+            }
+            catch (Exception ex)
+            {
+                StringBuilder sb = new StringBuilder("[SimpleUpload] Error: ");
+                Exception e = ex;
+                while (e != null)
+                {
+                    sb.Append(e.Message + " ");
+                    e = e.InnerException;
+                }
+
+                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
+                result.RefText += sb.ToString();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 上传文件 - 可附加自定义参数
+        /// </summary>
+        /// <param name="localFile">待上传的本地文件</param>
+        /// <param name="saveKey">要保存的目标文件名称</param>
+        /// <param name="token">上传凭证</param>
+        /// <param name="extraParams">用户自定义的附加参数</param>
+        /// <returns></returns>
+        public HttpResult uploadFile(string localFile, string saveKey, string token, Dictionary<string, string> extraParams)
+        {
+            HttpResult result = new HttpResult();
+
+            try
+            {
+                string boundary = HttpManager.createFormDataBoundary();
+                string sep = "--" + boundary;
+                StringBuilder sbp1 = new StringBuilder();
+
+                sbp1.AppendLine(sep);
+
+                sbp1.AppendLine("Content-Disposition: form-data; name=key");
+                sbp1.AppendLine();
+                sbp1.AppendLine(saveKey);
+                sbp1.AppendLine(sep);
+
+                sbp1.AppendLine("Content-Disposition: form-data; name=token");
+                sbp1.AppendLine();
+                sbp1.AppendLine(token);
+                sbp1.AppendLine(sep);
+
+                foreach (var d in extraParams)
+                {
+                    sbp1.AppendFormat("Content-Disposition: form-data; name=\"{0}\"", d.Key);
+                    sbp1.AppendLine();
+                    sbp1.AppendLine();
+                    sbp1.AppendLine(d.Value);
+                    sbp1.AppendLine(sep);
+                }
+
+                string filename = Path.GetFileName(localFile);
+                sbp1.AppendFormat("Content-Disposition: form-data; name=file; filename={0}", filename);
+                sbp1.AppendLine();
+                sbp1.AppendLine();
+
+                StringBuilder sbp3 = new StringBuilder();
+                sbp3.AppendLine();
+                sbp3.AppendLine(sep + "--");
+
+                byte[] partData1 = Encoding.UTF8.GetBytes(sbp1.ToString());
+                byte[] partData2 = File.ReadAllBytes(localFile);
+                byte[] partData3 = Encoding.UTF8.GetBytes(sbp3.ToString());
+
+                MemoryStream ms = new MemoryStream();
+                ms.Write(partData1, 0, partData1.Length);
+                ms.Write(partData2, 0, partData2.Length);
+                ms.Write(partData3, 0, partData3.Length);
+
+                result = httpManager.postMultipart(uploadHost, ms.ToArray(), boundary, null);
+                result.RefText += string.Format("[SimpleUpload] Uploaded: \"{0}\" ==> \"{1}\", @{2}\n",
+                    localFile, saveKey, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+            }
+            catch (Exception ex)
+            {
+                StringBuilder sb = new StringBuilder("[SimpleUpload] Error: ");
+                Exception e = ex;
+                while (e != null)
+                {
+                    sb.Append(e.Message + " ");
+                    e = e.InnerException;
+                }
+
+                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
+                result.RefText += sb.ToString();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 上传数据流
+        /// </summary>
+        /// <param name="stream">数据流，流长度必须可确定</param>
+        /// <param name="saveKey">要保存的key</param>
+        /// <param name="token">上传凭证</param>
+        /// <returns></returns>
+        public HttpResult uploadStream(Stream stream, string saveKey, string token)
+        {
+            HttpResult result = new HttpResult();
+
+            try
+            {
+                string boundary = HttpManager.createFormDataBoundary();
+                string sep = "--" + boundary;
+                StringBuilder sbp1 = new StringBuilder();
+
+                sbp1.AppendLine(sep);
+
+                sbp1.AppendLine("Content-Disposition: form-data; name=key");
+                sbp1.AppendLine();
+                sbp1.AppendLine(saveKey);
+                sbp1.AppendLine(sep);
+
+                sbp1.AppendLine("Content-Disposition: form-data; name=token");
+                sbp1.AppendLine();
+                sbp1.AppendLine(token);
+                sbp1.AppendLine(sep);
+
+                string filename = Path.GetFileName(saveKey);
+                sbp1.AppendFormat("Content-Disposition: form-data; name=file; filename={0}", filename);
+                sbp1.AppendLine();
+                sbp1.AppendLine();
+
+                int bufferSize = 1024 * 1024;
+                byte[] buffer = new byte[bufferSize];
+                int bytesRead = 0;
+                MemoryStream dataMS = new MemoryStream();
+                while (true)
+                {
+                    bytesRead = stream.Read(buffer, 0, bufferSize);
+                    if (bytesRead == 0)
+                    {
+                        break;
+                    }
+                    dataMS.Write(buffer, 0, bytesRead);
+                }
+
+                StringBuilder sbp3 = new StringBuilder();
+                sbp3.AppendLine();
+                sbp3.AppendLine(sep + "--");
+
+                byte[] partData1 = Encoding.UTF8.GetBytes(sbp1.ToString());
+                byte[] partData2 = dataMS.ToArray();
+                byte[] partData3 = Encoding.UTF8.GetBytes(sbp3.ToString());
+
+                MemoryStream ms = new MemoryStream();
+                ms.Write(partData1, 0, partData1.Length);
+                ms.Write(partData2, 0, partData2.Length);
+                ms.Write(partData3, 0, partData3.Length);
+
+                result = httpManager.postMultipart(uploadHost, ms.ToArray(), boundary, null);
+                result.RefText += string.Format("[SimpleUpload] Uploaded: \"#DATA#\" ==> \"{0}\", @{1}\n",
+                    saveKey, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+            }
+            catch (Exception ex)
+            {
+                StringBuilder sb = new StringBuilder("[SimpleUpload] Error: ");
+                Exception e = ex;
+                while (e != null)
+                {
+                    sb.Append(e.Message + " ");
+                    e = e.InnerException;
+                }
+
+                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
+                result.RefText += sb.ToString();
+            }
+
+            return result;
+        }
+
+        /// <summary>
+        /// 上传字节数据
+        /// </summary>
+        /// <param name="data">待上传的数据</param>
+        /// <param name="saveKey">要保存的key</param>
+        /// <param name="token">上传凭证</param>
+        /// <returns></returns>
+        public HttpResult uploadData(byte[] data, string saveKey, string token)
+        {
+            HttpResult result = new HttpResult();
+
+            try
+            {
+                string boundary = HttpManager.createFormDataBoundary();
+                string sep = "--" + boundary;
+
+                StringBuilder sbp1 = new StringBuilder();
+
+                sbp1.AppendLine(sep);
+
+                sbp1.AppendLine("Content-Disposition: form-data; name=key");
+                sbp1.AppendLine();
+                sbp1.AppendLine(saveKey);
+                sbp1.AppendLine(sep);
+
+                sbp1.AppendLine("Content-Disposition: form-data; name=token");
+                sbp1.AppendLine();
+                sbp1.AppendLine(token);
+                sbp1.AppendLine(sep);
+
+                string filename = Path.GetFileName(saveKey);
+                sbp1.AppendFormat("Content-Disposition: form-data; name=file; filename={0}", filename);
+                sbp1.AppendLine();
+                sbp1.AppendLine();
+
+                StringBuilder sbp3 = new StringBuilder();
+                sbp3.AppendLine();
+                sbp3.AppendLine(sep + "--");
+
+                byte[] partData1 = Encoding.UTF8.GetBytes(sbp1.ToString());
+                byte[] partData2 = data;
+                byte[] partData3 = Encoding.UTF8.GetBytes(sbp3.ToString());
+
+                MemoryStream ms = new MemoryStream();
+                ms.Write(partData1, 0, partData1.Length);
+                ms.Write(partData2, 0, partData2.Length);
+                ms.Write(partData3, 0, partData3.Length);
+
+                result = httpManager.postMultipart(uploadHost, ms.ToArray(), boundary, null);
+                result.RefText += string.Format("[SimpleUpload] Uploaded: \"#DATA#\" ==> \"{0}\", @{1}\n",
+                    saveKey, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+            }
+            catch (Exception ex)
+            {
+                StringBuilder sb = new StringBuilder("[SimpleUpload] Error: ");
+                Exception e = ex;
+                while (e != null)
+                {
+                    sb.Append(e.Message + " ");
+                    e = e.InnerException;
+                }
+
+                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
+                result.RefText += sb.ToString();
+            }
+
+            return result;
+        }
+
+    }
+}
diff --git a/src/Qiniu/IO/Model/PutPolicy.cs b/src/Qiniu/IO/Model/PutPolicy.cs
index 8285e65f..9b06435c 100644
--- a/src/Qiniu/IO/Model/PutPolicy.cs
+++ b/src/Qiniu/IO/Model/PutPolicy.cs
@@ -141,7 +141,9 @@ public void setExpires(int expireInSeconds)
         /// <returns>JSON字符串</returns>
         public string ToJsonString()
         {
-            return StringHelper.jsonEncode(this);
+            JsonSerializerSettings setting = new JsonSerializerSettings();
+            setting.NullValueHandling = NullValueHandling.Ignore;
+            return JsonConvert.SerializeObject(this, setting);
         }
     }
 }
diff --git a/src/Qiniu/IO/Model/ResumeInfo.cs b/src/Qiniu/IO/Model/ResumeInfo.cs
index d40a1fd8..6a80d148 100644
--- a/src/Qiniu/IO/Model/ResumeInfo.cs
+++ b/src/Qiniu/IO/Model/ResumeInfo.cs
@@ -1,4 +1,6 @@
-namespace Qiniu.IO.Model
+using System.Collections.Generic;
+
+namespace Qiniu.IO.Model
 {
     /// <summary>
     /// 断点续上传断点信息
@@ -23,6 +25,6 @@ public class ResumeInfo
         /// <summary>
         /// 上下文信息列表
         /// </summary>
-        public string[] Contexts { get; set; }
+        public List<string> Contexts { get; set; }
     }
 }
diff --git a/src/Qiniu/IO/Model/UploadProgressHandler.cs b/src/Qiniu/IO/Model/UploadProgressHandler.cs
index eaa5242d..83d0c7ca 100644
--- a/src/Qiniu/IO/Model/UploadProgressHandler.cs
+++ b/src/Qiniu/IO/Model/UploadProgressHandler.cs
@@ -6,4 +6,11 @@
     /// <param name="uploadedBytes">已上传的字节数</param>
     /// <param name="totalBytes">文件总字节数</param>
     public delegate void UploadProgressHandler(long uploadedBytes, long totalBytes);
+
+    /// <summary>
+    /// 数据流流上传进度处理
+    /// </summary>
+    /// <param name="uploadedBytes"></param>
+    public delegate void StreamProgressHandler(long uploadedBytes);
+
 }
diff --git a/src/Qiniu/IO/ResumableUploader.cs b/src/Qiniu/IO/ResumableUploader.cs
index 063b2b61..76fcdc2c 100644
--- a/src/Qiniu/IO/ResumableUploader.cs
+++ b/src/Qiniu/IO/ResumableUploader.cs
@@ -3,11 +3,11 @@
 using System.Text;
 using System.Collections.Generic;
 using System.Threading;
+using Newtonsoft.Json;
 using Qiniu.Common;
 using Qiniu.IO.Model;
 using Qiniu.Util;
 using Qiniu.Http;
-using Newtonsoft.Json;
 
 namespace Qiniu.IO
 {
@@ -118,7 +118,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                         FileSize = fileSize,
                         BlockIndex = 0,
                         BlockCount = blockCount,
-                        Contexts = new string[blockCount]
+                        Contexts = new List<string>(blockCount)
                     };
 
                     ResumeHelper.Save(resumeInfo, recordFile);
@@ -158,8 +158,8 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                     }
 
                     fs.Read(chunkBuffer, 0, (int)chunkSize);
-                    hr = mkblk(chunkBuffer, offset, blockSize, chunkSize, token);
-                    if (hr.Code != HttpHelper.STATUS_CODE_OK)
+                    hr = mkblk(chunkBuffer, blockSize, chunkSize, token);
+                    if (hr.Code != (int)HttpCode.OK)
                     {
                         result.shadow(hr);
                         result.RefText += string.Format("[ResumableUpload] Error: mkblk: offset={0}, blockSize={1}, chunkSize={2}, @{3}\n",
@@ -195,7 +195,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
                             fs.Read(chunkBuffer, 0, (int)chunkSize);
                             hr = bput(chunkBuffer, blockOffset, chunkSize, context, token);
-                            if (hr.Code != HttpHelper.STATUS_CODE_OK)
+                            if (hr.Code != (int)HttpCode.OK)
                             {
                                 result.shadow(hr);
                                 result.RefText += string.Format("[ResumableUpload] Error: bput: offset={0}, blockOffset={1}, chunkSize={2}, @{3}\n",
@@ -220,13 +220,14 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                     #endregion one_block
 
                     resumeInfo.BlockIndex = index;
-                    resumeInfo.Contexts[index] = context;
+                    resumeInfo.Contexts.Add(context);
                     ResumeHelper.Save(resumeInfo, recordFile);
                     ++index;
                 }
 
-                hr = mkfile(localFile, fileSize, saveKey, HttpHelper.CONTENT_TYPE_APP_OCTET, resumeInfo.Contexts, token);
-                if (hr.Code != HttpHelper.STATUS_CODE_OK)
+                string fileName = Path.GetFileName(localFile);
+                hr = mkfile(fileName, fileSize, saveKey, ContentType.APPLICATION_OCTET_STREAM, resumeInfo.Contexts, token);
+                if (hr.Code != (int)HttpCode.OK)
                 {
                     result.shadow(hr);
                     result.RefText += string.Format("[ResumableUpload] Error: mkfile @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
@@ -252,7 +253,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -305,7 +306,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                         FileSize = fileSize,
                         BlockIndex = 0,
                         BlockCount = blockCount,
-                        Contexts = new string[blockCount]
+                        Contexts = new List<string>(blockCount)
                     };
 
                     ResumeHelper.Save(resumeInfo, recordFile);
@@ -333,8 +334,8 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
                     if (upts == UPTS.Aborted)
                     {
-                        result.Code = HttpHelper.STATUS_CODE_USER_CANCELED;
-                        result.RefCode = HttpHelper.STATUS_CODE_USER_CANCELED;
+                        result.Code = (int)HttpCode.USER_CANCELED;
+                        result.RefCode = (int)HttpCode.USER_CANCELED;
                         result.RefText += string.Format("[ResumableUpload] Info: upload task is aborted @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
                         return result;
@@ -346,7 +347,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                             bres = false;
                             mres.Reset();
 
-                            result.RefCode = HttpHelper.STATUS_CODE_USER_PAUSED;
+                            result.RefCode = (int)HttpCode.USER_PAUSED;
                             result.RefText += string.Format("[ResumableUpload] Info: upload task is paused @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
                         }
                         mres.WaitOne(1000);
@@ -358,7 +359,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                             bres = true;
                             mres.Set();
 
-                            result.RefCode = HttpHelper.STATUS_CODE_USER_RESUMED;
+                            result.RefCode = (int)HttpCode.USER_RESUMED;
                             result.RefText += string.Format("[ResumableUpload] Info: upload task is resumed @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
                         }
 
@@ -383,8 +384,8 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                         }
 
                         fs.Read(chunkBuffer, 0, (int)chunkSize);
-                        hr = mkblk(chunkBuffer, offset, blockSize, chunkSize, token);
-                        if (hr.Code != HttpHelper.STATUS_CODE_OK)
+                        hr = mkblk(chunkBuffer, blockSize, chunkSize, token);
+                        if (hr.Code != (int)HttpCode.OK)
                         {
                             result.shadow(hr);
                             result.RefText += string.Format("[ResumableUpload] Error: mkblk: offset={0}, blockSize={1}, chunkSize={2}, @{3}\n",
@@ -420,7 +421,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
                                 fs.Read(chunkBuffer, 0, (int)chunkSize);
                                 hr = bput(chunkBuffer, blockOffset, chunkSize, context, token);
-                                if (hr.Code != HttpHelper.STATUS_CODE_OK)
+                                if (hr.Code != (int)HttpCode.OK)
                                 {
                                     result.shadow(hr);
                                     result.RefText += string.Format("[ResumableUpload] Error: bput: offset={0}, blockOffset={1}, chunkSize={2}, @{3}\n",
@@ -445,14 +446,15 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                         #endregion one_block
 
                         resumeInfo.BlockIndex = index;
-                        resumeInfo.Contexts[index] = context;
+                        resumeInfo.Contexts.Add(context);
                         ResumeHelper.Save(resumeInfo, recordFile);
                         ++index;
                     }
                 }
 
-                hr = mkfile(localFile, fileSize, saveKey, HttpHelper.CONTENT_TYPE_APP_OCTET, resumeInfo.Contexts, token);
-                if (hr.Code != HttpHelper.STATUS_CODE_OK)
+                string fileName = Path.GetFileName(localFile);
+                hr = mkfile(fileName, fileSize, saveKey, ContentType.APPLICATION_OCTET_STREAM, resumeInfo.Contexts, token);
+                if (hr.Code != (int)HttpCode.OK)
                 {
                     result.shadow(hr);
                     result.RefText += string.Format("[ResumableUpload] Error: mkfile @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
@@ -477,7 +479,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -565,7 +567,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                         FileSize = fileSize,
                         BlockIndex = 0,
                         BlockCount = blockCount,
-                        Contexts = new string[blockCount]
+                        Contexts = new List<string>(blockCount)
                     };
 
                     ResumeHelper.Save(resumeInfo, recordFile);
@@ -613,15 +615,15 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                     {
                         result.RefText += string.Format("[ResumableUpload] try mkblk#{0} @{1}\n", iTry, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                        hr = mkblkChecked(chunkBuffer, offset, blockSize, chunkSize, token);
+                        hr = mkblkChecked(chunkBuffer, blockSize, chunkSize, token);
 
-                        if (hr.Code == HttpHelper.STATUS_CODE_OK && hr.RefCode != HttpHelper.STATUS_CODE_NEED_RETRY)
+                        if (hr.Code == (int)HttpCode.OK && hr.RefCode != (int)HttpCode.USER_NEED_RETRY)
                         {
                             break;
                         }
                     }
 
-                    if (hr.Code != HttpHelper.STATUS_CODE_OK || hr.RefCode == HttpHelper.STATUS_CODE_NEED_RETRY)
+                    if (hr.Code != (int)HttpCode.OK || hr.RefCode == (int)HttpCode.USER_NEED_RETRY)
                     {
                         result.shadow(hr);
                         result.RefText += string.Format("[ResumableUpload] Error: mkblk: offset={0}, blockSize={1}, chunkSize={2}, @{3}\n",
@@ -664,12 +666,12 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
                                 hr = bputChecked(chunkBuffer, blockOffset, chunkSize, context, token);
 
-                                if (hr.Code == HttpHelper.STATUS_CODE_OK && hr.RefCode != HttpHelper.STATUS_CODE_NEED_RETRY)
+                                if (hr.Code == (int)HttpCode.OK && hr.RefCode != (int)HttpCode.USER_NEED_RETRY)
                                 {
                                     break;
                                 }
                             }
-                            if (hr.Code != HttpHelper.STATUS_CODE_OK || hr.RefCode == HttpHelper.STATUS_CODE_NEED_RETRY)
+                            if (hr.Code != (int)HttpCode.OK || hr.RefCode == (int)HttpCode.USER_NEED_RETRY)
                             {
                                 result.shadow(hr);
                                 result.RefText += string.Format("[ResumableUpload] Error: bput: offset={0}, blockOffset={1}, chunkSize={2}, @{3}\n",
@@ -693,13 +695,14 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                     #endregion one_block
 
                     resumeInfo.BlockIndex = index;
-                    resumeInfo.Contexts[index] = context;
+                    resumeInfo.Contexts.Add(context);
                     ResumeHelper.Save(resumeInfo, recordFile);
                     ++index;
                 }
 
-                hr = mkfile(localFile, fileSize, saveKey, HttpHelper.CONTENT_TYPE_APP_OCTET, resumeInfo.Contexts, token);
-                if (hr.Code != HttpHelper.STATUS_CODE_OK)
+                string fileName = Path.GetFileName(localFile);
+                hr = mkfile(fileName, fileSize, saveKey, ContentType.APPLICATION_OCTET_STREAM, resumeInfo.Contexts, token);
+                if (hr.Code != (int)HttpCode.OK)
                 {
                     result.shadow(hr);
                     result.RefText += string.Format("[ResumableUpload] Error: mkfile @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
@@ -724,7 +727,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -780,7 +783,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                         FileSize = fileSize,
                         BlockIndex = 0,
                         BlockCount = blockCount,
-                        Contexts = new string[blockCount]
+                        Contexts = new List<string>(blockCount)
                     };
 
                     ResumeHelper.Save(resumeInfo, recordFile);
@@ -809,8 +812,8 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
                     if (upts == UPTS.Aborted)
                     {
-                        result.Code = HttpHelper.STATUS_CODE_USER_CANCELED;
-                        result.RefCode = HttpHelper.STATUS_CODE_USER_CANCELED;
+                        result.Code = (int)HttpCode.USER_CANCELED;
+                        result.RefCode = (int)HttpCode.USER_CANCELED;
                         result.RefText += string.Format("[ResumableUpload] Info: upload task is aborted @{0}\n",
                             DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
@@ -823,7 +826,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                             bres = false;
                             mres.Reset();
 
-                            result.RefCode = HttpHelper.STATUS_CODE_USER_PAUSED;
+                            result.RefCode = (int)HttpCode.USER_PAUSED;
                             result.RefText += string.Format("[ResumableUpload] Info: upload task is paused @{0}\n",
                                 DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
                         }
@@ -836,7 +839,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                             bres = true;
                             mres.Set();
 
-                            result.RefCode = HttpHelper.STATUS_CODE_USER_RESUMED;
+                            result.RefCode = (int)HttpCode.USER_RESUMED;
                             result.RefText += string.Format("[ResumableUpload] Info: upload task is resumed @{0}\n",
                                 DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
                         }
@@ -869,18 +872,18 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                             result.RefText += string.Format("[ResumableUpload] try mkblk#{0} @{1}\n", iTry,
                                 DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                            hr = mkblkChecked(chunkBuffer, offset, blockSize, chunkSize, token);
+                            hr = mkblkChecked(chunkBuffer, blockSize, chunkSize, token);
 
-                            if (hr.Code == HttpHelper.STATUS_CODE_OK && hr.RefCode != HttpHelper.STATUS_CODE_NEED_RETRY)
+                            if (hr.Code == (int)HttpCode.OK && hr.RefCode != (int)HttpCode.USER_NEED_RETRY)
                             {
                                 break;
                             }
                         }
-                        if (hr.Code != HttpHelper.STATUS_CODE_OK || hr.RefCode == HttpHelper.STATUS_CODE_NEED_RETRY)
+                        if (hr.Code != (int)HttpCode.OK || hr.RefCode == (int)HttpCode.USER_NEED_RETRY)
                         {
                             result.shadow(hr);
                             result.RefText += string.Format("[ResumableUpload] Error: mkblk: offset={0}, blockSize={1}, chunkSize={2}, @{3}\n",
-                            offset, blockSize, chunkSize, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
+                                offset, blockSize, chunkSize, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
                             return result;
                         }
@@ -920,12 +923,12 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
                                     hr = bputChecked(chunkBuffer, blockOffset, chunkSize, context, token);
 
-                                    if (hr.Code == HttpHelper.STATUS_CODE_OK && hr.RefCode != HttpHelper.STATUS_CODE_NEED_RETRY)
+                                    if (hr.Code == (int)HttpCode.OK && hr.RefCode != (int)HttpCode.USER_NEED_RETRY)
                                     {
                                         break;
                                     }
                                 }
-                                if (hr.Code != HttpHelper.STATUS_CODE_OK || hr.RefCode == HttpHelper.STATUS_CODE_NEED_RETRY)
+                                if (hr.Code != (int)HttpCode.OK || hr.RefCode == (int)HttpCode.USER_NEED_RETRY)
                                 {
                                     result.shadow(hr);
                                     result.RefText += string.Format("[ResumableUpload] Error: bput: offset={0}, blockOffset={1}, chunkSize={2}, @{3}\n",
@@ -950,14 +953,15 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                         #endregion one_block
 
                         resumeInfo.BlockIndex = index;
-                        resumeInfo.Contexts[index] = context;
+                        resumeInfo.Contexts.Add(context);
                         ResumeHelper.Save(resumeInfo, recordFile);
                         ++index;
                     }
                 }
 
-                hr = mkfile(localFile, fileSize, saveKey, HttpHelper.CONTENT_TYPE_APP_OCTET, resumeInfo.Contexts, token);
-                if (hr.Code != HttpHelper.STATUS_CODE_OK)
+                string fileName = Path.GetFileName(localFile);
+                hr = mkfile(fileName, fileSize, saveKey, ContentType.APPLICATION_OCTET_STREAM, resumeInfo.Contexts, token);
+                if (hr.Code != (int)HttpCode.OK)
                 {
                     result.shadow(hr);
                     result.RefText += string.Format("[ResumableUpload] Error: mkfile @{0}\n",
@@ -984,7 +988,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                 sb.AppendFormat(" @{0}\n",
                     DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -1041,7 +1045,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                         FileSize = fileSize,
                         BlockIndex = 0,
                         BlockCount = blockCount,
-                        Contexts = new string[blockCount]
+                        Contexts = new List<string>(blockCount)
                     };
 
                     ResumeHelper.Save(resumeInfo, recordFile);
@@ -1070,8 +1074,8 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
                     if (upts == UPTS.Aborted)
                     {
-                        result.Code = HttpHelper.STATUS_CODE_USER_CANCELED;
-                        result.RefCode = HttpHelper.STATUS_CODE_USER_CANCELED;
+                        result.Code = (int)HttpCode.USER_CANCELED;
+                        result.RefCode = (int)HttpCode.USER_CANCELED;
                         result.RefText += string.Format("[ResumableUpload] Info: upload task is aborted @{0}\n",
                             DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
@@ -1084,7 +1088,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                             bres = false;
                             mres.Reset();
 
-                            result.RefCode = HttpHelper.STATUS_CODE_USER_PAUSED;
+                            result.RefCode = (int)HttpCode.USER_PAUSED;
                             result.RefText += string.Format("[ResumableUpload] Info: upload task is paused @{0}\n",
                                 DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
                         }
@@ -1097,7 +1101,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                             bres = true;
                             mres.Set();
 
-                            result.RefCode = HttpHelper.STATUS_CODE_USER_RESUMED;
+                            result.RefCode = (int)HttpCode.USER_RESUMED;
                             result.RefText += string.Format("[ResumableUpload] Info: upload task is resumed @{0}\n",
                                 DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
                         }
@@ -1130,14 +1134,14 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                             result.RefText += string.Format("[ResumableUpload] try mkblk#{0} @{1}\n", iTry,
                                 DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                            hr = mkblkChecked(chunkBuffer, offset, blockSize, chunkSize, token);
+                            hr = mkblkChecked(chunkBuffer, blockSize, chunkSize, token);
 
-                            if (hr.Code == HttpHelper.STATUS_CODE_OK && hr.RefCode != HttpHelper.STATUS_CODE_NEED_RETRY)
+                            if (hr.Code == (int)HttpCode.OK && hr.RefCode != (int)HttpCode.USER_NEED_RETRY)
                             {
                                 break;
                             }
                         }
-                        if (hr.Code != HttpHelper.STATUS_CODE_OK || hr.RefCode == HttpHelper.STATUS_CODE_NEED_RETRY)
+                        if (hr.Code != (int)HttpCode.OK || hr.RefCode == (int)HttpCode.USER_NEED_RETRY)
                         {
                             result.shadow(hr);
                             result.RefText += string.Format("[ResumableUpload] Error: mkblk: offset={0}, blockSize={1}, chunkSize={2}, @{3}\n",
@@ -1181,12 +1185,12 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
                                     hr = bputChecked(chunkBuffer, blockOffset, chunkSize, context, token);
 
-                                    if (hr.Code == HttpHelper.STATUS_CODE_OK && hr.RefCode != HttpHelper.STATUS_CODE_NEED_RETRY)
+                                    if (hr.Code == (int)HttpCode.OK && hr.RefCode != (int)HttpCode.USER_NEED_RETRY)
                                     {
                                         break;
                                     }
                                 }
-                                if (hr.Code != HttpHelper.STATUS_CODE_OK || hr.RefCode == HttpHelper.STATUS_CODE_NEED_RETRY)
+                                if (hr.Code != (int)HttpCode.OK || hr.RefCode == (int)HttpCode.USER_NEED_RETRY)
                                 {
                                     result.shadow(hr);
                                     result.RefText += string.Format("[ResumableUpload] Error: bput: offset={0}, blockOffset={1}, chunkSize={2}, @{3}\n",
@@ -1211,14 +1215,15 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                         #endregion one_block
 
                         resumeInfo.BlockIndex = index;
-                        resumeInfo.Contexts[index] = context;
+                        resumeInfo.Contexts.Add(context);
                         ResumeHelper.Save(resumeInfo, recordFile);
                         ++index;
                     }
                 }
 
-                hr = mkfile(localFile, fileSize, saveKey, HttpHelper.CONTENT_TYPE_APP_OCTET, resumeInfo.Contexts, token, extraParams);
-                if (hr.Code != HttpHelper.STATUS_CODE_OK)
+                string fileName = Path.GetFileName(localFile);
+                hr = mkfile(fileName, fileSize, saveKey, ContentType.APPLICATION_OCTET_STREAM, resumeInfo.Contexts, token, extraParams);
+                if (hr.Code != (int)HttpCode.OK)
                 {
                     result.shadow(hr);
                     result.RefText += string.Format("[ResumableUpload] Error: mkfile @{0}\n",
@@ -1245,7 +1250,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
                 sb.AppendFormat(" @{0}\n",
                     DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
             finally
@@ -1258,74 +1263,67 @@ public HttpResult uploadFile(string localFile, string saveKey, string token, str
 
             return result;
         }
-        
+
         /// <summary>
         /// 上传数据流-分片方式
         /// </summary>
         /// <param name="stream">数据流，流长度必须可确定</param>
+        /// <param name="streamId">流名称</param>
         /// <param name="saveKey">要保存的key</param>
         /// <param name="token">上传凭证</param>
-        /// <param name="uppHandler">上传进度处理</param>
+        /// <param name="spHandler">数据流上传进度处理</param> 
         /// <returns></returns>
-        public HttpResult uploadStream(Stream stream,string saveKey,string token,UploadProgressHandler uppHandler)
+        public HttpResult uploadStream(Stream stream, string streamId, string saveKey,string token,StreamProgressHandler spHandler)
         {
             HttpResult result = new HttpResult();
 
-            if(uppHandler==null)
+            if(spHandler==null)
             {
-                uppHandler = new UploadProgressHandler(defaultUploadProgressHandler);
+                spHandler = new StreamProgressHandler(defaultStreamProgressHandler);
             }
 
             try
             {
-                long fileSize = stream.Length;
-                long chunkSize = CHUNK_SIZE;
-                long blockSize = BLOCK_SIZE;
-                byte[] chunkBuffer = new byte[chunkSize];
-                int blockCount = (int)((fileSize + blockSize - 1) / blockSize);
+                long fileSize = 0;
+                int blockSize = (int)BLOCK_SIZE;
+                int chunkSize = 0;
+                byte[] buffer = new byte[blockSize];
 
                 ResumeInfo resumeInfo = new ResumeInfo()
                 {
-                    FileSize = fileSize,
+                    FileSize = 0,
                     BlockIndex = 0,
-                    BlockCount = blockCount,
-                    Contexts = new string[blockCount]
+                    BlockCount = 0,
+                    Contexts = new List<string>()
                 };
 
                 int index = 0;
                 long offset = 0;
                 string context = null;
-                long leftBytes = fileSize;
-                long blockLeft = 0;
-                long blockOffset = 0;
                 HttpResult hr = null;
                 ResumeContext rc = null;
 
-                while (leftBytes > 0)
+                while (true)
                 {
                     #region one_block
 
                     #region mkblk
-                    if (leftBytes < BLOCK_SIZE)
+                    chunkSize = stream.Read(buffer, 0, blockSize);
+
+                    if(chunkSize==0)
                     {
-                        blockSize = leftBytes;
+                        break;
                     }
-                    else
-                    {
-                        blockSize = BLOCK_SIZE;
-                    }
-                    if (leftBytes < CHUNK_SIZE)
+
+                    if (chunkSize < blockSize)
                     {
-                        chunkSize = leftBytes;
+                        hr = mkblk(buffer, chunkSize, chunkSize, token);
                     }
                     else
                     {
-                        chunkSize = CHUNK_SIZE;
+                        hr = mkblk(buffer, blockSize, chunkSize, token);
                     }
-
-                    stream.Read(chunkBuffer, 0, (int)chunkSize);
-                    hr = mkblk(chunkBuffer, offset, blockSize, chunkSize, token);
-                    if (hr.Code != HttpHelper.STATUS_CODE_OK)
+                    if (hr.Code != (int)HttpCode.OK)
                     {
                         result.shadow(hr);
                         result.RefText += string.Format("[ResumableUpload] Error: mkblk: offset={0}, blockSize={1}, chunkSize={2}, @{3}\n",
@@ -1337,61 +1335,22 @@ public HttpResult uploadStream(Stream stream,string saveKey,string token,UploadP
                     rc = JsonConvert.DeserializeObject<ResumeContext>(hr.Text);
                     context = rc.Ctx;
                     offset += chunkSize;
-                    leftBytes -= chunkSize;
+                    fileSize += chunkSize;
                     #endregion mkblk
 
-                    uppHandler(offset, fileSize);
-
-                    if (leftBytes > 0)
-                    {
-                        blockLeft = blockSize - chunkSize;
-                        blockOffset = chunkSize;
-                        while (blockLeft > 0)
-                        {
-                            #region bput-loop
-
-                            if (blockLeft < CHUNK_SIZE)
-                            {
-                                chunkSize = blockLeft;
-                            }
-                            else
-                            {
-                                chunkSize = CHUNK_SIZE;
-                            }
-
-                            stream.Read(chunkBuffer, 0, (int)chunkSize);
-                            hr = bput(chunkBuffer, blockOffset, chunkSize, context, token);
-                            if (hr.Code != HttpHelper.STATUS_CODE_OK)
-                            {
-                                result.shadow(hr);
-                                result.RefText += string.Format("[ResumableUpload] Error: bput: offset={0}, blockOffset={1}, chunkSize={2}, @{3}\n",
-                                    offset, blockOffset, chunkSize, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
-
-                                return result;
-                            }
-
-                            rc = JsonConvert.DeserializeObject<ResumeContext>(hr.Text);
-                            context = rc.Ctx;
-
-                            offset += chunkSize;
-                            leftBytes -= chunkSize;
-                            blockOffset += chunkSize;
-                            blockLeft -= chunkSize;
-                            #endregion bput-loop
-
-                            uppHandler(offset, fileSize);
-                        }
-                    }
+                    spHandler(offset);
 
                     #endregion one_block
 
+                    resumeInfo.FileSize = fileSize;
                     resumeInfo.BlockIndex = index;
-                    resumeInfo.Contexts[index] = context;
+                    resumeInfo.BlockCount = index + 1;
+                    resumeInfo.Contexts.Add(context);
                     ++index;
                 }
 
-                hr = mkfile("#DATA#", fileSize, saveKey, HttpHelper.CONTENT_TYPE_APP_OCTET, resumeInfo.Contexts, token);
-                if (hr.Code != HttpHelper.STATUS_CODE_OK)
+                hr = mkfile(streamId, fileSize, saveKey, ContentType.APPLICATION_OCTET_STREAM, resumeInfo.Contexts, token);
+                if (hr.Code != (int)HttpCode.OK)
                 {
                     result.shadow(hr);
                     result.RefText += string.Format("[ResumableUpload] Error: mkfile @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
@@ -1415,13 +1374,17 @@ public HttpResult uploadStream(Stream stream,string saveKey,string token,UploadP
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
-            //finally
-            //{
-            //    //stream
-            //}
+            finally
+            {
+#if NetStandard16
+                stream.Dispose();
+#else
+                stream.Close();
+#endif
+            }
 
             return result;
         }
@@ -1432,12 +1395,12 @@ public HttpResult uploadStream(Stream stream,string saveKey,string token,UploadP
         /// <param name="data">待上传的数据</param>
         /// <param name="saveKey">要保存的key</param>
         /// <param name="token">上传凭证</param>
-        /// <param name="uppHandler">上传进度处理</param>
+        /// <param name="spHandler">上传进度处理</param>
         /// <returns></returns>
-        public HttpResult uploadData(byte[] data,string saveKey,string token,UploadProgressHandler uppHandler)
+        public HttpResult uploadData(byte[] data,string saveKey,string token,StreamProgressHandler spHandler)
         {
-            Stream stream = new MemoryStream(data);
-            return uploadStream(stream, saveKey, token, uppHandler);
+            Stream ms = new MemoryStream(data);
+            return uploadStream(ms, "#DATA#", saveKey, token, spHandler);
         }
 
         /// <summary>
@@ -1448,7 +1411,7 @@ public HttpResult uploadData(byte[] data,string saveKey,string token,UploadProgr
         /// <returns></returns>
         public string defaultRecordKey(string localFile, string saveKey)
         {
-            return "QiniuRU_" + StringHelper.calcMD5(localFile + saveKey);
+            return "QiniuRU_" + Hashing.calcMD5(localFile + saveKey);
         }
 
         /// <summary>
@@ -1468,6 +1431,15 @@ public static void defaultUploadProgressHandler(long uploadedBytes, long totalBy
             }
         }
 
+        /// <summary>
+        /// 默认的进度处理函数
+        /// </summary>
+        /// <param name="uploadedBytes">已上传的字节数</param>
+        public static void defaultStreamProgressHandler(long uploadedBytes)
+        {
+            Console.WriteLine("[ResumableUpload-Stream] UploadledBytes: {0}", uploadedBytes);
+        }
+
         /// <summary>
         /// 默认的上传控制函数
         /// </summary>
@@ -1480,15 +1452,15 @@ public static UPTS defaultUploadController()
         /// <summary>
         /// 创建文件
         /// </summary>
-        private HttpResult mkfile(string fileName, long size, string saveKey, string mimeType, string[] contexts, string token)
+        private HttpResult mkfile(string fileName, long size, string saveKey, string mimeType, List<string> contexts, string token)
         {
             HttpResult result = new HttpResult();
 
             try
             {
-                string fnameStr = string.Format("/fname/{0}", StringHelper.urlSafeBase64Encode(fileName));
-                string mimeTypeStr = string.Format("/mimeType/{0}", StringHelper.urlSafeBase64Encode(mimeType));
-                string keyStr = string.Format("/key/{0}", StringHelper.urlSafeBase64Encode(saveKey));
+                string fnameStr = string.Format("/fname/{0}", Base64.urlSafeBase64Encode(fileName));
+                string mimeTypeStr = string.Format("/mimeType/{0}", Base64.urlSafeBase64Encode(mimeType));
+                string keyStr = string.Format("/key/{0}", Base64.urlSafeBase64Encode(saveKey));
 
                 string url = string.Format("{0}/mkfile/{1}{2}{3}{4}", uploadHost, size, mimeTypeStr, fnameStr, keyStr);
                 string body = StringHelper.join(contexts, ",");
@@ -1508,7 +1480,7 @@ private HttpResult mkfile(string fileName, long size, string saveKey, string mim
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1518,15 +1490,15 @@ private HttpResult mkfile(string fileName, long size, string saveKey, string mim
         /// <summary>
         /// 创建文件
         /// </summary>
-        private HttpResult mkfile(string fileName, long size, string saveKey, string mimeType, string[] contexts, string token, Dictionary<string, string> extraParams)
+        private HttpResult mkfile(string fileName, long size, string saveKey, string mimeType, List<string> contexts, string token, Dictionary<string, string> extraParams)
         {
             HttpResult result = new HttpResult();
 
             try
             {
-                string fnameStr = string.Format("/fname/{0}", StringHelper.urlSafeBase64Encode(fileName));
-                string mimeTypeStr = string.Format("/mimeType/{0}", StringHelper.urlSafeBase64Encode(mimeType));
-                string keyStr = string.Format("/key/{0}", StringHelper.urlSafeBase64Encode(saveKey));
+                string fnameStr = string.Format("/fname/{0}", Base64.urlSafeBase64Encode(fileName));
+                string mimeTypeStr = string.Format("/mimeType/{0}", Base64.urlSafeBase64Encode(mimeType));
+                string keyStr = string.Format("/key/{0}", Base64.urlSafeBase64Encode(saveKey));
                 string paramStr = "";
                 if (extraParams != null && extraParams.Count > 0)
                 {
@@ -1557,7 +1529,7 @@ private HttpResult mkfile(string fileName, long size, string saveKey, string mim
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1567,7 +1539,7 @@ private HttpResult mkfile(string fileName, long size, string saveKey, string mim
         /// <summary>
         /// 创建块(携带首片数据)
         /// </summary>
-        private HttpResult mkblk(byte[] chunkBuffer, long offset, long blockSize, long chunkSize, string token)
+        private HttpResult mkblk(byte[] chunkBuffer, long blockSize, long chunkSize, string token)
         {
             HttpResult result = new HttpResult();
 
@@ -1575,9 +1547,11 @@ private HttpResult mkblk(byte[] chunkBuffer, long offset, long blockSize, long c
             {
                 string url = string.Format("{0}/mkblk/{1}", uploadHost, blockSize);
                 string upToken = string.Format("UpToken {0}", token);
-                byte[] data = (new MemoryStream(chunkBuffer, 0, (int)chunkSize)).ToArray();
-
-                result = httpManager.postData(url, data, upToken);
+                using (MemoryStream ms = new MemoryStream(chunkBuffer, 0, (int)chunkSize))
+                {
+                    byte[] data = ms.ToArray();
+                    result = httpManager.postData(url, data, upToken);
+                }
             }
             catch (Exception ex)
             {
@@ -1591,7 +1565,7 @@ private HttpResult mkblk(byte[] chunkBuffer, long offset, long blockSize, long c
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1601,7 +1575,7 @@ private HttpResult mkblk(byte[] chunkBuffer, long offset, long blockSize, long c
         /// <summary>
         /// 创建块(携带首片数据),同时检查CRC32
         /// </summary>
-        private HttpResult mkblkChecked(byte[] chunkBuffer, long offset, long blockSize, long chunkSize, string token)
+        private HttpResult mkblkChecked(byte[] chunkBuffer, long blockSize, long chunkSize, string token)
         {
             HttpResult result = new HttpResult();
 
@@ -1609,27 +1583,30 @@ private HttpResult mkblkChecked(byte[] chunkBuffer, long offset, long blockSize,
             {
                 string url = string.Format("{0}/mkblk/{1}", uploadHost, blockSize);
                 string upToken = string.Format("UpToken {0}", token);
-                byte[] data = (new MemoryStream(chunkBuffer, 0, (int)chunkSize)).ToArray();
+                using (MemoryStream ms = new MemoryStream(chunkBuffer, 0, (int)chunkSize))
+                {
+                    byte[] data = ms.ToArray();
 
-                result = httpManager.postData(url, data, upToken);
+                    result = httpManager.postData(url, data, upToken);
 
-                if (result.Code == HttpHelper.STATUS_CODE_OK)
-                {
-                    var rd = JsonConvert.DeserializeObject<Dictionary<string, string>>(result.Text);
-                    if (rd.ContainsKey("crc32"))
+                    if (result.Code == (int)HttpCode.OK)
                     {
-                        uint crc_1 = Convert.ToUInt32(rd["crc32"]);
-                        uint crc_2 = CRC32.checkSumSlice(chunkBuffer, 0, (int)chunkSize);
-                        if (crc_1 != crc_2)
+                        var rd = JsonConvert.DeserializeObject<Dictionary<string, string>>(result.Text);
+                        if (rd.ContainsKey("crc32"))
                         {
-                            result.RefCode = HttpHelper.STATUS_CODE_NEED_RETRY;
-                            result.RefText += string.Format(" CRC32: remote={0}, local={1}\n", crc_1, crc_2);
+                            uint crc_1 = Convert.ToUInt32(rd["crc32"]);
+                            uint crc_2 = CRC32.checkSumSlice(chunkBuffer, 0, (int)chunkSize);
+                            if (crc_1 != crc_2)
+                            {
+                                result.RefCode = (int)HttpCode.USER_NEED_RETRY;
+                                result.RefText += string.Format(" CRC32: remote={0}, local={1}\n", crc_1, crc_2);
+                            }
                         }
                     }
-                }
-                else
-                {
-                    result.RefCode = HttpHelper.STATUS_CODE_NEED_RETRY;
+                    else
+                    {
+                        result.RefCode = (int)HttpCode.USER_NEED_RETRY;
+                    }
                 }
             }
             catch (Exception ex)
@@ -1644,7 +1621,7 @@ private HttpResult mkblkChecked(byte[] chunkBuffer, long offset, long blockSize,
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1662,9 +1639,11 @@ private HttpResult bput(byte[] chunkBuffer, long offset, long chunkSize, string
             {
                 string url = string.Format("{0}/bput/{1}/{2}", uploadHost, context, offset);
                 string upToken = string.Format("UpToken {0}", token);
-                byte[] data = (new MemoryStream(chunkBuffer, 0, (int)chunkSize)).ToArray();
-
-                result = httpManager.postData(url, data, upToken);
+                using (MemoryStream ms = new MemoryStream(chunkBuffer, 0, (int)chunkSize))
+                {
+                    byte[] data = ms.ToArray();
+                    result = httpManager.postData(url, data, upToken);
+                }
             }
             catch (Exception ex)
             {
@@ -1678,7 +1657,7 @@ private HttpResult bput(byte[] chunkBuffer, long offset, long chunkSize, string
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -1702,27 +1681,31 @@ private HttpResult bputChecked(byte[] chunkBuffer, long offset, long chunkSize,
             {
                 string url = string.Format("{0}/bput/{1}/{2}", uploadHost, context, offset);
                 string upToken = string.Format("UpToken {0}", token);
-                byte[] data = (new MemoryStream(chunkBuffer, 0, (int)chunkSize)).ToArray();
-
-                result = httpManager.postData(url, data, upToken);
 
-                if (result.Code == HttpHelper.STATUS_CODE_OK)
+                using (MemoryStream ms = new MemoryStream(chunkBuffer, 0, (int)chunkSize))
                 {
-                    var rd = JsonConvert.DeserializeObject<Dictionary<string, string>>(result.Text);
-                    if (rd.ContainsKey("crc32"))
+                    byte[] data = ms.ToArray();
+
+                    result = httpManager.postData(url, data, upToken);
+
+                    if (result.Code == (int)HttpCode.OK)
                     {
-                        uint crc_1 = Convert.ToUInt32(rd["crc32"]);
-                        uint crc_2 = CRC32.checkSumSlice(chunkBuffer, 0, (int)chunkSize);
-                        if (crc_1 != crc_2)
+                        var rd = JsonConvert.DeserializeObject<Dictionary<string, string>>(result.Text);
+                        if (rd.ContainsKey("crc32"))
                         {
-                            result.RefCode = HttpHelper.STATUS_CODE_NEED_RETRY;
-                            result.RefText += string.Format(" CRC32: remote={0}, local={1}\n", crc_1, crc_2);
+                            uint crc_1 = Convert.ToUInt32(rd["crc32"]);
+                            uint crc_2 = CRC32.checkSumSlice(chunkBuffer, 0, (int)chunkSize);
+                            if (crc_1 != crc_2)
+                            {
+                                result.RefCode = (int)HttpCode.USER_NEED_RETRY;
+                                result.RefText += string.Format(" CRC32: remote={0}, local={1}\n", crc_1, crc_2);
+                            }
                         }
                     }
-                }
-                else
-                {
-                    result.RefCode = HttpHelper.STATUS_CODE_NEED_RETRY;
+                    else
+                    {
+                        result.RefCode = (int)HttpCode.USER_NEED_RETRY;
+                    }
                 }
             }
             catch (Exception ex)
@@ -1737,7 +1720,7 @@ private HttpResult bputChecked(byte[] chunkBuffer, long offset, long chunkSize,
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
diff --git a/src/Qiniu/IO/SimpleUploader.cs b/src/Qiniu/IO/SimpleUploader.cs
index 3dc11e50..ea60228e 100644
--- a/src/Qiniu/IO/SimpleUploader.cs
+++ b/src/Qiniu/IO/SimpleUploader.cs
@@ -1,257 +1,11 @@
-using System;
-using System.IO;
-using System.Text;
-using System.Collections.Generic;
-using Qiniu.Common;
-using Qiniu.Http;
-
-namespace Qiniu.IO
+namespace Qiniu.IO
 {
     /// <summary>
-    /// 简单上传，适合于以下情形(1)
-    /// 
-    /// (1)网络较好并且待上传的文件体积较小时使用简单上传
-    /// 
-    /// (2)文件较大或者网络状况不理想时请使用分片上传
-    /// 
-    /// (3)文件较大上传需要花费较长时间，建议使用断点续上传
+    /// 将被废弃(请使用Qiniu.IO.FormUploader)
     /// </summary>
-    public class SimpleUploader
+    [System.Obsolete("请使用\'Qiniu.IO.FormUploader\'")]
+    public class SimpleUploader:FormUploader
     {
-        // 上传域名，默认Config.ZONE.upHost
-        private string uploadHost;
-
-        private HttpManager httpManager;
-
-        /// <summary>
-        /// 初始化
-        /// </summary>
-        /// <param name="uploadFromCDN">是否从CDN上传</param>
-        public SimpleUploader(bool uploadFromCDN = false)
-        {
-            httpManager = new HttpManager();
-
-            uploadHost = uploadFromCDN ? Config.ZONE.UploadHost : Config.ZONE.UpHost;
-        }
-
-        /// <summary>
-        /// 上传文件
-        /// 需要提供正确的上传凭证(参阅[1]，另关于上传策略请参阅[2])
-        /// [1] http://developer.qiniu.com/article/developer/security/upload-token.html
-        /// [2] http://developer.qiniu.com/article/developer/security/put-policy.html
-        /// </summary>
-        /// <param name="localFile">待上传的本地文件</param>
-        /// <param name="saveKey">要保存的目标文件名称</param>
-        /// <param name="token">上传凭证</param>
-        /// <returns>上传结果</returns>
-        public HttpResult uploadFile(string localFile, string saveKey, string token)
-        {
-            HttpResult result = new HttpResult();
-
-            try
-            {
-                string boundary = HttpHelper.createFormDataBoundary();
-                string sep = "--" + boundary;
-                StringBuilder sb = new StringBuilder();
-
-                sb.AppendLine(sep);
-
-                sb.AppendLine("Content-Disposition: form-data; name=key\r\n");
-                sb.AppendLine(saveKey);
-                sb.AppendLine(sep);
-
-                sb.AppendLine("Content-Disposition: form-data; name=token\r\n");
-                sb.AppendLine(token);
-                sb.AppendLine(sep);
-
-                string filename = Path.GetFileName(localFile);
-                sb.AppendFormat("Content-Disposition: form-data; name=file; filename={0}\r\n\r\n", filename);
-
-                byte[] partData1 = Encoding.UTF8.GetBytes(sb.ToString());
-                byte[] partData2 = File.ReadAllBytes(localFile);
-                byte[] partData3 = Encoding.UTF8.GetBytes(string.Format("\r\n{0}--\r\n", sep));
-
-                MemoryStream ms = new MemoryStream();
-                ms.Write(partData1, 0, partData1.Length);
-                ms.Write(partData2, 0, partData2.Length);
-                ms.Write(partData3, 0, partData3.Length);
-
-                result = httpManager.postMultipart(uploadHost, ms.ToArray(), boundary, null);
-                result.RefText += string.Format("[SimpleUpload] Uploaded: \"{0}\" ==> \"{1}\", @{2}\n",
-                    localFile, saveKey, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
-            }
-            catch (Exception ex)
-            {
-                StringBuilder sb = new StringBuilder("[SimpleUpload] Error: ");
-                Exception e = ex;
-                while (e != null)
-                {
-                    sb.Append(e.Message + " ");
-                    e = e.InnerException;
-                }
-
-                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
-
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
-                result.RefText += sb.ToString();
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// 上传文件 - 可附加自定义参数
-        /// </summary>
-        /// <param name="localFile">待上传的本地文件</param>
-        /// <param name="saveKey">要保存的目标文件名称</param>
-        /// <param name="token">上传凭证</param>
-        /// <param name="extraParams">用户自定义的附加参数</param>
-        /// <returns></returns>
-        public HttpResult uploadFile(string localFile, string saveKey, string token, Dictionary<string,string> extraParams)
-        {
-            HttpResult result = new HttpResult();
-
-            try
-            {
-                string boundary = HttpHelper.createFormDataBoundary();
-                string sep = "--" + boundary;
-                StringBuilder sb = new StringBuilder();
-
-                sb.AppendLine(sep);                
-
-                sb.AppendLine("Content-Disposition: form-data; name=key\r\n");
-                sb.AppendLine(saveKey);
-                sb.AppendLine(sep);
-
-                sb.AppendLine("Content-Disposition: form-data; name=token\r\n");
-                sb.AppendLine(token);
-                sb.AppendLine(sep);
-
-                foreach (var d in extraParams)
-                {
-                    sb.AppendFormat("Content-Disposition: form-data; name=\"{0}\"\r\n\r\n", d.Key);
-                    sb.AppendLine(d.Value);
-                    sb.AppendLine(sep);
-                }
-
-                string filename = Path.GetFileName(localFile);
-                sb.AppendFormat("Content-Disposition: form-data; name=file; filename={0}\r\n\r\n", filename);               
-
-                byte[] partData1 = Encoding.UTF8.GetBytes(sb.ToString());
-                byte[] partData2 = File.ReadAllBytes(localFile);
-                byte[] partData3 = Encoding.UTF8.GetBytes(string.Format("\r\n{0}--\r\n", sep));
-
-                MemoryStream ms = new MemoryStream();
-                ms.Write(partData1, 0, partData1.Length);
-                ms.Write(partData2, 0, partData2.Length);
-                ms.Write(partData3, 0, partData3.Length);
-
-                result = httpManager.postMultipart(uploadHost, ms.ToArray(), boundary, null);
-                result.RefText += string.Format("[SimpleUpload] Uploaded: \"{0}\" ==> \"{1}\", @{2}\n",
-                    localFile, saveKey, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
-            }
-            catch (Exception ex)
-            {
-                StringBuilder sb = new StringBuilder("[SimpleUpload] Error: ");
-                Exception e = ex;
-                while (e != null)
-                {
-                    sb.Append(e.Message + " ");
-                    e = e.InnerException;
-                }
-
-                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
-
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
-                result.RefText += sb.ToString();
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// 上传数据流
-        /// </summary>
-        /// <param name="stream">数据流，流长度必须可确定</param>
-        /// <param name="saveKey">要保存的key</param>
-        /// <param name="token">上传凭证</param>
-        /// <returns></returns>
-        public HttpResult uploadStream(Stream stream,string saveKey,string token)
-        {
-            HttpResult result = new HttpResult();
-
-            try
-            {
-                string boundary = HttpHelper.createFormDataBoundary();
-                string sep = "--" + boundary;
-                StringBuilder sb = new StringBuilder();
-
-                sb.AppendLine(sep);
-
-                sb.AppendLine("Content-Disposition: form-data; name=key\r\n");
-                sb.AppendLine(saveKey);
-                sb.AppendLine(sep);
-
-                sb.AppendLine("Content-Disposition: form-data; name=token\r\n");
-                sb.AppendLine(token);
-                sb.AppendLine(sep);
-
-                string filename = Path.GetFileName(saveKey);
-                sb.AppendFormat("Content-Disposition: form-data; name=file; filename={0}\r\n\r\n", filename);
-
-                byte[] partData1 = Encoding.UTF8.GetBytes(sb.ToString());
-                byte[] partData2 = new byte[stream.Length];
-                int offset = 0;
-                int bytesLeft = (int)(stream.Length);
-                int bytesRead = 0;
-                while(bytesLeft>0)
-                {
-                    bytesRead = stream.Read(partData2, offset, bytesLeft);
-                    offset += bytesRead;
-                    bytesLeft -= bytesLeft;
-                }
-                byte[] partData3 = Encoding.UTF8.GetBytes(string.Format("\r\n{0}--\r\n", sep));
-
-                MemoryStream ms = new MemoryStream();
-                ms.Write(partData1, 0, partData1.Length);
-                ms.Write(partData2, 0, partData2.Length);
-                ms.Write(partData3, 0, partData3.Length);
-
-                result = httpManager.postMultipart(uploadHost, ms.ToArray(), boundary, null);
-                result.RefText += string.Format("[SimpleUpload] Uploaded: \"#DATA#\" ==> \"{0}\", @{1}\n",
-                    saveKey, DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
-            }
-            catch (Exception ex)
-            {
-                StringBuilder sb = new StringBuilder("[SimpleUpload] Error: ");
-                Exception e = ex;
-                while (e != null)
-                {
-                    sb.Append(e.Message + " ");
-                    e = e.InnerException;
-                }
-
-                sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
-
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
-                result.RefText += sb.ToString();
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// 上传字节数据
-        /// </summary>
-        /// <param name="data">待上传的数据</param>
-        /// <param name="saveKey">要保存的key</param>
-        /// <param name="token">上传凭证</param>
-        /// <returns></returns>
-        public HttpResult uploadData(byte[] data, string saveKey,string token)
-        {
-            Stream stream = new MemoryStream(data);
-            return uploadStream(stream, saveKey, token);
-        }
-
+        // 请参见FormUploader类
     }
 }
diff --git a/src/Qiniu/IO/UploadManager.cs b/src/Qiniu/IO/UploadManager.cs
index 6baea78d..f438ecc9 100644
--- a/src/Qiniu/IO/UploadManager.cs
+++ b/src/Qiniu/IO/UploadManager.cs
@@ -1,4 +1,4 @@
-using Qiniu.Common;
+using Qiniu.Util;
 using Qiniu.IO.Model;
 using System.IO;
 using Qiniu.Http;
@@ -81,20 +81,6 @@ public void setChunkUnit(ChunkUnit cu)
             CHUNK_UNIT = cu;
         }
 
-        /// <summary>
-        /// 生成上传凭证
-        /// 有关上传策略请参阅 http://developer.qiniu.com/article/developer/security/put-policy.html
-        /// 有关上传凭证请参阅 http://developer.qiniu.com/article/developer/security/upload-token.html
-        /// </summary>
-        /// <param name="mac">账户访问控制(密钥)</param>
-        /// <param name="putPolicy">上传策略</param>
-        /// <returns></returns>
-        public static string createUploadToken(Mac mac,PutPolicy putPolicy)
-        {
-            Signature sx = new Signature(mac);
-            return sx.signWithData(putPolicy.ToJsonString());
-        }
-
         /// <summary>
         /// 上传文件
         /// </summary>
@@ -111,7 +97,7 @@ public HttpResult uploadFile(string localFile, string saveKey, string token)
             {
                 if (string.IsNullOrEmpty(recordFile))
                 {
-                    recordFile = "QiniuRU_" + Util.StringHelper.calcMD5(localFile + saveKey);
+                    recordFile = "QiniuRU_" + Hashing.calcMD5(localFile + saveKey);
                 }
 
                 if (upph == null)
@@ -129,38 +115,13 @@ public HttpResult uploadFile(string localFile, string saveKey, string token)
             }
             else
             {
-                SimpleUploader su = new SimpleUploader(UPLOAD_FROM_CDN);
+                FormUploader su = new FormUploader(UPLOAD_FROM_CDN);
                 result = su.uploadFile(localFile, saveKey, token);
             }
 
             return result;
         }
 
-        /// <summary>
-        /// 上传数据流
-        /// </summary>
-        /// <param name="stream">待上传的数据流</param>
-        /// <param name="saveKey">要保存的文件名称</param>
-        /// <param name="token">上传凭证</param>
-        /// <returns>上传结果</returns>
-        public HttpResult uploadStream(Stream stream, string saveKey, string token)
-        {
-            HttpResult result = new HttpResult();
-
-            if (stream.Length > PUT_THRESHOLD)
-            {
-                ResumableUploader ru = new ResumableUploader(UPLOAD_FROM_CDN);
-                result = ru.uploadStream(stream, saveKey, token, null);
-            }
-            else
-            {
-                SimpleUploader su = new SimpleUploader(UPLOAD_FROM_CDN);
-                result = su.uploadStream(stream, saveKey, token);
-            }
-
-            return result;
-        }
-
         /// <summary>
         /// 上传数据
         /// </summary>
@@ -179,12 +140,11 @@ public HttpResult uploadData(byte[] data, string saveKey, string token)
             }
             else
             {
-                SimpleUploader su = new SimpleUploader(UPLOAD_FROM_CDN);
+                FormUploader su = new FormUploader(UPLOAD_FROM_CDN);
                 result = su.uploadData(data, saveKey, token);
             }
 
             return result;
         }
-
     }
 }
diff --git a/src/Qiniu/Properties/AssemblyInfo.cs b/src/Qiniu/Properties/AssemblyInfo.cs
index a8c2a7f6..17a94c31 100644
--- a/src/Qiniu/Properties/AssemblyInfo.cs
+++ b/src/Qiniu/Properties/AssemblyInfo.cs
@@ -10,45 +10,45 @@
 
 #if Net20
 
-[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.4 (.NET 2.0)")]
-[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.4 (.NET 2.0)")]
-[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.4 (.NET 2.0)")]
+[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.5 (.NET 2.0)")]
+[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.5 (.NET 2.0)")]
+[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.5 (.NET 2.0)")]
 
 #elif Net35
 
-[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.4 (.NET 3.5)")]
-[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.4 (.NET 3.5)")]
-[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.4 (.NET 3.5)")]
+[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.5 (.NET 3.5)")]
+[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.5 (.NET 3.5)")]
+[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.5 (.NET 3.5)")]
 
 #elif Net40
 
-[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.4 (.NET 4.0)")]
-[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.4 (.NET 4.0)")]
-[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.4 (.NET 4.0)")]
+[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.5 (.NET 4.0)")]
+[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.5 (.NET 4.0)")]
+[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.5 (.NET 4.0)")]
 
 #elif Net45
 
-[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.4 (.NET 4.5)")]
-[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.4 (.NET 4.5)")]
-[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.4 (.NET 4.5)")]
+[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.5 (.NET 4.5)")]
+[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.5 (.NET 4.5)")]
+[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.5 (.NET 4.5)")]
 
 #elif Net46
 
-[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.4 (.NET 4.6)")]
-[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.4 (.NET 4.6)")]
-[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.4 (.NET 4.6)")]
+[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.5 (.NET 4.6)")]
+[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.5 (.NET 4.6)")]
+[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.5 (.NET 4.6)")]
 
 #elif NetStandard16
 
-[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.4 (.NETStd 1.6)")]
-[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.4 (.NETStd 1.6)")]
-[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.4 (.NETStd 1.6)")]
+[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.5 (.NETStd 1.6)")]
+[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.5 (.NETStd 1.6)")]
+[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.5 (.NETStd 1.6)")]
 
 #else
 
-[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.4")]
-[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.4")]
-[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.4")]
+[assembly: AssemblyProduct("Qiniu (Cloud) C# SDK v7.2.5")]
+[assembly: AssemblyTitle("Qiniu (Cloud) C# SDK v7.2.5")]
+[assembly: AssemblyDescription("Qiniu (Cloud) C# SDK v7.2.5")]
 
 #endif
 
@@ -63,6 +63,6 @@
 [assembly: Guid("957cd434-8b12-46ce-980b-09ca26ed340d")]
 
 [assembly: AssemblyCopyright("Copyright ©  2017")]
-[assembly: AssemblyVersion("7.2.4")]
-[assembly: AssemblyFileVersion("7.2.4")]
+[assembly: AssemblyVersion("7.2.5")]
+[assembly: AssemblyFileVersion("7.2.5")]
 
diff --git a/src/Qiniu/Qiniu.Net20.csproj b/src/Qiniu/Qiniu.Net20.csproj
index b57a3232..69379123 100644
--- a/src/Qiniu/Qiniu.Net20.csproj
+++ b/src/Qiniu/Qiniu.Net20.csproj
@@ -53,8 +53,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Http\HttpManager.cs" />
+    <Compile Include="IO\SimpleUploader.cs" />
+    <Compile Include="QiniuCSharpSDK.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Common\Config.cs" />
+    <Compile Include="Common\Zone.cs" />
+    <Compile Include="Common\ZoneHelper.cs" />
+    <Compile Include="Common\ZoneInfo.cs" />
     <Compile Include="CDN\Model\RefreshRequest.cs" />
     <Compile Include="CDN\Model\RefreshInfo.cs" />
     <Compile Include="CDN\Model\RefreshResult.cs" />
@@ -71,23 +76,21 @@
     <Compile Include="CDN\Model\LogListInfo.cs" />
     <Compile Include="CDN\Model\LogListResult.cs" />
     <Compile Include="CDN\Model\HotLinkRequest.cs" />
-    <Compile Include="CDN\FusionManager.cs" />
-    <Compile Include="RSF\OperationManager.cs" />
-    <Compile Include="RS\Model\BucketInfo.cs" />
-    <Compile Include="RS\Model\BucketResult.cs" />
+    <Compile Include="CDN\CdnManager.cs" />
+    <Compile Include="Util\Auth.cs" />
+    <Compile Include="Util\Mac.cs" />
+    <Compile Include="Util\Signature.cs" />
+    <Compile Include="Util\UrlHelper.cs" />
+    <Compile Include="Util\Base64.cs" />
     <Compile Include="Util\CRC32.cs" />
-    <Compile Include="Util\QETag.cs" />
+    <Compile Include="Util\ETag.cs" />
+    <Compile Include="Util\Hashing.cs" />
     <Compile Include="Util\StringHelper.cs" />
     <Compile Include="Util\UserEnv.cs" />
-    <Compile Include="Common\QiniuCSharpSDK.cs" />
-    <Compile Include="Common\Config.cs" />
-    <Compile Include="Common\Mac.cs" />
-    <Compile Include="Common\Signature.cs" />
-    <Compile Include="Common\Zone.cs" />
-    <Compile Include="Common\ZoneHelper.cs" />
-    <Compile Include="Http\HttpHelper.cs" />
+    <Compile Include="Http\HttpCode.cs" />
+    <Compile Include="Http\ContentType.cs" />
     <Compile Include="Http\HttpResult.cs" />
-    <Compile Include="Http\UrlHelper.cs" />
+    <Compile Include="Http\HttpManager.cs" />
     <Compile Include="IO\Model\ChunkUnit.cs" />
     <Compile Include="IO\Model\PutPolicy.cs" />
     <Compile Include="IO\Model\ResumeContext.cs" />
@@ -96,7 +99,7 @@
     <Compile Include="IO\Model\UploadController.cs" />
     <Compile Include="IO\Model\UploadProgressHandler.cs" />
     <Compile Include="IO\ResumableUploader.cs" />
-    <Compile Include="IO\SimpleUploader.cs" />
+    <Compile Include="IO\FormUploader.cs" />
     <Compile Include="IO\UploadManager.cs" />
     <Compile Include="IO\DownloadManager.cs" />
     <Compile Include="RS\Model\BatchResult.cs" />
@@ -109,7 +112,10 @@
     <Compile Include="RS\Model\ListResult.cs" />
     <Compile Include="RS\Model\StatInfo.cs" />
     <Compile Include="RS\Model\StatResult.cs" />
+    <Compile Include="RS\Model\BucketInfo.cs" />
+    <Compile Include="RS\Model\BucketResult.cs" />
     <Compile Include="RSF\Model\PfopResult.cs" />
+    <Compile Include="RSF\OperationManager.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Packages.Net20.config" />
diff --git a/src/Qiniu/Qiniu.Net35.csproj b/src/Qiniu/Qiniu.Net35.csproj
index b3dc817d..b8769a79 100644
--- a/src/Qiniu/Qiniu.Net35.csproj
+++ b/src/Qiniu/Qiniu.Net35.csproj
@@ -56,8 +56,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Http\HttpManager.cs" />
+    <Compile Include="IO\SimpleUploader.cs" />
+    <Compile Include="QiniuCSharpSDK.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Common\Config.cs" />
+    <Compile Include="Common\Zone.cs" />
+    <Compile Include="Common\ZoneHelper.cs" />
+    <Compile Include="Common\ZoneInfo.cs" />
     <Compile Include="CDN\Model\RefreshRequest.cs" />
     <Compile Include="CDN\Model\RefreshInfo.cs" />
     <Compile Include="CDN\Model\RefreshResult.cs" />
@@ -74,24 +79,21 @@
     <Compile Include="CDN\Model\LogListInfo.cs" />
     <Compile Include="CDN\Model\LogListResult.cs" />
     <Compile Include="CDN\Model\HotLinkRequest.cs" />
-    <Compile Include="CDN\FusionManager.cs" />
-    <Compile Include="RSF\Model\PfopResult.cs" />
-    <Compile Include="RSF\OperationManager.cs" />
-    <Compile Include="RS\Model\BucketInfo.cs" />
-    <Compile Include="RS\Model\BucketResult.cs" />
+    <Compile Include="CDN\CdnManager.cs" />
+    <Compile Include="Util\Auth.cs" />
+    <Compile Include="Util\Mac.cs" />
+    <Compile Include="Util\Signature.cs" />
+    <Compile Include="Util\UrlHelper.cs" />
+    <Compile Include="Util\Base64.cs" />
     <Compile Include="Util\CRC32.cs" />
-    <Compile Include="Util\QETag.cs" />
+    <Compile Include="Util\ETag.cs" />
+    <Compile Include="Util\Hashing.cs" />
     <Compile Include="Util\StringHelper.cs" />
     <Compile Include="Util\UserEnv.cs" />
-    <Compile Include="Common\QiniuCSharpSDK.cs" />
-    <Compile Include="Common\Config.cs" />
-    <Compile Include="Common\Mac.cs" />
-    <Compile Include="Common\Signature.cs" />
-    <Compile Include="Common\Zone.cs" />
-    <Compile Include="Common\ZoneHelper.cs" />
-    <Compile Include="Http\HttpHelper.cs" />
+    <Compile Include="Http\HttpCode.cs" />
+    <Compile Include="Http\ContentType.cs" />
     <Compile Include="Http\HttpResult.cs" />
-    <Compile Include="Http\UrlHelper.cs" />
+    <Compile Include="Http\HttpManager.cs" />
     <Compile Include="IO\Model\ChunkUnit.cs" />
     <Compile Include="IO\Model\PutPolicy.cs" />
     <Compile Include="IO\Model\ResumeContext.cs" />
@@ -100,7 +102,7 @@
     <Compile Include="IO\Model\UploadController.cs" />
     <Compile Include="IO\Model\UploadProgressHandler.cs" />
     <Compile Include="IO\ResumableUploader.cs" />
-    <Compile Include="IO\SimpleUploader.cs" />
+    <Compile Include="IO\FormUploader.cs" />
     <Compile Include="IO\UploadManager.cs" />
     <Compile Include="IO\DownloadManager.cs" />
     <Compile Include="RS\Model\BatchResult.cs" />
@@ -113,6 +115,10 @@
     <Compile Include="RS\Model\ListResult.cs" />
     <Compile Include="RS\Model\StatInfo.cs" />
     <Compile Include="RS\Model\StatResult.cs" />
+    <Compile Include="RS\Model\BucketInfo.cs" />
+    <Compile Include="RS\Model\BucketResult.cs" />
+    <Compile Include="RSF\Model\PfopResult.cs" />
+    <Compile Include="RSF\OperationManager.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Packages.Net35.config" />
diff --git a/src/Qiniu/Qiniu.Net40.csproj b/src/Qiniu/Qiniu.Net40.csproj
index bdfa8748..80fa07c1 100644
--- a/src/Qiniu/Qiniu.Net40.csproj
+++ b/src/Qiniu/Qiniu.Net40.csproj
@@ -61,8 +61,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Http\HttpManager.cs" />
+    <Compile Include="IO\SimpleUploader.cs" />
+    <Compile Include="QiniuCSharpSDK.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Common\Config.cs" />
+    <Compile Include="Common\Zone.cs" />
+    <Compile Include="Common\ZoneHelper.cs" />
+    <Compile Include="Common\ZoneInfo.cs" />
     <Compile Include="CDN\Model\RefreshRequest.cs" />
     <Compile Include="CDN\Model\RefreshInfo.cs" />
     <Compile Include="CDN\Model\RefreshResult.cs" />
@@ -79,22 +84,21 @@
     <Compile Include="CDN\Model\LogListInfo.cs" />
     <Compile Include="CDN\Model\LogListResult.cs" />
     <Compile Include="CDN\Model\HotLinkRequest.cs" />
-    <Compile Include="CDN\FusionManager.cs" />
-    <Compile Include="RS\Model\BucketInfo.cs" />
-    <Compile Include="RS\Model\BucketResult.cs" />
+    <Compile Include="CDN\CdnManager.cs" />
+    <Compile Include="Util\Auth.cs" />
+    <Compile Include="Util\Mac.cs" />
+    <Compile Include="Util\Signature.cs" />
+    <Compile Include="Util\UrlHelper.cs" />
+    <Compile Include="Util\Base64.cs" />
     <Compile Include="Util\CRC32.cs" />
-    <Compile Include="Util\QETag.cs" />
+    <Compile Include="Util\ETag.cs" />
+    <Compile Include="Util\Hashing.cs" />
     <Compile Include="Util\StringHelper.cs" />
     <Compile Include="Util\UserEnv.cs" />
-    <Compile Include="Common\QiniuCSharpSDK.cs" />
-    <Compile Include="Common\Config.cs" />
-    <Compile Include="Common\Mac.cs" />
-    <Compile Include="Common\Signature.cs" />
-    <Compile Include="Common\Zone.cs" />
-    <Compile Include="Common\ZoneHelper.cs" />
-    <Compile Include="Http\HttpHelper.cs" />
+    <Compile Include="Http\HttpCode.cs" />
+    <Compile Include="Http\ContentType.cs" />
     <Compile Include="Http\HttpResult.cs" />
-    <Compile Include="Http\UrlHelper.cs" />
+    <Compile Include="Http\HttpManager.cs" />
     <Compile Include="IO\Model\ChunkUnit.cs" />
     <Compile Include="IO\Model\PutPolicy.cs" />
     <Compile Include="IO\Model\ResumeContext.cs" />
@@ -103,7 +107,7 @@
     <Compile Include="IO\Model\UploadController.cs" />
     <Compile Include="IO\Model\UploadProgressHandler.cs" />
     <Compile Include="IO\ResumableUploader.cs" />
-    <Compile Include="IO\SimpleUploader.cs" />
+    <Compile Include="IO\FormUploader.cs" />
     <Compile Include="IO\UploadManager.cs" />
     <Compile Include="IO\DownloadManager.cs" />
     <Compile Include="RS\Model\BatchResult.cs" />
@@ -116,6 +120,8 @@
     <Compile Include="RS\Model\ListResult.cs" />
     <Compile Include="RS\Model\StatInfo.cs" />
     <Compile Include="RS\Model\StatResult.cs" />
+    <Compile Include="RS\Model\BucketInfo.cs" />
+    <Compile Include="RS\Model\BucketResult.cs" />
     <Compile Include="RSF\Model\PfopResult.cs" />
     <Compile Include="RSF\OperationManager.cs" />
   </ItemGroup>
diff --git a/src/Qiniu/Qiniu.Net45.csproj b/src/Qiniu/Qiniu.Net45.csproj
index 0446f34a..72c0642c 100644
--- a/src/Qiniu/Qiniu.Net45.csproj
+++ b/src/Qiniu/Qiniu.Net45.csproj
@@ -57,8 +57,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Http\HttpManager.cs" />
+    <Compile Include="IO\SimpleUploader.cs" />
+    <Compile Include="QiniuCSharpSDK.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Common\Config.cs" />
+    <Compile Include="Common\Zone.cs" />
+    <Compile Include="Common\ZoneHelper.cs" />
+    <Compile Include="Common\ZoneInfo.cs" />
     <Compile Include="CDN\Model\RefreshRequest.cs" />
     <Compile Include="CDN\Model\RefreshInfo.cs" />
     <Compile Include="CDN\Model\RefreshResult.cs" />
@@ -75,23 +80,21 @@
     <Compile Include="CDN\Model\LogListInfo.cs" />
     <Compile Include="CDN\Model\LogListResult.cs" />
     <Compile Include="CDN\Model\HotLinkRequest.cs" />
-    <Compile Include="CDN\FusionManager.cs" />
-    <Compile Include="RSF\OperationManager.cs" />
-    <Compile Include="RS\Model\BucketInfo.cs" />
-    <Compile Include="RS\Model\BucketResult.cs" />
+    <Compile Include="CDN\CdnManager.cs" />
+    <Compile Include="Util\Auth.cs" />
+    <Compile Include="Util\Mac.cs" />
+    <Compile Include="Util\Signature.cs" />
+    <Compile Include="Util\UrlHelper.cs" />
+    <Compile Include="Util\Base64.cs" />
     <Compile Include="Util\CRC32.cs" />
-    <Compile Include="Util\QETag.cs" />
+    <Compile Include="Util\ETag.cs" />
+    <Compile Include="Util\Hashing.cs" />
     <Compile Include="Util\StringHelper.cs" />
     <Compile Include="Util\UserEnv.cs" />
-    <Compile Include="Common\QiniuCSharpSDK.cs" />
-    <Compile Include="Common\Config.cs" />
-    <Compile Include="Common\Mac.cs" />
-    <Compile Include="Common\Signature.cs" />
-    <Compile Include="Common\Zone.cs" />
-    <Compile Include="Common\ZoneHelper.cs" />
-    <Compile Include="Http\HttpHelper.cs" />
+    <Compile Include="Http\HttpCode.cs" />
+    <Compile Include="Http\ContentType.cs" />
     <Compile Include="Http\HttpResult.cs" />
-    <Compile Include="Http\UrlHelper.cs" />
+    <Compile Include="Http\HttpManager.cs" />
     <Compile Include="IO\Model\ChunkUnit.cs" />
     <Compile Include="IO\Model\PutPolicy.cs" />
     <Compile Include="IO\Model\ResumeContext.cs" />
@@ -100,7 +103,7 @@
     <Compile Include="IO\Model\UploadController.cs" />
     <Compile Include="IO\Model\UploadProgressHandler.cs" />
     <Compile Include="IO\ResumableUploader.cs" />
-    <Compile Include="IO\SimpleUploader.cs" />
+    <Compile Include="IO\FormUploader.cs" />
     <Compile Include="IO\UploadManager.cs" />
     <Compile Include="IO\DownloadManager.cs" />
     <Compile Include="RS\Model\BatchResult.cs" />
@@ -113,7 +116,10 @@
     <Compile Include="RS\Model\ListResult.cs" />
     <Compile Include="RS\Model\StatInfo.cs" />
     <Compile Include="RS\Model\StatResult.cs" />
+    <Compile Include="RS\Model\BucketInfo.cs" />
+    <Compile Include="RS\Model\BucketResult.cs" />
     <Compile Include="RSF\Model\PfopResult.cs" />
+    <Compile Include="RSF\OperationManager.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Packages.Net40.config" />
diff --git a/src/Qiniu/Qiniu.Net46.csproj b/src/Qiniu/Qiniu.Net46.csproj
index 6eb3f1e5..489c7d7e 100644
--- a/src/Qiniu/Qiniu.Net46.csproj
+++ b/src/Qiniu/Qiniu.Net46.csproj
@@ -57,8 +57,13 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Http\HttpManager.cs" />
+    <Compile Include="IO\SimpleUploader.cs" />
+    <Compile Include="QiniuCSharpSDK.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Common\Config.cs" />
+    <Compile Include="Common\Zone.cs" />
+    <Compile Include="Common\ZoneHelper.cs" />
+    <Compile Include="Common\ZoneInfo.cs" />
     <Compile Include="CDN\Model\RefreshRequest.cs" />
     <Compile Include="CDN\Model\RefreshInfo.cs" />
     <Compile Include="CDN\Model\RefreshResult.cs" />
@@ -75,23 +80,21 @@
     <Compile Include="CDN\Model\LogListInfo.cs" />
     <Compile Include="CDN\Model\LogListResult.cs" />
     <Compile Include="CDN\Model\HotLinkRequest.cs" />
-    <Compile Include="CDN\FusionManager.cs" />
-    <Compile Include="RSF\OperationManager.cs" />
-    <Compile Include="RS\Model\BucketInfo.cs" />
-    <Compile Include="RS\Model\BucketResult.cs" />
+    <Compile Include="CDN\CdnManager.cs" />
+    <Compile Include="Util\Auth.cs" />
+    <Compile Include="Util\Mac.cs" />
+    <Compile Include="Util\Signature.cs" />
+    <Compile Include="Util\UrlHelper.cs" />
+    <Compile Include="Util\Base64.cs" />
     <Compile Include="Util\CRC32.cs" />
-    <Compile Include="Util\QETag.cs" />
+    <Compile Include="Util\ETag.cs" />
+    <Compile Include="Util\Hashing.cs" />
     <Compile Include="Util\StringHelper.cs" />
     <Compile Include="Util\UserEnv.cs" />
-    <Compile Include="Common\QiniuCSharpSDK.cs" />
-    <Compile Include="Common\Config.cs" />
-    <Compile Include="Common\Mac.cs" />
-    <Compile Include="Common\Signature.cs" />
-    <Compile Include="Common\Zone.cs" />
-    <Compile Include="Common\ZoneHelper.cs" />
-    <Compile Include="Http\HttpHelper.cs" />
+    <Compile Include="Http\HttpCode.cs" />
+    <Compile Include="Http\ContentType.cs" />
     <Compile Include="Http\HttpResult.cs" />
-    <Compile Include="Http\UrlHelper.cs" />
+    <Compile Include="Http\HttpManager.cs" />
     <Compile Include="IO\Model\ChunkUnit.cs" />
     <Compile Include="IO\Model\PutPolicy.cs" />
     <Compile Include="IO\Model\ResumeContext.cs" />
@@ -100,7 +103,7 @@
     <Compile Include="IO\Model\UploadController.cs" />
     <Compile Include="IO\Model\UploadProgressHandler.cs" />
     <Compile Include="IO\ResumableUploader.cs" />
-    <Compile Include="IO\SimpleUploader.cs" />
+    <Compile Include="IO\FormUploader.cs" />
     <Compile Include="IO\UploadManager.cs" />
     <Compile Include="IO\DownloadManager.cs" />
     <Compile Include="RS\Model\BatchResult.cs" />
@@ -113,7 +116,10 @@
     <Compile Include="RS\Model\ListResult.cs" />
     <Compile Include="RS\Model\StatInfo.cs" />
     <Compile Include="RS\Model\StatResult.cs" />
+    <Compile Include="RS\Model\BucketInfo.cs" />
+    <Compile Include="RS\Model\BucketResult.cs" />
     <Compile Include="RSF\Model\PfopResult.cs" />
+    <Compile Include="RSF\OperationManager.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="..\Packages.Net40.config" />
diff --git a/src/Qiniu/Qiniu.NetStandard16.xproj b/src/Qiniu/Qiniu.NetStandard16.xproj
index 5cb22813..31be33fe 100644
--- a/src/Qiniu/Qiniu.NetStandard16.xproj
+++ b/src/Qiniu/Qiniu.NetStandard16.xproj
@@ -12,7 +12,12 @@
     <OutputPath Condition="'$(OutputPath)'=='' ">..\..\bin\netstandard16</OutputPath>
   </PropertyGroup>
   <ItemGroup>
+    <Compile Include="QiniuCSharpSDK.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Common\Config.cs" />
+    <Compile Include="Common\Zone.cs" />
+    <Compile Include="Common\ZoneHelper.cs" />
+    <Compile Include="Common\ZoneInfo.cs" />
     <Compile Include="CDN\Model\RefreshRequest.cs" />
     <Compile Include="CDN\Model\RefreshInfo.cs" />
     <Compile Include="CDN\Model\RefreshResult.cs" />
@@ -29,20 +34,21 @@
     <Compile Include="CDN\Model\LogListInfo.cs" />
     <Compile Include="CDN\Model\LogListResult.cs" />
     <Compile Include="CDN\Model\HotLinkRequest.cs" />
-    <Compile Include="CDN\FusionManager.cs" />
+    <Compile Include="CDN\CdnManager.cs" />
+    <Compile Include="Util\Auth.cs" />
+    <Compile Include="Util\Mac.cs" />
+    <Compile Include="Util\Signature.cs" />
+    <Compile Include="Util\UrlHelper.cs" />
+    <Compile Include="Util\Base64.cs" />
     <Compile Include="Util\CRC32.cs" />
-    <Compile Include="Util\QETag.cs" />
+    <Compile Include="Util\ETag.cs" />
+    <Compile Include="Util\Hashing.cs" />
     <Compile Include="Util\StringHelper.cs" />
     <Compile Include="Util\UserEnv.cs" />
-    <Compile Include="Common\QiniuCSharpSDK.cs" />
-    <Compile Include="Common\Config.cs" />
-    <Compile Include="Common\Mac.cs" />
-    <Compile Include="Common\Signature.cs" />
-    <Compile Include="Common\Zone.cs" />
-    <Compile Include="Common\ZoneHelper.cs" />
-    <Compile Include="Http\HttpHelper.cs" />
+    <Compile Include="Http\HttpCode.cs" />
+    <Compile Include="Http\ContentType.cs" />
     <Compile Include="Http\HttpResult.cs" />
-    <Compile Include="Http\UrlHelper.cs" />
+    <Compile Include="Http\HttpManager.cs" />
     <Compile Include="IO\Model\ChunkUnit.cs" />
     <Compile Include="IO\Model\PutPolicy.cs" />
     <Compile Include="IO\Model\ResumeContext.cs" />
@@ -51,7 +57,7 @@
     <Compile Include="IO\Model\UploadController.cs" />
     <Compile Include="IO\Model\UploadProgressHandler.cs" />
     <Compile Include="IO\ResumableUploader.cs" />
-    <Compile Include="IO\SimpleUploader.cs" />
+    <Compile Include="IO\FormUploader.cs" />
     <Compile Include="IO\UploadManager.cs" />
     <Compile Include="IO\DownloadManager.cs" />
     <Compile Include="RS\Model\BatchResult.cs" />
@@ -64,6 +70,8 @@
     <Compile Include="RS\Model\ListResult.cs" />
     <Compile Include="RS\Model\StatInfo.cs" />
     <Compile Include="RS\Model\StatResult.cs" />
+    <Compile Include="RS\Model\BucketInfo.cs" />
+    <Compile Include="RS\Model\BucketResult.cs" />
     <Compile Include="RSF\Model\PfopResult.cs" />
     <Compile Include="RSF\OperationManager.cs" />
   </ItemGroup>
diff --git a/src/Qiniu/QiniuCSharpSDK.cs b/src/Qiniu/QiniuCSharpSDK.cs
new file mode 100644
index 00000000..ee2388cf
--- /dev/null
+++ b/src/Qiniu/QiniuCSharpSDK.cs
@@ -0,0 +1,20 @@
+/// <summary>
+/// Qiniu (Cloud) C# SDK for .NET Framework 2.0+ and for .NET Core
+/// </summary>
+public class QiniuCSharpSDK
+{
+    /// <summary>
+    /// SDK名称
+    /// </summary>
+    public const string ALIAS = "QiniuCSharpSDK";
+
+    /// <summary>
+    /// SDK版本号
+    /// </summary>
+    public const string VERSION = "7.2.5";
+
+    /// <summary>
+    /// SDK模块
+    /// </summary>
+    public static string[] MODULES = { "IO", "RS", "RSF", "CDN", "Util", "Common", "Http" };
+}
diff --git a/src/Qiniu/RS/BucketManager.cs b/src/Qiniu/RS/BucketManager.cs
index 71afd7dd..31e4330f 100644
--- a/src/Qiniu/RS/BucketManager.cs
+++ b/src/Qiniu/RS/BucketManager.cs
@@ -12,7 +12,7 @@ namespace Qiniu.RS
     /// </summary>
     public class BucketManager
     {
-        private Signature signature;
+        private Auth auth;
         private HttpManager httpManager;
 
         /// <summary>
@@ -21,35 +21,10 @@ public class BucketManager
         /// <param name="mac">账户访问控制(密钥)</param>
         public BucketManager(Mac mac)
         {
-            signature = new Signature(mac);
+            auth = new Auth(mac);
             httpManager = new HttpManager();
         }
 
-        /// <summary>
-        /// 生成管理凭证
-        /// 有关管理凭证请参阅
-        /// http://developer.qiniu.com/article/developer/security/access-token.html
-        /// </summary>
-        /// <param name="url">请求的URL</param>
-        /// <returns>生成的管理凭证</returns>
-        public string createManageToken(string url)
-        {
-            return createManageToken(url, null);
-        }
-
-        /// <summary>
-        /// 生成管理凭证
-        /// 有关管理凭证请参阅
-        /// http://developer.qiniu.com/article/developer/security/access-token.html
-        /// </summary>
-        /// <param name="url">请求的URL</param>
-        /// <param name="body">请求的主体内容</param>
-        /// <returns>生成的管理凭证</returns>
-        public string createManageToken(string url, byte[] body)
-        {
-            return string.Format("QBox {0}", signature.signRequest(url, body));
-        }
-
         /// <summary>
         /// 获取空间文件信息
         /// </summary>
@@ -63,7 +38,7 @@ public StatResult stat(string bucket, string key)
             try
             {
                 string statUrl = Config.ZONE.RsHost + statOp(bucket, key);
-                string token = createManageToken(statUrl);
+                string token = auth.createManageToken(statUrl);
 
                 HttpResult hr = httpManager.get(statUrl, token);
                 result.shadow(hr);
@@ -80,7 +55,7 @@ public StatResult stat(string bucket, string key)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -98,7 +73,7 @@ public BucketsResult buckets()
             try
             {
                 string bucketsUrl = Config.ZONE.RsHost + "/buckets";
-                string token = createManageToken(bucketsUrl);
+                string token = auth.createManageToken(bucketsUrl);
 
                 HttpResult hr = httpManager.get(bucketsUrl, token);
                 result.shadow(hr);
@@ -115,7 +90,7 @@ public BucketsResult buckets()
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -134,7 +109,7 @@ public BucketResult bucket(string bucketName)
             try
             {
                 string bucketsUrl = Config.ZONE.RsHost + "/bucket/" + bucketName;
-                string token = createManageToken(bucketsUrl);
+                string token = auth.createManageToken(bucketsUrl);
 
                 HttpResult hr = httpManager.get(bucketsUrl, token);
                 result.shadow(hr);
@@ -151,7 +126,7 @@ public BucketResult bucket(string bucketName)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -171,7 +146,7 @@ public HttpResult delete(string bucket, string key)
             try
             {
                 string deleteUrl = Config.ZONE.RsHost + deleteOp(bucket, key);
-                string token = createManageToken(deleteUrl);
+                string token = auth.createManageToken(deleteUrl);
 
                 result = httpManager.post(deleteUrl, token);
             }
@@ -187,7 +162,7 @@ public HttpResult delete(string bucket, string key)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -209,7 +184,7 @@ public HttpResult copy(string srcBucket, string srcKey, string dstBucket, string
             try
             {
                 string copyUrl = Config.ZONE.RsHost + copyOp(srcBucket, srcKey, dstBucket, dstKey);
-                string token = createManageToken(copyUrl);
+                string token = auth.createManageToken(copyUrl);
 
                 result = httpManager.post(copyUrl, token);
             }
@@ -225,7 +200,7 @@ public HttpResult copy(string srcBucket, string srcKey, string dstBucket, string
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -248,7 +223,7 @@ public HttpResult copy(string srcBucket, string srcKey, string dstBucket, string
             try
             {
                 string copyUrl = Config.ZONE.RsHost + copyOp(srcBucket, srcKey, dstBucket, dstKey, force);
-                string token = createManageToken(copyUrl);
+                string token = auth.createManageToken(copyUrl);
 
                 result = httpManager.post(copyUrl, token);
             }
@@ -264,7 +239,7 @@ public HttpResult copy(string srcBucket, string srcKey, string dstBucket, string
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -286,7 +261,7 @@ public HttpResult move(string srcBucket, string srcKey, string dstBucket, string
             try
             {
                 string moveUrl = Config.ZONE.RsHost + moveOp(srcBucket, srcKey, dstBucket, dstKey);
-                string token = createManageToken(moveUrl);
+                string token = auth.createManageToken(moveUrl);
 
                 result = httpManager.post(moveUrl, token);
             }
@@ -302,7 +277,7 @@ public HttpResult move(string srcBucket, string srcKey, string dstBucket, string
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -325,7 +300,7 @@ public HttpResult move(string srcBucket, string srcKey, string dstBucket, string
             try
             {
                 string moveUrl = Config.ZONE.RsHost + moveOp(srcBucket, srcKey, dstBucket, dstKey, force);
-                string token = createManageToken(moveUrl);
+                string token = auth.createManageToken(moveUrl);
 
                 result = httpManager.post(moveUrl, token);
             }
@@ -341,7 +316,7 @@ public HttpResult move(string srcBucket, string srcKey, string dstBucket, string
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -374,7 +349,7 @@ public HttpResult chgm(string bucket, string key, string mimeType)
             try
             {
                 string chgmUrl = Config.ZONE.RsHost + chgmOp(bucket, key, mimeType);
-                string token = createManageToken(chgmUrl);
+                string token = auth.createManageToken(chgmUrl);
 
                 result = httpManager.post(chgmUrl, token);
             }
@@ -390,7 +365,7 @@ public HttpResult chgm(string bucket, string key, string mimeType)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -410,7 +385,7 @@ public BatchResult batch(string batchOps)
             {
                 string batchUrl = Config.ZONE.RsHost + "/batch";
                 byte[] data = Encoding.UTF8.GetBytes(batchOps);
-                string token = createManageToken(batchUrl, data);
+                string token = auth.createManageToken(batchUrl, data);
 
                 HttpResult hr = httpManager.postForm(batchUrl, data, token);
                 result.shadow(hr);
@@ -427,7 +402,7 @@ public BatchResult batch(string batchOps)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -499,7 +474,7 @@ public HttpResult fetch(string resUrl, string bucket, string key)
             try
             {
                 string fetchUrl = Config.ZONE.IovipHost + fetchOp(resUrl, bucket, key);
-                string token = createManageToken(fetchUrl);
+                string token = auth.createManageToken(fetchUrl);
 
                 result = httpManager.post(fetchUrl, token);
             }
@@ -515,7 +490,7 @@ public HttpResult fetch(string resUrl, string bucket, string key)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -535,7 +510,7 @@ public HttpResult prefetch(string bucket, string key)
             try
             {
                 string prefetchUrl = Config.ZONE.IovipHost + prefetchOp(bucket, key);
-                string token = createManageToken(prefetchUrl);
+                string token = auth.createManageToken(prefetchUrl);
 
                 result = httpManager.post(prefetchUrl, token);
             }
@@ -551,7 +526,7 @@ public HttpResult prefetch(string bucket, string key)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -572,7 +547,7 @@ public DomainsResult domains(string bucket)
                 string domainsUrl = Config.ZONE.ApiHost + "/v6/domain/list";
                 string body = string.Format("tbl={0}", bucket);
                 byte[] data = Encoding.UTF8.GetBytes(body);
-                string token = createManageToken(domainsUrl, data);
+                string token = auth.createManageToken(domainsUrl, data);
 
                 HttpResult hr = httpManager.postForm(domainsUrl, data, token);
                 result.shadow(hr);
@@ -589,7 +564,7 @@ public DomainsResult domains(string bucket)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -657,7 +632,7 @@ public ListResult listFiles(string bucket, string prefix, string marker, int lim
                 }
 
                 string listUrl = Config.ZONE.RsfHost + sb.ToString();
-                string token = createManageToken(listUrl);
+                string token = auth.createManageToken(listUrl);
 
                 HttpResult hr = httpManager.post(listUrl, token);
                 result.shadow(hr);
@@ -674,7 +649,7 @@ public ListResult listFiles(string bucket, string prefix, string marker, int lim
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -695,8 +670,7 @@ public HttpResult updateLifecycle(string bucket, string key, int deleteAfterDays
             try
             {
                 string updateUrl = Config.ZONE.RsHost + updateLifecycleOp(bucket, key, deleteAfterDays);
-
-                string token = createManageToken(updateUrl);
+                string token = auth.createManageToken(updateUrl);
 
                 result = httpManager.post(updateUrl, token);
             }
@@ -712,7 +686,7 @@ public HttpResult updateLifecycle(string bucket, string key, int deleteAfterDays
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -727,7 +701,7 @@ public HttpResult updateLifecycle(string bucket, string key, int deleteAfterDays
         /// <returns>stat操作字符串</returns>
         public string statOp(string bucket, string key)
         {
-            return string.Format("/stat/{0}", StringHelper.encodedEntry(bucket, key));
+            return string.Format("/stat/{0}", Base64.urlSafeBase64Encode(bucket, key));
         }
 
         /// <summary>
@@ -738,7 +712,7 @@ public string statOp(string bucket, string key)
         /// <returns>delete操作字符串</returns>
         public string deleteOp(string bucket, string key)
         {
-            return string.Format("/delete/{0}", StringHelper.encodedEntry(bucket, key));
+            return string.Format("/delete/{0}", Base64.urlSafeBase64Encode(bucket, key));
         }
 
         /// <summary>
@@ -752,8 +726,8 @@ public string deleteOp(string bucket, string key)
         public string copyOp(string srcBucket, string srcKey, string dstBucket, string dstKey)
         {
             return string.Format("/copy/{0}/{1}",
-                StringHelper.encodedEntry(srcBucket, srcKey),
-                StringHelper.encodedEntry(dstBucket, dstKey));
+                Base64.urlSafeBase64Encode(srcBucket, srcKey),
+                Base64.urlSafeBase64Encode(dstBucket, dstKey));
         }
 
         /// <summary>
@@ -769,8 +743,8 @@ public string copyOp(string srcBucket, string srcKey, string dstBucket, string d
         {
             string fx = force ? "force/true" : "force/false";
             return string.Format("/copy/{0}/{1}/{2}",
-                StringHelper.encodedEntry(srcBucket, srcKey),
-                StringHelper.encodedEntry(dstBucket, dstKey), fx);
+                Base64.urlSafeBase64Encode(srcBucket, srcKey),
+                Base64.urlSafeBase64Encode(dstBucket, dstKey), fx);
         }
 
         /// <summary>
@@ -784,8 +758,8 @@ public string copyOp(string srcBucket, string srcKey, string dstBucket, string d
         public string moveOp(string srcBucket, string srcKey, string dstBucket, string dstKey)
         {
             return string.Format("/move/{0}/{1}",
-                StringHelper.encodedEntry(srcBucket, srcKey),
-                StringHelper.encodedEntry(dstBucket, dstKey));
+                Base64.urlSafeBase64Encode(srcBucket, srcKey),
+                Base64.urlSafeBase64Encode(dstBucket, dstKey));
         }
 
         /// <summary>
@@ -801,8 +775,8 @@ public string moveOp(string srcBucket, string srcKey, string dstBucket, string d
         {
             string fx = force ? "force/true" : "force/false";
             return string.Format("/move/{0}/{1}/{2}",
-                StringHelper.encodedEntry(srcBucket, srcKey),
-                StringHelper.encodedEntry(dstBucket, dstKey), fx);
+                Base64.urlSafeBase64Encode(srcBucket, srcKey),
+                Base64.urlSafeBase64Encode(dstBucket, dstKey), fx);
         }
 
         /// <summary>
@@ -815,8 +789,8 @@ public string moveOp(string srcBucket, string srcKey, string dstBucket, string d
         public string chgmOp(string bucket, string key, string mimeType)
         {
             return string.Format("/chgm/{0}/mime/{1}",
-                StringHelper.encodedEntry(bucket, key),
-                StringHelper.urlSafeBase64Encode(mimeType));
+                Base64.urlSafeBase64Encode(bucket, key),
+                Base64.urlSafeBase64Encode(mimeType));
         }
 
         /// <summary>
@@ -829,8 +803,8 @@ public string chgmOp(string bucket, string key, string mimeType)
         public string fetchOp(string url, string bucket, string key)
         {
             return string.Format("/fetch/{0}/to/{1}",
-                StringHelper.urlSafeBase64Encode(url), 
-                StringHelper.encodedEntry(bucket, key));
+                Base64.urlSafeBase64Encode(url),
+                Base64.urlSafeBase64Encode(bucket, key));
         }
 
         /// <summary>
@@ -841,8 +815,8 @@ public string fetchOp(string url, string bucket, string key)
         /// <returns>prefetch操作字符串</returns>
         public string prefetchOp(string bucket, string key)
         {
-            return string.Format("/prefetch/{0}", 
-                StringHelper.encodedEntry(bucket, key));
+            return string.Format("/prefetch/{0}",
+                Base64.urlSafeBase64Encode(bucket, key));
         }
 
         /// <summary>
@@ -855,7 +829,7 @@ public string prefetchOp(string bucket, string key)
         public string updateLifecycleOp(string bucket,string key,int deleteAfterDays)
         {
             return string.Format("/deleteAfterDays/{0}/{1}",
-                StringHelper.encodedEntry(bucket, key), deleteAfterDays);
+                Base64.urlSafeBase64Encode(bucket, key), deleteAfterDays);
         }
 
     }
diff --git a/src/Qiniu/RS/Model/BatchResult.cs b/src/Qiniu/RS/Model/BatchResult.cs
index ef37d5d1..aaf75fb0 100644
--- a/src/Qiniu/RS/Model/BatchResult.cs
+++ b/src/Qiniu/RS/Model/BatchResult.cs
@@ -18,7 +18,7 @@ public string Error
             get
             {
                 string ex = null;
-                if (Code != HttpHelper.STATUS_CODE_OK && Code != HttpHelper.STATUS_CODE_PARTLY_OK)
+                if (Code != (int)HttpCode.OK && Code != (int)HttpCode.PARTLY_OK)
                 {
                     var vt = JsonConvert.DeserializeObject<Dictionary<string, string>>(Text);
                     if (vt.ContainsKey("error"))
@@ -38,7 +38,7 @@ public List<BatchInfo> Result
             get
             {
                 List<BatchInfo> info = null;
-                if ((Code == HttpHelper.STATUS_CODE_OK || Code == HttpHelper.STATUS_CODE_PARTLY_OK)&&
+                if ((Code == (int)HttpCode.OK || Code == (int)HttpCode.PARTLY_OK) &&
                     (!string.IsNullOrEmpty(Text)))
                 {
                     info = JsonConvert.DeserializeObject<List<BatchInfo>>(Text);
diff --git a/src/Qiniu/RS/Model/BucketResult.cs b/src/Qiniu/RS/Model/BucketResult.cs
index bc27dc62..d32ceb76 100644
--- a/src/Qiniu/RS/Model/BucketResult.cs
+++ b/src/Qiniu/RS/Model/BucketResult.cs
@@ -18,7 +18,7 @@ public BucketInfo Result
             {
                 BucketInfo info = null;
 
-                if (Code == HttpHelper.STATUS_CODE_OK && !string.IsNullOrEmpty(Text))
+                if (Code == (int)HttpCode.OK && !string.IsNullOrEmpty(Text))
                 {
                     info = JsonConvert.DeserializeObject<BucketInfo>(Text);
                 }
diff --git a/src/Qiniu/RS/Model/BucketsResult.cs b/src/Qiniu/RS/Model/BucketsResult.cs
index c41dfabe..5e7f9570 100644
--- a/src/Qiniu/RS/Model/BucketsResult.cs
+++ b/src/Qiniu/RS/Model/BucketsResult.cs
@@ -18,7 +18,7 @@ public List<string> Result
             get
             {
                 List<string> buckets = null;
-                if ((Code == HttpHelper.STATUS_CODE_OK) && (!string.IsNullOrEmpty(Text)))
+                if ((Code == (int)HttpCode.OK) && (!string.IsNullOrEmpty(Text)))
                 {
                     buckets = JsonConvert.DeserializeObject<List<string>>(Text);
                 }
diff --git a/src/Qiniu/RS/Model/DomainsResult.cs b/src/Qiniu/RS/Model/DomainsResult.cs
index df1a5c3b..1183dbd0 100644
--- a/src/Qiniu/RS/Model/DomainsResult.cs
+++ b/src/Qiniu/RS/Model/DomainsResult.cs
@@ -18,7 +18,7 @@ public List<string> Result
             get
             {
                 List<string> domains = null;
-                if ((Code == HttpHelper.STATUS_CODE_OK) && (!string.IsNullOrEmpty(Text)))
+                if ((Code == (int)HttpCode.OK) && (!string.IsNullOrEmpty(Text)))
                 {
                     domains = JsonConvert.DeserializeObject<List<string>>(Text);
                 }
diff --git a/src/Qiniu/RS/Model/ListResult.cs b/src/Qiniu/RS/Model/ListResult.cs
index 13990281..16bdbb00 100644
--- a/src/Qiniu/RS/Model/ListResult.cs
+++ b/src/Qiniu/RS/Model/ListResult.cs
@@ -17,7 +17,7 @@ public ListInfo Result
             get
             {
                 ListInfo info = null;
-                if ((Code == HttpHelper.STATUS_CODE_OK) && (!string.IsNullOrEmpty(Text)))
+                if ((Code == (int)HttpCode.OK) && (!string.IsNullOrEmpty(Text)))
                 {
                     info = JsonConvert.DeserializeObject<ListInfo>(Text);
                 }
diff --git a/src/Qiniu/RS/Model/StatResult.cs b/src/Qiniu/RS/Model/StatResult.cs
index e230d714..4ae40dc2 100644
--- a/src/Qiniu/RS/Model/StatResult.cs
+++ b/src/Qiniu/RS/Model/StatResult.cs
@@ -17,7 +17,7 @@ public StatInfo Result
             get
             {
                 StatInfo info = null;
-                if ((Code == HttpHelper.STATUS_CODE_OK) && (!string.IsNullOrEmpty(Text)))
+                if ((Code == (int)HttpCode.OK) && (!string.IsNullOrEmpty(Text)))
                 {
                     info = JsonConvert.DeserializeObject<StatInfo>(Text);
                 }
diff --git a/src/Qiniu/RSF/Model/PfopResult.cs b/src/Qiniu/RSF/Model/PfopResult.cs
index 542c1133..e063040f 100644
--- a/src/Qiniu/RSF/Model/PfopResult.cs
+++ b/src/Qiniu/RSF/Model/PfopResult.cs
@@ -19,7 +19,7 @@ public string PersistentId
             {
                 string pid = null;
 
-                if ((Code == HttpHelper.STATUS_CODE_OK) && (!string.IsNullOrEmpty(Text)))
+                if ((Code == (int)HttpCode.OK) && (!string.IsNullOrEmpty(Text)))
                 {
                     var vt = JsonConvert.DeserializeObject<Dictionary<string, string>>(Text);
                     if (vt.ContainsKey("persistentId"))
diff --git a/src/Qiniu/RSF/OperationManager.cs b/src/Qiniu/RSF/OperationManager.cs
index 68de7626..7e38278f 100644
--- a/src/Qiniu/RSF/OperationManager.cs
+++ b/src/Qiniu/RSF/OperationManager.cs
@@ -13,7 +13,7 @@ namespace Qiniu.RSF
     /// </summary>
     public class OperationManager
     {
-        private Signature signature;
+        private Auth auth;
         private HttpManager httpManager;
 
         /// <summary>
@@ -22,21 +22,10 @@ public class OperationManager
         /// <param name="mac">账户访问控制(密钥)</param>
         public OperationManager(Mac mac)
         {
-            signature = new Signature(mac);
+            auth = new Auth(mac);
             httpManager = new HttpManager();
         }
 
-        /// <summary>
-        /// 生成管理凭证
-        /// </summary>
-        /// <param name="url">请求的URL</param>
-        /// <param name="body">请求的主体内容</param>
-        /// <returns></returns>
-        public string createManageToken(string url, byte[] body)
-        {
-            return string.Format("QBox {0}", signature.signRequest(url, body));
-        }
-
         /// <summary>
         /// 数据处理
         /// </summary>
@@ -70,7 +59,7 @@ public PfopResult pfop(string bucket, string key, string fops, string pipeline,
                     sb.AppendFormat("&pipeline={0}", pipeline);
                 }
                 byte[] data = Encoding.UTF8.GetBytes(sb.ToString());
-                string token = createManageToken(pfopUrl, data);
+                string token = auth.createManageToken(pfopUrl, data);
 
                 HttpResult hr = httpManager.postForm(pfopUrl, data, token);
                 result.shadow(hr);
@@ -87,7 +76,7 @@ public PfopResult pfop(string bucket, string key, string fops, string pipeline,
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -115,7 +104,7 @@ public PfopResult pfop(string bucket, string key, string[] fops, string pipeline
         /// </summary>
         /// <param name="persistentId">持久化ID</param>
         /// <returns>操作结果</returns>
-        public HttpResult prefop(string persistentId)
+        public static HttpResult prefop(string persistentId)
         {
             HttpResult result = new HttpResult();
 
@@ -123,7 +112,8 @@ public HttpResult prefop(string persistentId)
             {
                 string prefopUrl = string.Format("{0}/status/get/prefop?id={1}", Config.ZONE.ApiHost, persistentId);
 
-                result = httpManager.get(prefopUrl, null);
+                HttpManager httpMgr = new HttpManager();
+                result = httpMgr.get(prefopUrl, null);
             }
             catch (Exception ex)
             {
@@ -137,7 +127,7 @@ public HttpResult prefop(string persistentId)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -175,15 +165,17 @@ public HttpResult dfopText(string fop, string text)
             try
             {
                 string dfopUrl = string.Format("{0}/dfop?fop={1}", Config.DFOP_API_HOST, fop);
-                string token = createManageToken(dfopUrl, null);
-                string boundary = HttpHelper.createFormDataBoundary();
+                string token = auth.createManageToken(dfopUrl);
+                string boundary = HttpManager.createFormDataBoundary();
                 string sep = "--" + boundary;
                 StringBuilder sb = new StringBuilder();
                 sb.AppendLine(sep);
-                sb.AppendFormat("Content-Type: {0}\r\n", HttpHelper.CONTENT_TYPE_TEXT_PLAIN);
-                sb.AppendLine("Content-Disposition: form-data; name=data; filename=text\r\n");
+                sb.AppendFormat("Content-Type: {0}", ContentType.TEXT_PLAIN);
+                sb.AppendLine();
+                sb.AppendLine("Content-Disposition: form-data; name=data; filename=text");
+                sb.AppendLine();
                 sb.AppendLine(text);
-                sb.AppendFormat("{0}--\r\n", sep);
+                sb.AppendLine(sep + "--");
                 byte[] data = Encoding.UTF8.GetBytes(sb.ToString());
 
                 result = httpManager.postMultipart(dfopUrl, data, boundary, token, true);
@@ -200,7 +192,7 @@ public HttpResult dfopText(string fop, string text)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -223,7 +215,7 @@ public HttpResult dfopTextFile(string fop, string textFile)
             }
             else
             {
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText = "[dfop error] File not found: " + textFile;
             }
 
@@ -244,7 +236,7 @@ public HttpResult dfopUrl(string fop, string url)
             {
                 string encodedUrl = StringHelper.urlEncode(url);
                 string dfopUrl = string.Format("{0}/dfop?fop={1}&url={2}", Config.DFOP_API_HOST, fop, encodedUrl);
-                string token = createManageToken(dfopUrl, null);
+                string token = auth.createManageToken(dfopUrl);
 
                 result = httpManager.post(dfopUrl, token, true);
             }
@@ -260,7 +252,7 @@ public HttpResult dfopUrl(string fop, string url)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
@@ -282,18 +274,27 @@ public HttpResult dfopData(string fop, string localFile)
                 string dfopUrl = string.Format("{0}/dfop?fop={1}", Config.DFOP_API_HOST, fop);
                 string key = Path.GetFileName(localFile);
                 byte[] data = File.ReadAllBytes(localFile);
-                string token = createManageToken(dfopUrl, null);
-                string boundary = HttpHelper.createFormDataBoundary();
+                string token = auth.createManageToken(dfopUrl);
+                string boundary = HttpManager.createFormDataBoundary();
                 string sep = "--" + boundary;
 
-                StringBuilder sb = new StringBuilder();
-                sb.AppendLine(sep);
+                StringBuilder sbp1 = new StringBuilder();
+                sbp1.AppendLine(sep);
                 string filename = Path.GetFileName(localFile);
-                sb.AppendFormat("Content-Type: {0}\r\n", HttpHelper.CONTENT_TYPE_APP_OCTET);
-                sb.AppendFormat("Content-Disposition: form-data; name=\"data\"; filename={0}\r\n\r\n", filename);
-                byte[] partData1 = Encoding.UTF8.GetBytes(sb.ToString());
+                sbp1.AppendFormat("Content-Type: {0}", ContentType.APPLICATION_OCTET_STREAM);
+                sbp1.AppendLine();
+                sbp1.AppendFormat("Content-Disposition: form-data; name=\"data\"; filename={0}", filename);
+                sbp1.AppendLine();
+                sbp1.AppendLine();
+
+                StringBuilder sbp3 = new StringBuilder();
+                sbp3.AppendLine();
+                sbp3.AppendLine(sep + "--");
+
+                byte[] partData1 = Encoding.UTF8.GetBytes(sbp1.ToString());
                 byte[] partData2 = File.ReadAllBytes(localFile);
-                byte[] partData3 = Encoding.UTF8.GetBytes(string.Format("\r\n{0}--\r\n", sep));
+                byte[] partData3 = Encoding.UTF8.GetBytes(sbp3.ToString());
+
                 MemoryStream ms = new MemoryStream();
                 ms.Write(partData1, 0, partData1.Length);
                 ms.Write(partData2, 0, partData2.Length);
@@ -313,7 +314,7 @@ public HttpResult dfopData(string fop, string localFile)
 
                 sb.AppendFormat(" @{0}\n", DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss.ffff"));
 
-                result.RefCode = HttpHelper.STATUS_CODE_EXCEPTION;
+                result.RefCode = (int)HttpCode.USER_EXCEPTION;
                 result.RefText += sb.ToString();
             }
 
diff --git a/src/Qiniu/Util/Auth.cs b/src/Qiniu/Util/Auth.cs
new file mode 100644
index 00000000..5ba62f29
--- /dev/null
+++ b/src/Qiniu/Util/Auth.cs
@@ -0,0 +1,157 @@
+namespace Qiniu.Util
+{
+    /// <summary>
+    /// Authentication/Authorization
+    /// </summary>
+    public class Auth
+    {
+        private Signature signature;
+
+        /// <summary>
+        /// 一般初始化
+        /// </summary>
+        /// <param name="mac">账号</param>
+        public Auth(Mac mac)
+        {
+            signature = new Signature(mac);
+        }
+
+        /// <summary>
+        /// 生成管理凭证
+        /// 有关管理凭证请参阅
+        /// http://developer.qiniu.com/article/developer/security/access-token.html
+        /// </summary>
+        /// <param name="url">请求的URL</param>
+        /// <param name="body">请求的主体内容</param>
+        /// <returns>生成的管理凭证</returns>
+        public string createManageToken(string url,byte[] body)
+        {
+            return string.Format("QBox {0}", signature.signRequest(url, body));
+        }
+
+        /// <summary>
+        /// 生成管理凭证-不包含body
+        /// </summary>
+        /// <param name="url">请求的URL</param>
+        /// <returns>生成的管理凭证</returns>
+        public string createManageToken(string url)
+        {
+            return createManageToken(url, null);
+        }
+
+        /// <summary>
+        /// 生成上传凭证
+        /// </summary>
+        /// <param name="jsonBody">上传策略JSON串</param>
+        /// <returns>生成的上传凭证</returns>
+        public string createUploadToken(string jsonBody)
+        {
+            return signature.signWithData(jsonBody);
+        }
+
+        /// <summary>
+        /// 生成下载凭证
+        /// </summary>
+        /// <param name="url">原始链接</param>
+        /// <returns></returns>
+        public string createDownloadToken(string url)
+        {
+            return signature.sign(url);
+        }
+
+        /// <summary>
+        /// 生成推流地址使用的凭证
+        /// </summary>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public string createStreamPublishToken(string path)
+        {
+            return signature.sign(path);
+        }
+
+        /// <summary>
+        /// 生成流管理凭证
+        /// </summary>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public string createStreamManageToken(string data)
+        {
+            return string.Format("Qiniu {0}", signature.signWithData(data));
+        }
+
+        /// <summary>
+        /// 生成管理凭证
+        /// 有关管理凭证请参阅
+        /// http://developer.qiniu.com/article/developer/security/access-token.html
+        /// </summary>
+        /// <param name="mac">账号</param>
+        /// <param name="url">访问的URL</param>
+        /// <param name="body">请求的body</param>
+        /// <returns>生成的管理凭证</returns>
+        public static string createManageToken(Mac mac, string url, byte[] body)
+        {
+            Signature sx = new Signature(mac);
+            return string.Format("QBox {0}", sx.signRequest(url, body));
+        }
+
+        /// <summary>
+        /// 生成管理凭证-不包含body
+        /// </summary>
+        /// <param name="mac">账号</param>
+        /// <param name="url">请求的URL</param>
+        /// <returns>生成的管理凭证</returns>
+        public static string createManageToken(Mac mac, string url)
+        {
+            return createManageToken(mac, url, null);
+        }
+
+        /// <summary>
+        /// 生成上传凭证
+        /// </summary>
+        /// <param name="mac">账号</param>
+        /// <param name="jsonBody">上传策略JSON串</param>
+        /// <returns>生成的上传凭证</returns>
+        public static string createUploadToken(Mac mac, string jsonBody)
+        {
+            Signature sx = new Signature(mac);
+            return sx.signWithData(jsonBody);
+        }
+
+        /// <summary>
+        /// 生成下载凭证
+        /// </summary>
+        /// <param name="mac">账号</param>
+        /// <param name="url">原始链接</param>
+        /// <returns></returns>
+        public static string createDownloadToken(Mac mac, string url)
+        {
+            Signature sx = new Signature(mac);
+            return sx.sign(url);
+        }
+
+        /// <summary>
+        /// 生成推流地址使用的凭证
+        /// </summary>
+        /// <param name="mac"></param>
+        /// <param name="path"></param>
+        /// <returns></returns>
+        public static string createStreamPublishToken(Mac mac,string path)
+        {
+            Signature sx = new Signature(mac);
+            return sx.sign(path);
+        }
+
+        /// <summary>
+        /// 生成流管理凭证
+        /// </summary>
+        /// <param name="mac"></param>
+        /// <param name="data"></param>
+        /// <returns></returns>
+        public static string createStreamManageToken(Mac mac, string data)
+        {
+            Signature sx = new Signature(mac);
+            return string.Format("Qiniu {0}", sx.sign(data));
+        }
+
+    }
+}
diff --git a/src/Qiniu/Util/Base64.cs b/src/Qiniu/Util/Base64.cs
new file mode 100644
index 00000000..2b96dbff
--- /dev/null
+++ b/src/Qiniu/Util/Base64.cs
@@ -0,0 +1,52 @@
+using System;
+using System.Text;
+
+namespace Qiniu.Util
+{
+    /// <summary>
+    /// Base64 编码/解码
+    /// </summary>
+    public class Base64
+    {
+        /// <summary>
+        /// 获取字符串Url安全Base64编码值
+        /// </summary>
+        /// <param name="text">源字符串</param>
+        /// <returns>已编码字符串</returns>
+        public static string urlSafeBase64Encode(string text)
+        {
+            return urlSafeBase64Encode(Encoding.UTF8.GetBytes(text));
+        }
+
+        /// <summary>
+        /// URL安全的base64编码
+        /// </summary>
+        /// <param name="data">需要编码的字节数据</param>
+        /// <returns></returns>
+        public static string urlSafeBase64Encode(byte[] data)
+        {
+            return Convert.ToBase64String(data).Replace('+', '-').Replace('/', '_');
+        }
+
+        /// <summary>
+        /// bucket:key 编码
+        /// </summary>
+        /// <param name="bucket">空间名称</param>
+        /// <param name="key">文件key</param>
+        /// <returns>编码</returns>
+        public static string urlSafeBase64Encode(string bucket, string key)
+        {
+            return urlSafeBase64Encode(bucket + ":" + key);
+        }
+
+        /// <summary>
+        /// Base64解码
+        /// </summary>
+        /// <param name="text">待解码的字符串</param>
+        /// <returns>已解码字符串</returns>
+        public static byte[] urlsafeBase64Decode(string text)
+        {
+            return Convert.FromBase64String(text.Replace('-', '+').Replace('_', '/'));
+        }
+    }
+}
diff --git a/src/Qiniu/Util/CRC32.cs b/src/Qiniu/Util/CRC32.cs
index 25f4215b..f15f8855 100644
--- a/src/Qiniu/Util/CRC32.cs
+++ b/src/Qiniu/Util/CRC32.cs
@@ -11,9 +11,9 @@ public class CRC32
         /// <summary>
         /// magic
         /// </summary>
-        public const UInt32 IEEE = 0xedb88320;
-        private UInt32[] Table;
-        private UInt32 Value;
+        public const uint IEEE = 0xedb88320;
+        private uint[] Table;
+        private uint Value;
 
         /// <summary>
         /// 初始化
@@ -44,12 +44,12 @@ public uint sum()
             return this.Value;
         }
 
-        private static uint[] makeTable(UInt32 poly)
+        private static uint[] makeTable(uint poly)
         {
-            UInt32[] table = new UInt32[256];
+            uint[] table = new uint[256];
             for (int i = 0; i < 256; i++)
             {
-                UInt32 crc = (UInt32)i;
+                uint crc = (uint)i;
                 for (int j = 0; j < 8; j++)
                 {
                     if ((crc & 1) == 1)
diff --git a/src/Qiniu/Util/ETag.cs b/src/Qiniu/Util/ETag.cs
new file mode 100644
index 00000000..f46f7e9d
--- /dev/null
+++ b/src/Qiniu/Util/ETag.cs
@@ -0,0 +1,73 @@
+using System;
+using System.IO;
+
+namespace Qiniu.Util
+{
+    /// <summary>
+    /// QINIU ETAG(文件hash)
+    /// </summary>
+    public class ETag
+    {
+        // 块大小(固定为4MB)
+        private const int BLOCK_SIZE = 4 * 1024 * 1024;
+
+        // 计算时以20B为单位
+        private static int BLOCK_SHA1_SIZE = 20;        
+
+        /// <summary>
+        /// 计算文件hash(ETAG)
+        /// </summary>
+        /// <param name="filePath"></param>
+        /// <returns>文件hash</returns>
+        public static string calcHash(string filePath)
+        {
+            string qetag = "";
+
+            try
+            {
+                using (FileStream stream = new FileStream(filePath, FileMode.Open, FileAccess.Read))
+                {
+                    long fileLength = stream.Length;
+                    byte[] buffer = new byte[BLOCK_SIZE];
+                    byte[] finalBuffer = new byte[BLOCK_SHA1_SIZE + 1];
+                    if (fileLength <= BLOCK_SIZE)
+                    {
+                        int readByteCount = stream.Read(buffer, 0, BLOCK_SIZE);
+                        byte[] readBuffer = new byte[readByteCount];
+                        Array.Copy(buffer, readBuffer, readByteCount);
+
+                        byte[] sha1Buffer = Hashing.calcSHA1(readBuffer);
+
+                        finalBuffer[0] = 0x16;
+                        Array.Copy(sha1Buffer, 0, finalBuffer, 1, sha1Buffer.Length);
+                    }
+                    else
+                    {
+                        long blockCount = (fileLength % BLOCK_SIZE == 0) ? (fileLength / BLOCK_SIZE) : (fileLength / BLOCK_SIZE + 1);
+                        byte[] sha1AllBuffer = new byte[BLOCK_SHA1_SIZE * blockCount];
+
+                        for (int i = 0; i < blockCount; i++)
+                        {
+                            int readByteCount = stream.Read(buffer, 0, BLOCK_SIZE);
+                            byte[] readBuffer = new byte[readByteCount];
+                            Array.Copy(buffer, readBuffer, readByteCount);
+
+                            byte[] sha1Buffer = Hashing.calcSHA1(readBuffer);
+                            Array.Copy(sha1Buffer, 0, sha1AllBuffer, i * BLOCK_SHA1_SIZE, sha1Buffer.Length);
+                        }
+
+                        byte[] sha1AllBufferSha1 = Hashing.calcSHA1(sha1AllBuffer);
+
+                        finalBuffer[0] = 0x96;
+                        Array.Copy(sha1AllBufferSha1, 0, finalBuffer, 1, sha1AllBufferSha1.Length);
+
+                    }
+                    qetag = Base64.urlSafeBase64Encode(finalBuffer);
+                }
+            }
+            catch (Exception) { }
+
+            return qetag;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Qiniu/Util/Hashing.cs b/src/Qiniu/Util/Hashing.cs
new file mode 100644
index 00000000..922bd577
--- /dev/null
+++ b/src/Qiniu/Util/Hashing.cs
@@ -0,0 +1,42 @@
+using System.Text;
+using System.Security.Cryptography;
+
+namespace Qiniu.Util
+{
+    /// <summary>
+    /// 计算hash值
+    /// 特别注意，不同平台使用的Cryptography可能略有不同，使用中如有遇到问题，请反馈
+    /// 提交您的issue到 https://github.com/qiniu/csharp-sdk
+    /// </summary>
+    public class Hashing
+    {
+        /// <summary>
+        /// 计算SHA1
+        /// </summary>
+        /// <param name="data">字节数据</param>
+        /// <returns>SHA1</returns>
+        public static byte[] calcSHA1(byte[] data)
+        {
+            SHA1 sha1 = SHA1.Create();
+            return sha1.ComputeHash(data);
+        }
+
+        /// <summary>
+        /// md5 hash in hex string
+        /// </summary>
+        /// <param name="str">待计算的字符串</param>
+        /// <returns>MD5结果</returns>
+        public static string calcMD5(string str)
+        {
+            MD5 md5 = MD5.Create();
+            byte[] data = Encoding.UTF8.GetBytes(str);
+            byte[] hashData = md5.ComputeHash(data);
+            StringBuilder sb = new StringBuilder(hashData.Length * 2);
+            foreach (byte b in hashData)
+            {
+                sb.AppendFormat("{0:x2}", b);
+            }
+            return sb.ToString();
+        }
+    }
+}
diff --git a/src/Qiniu/Util/Mac.cs b/src/Qiniu/Util/Mac.cs
new file mode 100644
index 00000000..69c59ac2
--- /dev/null
+++ b/src/Qiniu/Util/Mac.cs
@@ -0,0 +1,29 @@
+namespace Qiniu.Util
+{
+    /// <summary>
+    /// 账户访问控制(密钥)
+    /// </summary>
+    public class Mac
+    {
+        /// <summary>
+        /// 密钥-AccessKey
+        /// </summary>
+        public string AccessKey { set; get; }
+
+        /// <summary>
+        /// 密钥-SecretKey
+        /// </summary>
+        public string SecretKey { set; get; }
+
+        /// <summary>
+        /// 初始化密钥AK/SK
+        /// </summary>
+        /// <param name="accessKey">AccessKey</param>
+        /// <param name="secretKey">SecretKey</param>
+        public Mac(string accessKey, string secretKey)
+        {
+            this.AccessKey = accessKey;
+            this.SecretKey = secretKey;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Qiniu/Util/Signature.cs b/src/Qiniu/Util/Signature.cs
new file mode 100644
index 00000000..a2d70415
--- /dev/null
+++ b/src/Qiniu/Util/Signature.cs
@@ -0,0 +1,122 @@
+using System;
+using System.IO;
+using System.Security.Cryptography;
+using System.Text;
+
+namespace Qiniu.Util
+{
+    /// <summary>
+    /// 签名/加密
+    /// 特别注意，不同平台使用的Cryptography可能略有不同，使用中如有遇到问题，请反馈
+    /// 提交您的issue到 https://github.com/qiniu/csharp-sdk
+    /// </summary>
+    public class Signature
+    {
+        private Mac mac;
+
+        /// <summary>
+        /// 初始化
+        /// </summary>
+        /// <param name="mac">账户访问控制(密钥)</param>
+        public Signature(Mac mac)
+        {
+            this.mac = mac;
+        }
+
+        private string encodedSign(byte[] data)
+        {
+            HMACSHA1 hmac = new HMACSHA1(Encoding.UTF8.GetBytes(mac.SecretKey));
+            byte[] digest = hmac.ComputeHash(data);
+            return Base64.urlSafeBase64Encode(digest);
+        }
+
+        private string encodedSign(string str)
+        {
+            byte[] data = Encoding.UTF8.GetBytes(str);
+            return encodedSign(data);
+        }
+
+        /// <summary>
+        /// 签名-字节数据
+        /// </summary>
+        /// <param name="data">待签名的数据</param>
+        /// <returns></returns>
+        public string sign(byte[] data)
+        {
+            return string.Format("{0}:{1}", mac.AccessKey,encodedSign(data));
+        }
+
+        /// <summary>
+        /// 签名-字符串数据
+        /// </summary>
+        /// <param name="str">待签名的数据</param>
+        /// <returns></returns>
+        public string sign(string str)
+        {
+            byte[] data = Encoding.UTF8.GetBytes(str);
+            return sign(data);
+        }
+
+        /// <summary>
+        /// 附带数据的签名
+        /// </summary>
+        /// <param name="data">待签名的数据</param>
+        /// <returns></returns>
+        public string signWithData(byte[] data)
+        {
+            string sstr = Base64.urlSafeBase64Encode(data);
+            return string.Format("{0}:{1}:{2}", mac.AccessKey, encodedSign(sstr), sstr);
+        }
+
+        /// <summary>
+        /// 附带数据的签名
+        /// </summary>
+        /// <param name="str">待签名的数据</param>
+        /// <returns>签名结果</returns>
+        public string signWithData(string str)
+        {
+            byte[] data = Encoding.UTF8.GetBytes(str);
+            return signWithData(data);
+        }
+
+        /// <summary>
+        /// HTTP请求签名
+        /// </summary>
+        /// <param name="url">请求目标的URL</param>
+        /// <param name="body">请求的主体数据</param>
+        /// <returns></returns>
+        public string signRequest(string url, byte[] body)
+        {
+            Uri u = new Uri(url);
+            using (HMACSHA1 hmac = new HMACSHA1(Encoding.UTF8.GetBytes(mac.SecretKey)))
+            {
+                string pathAndQuery = u.PathAndQuery;
+                byte[] pathAndQueryBytes = Encoding.UTF8.GetBytes(pathAndQuery);
+                using (MemoryStream buffer = new MemoryStream())
+                {
+                    buffer.Write(pathAndQueryBytes, 0, pathAndQueryBytes.Length);
+                    buffer.WriteByte((byte)'\n');
+                    if (body != null && body.Length > 0)
+                    {
+                        buffer.Write(body, 0, body.Length);
+                    }
+                    byte[] digest = hmac.ComputeHash(buffer.ToArray());
+                    string digestBase64 = Base64.urlSafeBase64Encode(digest);
+                    return string.Format("{0}:{1}", mac.AccessKey, digestBase64);
+                }
+            }
+        }
+
+        /// <summary>
+        /// HTTP请求签名
+        /// </summary>
+        /// <param name="url">请求目标的URL</param>
+        /// <param name="body">请求的主体数据</param>
+        /// <returns></returns>
+        public string signRequest(string url, string body)
+        {
+            byte[] data = Encoding.UTF8.GetBytes(body);
+            return signRequest(url, data);
+        }
+    }
+}
diff --git a/src/Qiniu/Util/StringHelper.cs b/src/Qiniu/Util/StringHelper.cs
index d4c11e47..a1c88c31 100644
--- a/src/Qiniu/Util/StringHelper.cs
+++ b/src/Qiniu/Util/StringHelper.cs
@@ -1,15 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Security.Cryptography;
 using System.Text;
-using Newtonsoft.Json;
 
 namespace Qiniu.Util
 {
     /// <summary>
     /// 字符串处理工具
-    /// 特别注意，不同平台使用的Cryptography可能略有不同，使用中如有遇到问题，请反馈
-    /// 提交您的issue到 https://github.com/fengyhack/csharp-sdk-shared
     /// </summary>
     public class StringHelper
     {
@@ -19,23 +15,20 @@ public class StringHelper
         /// <param name="array">字符串数组</param>
         /// <param name="sep">连接符</param>
         /// <returns>连接后字符串</returns>
-        public static string join(string[] array, string sep)
+        public static string join(IList<string> array, string sep)
         {
             if (array == null || sep == null)
             {
                 return null;
             }
-            StringBuilder joined = new StringBuilder();
-            int arrayLength = array.Length;
+            StringBuilder sb = new StringBuilder();
+            int arrayLength = array.Count;
             for (int i = 0; i < arrayLength; i++)
             {
-                joined.Append(array[i]);
-                if (i < arrayLength - 1)
-                {
-                    joined.Append(sep);
-                }
+                sb.Append(array[i]);
+                sb.Append(sep);
             }
-            return joined.ToString();
+            return sb.ToString(0, sb.Length - sep.Length);
         }
 
         /// <summary>
@@ -43,115 +36,31 @@ public static string join(string[] array, string sep)
         /// </summary>
         /// <param name="array">字符串数组</param>
         /// <returns>连接后字符串</returns>
-        public static string jsonJoin(string[] array)
+        public static string jsonJoin(IList<string> array)
         {
-            if (array == null)
+            if (array == null || array.Count == 0)
             {
-                return null;
-            }
-            StringBuilder joined = new StringBuilder();
-            int arrayLength = array.Length;
-            for (int i = 0; i < arrayLength; i++)
-            {
-                joined.Append("\"").Append(array[i]).Append("\"");
-                if (i < arrayLength - 1)
-                {
-                    joined.Append(",");
-                }
+                return "";
             }
-            return joined.ToString();
-        }
-
-        /// <summary>
-        /// 获取字符串Url安全Base64编码值
-        /// </summary>
-        /// <param name="from">源字符串</param>
-        /// <returns>已编码字符串</returns>
-        public static string urlSafeBase64Encode(string from)
-        {
-            return urlSafeBase64Encode(Encoding.UTF8.GetBytes(from));
-        }
-
-        /// <summary>
-        /// URL安全的base64编码
-        /// </summary>
-        /// <param name="from"></param>
-        /// <returns></returns>
-        public static string urlSafeBase64Encode(byte[] from)
-        {
-            return Convert.ToBase64String(from).Replace('+', '-').Replace('/', '_');
-        }
-
-        /// <summary>
-        /// 解码Url安全的Base64编码值
-        /// </summary>
-        /// <param name="from">编码字符串</param>
-        /// <returns>已解码字符串</returns>
-        public static byte[] urlsafeBase64Decode(string from)
-        {
-            return Convert.FromBase64String(from.Replace('-', '+').Replace('_', '/'));
-        }
-
-        /// <summary>
-        /// 转换到JSON字符串
-        /// </summary>
-        /// <param name="obj">对象实例</param>
-        /// <returns>JSON编码字符串</returns>
-        public static string jsonEncode(object obj)
-        {
-            JsonSerializerSettings setting = new JsonSerializerSettings();
-            setting.NullValueHandling = NullValueHandling.Ignore;
-            return JsonConvert.SerializeObject(obj, setting);
-        }
 
-        /// <summary>
-        /// JSON解析
-        /// </summary>
-        /// <typeparam name="T">类型</typeparam>
-        /// <param name="jsonData">JSON字符串</param>
-        /// <returns>JSON解码结果</returns>
-        public static T jsonDecode<T>(string jsonData)
-        {
-            return JsonConvert.DeserializeObject<T>(jsonData);
-        }
+            StringBuilder sb = new StringBuilder();
+            int arrayLength = array.Count;
 
-        /// <summary>
-        /// bucket:key 编码
-        /// </summary>
-        /// <param name="bucket">空间名称</param>
-        /// <param name="key">文件key</param>
-        /// <returns>编码</returns>
-        public static string encodedEntry(string bucket, string key)
-        {
-            if (key == null)
-            {
-                return urlSafeBase64Encode(bucket);
-            }
-            else
+            for (int i = 0; i < arrayLength; i++)
             {
-                return urlSafeBase64Encode(bucket + ":" + key);
+                sb.AppendFormat("\"{0}\",", array[i]);
             }
-        }
-
-        /// <summary>
-        /// 计算SHA1
-        /// </summary>
-        /// <param name="data">字节数据</param>
-        /// <returns>SHA1</returns>
-        public static byte[] calcSHA1(byte[] data)
-        {
-            SHA1 sha1 = SHA1.Create();
-            return sha1.ComputeHash(data);
-        }
+            return sb.ToString(0, sb.Length - 1);
+        }               
 
         /// <summary>
         /// URL编码
         /// </summary>
-        /// <param name="from">源字符串</param>
+        /// <param name="text">源字符串</param>
         /// <returns>URL编码字符串</returns>
-        public static string urlEncode(string from)
+        public static string urlEncode(string text)
         {
-            return Uri.EscapeDataString(from);
+            return Uri.EscapeDataString(text);
         }
 
         /// <summary>
@@ -171,24 +80,6 @@ public static string urlValuesEncode(Dictionary<string, string> values)
             return encodedStr.Substring(0, encodedStr.Length - 1);
         }
 
-        /// <summary>
-        /// md5 hash in hex string
-        /// </summary>
-        /// <param name="str">待计算的字符串</param>
-        /// <returns>MD5结果</returns>
-        public static string calcMD5(string str)
-        {
-            MD5 md5 = MD5.Create();
-            byte[] data = Encoding.UTF8.GetBytes(str);
-            byte[] hashData = md5.ComputeHash(data);
-            StringBuilder sb = new StringBuilder(hashData.Length * 2);
-            foreach (byte b in hashData)
-            {
-                sb.AppendFormat("{0:x2}", b);
-            }
-            return sb.ToString();
-        }
-
         /// <summary>
         /// 从UNIX时间戳转换为DateTime
         /// </summary>
diff --git a/src/Qiniu/Util/UrlHelper.cs b/src/Qiniu/Util/UrlHelper.cs
new file mode 100644
index 00000000..883d4193
--- /dev/null
+++ b/src/Qiniu/Util/UrlHelper.cs
@@ -0,0 +1,87 @@
+using System.Text.RegularExpressions;
+
+namespace Qiniu.Util
+{
+    /// <summary>
+    /// URL辅助工具(RegExp)
+    /// </summary>
+    public class UrlHelper
+    {
+        private static Regex regx = new Regex(@"(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,@?^=%&amp;:/~\+#]*[\w\-\@?^=%&amp;/~\+#])?");
+
+        private static Regex regu = new Regex(@"(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,/~\+#]*)?");
+
+        private static Regex regd = new Regex(@"(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+([\w\-\.,/~\+#]*)?/");
+
+        /// <summary>
+        /// 是否合法URL
+        /// </summary>
+        /// <param name="_url">待判断的url</param>
+        /// <returns></returns>
+        public static bool isValidUrl(string _url)
+        {
+            return regx.IsMatch(_url);
+        }
+
+        /// <summary>
+        /// 是否一般URL(不包含？等后缀参数)
+        /// </summary>
+        /// <param name="_url">待判断的url</param>
+        /// <returns></returns>
+        public static bool isNormalUrl(string _url)
+        {
+            return regu.IsMatch(_url);
+        }
+
+        /// <summary>
+        /// 是否合法URL目录
+        /// </summary>
+        /// <param name="_dir">待判断的url目录</param>
+        /// <returns></returns>
+        public static bool isValidDir(string _dir)
+        {
+            return regd.IsMatch(_dir);
+        }
+
+        /// <summary>
+        /// 从原始URL转换为一般URL(根据需要截断)
+        /// </summary>
+        /// <param name="_url">待转换的url</param>
+        /// <returns></returns>
+        public static string getNormalUrl(string _url)
+        {
+            var m = regu.Match(_url);
+            return m.Value;
+        }
+
+        /// <summary>
+        /// URL分析，拆分出Host,Path,File,Query各个部分
+        /// </summary>
+        /// <param name="url">原始URL</param>
+        /// <param name="host">host部分</param>
+        /// <param name="path">path部分</param>
+        /// <param name="file">文件名</param>
+        /// <param name="query">参数</param>
+        public static void urlSplit(string url, out string host, out string path, out string file, out string query)
+        {
+            int start = 0;
+
+            Regex regHost = new Regex(@"(http|https):\/\/[\w\-_]+(\.[\w\-_]+)+");
+            host = regHost.Match(url, start).Value;
+            start += host.Length;
+
+            Regex regPath = new Regex(@"(/(\w|\-)*)+/");
+            path = regPath.Match(url, start).Value;
+            if (string.IsNullOrEmpty(path))
+            {
+                path = "/";
+            }
+            start += path.Length;
+
+            int index = url.IndexOf('?', start);
+            file = url.Substring(start, index - start);
+
+            query = url.Substring(index);
+        }
+    }
+}
diff --git a/src/project.json b/src/project.json
index b57df3fb..af817948 100644
--- a/src/project.json
+++ b/src/project.json
@@ -1,8 +1,8 @@
 {
-  "title": "Qiniu (Cloud) C# SDK v7.2.4 (.NETStd 1.6)",
+  "title": "Qiniu (Cloud) C# SDK v7.2.5 (.NETStd 1.6)",
   "copyright": "Copyright ©  2017",
-  "description": "Qiniu (Cloud) C# SDK v7.2.4 (.NETStd 1.6)",
-  "version": "7.2.4-0",
+  "description": "Qiniu (Cloud) C# SDK v7.2.5 (.NETStd 1.6)",
+  "version": "7.2.5-0",
   "dependencies": {
     "NETStandard.Library": "1.6.0"
   },