putObject sliceUploadFile 统一返回值格式。

tencentyun · Dec 17, 2020 · f95505c · f95505c
1 parent 056bbb5
commit f95505c
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 37 deletions.
diff --git a/dist/cos-js-sdk-v5.js b/dist/cos-js-sdk-v5.js
@@ -7361,8 +7361,23 @@ function multipartComplete(params, callback) {
             object: params.Key,
             isLocation: true
         });
-        var CompleteMultipartUploadResult = data.CompleteMultipartUploadResult || {};
-        var result = util.extend(CompleteMultipartUploadResult, {
+        var res = data.CompleteMultipartUploadResult || {};
+        if (res.ProcessResults) {
+            if (res && res.ProcessResults) {
+                res.UploadResult = {
+                    OriginalInfo: {
+                        Key: res.Key,
+                        Location: res.Location,
+                        ETag: res.ETag,
+                        ImageInfo: res.ImageInfo
+                    },
+                    ProcessResults: res.ProcessResults
+                };
+                delete res.ImageInfo;
+                delete res.ProcessResults;
+            }
+        }
+        var result = util.extend(res, {
             Location: url,
             statusCode: data.statusCode,
             headers: data.headers
@@ -8979,22 +8994,6 @@ function uploadSliceComplete(params, callback) {
             Headers: Headers
         }, tryCallback);
     }, function (err, data) {
-        if (data && data.ProcessResults) {
-            data.UploadResult = {
-                OriginalInfo: {
-                    Key: data.Key,
-                    Location: data.Location,
-                    ETag: data.ETag,
-                    ImageInfo: data.ImageInfo
-                },
-                ProcessResults: data.ProcessResults
-            };
-            delete data.Key;
-            delete data.Location;
-            delete data.ETag;
-            delete data.ImageInfo;
-            delete data.ProcessResults;
-        }
         callback(err, data);
     });
 }

diff --git a/dist/cos-js-sdk-v5.min.js b/dist/cos-js-sdk-v5.min.js
diff --git a/src/advance.js b/src/advance.js
@@ -651,22 +651,6 @@ function uploadSliceComplete(params, callback) {
             Headers: Headers,
         }, tryCallback);
     }, function (err, data) {
-        if (data && data.ProcessResults) {
-            data.UploadResult = {
-                OriginalInfo: {
-                    Key: data.Key,
-                    Location: data.Location,
-                    ETag: data.ETag,
-                    ImageInfo: data.ImageInfo,
-                },
-                ProcessResults: data.ProcessResults,
-            };
-            delete data.Key;
-            delete data.Location;
-            delete data.ETag;
-            delete data.ImageInfo;
-            delete data.ProcessResults;
-        }
         callback(err, data);
     });
 }

diff --git a/src/base.js b/src/base.js
@@ -2612,8 +2612,23 @@ function multipartComplete(params, callback) {
             object: params.Key,
             isLocation: true,
         });
-        var CompleteMultipartUploadResult = data.CompleteMultipartUploadResult || {};
-        var result = util.extend(CompleteMultipartUploadResult, {
+        var res = data.CompleteMultipartUploadResult || {};
+        if (res.ProcessResults) {
+            if (res && res.ProcessResults) {
+                res.UploadResult = {
+                    OriginalInfo: {
+                        Key: res.Key,
+                        Location: res.Location,
+                        ETag: res.ETag,
+                        ImageInfo: res.ImageInfo,
+                    },
+                    ProcessResults: res.ProcessResults,
+                };
+                delete res.ImageInfo;
+                delete res.ProcessResults;
+            }
+        }
+        var result = util.extend(res, {
             Location: url,
             statusCode: data.statusCode,
             headers: data.headers,