修改 demo

tencentyun · Aug 23, 2018 · a05e5c2 · a05e5c2
1 parent b100fb3
commit a05e5c2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/demo/demo.js b/demo/demo.js
@@ -18,7 +18,6 @@ var util = {
 };
 
 var cos = new COS({
-    FileParallelLimit: 5,
     getAuthorization: function (options,callback) {
         // 方法一、后端通过获取临时密钥给到前端，前端计算签名
         // var url = 'http://127.0.0.1:3000/sts';
@@ -127,8 +126,8 @@ var showLogText = function (text, color) {
 
 var logger = {
     log: function (text) {
-        console.log(text);
-        showLogText(text);
+        console.log.apply(console, arguments);
+        showLogText([].join.call(arguments, ' '));
     },
     error: function (text) {
         console.error(text);
@@ -626,6 +625,7 @@ function sliceUploadFile() {
             TaskId = tid;
         },
         onHashProgress: function (progressData) {
+            logger.log('onHashProgress', JSON.stringify(progressData));
         },
         onProgress: function (progressData) {
             logger.log('onProgress', JSON.stringify(progressData));

diff --git a/demo/sts-form.html b/demo/sts-form.html
@@ -39,8 +39,8 @@ <h1>Form 表单简单上传（兼容 IE8）</h1>
         // 计算签名
         var getAuthorization = function (options, callback) {
             var method = (options.Method || 'get').toLowerCase();
-            var url = 'http://127.0.0.1:3000/sts-auth' +
-            // var url = '../server/sts-auth.php' +
+            // var url = 'http://127.0.0.1:3000/sts-auth' +
+            var url = '../server/sts-auth.php' +
                 '?method=' + method +
                 '&pathname=' + encodeURIComponent('/');
             var xhr = new XMLHttpRequest();
@@ -90,7 +90,7 @@ <h1>Form 表单简单上传（兼容 IE8）</h1>
                     arr = items[i].split('=');
                     data[arr[0]] = decodeURIComponent(arr[1] || '');
                 }
-                showMessage(null, {url: prefix + Key, ETag: data.etag});
+                showMessage(null, {url: prefix + encodeURIComponent(Key).replace(/%2F/g, '/'), ETag: data.etag});
             } else {
             }
         };

diff --git a/demo/sts-post.html b/demo/sts-post.html
@@ -63,7 +63,6 @@ <h1>Ajax Post 上传</h1>
         // 上传文件
         var uploadFile = function (file, callback) {
             var Key = 'dir/' + file.name; // 这里指定上传目录和文件名
-
             getAuthorization({Method: 'POST', Key: Key}, function (err, info) {
                 var fd = new FormData();
                 fd.append('key', Key);
@@ -77,7 +76,7 @@ <h1>Ajax Post 上传</h1>
                 xhr.onload = function () {
                     if (Math.floor(xhr.status / 100) === 2) {
                         var ETag = xhr.getResponseHeader('etag');
-                        callback(null, {url: url, ETag: ETag});
+                        callback(null, {url: prefix + encodeURIComponent(Key).replace(/%2F/g, '/'), ETag: ETag});
                     } else {
                         callback('文件 ' + Key + ' 上传失败，状态码：' + xhr.status);
                     }
@@ -86,7 +85,6 @@ <h1>Ajax Post 上传</h1>
                     callback('文件 ' + Key + ' 上传失败，请检查是否没配置 CORS 跨域规则');
                 };
                 xhr.send(fd);
-
             });
         };