Merge remote-tracking branch 'origin/master'

# Conflicts: # dist/cos-js-sdk-v5.js # dist/cos-js-sdk-v5.min.js # package.json # webpack.config.js
tencentyun · Nov 1, 2017 · a8a454f · a8a454f
2 parents e451781 + 525ccae
commit a8a454f
Show file tree

Hide file tree

Showing 15 changed files with 8,125 additions and 22,677 deletions.
diff --git a/demo/demo.js b/demo/demo.js
@@ -323,8 +323,8 @@ function deleteBucket() {
 
 function putObject() {
     // 创建测试文件
+    var blob = util.createFile({size: 1024 * 1024 * 10});
     var filename = '1mb.zip';
-    var blob = util.createFile({size: 10});
     // 调用方法
     cos.putObject({
         Bucket: config.Bucket, /* 必须 */
@@ -538,6 +538,40 @@ function restartTask() {
     console.log('restart');
 }
 
+function uploadFiles() {
+    var filename = 'mb.zip';
+    var blob = util.createFile({size: 1024 * 1024 * 10});
+    cos.uploadFiles({
+        files: [{
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Key: '1' + filename,
+            Body: blob,
+        }, {
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Key: '2' + filename,
+            Body: blob,
+        }, {
+            Bucket: config.Bucket,
+            Region: config.Region,
+            Key: '3' + filename,
+            Body: blob,
+        }],
+        SliceSize: 1024 * 1024,
+        onProgress: function (info) {
+            var percent = parseInt(info.percent * 10000) / 100;
+            var speed = parseInt(info.speed / 1024 / 1024 * 100) / 100;
+            console.log('进度：' + percent + '%; 速度：' + speed + 'Mb/s;');
+        },
+        onFileFinish: function (err, data, options) {
+            console.log(options.Key + ' 上传' + (err ? '失败' : '完成'));
+        },
+    }, function (err, data) {
+        console.log(err || data);
+    });
+}
+
 // getAuth();
 // getBucket();
 // headBucket();
@@ -569,6 +603,7 @@ function restartTask() {
 // cancelTask();
 // pauseTask();
 // restartTask();
+// uploadFiles();
 
 
 (function () {
@@ -607,6 +642,7 @@ function restartTask() {
         'cancelTask',
         'pauseTask',
         'restartTask',
+        'uploadFiles',
     ];
     var container = document.querySelector('.main');
     var html = [];