Merge pull request #253 from ankadada/master

增加$filePath传值

Author: jemygraw

src/Qiniu/Storage/FormUploader.php

@@ -30,14 +30,16 @@ public static function put(
         $data,
         $config,
         $params,
-        $mime
+        $mime,
+        $checkCrc,
+        $filePath
     ) {
 
         $fields = array('token' => $upToken);
         if ($key === null) {
-            $fname = 'filename';
+            $fname = $filePath;
         } else {
-            $fname = $key;
+            $fname = $filePath;
             $fields['key'] = $key;
         }
 

src/Qiniu/Storage/ResumeUploader.php

@@ -71,7 +71,7 @@ public function __construct(
     /**
      * 上传操作
      */
-    public function upload()
+    public function upload($filePath)
     {
         $uploaded = 0;
         while ($uploaded < $this->size) {
@@ -106,7 +106,7 @@ public function upload()
             array_push($this->contexts, $ret['ctx']);
             $uploaded += $blockSize;
         }
-        return $this->makeFile();
+        return $this->makeFile($filePath);
     }
 
     /**
@@ -118,13 +118,14 @@ private function makeBlock($block, $blockSize)
         return $this->post($url, $block);
     }
 
-    private function fileUrl()
+    private function fileUrl($filePath)
     {
         $url = $this->host . '/mkfile/' . $this->size;
         $url .= '/mimeType/' . \Qiniu\base64_urlSafeEncode($this->mime);
         if ($this->key != null) {
             $url .= '/key/' . \Qiniu\base64_urlSafeEncode($this->key);
         }
+        $url .= '/fname/' . \Qiniu\base64_urlSafeEncode($filePath);
         if (!empty($this->params)) {
             foreach ($this->params as $key => $value) {
                 $val = \Qiniu\base64_urlSafeEncode($value);
@@ -137,9 +138,9 @@ private function fileUrl()
     /**
      * 创建文件
      */
-    private function makeFile()
+    private function makeFile($filePath)
     {
-        $url = $this->fileUrl();
+        $url = $this->fileUrl($filePath);
         $body = implode(',', $this->contexts);
         $response = $this->post($url, $body);
         if ($response->needRetry()) {

src/Qiniu/Storage/UploadManager.php

@@ -56,7 +56,8 @@ public function put(
             $this->config,
             $params,
             $mime,
-            $checkCrc
+            $checkCrc,
+            $filePath
         );
     }
 
@@ -106,7 +107,8 @@ public function putFile(
                 $this->config,
                 $params,
                 $mime,
-                $checkCrc
+                $checkCrc,
+                $filePath
             );
         }
 
@@ -119,7 +121,7 @@ public function putFile(
             $mime,
             $this->config
         );
-        $ret = $up->upload();
+        $ret = $up->upload($filePath);
         fclose($file);
         return $ret;
     }