fix getObject bug

tencentyun · Aug 17, 2019 · 6c9a10c · 6c9a10c
1 parent d18e01a
commit 6c9a10c
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 6 deletions.
diff --git a/dist/cos-js-sdk-v5.min.js b/dist/cos-js-sdk-v5.min.js
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
   "homepage": "https://github.com/tencentyun/cos-js-sdk-v5#readme",
   "dependencies": {
     "body-parser": "^1.18.3",
-    "qcloud-cos-sts": "^3.0.0",
+    "qcloud-cos-sts": "^3.0.2",
     "express": "^4.16.4"
   },
   "devDependencies": {

diff --git a/server/sts.js b/server/sts.js
@@ -65,11 +65,12 @@ app.all('/sts', function (req, res, next) {
         secretId: config.secretId,
         secretKey: config.secretKey,
         proxy: config.proxy,
+        region: config.region,
         durationSeconds: config.durationSeconds,
         policy: policy,
     }, function (err, tempKeys) {
-        var result = JSON.stringify(err || tempKeys) || '';
-        res.send(result);
+        if (tempKeys) tempKeys.startTime = startTime;
+        res.send(err || tempKeys);
     });
 });
 
@@ -105,8 +106,8 @@ app.all('/sts', function (req, res, next) {
 //         durationSeconds: config.durationSeconds,
 //         policy: policy,
 //     }, function (err, tempKeys) {
-//         var result = JSON.stringify(err || tempKeys) || '';
-//         res.send(result);
+//         if (tempKeys) tempKeys.startTime = startTime;
+//         res.send(err || tempKeys);
 //     });
 // });
 

diff --git a/test/test.js b/test/test.js
@@ -298,6 +298,7 @@ group('mock readAsBinaryString', function () {
                             TaskId = taskId;
                         },
                         onProgress: function (info) {
+                            if (info.percent === 0) return;
                             assert.ok(info.percent > 0.3, '分片续传成功');
                             cos.cancelTask(TaskId);
                             FileReader.prototype.readAsBinaryString = FileReader.prototype._readAsBinaryString;
@@ -527,6 +528,7 @@ group('sliceUploadFile(),pauseTask(),restartTask()', function () {
                         }, 1000);
                     }
                     if (paused && restarted) {
+                        if (info.percent === 0) return;
                         assert.ok(info.percent > 0.3, '暂停和重试成功');
                         cos.cancelTask(TaskId);
                         done();