fix：优化uploadFile、uploadFIles文件路径不正确场景

Author: livehigh

sdk/advance.js

@@ -795,47 +795,48 @@ function uploadFile(params, callback) {
   var taskList = [];
 
   fs.stat(params.FilePath, function (err, stat) {
-      try {
-          var isDir = stat.isDirectory();
-          var FileSize = params.ContentLength = stat.size || 0;
-          var fileInfo = {TaskId: ''};
-    
-          // 整理 option，用于返回给回调
-          util.each(params, function (v, k) {
-              if (typeof v !== 'object' && typeof v !== 'function') {
-                  fileInfo[k] = v;
-              }
-          });
-    
-          // 处理文件 TaskReady
-          var _onTaskReady = params.onTaskReady;
-          var onTaskReady = function (tid) {
-              fileInfo.TaskId = tid;
-              _onTaskReady && _onTaskReady(tid);
-          };
-          params.onTaskReady = onTaskReady;
-    
-          // 处理文件完成
-          var _onFileFinish = params.onFileFinish;
-          var onFileFinish = function (err, data) {
-              _onFileFinish && _onFileFinish(err, data, fileInfo);
-              callback && callback(err, data);
-          };
-    
-          // 添加上传任务
-          var api = FileSize <= SliceSize || isDir ? 'putObject' : 'sliceUploadFile';
-          if (api === 'putObject') {
-            params.Body = isDir ? '' : fs.createReadStream(params.FilePath);
-            params.Body.isSdkCreated = true;
+      if (err) {
+          return callback(err);
+      }
+
+      var isDir = stat.isDirectory();
+      var FileSize = params.ContentLength = stat.size || 0;
+      var fileInfo = {TaskId: ''};
+
+      // 整理 option，用于返回给回调
+      util.each(params, function (v, k) {
+          if (typeof v !== 'object' && typeof v !== 'function') {
+              fileInfo[k] = v;
           }
-          taskList.push({
-              api: api,
-              params: params,
-              callback: onFileFinish,
-          });
-          self._addTasks(taskList);
-      } catch (e) {
+      });
+
+      // 处理文件 TaskReady
+      var _onTaskReady = params.onTaskReady;
+      var onTaskReady = function (tid) {
+          fileInfo.TaskId = tid;
+          _onTaskReady && _onTaskReady(tid);
+      };
+      params.onTaskReady = onTaskReady;
+
+      // 处理文件完成
+      var _onFileFinish = params.onFileFinish;
+      var onFileFinish = function (err, data) {
+          _onFileFinish && _onFileFinish(err, data, fileInfo);
+          callback && callback(err, data);
+      };
+
+      // 添加上传任务
+      var api = FileSize <= SliceSize || isDir ? 'putObject' : 'sliceUploadFile';
+      if (api === 'putObject') {
+        params.Body = isDir ? '' : fs.createReadStream(params.FilePath);
+        params.Body.isSdkCreated = true;
       }
+      taskList.push({
+          api: api,
+          params: params,
+          callback: onFileFinish,
+      });
+      self._addTasks(taskList);
   });
 }
 
@@ -873,61 +874,58 @@ function uploadFiles(params, callback) {
     var count = params.files.length;
     util.each(params.files, function (fileParams, index) {
         fs.stat(fileParams.FilePath, function (err, stat) {
-            try {
-                var isDir = stat.isDirectory();
-                var FileSize = fileParams.ContentLength = stat.size || 0;
-                var fileInfo = {Index: index, TaskId: ''};
+            var isDir = stat ? stat.isDirectory() : false;
+            var FileSize = fileParams.ContentLength = stat ? stat.size : 0;
+            var fileInfo = {Index: index, TaskId: ''};
 
-                // 更新文件总大小
-                TotalSize += FileSize;
+            // 更新文件总大小
+            TotalSize += FileSize;
 
-                // 整理 option，用于返回给回调
-                util.each(fileParams, function (v, k) {
-                    if (typeof v !== 'object' && typeof v !== 'function') {
-                        fileInfo[k] = v;
-                    }
-                });
+            // 整理 option，用于返回给回调
+            util.each(fileParams, function (v, k) {
+                if (typeof v !== 'object' && typeof v !== 'function') {
+                    fileInfo[k] = v;
+                }
+            });
 
-                // 处理单个文件 TaskReady
-                var _onTaskReady = fileParams.onTaskReady;
-                var onTaskReady = function (tid) {
-                    fileInfo.TaskId = tid;
-                    _onTaskReady && _onTaskReady(tid);
-                };
-                fileParams.onTaskReady = onTaskReady;
+            // 处理单个文件 TaskReady
+            var _onTaskReady = fileParams.onTaskReady;
+            var onTaskReady = function (tid) {
+                fileInfo.TaskId = tid;
+                _onTaskReady && _onTaskReady(tid);
+            };
+            fileParams.onTaskReady = onTaskReady;
 
-                // 处理单个文件进度
-                var PreAddSize = 0;
-                var _onProgress = fileParams.onProgress;
-                var onProgress = function (info) {
-                    TotalFinish = TotalFinish - PreAddSize + info.loaded;
-                    PreAddSize = info.loaded;
-                    _onProgress && _onProgress(info);
-                    onTotalProgress({loaded: TotalFinish, total: TotalSize});
-                };
-                fileParams.onProgress = onProgress;
+            // 处理单个文件进度
+            var PreAddSize = 0;
+            var _onProgress = fileParams.onProgress;
+            var onProgress = function (info) {
+                TotalFinish = TotalFinish - PreAddSize + info.loaded;
+                PreAddSize = info.loaded;
+                _onProgress && _onProgress(info);
+                onTotalProgress({loaded: TotalFinish, total: TotalSize});
+            };
+            fileParams.onProgress = onProgress;
 
-                // 处理单个文件完成
-                var _onFileFinish = fileParams.onFileFinish;
-                var onFileFinish = function (err, data) {
-                    _onFileFinish && _onFileFinish(err, data);
-                    onTotalFileFinish && onTotalFileFinish(err, data, fileInfo);
-                };
+            // 处理单个文件完成
+            var _onFileFinish = fileParams.onFileFinish;
+            var onFileFinish = function (err, data) {
+                _onFileFinish && _onFileFinish(err, data);
+                onTotalFileFinish && onTotalFileFinish(err, data, fileInfo);
+            };
 
-                // 添加上传任务
-                var api = FileSize <= SliceSize || isDir ? 'putObject' : 'sliceUploadFile';
-                if (api === 'putObject') {
-                    fileParams.Body = isDir ? '' : fs.createReadStream(fileParams.FilePath);
-                    fileParams.Body.isSdkCreated = true;
-                }
-                taskList.push({
-                    api: api,
-                    params: fileParams,
-                    callback: onFileFinish,
-                });
-                --count === 0 && self._addTasks(taskList);
-            } catch (e){
+            // 添加上传任务
+            var api = FileSize <= SliceSize || isDir ? 'putObject' : 'sliceUploadFile';
+            if (api === 'putObject') {
+                fileParams.Body = isDir ? '' : fs.createReadStream(fileParams.FilePath);
+                fileParams.Body.isSdkCreated = true;
             }
+            taskList.push({
+                api: api,
+                params: fileParams,
+                callback: onFileFinish,
+            });
+            --count === 0 && self._addTasks(taskList);
         });
     });
 }