Merge pull request overtrue#8 from JellyBool/qiniu-support

Add Qiniu support base on laravel-filesystem-qiniu

Author: overtrue

README.md

@@ -59,42 +59,16 @@ $ composer require "overtrue/laravel-ueditor:~1.0"
 
 如果你想使用七牛云储存，需要进行下面几个简单的操作：
 
-1.配置 `config/ueditor.php` 的 `disk` 为 `qiniu`:
+1.安装和配置 [laravel-filesystem-qiniu](https://github.com/overtrue/laravel-filesystem-qiniu) 
 
-```php
-'disk' => 'qiniu'
-```
-
-2.在 `config/filesystems.php` 添加下面的配置：
+2.配置 `config/ueditor.php` 的 `disk` 为 `qiniu`:
 
 ```php
-'s3' => [
-        'driver' => 's3',
-        'key' => env('AWS_KEY'),
-        'secret' => env('AWS_SECRET'),
-        'region' => env('AWS_REGION'),
-        'bucket' => env('AWS_BUCKET'),
-    ],
-    
-// 下面是添加的配置
-
-'qiniu' => [
-    'protocol' => 'http', // 域名对于的协议 http 或 https，默认 http
-    'bucket' => env('QINIU_BUCKET_NAME'), // 七牛存储空间名字（bucket name），推荐使用公开空间
-    'domain' => env('QINIU_BUCKET_DOMAIN'), // 七牛分配的域名
-    'key' => env('QINIU_ACCESS_KEY'),
-    'secret' => env('QINIU_SECRET_KEY'),
-],
+'disk' => 'qiniu'
 ```
 
-3.在 `.env` 文件添加配置：
+3.剩下时间打局 LOL，已经完事了。
 
-```php
-QINIU_BUCKET_NAME=
-QINIU_BUCKET_DOMAIN=
-QINIU_ACCESS_KEY=
-QINIU_SECRET_KEY=
-```
 > 七牛的 `access_key` 和 `secret_Key` 可以在这里找到：https://portal.qiniu.com/user/key ,在创建 `bucket`
 （空间）的时候，推荐大家都使用公开的空间。
 

src/QiNiuStorage.php

@@ -11,10 +11,7 @@
  */
 namespace Overtrue\LaravelUEditor;
 
-use Qiniu\Auth;
-use Qiniu\Processing\Operation;
-use Qiniu\Storage\BucketManager;
-use Qiniu\Storage\UploadManager;
+use Storage;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
@@ -32,19 +29,7 @@ class QiNiuStorage implements StorageInterface
      */
     public function store(UploadedFile $file, $filename)
     {
-        $uploadManager = new UploadManager();
-
-        list($result, $error) = $uploadManager->putFile(
-            $this->getQiNiuAuth()->uploadToken(config('filesystems.disks.qiniu.bucket')),
-            basename($filename),
-            $file->getRealPath()
-        );
-
-        if ($error !== null) {
-            throw new StoreErrorException(trans('ERROR_UNKNOWN'));
-        } else {
-            // Anything todo here ?
-        }
+        Storage::disk('qiniu')->writeStream($filename, fopen($file->getRealPath(), 'r'));
     }
 
     /**
@@ -59,67 +44,24 @@ public function store(UploadedFile $file, $filename)
      */
     public function lists($path, $start, $size = 20, array $allowFiles = [])
     {
-        $bucketManager = new BucketManager($this->getQiNiuAuth());
-
-        list($iterms, $marker, $error) = $bucketManager->listFiles(config('filesystems.disks.qiniu.bucket'), '', '', $size);
-
-        if ($error !== null) {
-            throw new StoreErrorException(trans('ERROR_UNKNOWN'));
-        } else {
-            $files = [];
-            foreach (collect($iterms)->sortBy('putTime', SORT_REGULAR, true)->toArray() as $file ) {
-                $files[] = [
-                    'url'   => $this->getQiNiuUrl($file['key']),
-                    'mtime' => $file['putTime'],
-                ];
-            }
+        $contents = Storage::disk('qiniu')->listContents($path,true);
 
+        return collect($contents)->map(function ($file) {
+            $files['url'] = $this->getUrl('/'.$file['path']);
+            $files['mtime'] = $file['timestamp'];
             return $files;
-        }
+        });
     }
 
     /**
      * Make the url of file.
      *
      * @param $filename
      *
-     * @return mixed
-     */
-    public function getUrl($filename)
-    {
-        return $this->getQiNiuUrl(basename($filename));
-    }
-
-    /**
-     * Get QiNiu auth object.
-     *
-     * @return string
-     */
-    protected function getQiNiuAuth()
-    {
-        return new Auth(config('filesystems.disks.qiniu.key'), config('filesystems.disks.qiniu.secret'));
-    }
-
-
-    /**
-     * Get QiNiu url base on file key.
-     *
-     * @param $key
      * @return string
      */
-    protected function getQiNiuUrl($key)
-    {
-        return $this->getQiNiuOperation()->buildUrl($key, [], config('filesystems.disks.qiniu.protocol'));
-    }
-
-    /**
-     * Get QiNiu operation object.
-     *
-     * @return Operation
-     */
-    protected function getQiNiuOperation()
+    public function getUrl($filename)
     {
-        return new Operation(config('filesystems.disks.qiniu.domain'));
+        return 'http://' . config('filesystems.disks.qiniu.domain') . $filename;
     }
-
 }