From 3bf54e4a2df1a49b453808bcf3d009aab6e9ebf8 Mon Sep 17 00:00:00 2001 From: JemyCheung Date: Wed, 1 Jul 2020 09:51:44 +0800 Subject: [PATCH 1/2] v7.3.2 --- examples/form_upload_simple.js | 40 +++------------------------------- qiniu/storage/form.js | 14 ++++++++---- 2 files changed, 13 insertions(+), 41 deletions(-) diff --git a/examples/form_upload_simple.js b/examples/form_upload_simple.js index 05c1a665..a28fb103 100644 --- a/examples/form_upload_simple.js +++ b/examples/form_upload_simple.js @@ -12,28 +12,13 @@ var putPolicy = new qiniu.rs.PutPolicy(options); var uploadToken = putPolicy.uploadToken(mac); var config = new qiniu.conf.Config(); -var localFile = '/Users/jemy/Downloads/VIDEO_20191008_093955.mp4.zip'; +var localFile = '/Users/jemy/Downloads/download.csv'; // config.zone = qiniu.zone.Zone_z0; var formUploader = new qiniu.form_up.FormUploader(config); var putExtra = new qiniu.form_up.PutExtra(); - -// bytes -// formUploader.put(uploadToken, null, "hello", null, function(respErr, -// respBody, respInfo) { -// if (respErr) { -// throw respErr; -// } -// -// if (respInfo.statusCode == 200) { -// console.log(respBody); -// } else { -// console.log(respInfo.statusCode); -// console.log(respBody); -// } -// }); - // file -putExtra.fname = 'testfile16.mp4'; +putExtra.fname = 'test01.csv'; +putExtra.crc32 = 3497766758; formUploader.putFile(uploadToken, null, localFile, putExtra, function (respErr, respBody, respInfo) { if (respErr) { @@ -47,22 +32,3 @@ formUploader.putFile(uploadToken, null, localFile, putExtra, function (respErr, console.log(respBody); } }); - -// test query zone frequently when config.zone==null; -setTimeout(upload, 1500); -function upload () { - putExtra.fname = 'testfile17.mp4'; - formUploader.putFile(uploadToken, null, localFile, putExtra, function (respErr, - respBody, respInfo) { - if (respErr) { - throw respErr; - } - - if (respInfo.statusCode == 200) { - console.log(respBody); - } else { - console.log(respInfo.statusCode); - console.log(respBody); - } - }); -} diff --git a/qiniu/storage/form.js b/qiniu/storage/form.js index 241e206e..d0d74280 100644 --- a/qiniu/storage/form.js +++ b/qiniu/storage/form.js @@ -122,10 +122,16 @@ function createMultipartForm (uploadToken, key, fsStream, putExtra, callbackFunc fileBody.push(data); }); - fsStream.on('end', function () { - fileBody = Buffer.concat(fileBody); - var bodyCrc32 = parseInt('0x' + getCrc32(fileBody)); - postForm.field('crc32', bodyCrc32); + fsStream.on('end', function() { + if (putExtra.checkCrc) { + if (putExtra.crc32 == null) { + fileBody = Buffer.concat(fileBody); + var bodyCrc32 = parseInt('0x' + getCrc32(fileBody)); + postForm.field('crc32', bodyCrc32); + } else { + postForm.field('crc32', putExtra.crc32); + } + } }); callbackFunc(postForm); } From 246685571e7e4a80728ac19f6dbd56c3d2422b4a Mon Sep 17 00:00:00 2001 From: JemyCheung Date: Wed, 1 Jul 2020 09:53:18 +0800 Subject: [PATCH 2/2] crc32 --- qiniu/storage/form.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qiniu/storage/form.js b/qiniu/storage/form.js index d0d74280..c5ab9f6d 100644 --- a/qiniu/storage/form.js +++ b/qiniu/storage/form.js @@ -26,7 +26,7 @@ function PutExtra (fname, params, mimeType, crc32, checkCrc) { this.params = params || {}; this.mimeType = mimeType || null; this.crc32 = crc32 || null; - this.checkCrc = checkCrc || 1; + this.checkCrc = checkCrc || true; } FormUploader.prototype.putStream = function (uploadToken, key, fsStream,