📦 Cleanup.

Author: overtrue

README.md

@@ -51,15 +51,15 @@ $ composer require "overtrue/laravel-ueditor:~1.0"
 
 # 说明
 
-在 `config/ueditor.php` 配置 `disk` 为 `'local'` 情况下，上传路径在：`public/uploads/` 下，确认该目录存在并可写。
-
-如果要修改上传路径，请在 `config/ueditor.php` 里各种类型的上传路径，但是都在 public 下。
+1. 在 `config/ueditor.php` 配置 `disk` 为 `'public'` 情况下，上传路径在：`public/uploads/` 下，确认该目录存在并可写。
+2. 如果要修改上传路径，请在 `config/ueditor.php` 里各种类型的上传路径，但是都在 public 下。
+3. 请在 `.env` 中正确配置 `APP_URL` 为你的当前域名，否则可能上传成功了，但是无法正确显示。
 
 # 七牛支持
 
 如果你想使用七牛云储存，需要进行下面几个简单的操作：
 
-1.安装和配置 [laravel-filesystem-qiniu](https://github.com/overtrue/laravel-filesystem-qiniu) 
+1.安装和配置 [laravel-filesystem-qiniu](https://github.com/overtrue/laravel-filesystem-qiniu)
 
 2.配置 `config/ueditor.php` 的 `disk` 为 `qiniu`:
 

src/StorageManager.php

@@ -11,14 +11,29 @@
 
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Support\Manager;
+use Illuminate\Contracts\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * Class StorageManager.
  */
-class StorageManager extends Manager
+class StorageManager
 {
+    /**
+     * @var \Illuminate\Contracts\Filesystem\Filesystem
+     */
+    protected $disk;
+
+    /**
+     * Constructor.
+     *
+     * @param \Illuminate\Contracts\Filesystem\Filesystem $disk
+     */
+    public function __construct(Filesystem $disk)
+    {
+        $this->disk = $disk;
+    }
+
     /**
      * Upload a file.
      *
@@ -46,7 +61,7 @@ public function upload(Request $request)
             $this->store($file, $filename);
             $response = [
                 'state' => 'SUCCESS',
-                'url' => $this->getUrl($filename),
+                'url' => $this->disk->url($filename),
                 'title' => $filename,
                 'original' => $file->getClientOriginalName(),
                 'type' => $file->getExtension(),
@@ -69,9 +84,9 @@ public function upload(Request $request)
      *
      * @return Response
      */
-    public function listFiles($path, $start, $size = 20, array $allowFiles = [])
+    protected function listFiles($path, $start, $size = 20, array $allowFiles = [])
     {
-        $files = $this->paginateFiles($this->listContents($path, true), $start, $size);
+        $files = $this->paginateFiles($this->disk->listContents($path, true), $start, $size);
 
         return [
             'state' => empty($files) ? 'EMPTY' : 'SUCCESS',
@@ -92,11 +107,9 @@ public function listFiles($path, $start, $size = 20, array $allowFiles = [])
      */
     protected function paginateFiles(array $files, $start = 0, $size = 50)
     {
-        $disk = Storage::disk($this->app['config']['ueditor.disk']);
-
-        return collect($files)->skip($start)->take($size)->map(function ($file) use ($disk) {
+        return collect($files)->skip($start)->take($size)->map(function ($file) {
             return [
-                'url' => $disk->url($file['path']),
+                'url' => $this->disk->url($file['path']),
                 'mtime' => $file['timestamp'],
             ];
         })->all();
@@ -110,19 +123,9 @@ protected function paginateFiles(array $files, $start = 0, $size = 50)
      *
      * @return mixed
      */
-    public function store(UploadedFile $file, $filename)
-    {
-        Storage::disk('qiniu')->putFileAs('', $filename, $file);
-    }
-
-    /**
-     * Return default driver name.
-     *
-     * @return string
-     */
-    public function getDefaultDriver()
+    protected function store(UploadedFile $file, $filename)
     {
-        return Storage::disk($this->app['config']['ueditor.disk']);
+        return $this->disk->putFileAs('', $file, $filename);
     }
 
     /**
@@ -133,7 +136,7 @@ public function getDefaultDriver()
      *
      * @return bool|string
      */
-    public function fileHasError(UploadedFile $file, array $config)
+    protected function fileHasError(UploadedFile $file, array $config)
     {
         $error = false;
 
@@ -171,7 +174,7 @@ protected function getFilename(UploadedFile $file, array $config)
      *
      * @return array
      */
-    public function getUploadConfig($action)
+    protected function getUploadConfig($action)
     {
         $upload = config('ueditor.upload');
 
@@ -217,7 +220,7 @@ protected function error($message)
      *
      * @return mixed
      */
-    public function formatPath($path)
+    protected function formatPath($path)
     {
         $time = time();
         $partials = explode('-', date('Y-y-m-d-H-i-s'));

src/UEditorServiceProvider.php

@@ -10,6 +10,7 @@
 namespace Overtrue\LaravelUEditor;
 
 use Illuminate\Routing\Router;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\ServiceProvider;
 
 /**
@@ -50,7 +51,7 @@ public function register()
     {
         $this->mergeConfigFrom(__DIR__.'/config/ueditor.php', 'ueditor');
         $this->app->singleton('ueditor.storage', function ($app) {
-            return new StorageManager($app);
+            return new StorageManager(Storage::disk($app['config']->get('ueditor.disk', 'public')));
         });
     }
 

src/config/ueditor.php

@@ -8,9 +8,8 @@
  */
 
 return [
-    // 存储引擎:filesystem.php 中 disks，local 或 qiniu
-    'disk' => 'local',
-
+    // 存储引擎: config/filesystem.php 中 disks， public 或 qiniu
+    'disk' => 'public',
     'route' => [
         'name' => '/ueditor/server',
     ],