支持指定 Ip，增加 StrictSSL 参数

Author: carsonxu

sdk/advance.js

@@ -144,7 +144,7 @@ function sliceUploadFile(params, callback) {
     if (FileSize === 0) {
         params.Body = '';
         params.ContentLength = 0;
-        params._OnlyUploadNotAddTask = true;
+        params.SkipTask = true;
         self.putObject(params, function (err, data) {
             if (err) {
                 return callback(err);
@@ -657,33 +657,38 @@ function uploadSliceItem(params, callback) {
         ContentLength = end - start;
     }
 
-    var PartItem = UploadData.PartList[PartNumber - 1];
-    Async.retry(ChunkRetryTimes, function (tryCallback) {
-        if (!self._isRunningTask(TaskId)) return;
-        var Body = util.fileSlice(FilePath, start, end);
-        self.multipartUpload({
-            TaskId: TaskId,
-            Bucket: Bucket,
-            Region: Region,
-            Key: Key,
-            ContentLength: ContentLength,
-            PartNumber: PartNumber,
-            UploadId: UploadData.UploadId,
-            ServerSideEncryption: ServerSideEncryption,
-            Body: Body,
-            onProgress: params.onProgress
+    var md5Body = util.fileSlice(FilePath, start, end);
+    util.getFileMd5(md5Body, function (err, md5) {
+        var contentMd5 = md5 ? util.binaryBase64(md5) : '';
+        var PartItem = UploadData.PartList[PartNumber - 1];
+        Async.retry(ChunkRetryTimes, function (tryCallback) {
+            if (!self._isRunningTask(TaskId)) return;
+            var Body = util.fileSlice(FilePath, start, end);
+            self.multipartUpload({
+                TaskId: TaskId,
+                Bucket: Bucket,
+                Region: Region,
+                Key: Key,
+                ContentLength: ContentLength,
+                PartNumber: PartNumber,
+                UploadId: UploadData.UploadId,
+                ServerSideEncryption: ServerSideEncryption,
+                Body: Body,
+                onProgress: params.onProgress,
+                ContentMD5: contentMd5,
+            }, function (err, data) {
+                if (!self._isRunningTask(TaskId)) return;
+                if (err) {
+                    return tryCallback(err);
+                } else {
+                    PartItem.Uploaded = true;
+                    return tryCallback(null, data);
+                }
+            });
         }, function (err, data) {
             if (!self._isRunningTask(TaskId)) return;
-            if (err) {
-                return tryCallback(err);
-            } else {
-                PartItem.Uploaded = true;
-                return tryCallback(null, data);
-            }
+            return callback(err, data);
         });
-    }, function (err, data) {
-        if (!self._isRunningTask(TaskId)) return;
-        return callback(err, data);
     });
 }
 

sdk/base.js

@@ -2380,6 +2380,16 @@ function _submitRequest(params, callback) {
     opt.headers && (opt.headers = util.clearKey(opt.headers));
     opt = util.clearKey(opt);
 
+    var Ip = this.options.Ip;
+    if (Ip) {
+        opt.url = opt.url.replace(/^(https?:\/\/)([^\/]+)/, function (str, pre, Host) {
+            opt.headers.Host = Host;
+            return pre + Ip;
+        });
+    }
+    if (this.options.StrictSSL !== true) {
+        opt.strictSSL = this.options.StrictSSL;
+    }
     if (this.options.Proxy) {
         opt.proxy = this.options.Proxy;
     }

sdk/cos.js

@@ -33,6 +33,8 @@ var defaultOptions = {
     UploadCheckContentMd5: false,
     UploadIdCacheLimit: 500,
     Proxy: '',
+    Ip: '',
+    StrictSSL: true,
     UserAgent: '',
 };
 

sdk/task.js

@@ -4,7 +4,7 @@ var originApiMap = {};
 var transferToTaskMethod = function (apiMap, apiName) {
     originApiMap[apiName] = apiMap[apiName];
     apiMap[apiName] = function (params, callback) {
-        if (params._OnlyUploadNotAddTask) {
+        if (params.SkipTask) {
             originApiMap[apiName].call(this, params, callback);
         } else {
             this._addTask(apiName, params, callback);

sdk/util.js

@@ -584,7 +584,7 @@ util.getFileUUID = function (FileStat, ChunkSize) {
 util.getBodyMd5 = function (UploadCheckContentMd5, Body, callback) {
     callback = callback || noop;
     if (UploadCheckContentMd5) {
-        if (Body instanceof Buffer || typeof Body.pipe !== 'function') {
+        if (Body instanceof Buffer || typeof Body === 'string') {
             callback(util.md5(Body));
         } else {
             callback();