From b399f8f700bcdd61deab07545d376d1026ab3bf4 Mon Sep 17 00:00:00 2001
From: Rain Cheung <chinachuner@163.com>
Date: Tue, 22 Aug 2017 11:04:00 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=83=E7=89=9B=E4=B8=8A=E4=BC=A0=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

根据最新的七牛SDK修改了上传方法
测试已上传成功
https://developer.qiniu.com/kodo/sdk/1289/nodejs
---
 core/utils/common.js | 40 +++++++++++++++++++---------------------
 1 file changed, 19 insertions(+), 21 deletions(-)

diff --git a/core/utils/common.js b/core/utils/common.js
index 777c0c1a..7db26230 100644
--- a/core/utils/common.js
+++ b/core/utils/common.js
@@ -206,29 +206,27 @@ common.getBlobDownloadUrl = function (blobUrl) {
 
 common.uploadFileToQiniu = function (key, filePath) {
   return new Promise((resolve, reject) => {
-    qiniu.conf.ACCESS_KEY = _.get(config, "qiniu.accessKey");
-    qiniu.conf.SECRET_KEY = _.get(config, "qiniu.secretKey");
+    var accessKey = _.get(config, "qiniu.accessKey");
+    var secretKey = _.get(config, "qiniu.secretKey");
     var bucket = _.get(config, "qiniu.bucketName", "");
-    var client = new qiniu.rs.Client();
-    client.stat(bucket, key, (err, ret) => {
-      if (!err) {
-        resolve(ret.hash);
+    var mac = new qiniu.auth.digest.Mac(accessKey, secretKey);
+    var options = {
+      scope: bucket,
+    };
+    var putPolicy = new qiniu.rs.PutPolicy(options);
+    var uploadToken=putPolicy.uploadToken(mac);
+    var formUploader = new qiniu.form_up.FormUploader();
+    var putExtra = new qiniu.form_up.PutExtra();
+    formUploader.putFile(uploadToken, key, filePath, putExtra, function(respErr, respBody, respInfo) {
+      log.debug(`respErr ${respErr}`)
+      log.debug(`respBody ${JSON.stringify(respBody)}`)
+      if (respErr) {
+        reject(new AppError.AppError(JSON.stringify(respErr)));
+      }
+      if (respInfo.statusCode == 200) {
+        resolve(respBody.hash);
       } else {
-        try {
-          var uptoken = common.uptoken(bucket, key);
-        } catch (e) {
-          return reject(e);
-        }
-        var extra = new qiniu.io.PutExtra();
-        qiniu.io.putFile(uptoken, key, filePath, extra, (err, ret) => {
-          if(!err) {
-            // 上传成功， 处理返回值
-            resolve(ret.hash);
-          } else {
-            // 上传失败， 处理返回代码
-            reject(new AppError.AppError(JSON.stringify(err)));
-          }
-        });
+        log.debug(respInfo.statusCode);
       }
     });
   });