fix: #26 upload api changed

shaunthegeek · shaunthegeek · commit dc69e15a0b7b · 2021-07-09T16:18:15.000+08:00
diff --git a/app/Coding.php b/app/Coding.php
@@ -88,7 +88,7 @@ public function upload(array $uploadToken, string $fileFullPath): bool
         config(['filesystems.disks.cos.region' => $uploadToken['Region']]);
         config(['filesystems.disks.cos.bucket' => $uploadToken['Bucket']]);
 
-        return Storage::disk('cos')->put(basename($fileFullPath), File::get($fileFullPath));
+        return Storage::disk('cos')->put($uploadToken['StorageKey'], File::get($fileFullPath));
     }
 
     public function createWikiByZip(string $token, string $projectName, array $uploadToken, array $data)
diff --git a/tests/Unit/CodingTest.php b/tests/Unit/CodingTest.php
@@ -17,6 +17,7 @@ class CodingTest extends TestCase
         'SecretKey' => 'clUYSNeg2es16EILsrF6RyCD3ss6uFLX3Xgc=',
         'UploadLink' => 'https://coding-net-dev-file-123456.cos.ap-shanghai.myqcloud.com',
         'UpToken' => 'EOlMEc2x0xbrFoL9CMy7OqDl5413654938410a360a63207e30dab4655pMKmNJ3t5M-Z8bGt',
+        'StorageKey' => 'b5d0d8e0-3aca-11eb-8673-a9b6d94ca755.zip',
         'Time' => 1625579588693,
         'Bucket' => 'coding-net-dev-file-123456',
         'AppId' => '123456',
@@ -126,7 +127,7 @@ public function testUpload()
         $coding = new Coding();
         $coding->upload(self::$uploadToken, $file);
 
-        Storage::disk('cos')->assertExists(basename($file));
+        Storage::disk('cos')->assertExists(self::$uploadToken['StorageKey']);
     }
 
     public function testGetImportJobStatus()
diff --git a/tests/data/coding/createUploadTokenResponse.json b/tests/data/coding/createUploadTokenResponse.json
@@ -8,6 +8,7 @@
       "SecretKey": "clUYSNeg2es16EILsrF6RyCD3ss6uFLX3Xgc=",
       "UploadLink": "https://coding-net-dev-file-123456.cos.ap-shanghai.myqcloud.com",
       "UpToken": "EOlMEc2x0xbrFoL9CMy7OqDl5413654938410a360a63207e30dab4655pMKmNJ3t5M-Z8bGt",
+      "StorageKey": "b5d0d8e0-3aca-11eb-8673-a9b6d94ca755.zip",
       "Time": 1625579588693
     }
   }

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ public function upload(array $uploadToken, string $fileFullPath): bool`
`88`	`88`	`config(['filesystems.disks.cos.region' => $uploadToken['Region']]);`
`89`	`89`	`config(['filesystems.disks.cos.bucket' => $uploadToken['Bucket']]);`
`90`	`90`
`91`		`- return Storage::disk('cos')->put(basename($fileFullPath), File::get($fileFullPath));`
	`91`	`+ return Storage::disk('cos')->put($uploadToken['StorageKey'], File::get($fileFullPath));`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`public function createWikiByZip(string $token, string $projectName, array $uploadToken, array $data)`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`"SecretKey": "clUYSNeg2es16EILsrF6RyCD3ss6uFLX3Xgc=",`
`9`	`9`	`"UploadLink": "https://coding-net-dev-file-123456.cos.ap-shanghai.myqcloud.com",`
`10`	`10`	`"UpToken": "EOlMEc2x0xbrFoL9CMy7OqDl5413654938410a360a63207e30dab4655pMKmNJ3t5M-Z8bGt",`
	`11`	`+ "StorageKey": "b5d0d8e0-3aca-11eb-8673-a9b6d94ca755.zip",`
`11`	`12`	`"Time": 1625579588693`
`12`	`13`	`}`
`13`	`14`	`}`