更新上传方式

ProtosL · ProtosL · commit ff8c4513490f · 2020-12-01T17:16:11.000+08:00
diff --git a/bin/index.js b/bin/index.js
@@ -5,7 +5,6 @@ const SparkMD5 = require('spark-md5');
 const chalk = require('chalk');
 const prompts = require('prompts');
 const path = require('path');
-const FormData = require('form-data');
 require('winston-daily-rotate-file');
 const logger = require('../lib/log');
 const ProgressBar = require('progress');
@@ -29,26 +28,24 @@ process.on('uncaughtException', error => {
 const upload = async (filePath, parts = []) => {
     const totalChunk = Math.ceil(fileSize / CHUNK_SIZE);
 
-    const bar = new ProgressBar(':bar [:current/:total] :percent', { total: totalChunk });
+    const bar = new ProgressBar(':bar [:current/:total] :percent ', { total: totalChunk });
     const uploadChunk = async (currentChunk, currentChunkIndex, parts, isRetry) => {
         if (parts.some(({ partNumber, size }) => partNumber === currentChunkIndex && size === currentChunk.length)) {
             bar.tick();
             return Promise.resolve();
         }
 
-        const form = new FormData();
-        form.append('chunk', currentChunk, {
-            filename: requestUrl.replace(/^http(s)?:\/\/.+?\/.+?\/.+?\//, '')
-        });
         try {
             await _uploadChunk(requestUrl, {
                 uploadId,
                 version,
                 partNumber: currentChunkIndex,
                 size: currentChunk.length,
-                form
+                currentChunk 
             }, {
-                headers: form.getHeaders(),
+                headers: {
+                    'Content-Type': 'application/octet-stream'
+                },
                 Authorization
             });
             bar.tick();
@@ -163,7 +160,7 @@ const getFileMD5 = async (filePath) => {
         console.log(`\n开始计算 MD5\n`)
         logger.info('开始计算 MD5')
 
-        const bar = new ProgressBar(':bar [:current/:total] :percent', { total: totalChunk });
+        const bar = new ProgressBar(':bar [:current/:total] :percent ', { total: totalChunk });
         await new Promise(resolve => {
             stream = fs.createReadStream(filePath, { highWaterMark: CHUNK_SIZE })
             stream.on('data', chunk => {
diff --git a/lib/request.js b/lib/request.js
@@ -36,16 +36,17 @@ const uploadChunk = (requestUrl, {
     version,
     partNumber, 
     size, 
-    form,
+    currentChunk,
 }, {
     headers,
     Authorization
 }) => {
-    return axios.post(`${requestUrl}?version=${version}&uploadId=${uploadId}&partNumber=${partNumber}&size=${size}&action=part-upload`, form,
-        {
-            headers: { Authorization, ...headers }
-        }
-    )
+    return axios({
+        method: 'post',
+        url: `${requestUrl}?version=${version}&uploadId=${uploadId}&partNumber=${partNumber}&size=${size}&action=part-upload`,
+        data: currentChunk,
+        headers: { Authorization, ...headers }
+    })
 }
 
 /**
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "coding-generic",
-    "version": "1.0.4",
+    "version": "1.0.7",
     "description": "",
     "main": "index.js",
     "bin": {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "coding-generic",`
`3`		`- "version": "1.0.4",`
	`3`	`+ "version": "1.0.7",`
`4`	`4`	`"description": "",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"bin": {`