Fix url method compatible in laravel 5.1.

Author: overtrue

src/StorageManager.php

@@ -9,16 +9,18 @@
 
 namespace Overtrue\LaravelUEditor;
 
+use Illuminate\Contracts\Filesystem\Filesystem;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Contracts\Filesystem\Filesystem;
 use Symfony\Component\HttpFoundation\File\UploadedFile;
 
 /**
  * Class StorageManager.
  */
 class StorageManager
 {
+    use UrlResolverTrait;
+
     /**
      * @var \Illuminate\Contracts\Filesystem\Filesystem
      */
@@ -61,7 +63,7 @@ public function upload(Request $request)
 
         $response = [
             'state' => 'SUCCESS',
-            'url' => $this->disk->url($filename),
+            'url' => $this->getUrl($filename),
             'title' => $filename,
             'original' => $file->getClientOriginalName(),
             'type' => $file->getExtension(),
@@ -226,9 +228,9 @@ protected function formatPath($path)
         $path = str_replace('{time}', $time, $path);
 
         //替换随机字符串
-        if (preg_match("/\{rand\:([\d]*)\}/i", $path, $matches)) {
+        if (preg_match('/\{rand\:([\d]*)\}/i', $path, $matches)) {
             $length = min($matches[1], strlen(PHP_INT_MAX));
-            $path = preg_replace("/\{rand\:[\d]*\}/i", str_pad(mt_rand(0, pow(10, $length) - 1), $length, '0', STR_PAD_LEFT), $path);
+            $path = preg_replace('/\{rand\:[\d]*\}/i', str_pad(mt_rand(0, pow(10, $length) - 1), $length, '0', STR_PAD_LEFT), $path);
         }
 
         return $path;

src/UrlResolverTrait.php

@@ -0,0 +1,101 @@
+<?php
+
+/*
+ * This file is part of the overtrue/laravel-ueditor.
+ * (c) overtrue <[email protected]>
+ * This source file is subject to the MIT license that is bundled
+ * with this source code in the file LICENSE.
+ */
+
+namespace Overtrue\LaravelUEditor;
+
+use Illuminate\Support\Str;
+use League\Flysystem\Adapter\Local as LocalAdapter;
+use League\Flysystem\AwsS3v3\AwsS3Adapter;
+use RuntimeException;
+
+/**
+ * Trait UrlResolverTrait.
+ */
+trait UrlResolverTrait
+{
+    /**
+     * @param string $filename
+     *
+     * @return string
+     */
+    public function getUrl($filename)
+    {
+        if (method_exists($this->disk, 'url')) {
+            return $this->disk->url($filename);
+        }
+
+        return $this->url($filename);
+    }
+
+    /**
+     * Get the URL for the file at the given path.
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    public function url($path)
+    {
+        $adapter = $this->disk->getDriver()->getAdapter();
+
+        if (method_exists($adapter, 'getUrl')) {
+            return $adapter->getUrl($path);
+        } elseif ($adapter instanceof AwsS3Adapter) {
+            return $this->getAwsUrl($adapter, $path);
+        } elseif ($adapter instanceof LocalAdapter) {
+            return $this->getLocalUrl($path);
+        }
+        throw new RuntimeException('This driver does not support retrieving URLs.');
+    }
+
+    /**
+     * Get the URL for the file at the given path.
+     *
+     * @param \League\Flysystem\AwsS3v3\AwsS3Adapter $adapter
+     * @param string                                 $path
+     *
+     * @return string
+     */
+    protected function getAwsUrl($adapter, $path)
+    {
+        return $adapter->getClient()->getObjectUrl(
+            $adapter->getBucket(), $adapter->getPathPrefix().$path
+        );
+    }
+
+    /**
+     * Get the URL for the file at the given path.
+     *
+     * @param string $path
+     *
+     * @return string
+     */
+    protected function getLocalUrl($path)
+    {
+        $config = $this->disk->getDriver()->getConfig();
+
+        // If an explicit base URL has been set on the disk configuration then we will use
+        // it as the base URL instead of the default path. This allows the developer to
+        // have full control over the base path for this filesystem's generated URLs.
+        if ($config->has('url')) {
+            return rtrim($config->get('url'), '/').'/'.ltrim($path, '/');
+        }
+
+        $path = '/storage/'.$path;
+
+        // If the path contains "storage/public", it probably means the developer is using
+        // the default disk to generate the path instead of the "public" disk like they
+        // are really supposed to use. We will remove the public from this path here.
+        if (Str::contains($path, '/storage/public/')) {
+            return Str::replaceFirst('/public/', '/', $path);
+        }
+
+        return $path;
+    }
+}