From 8e16e3a4844932afb502ec423394d31bc02b4561 Mon Sep 17 00:00:00 2001 From: Edward Yang Date: Wed, 13 Jul 2022 14:14:02 +0800 Subject: [PATCH] add origin url --- beike/Admin/Services/FileManagerService.php | 3 +-- beike/Helpers.php | 14 ++++++++++++++ beike/Services/ImageService.php | 9 +++++++++ 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/beike/Admin/Services/FileManagerService.php b/beike/Admin/Services/FileManagerService.php index e805e571..524be13d 100644 --- a/beike/Admin/Services/FileManagerService.php +++ b/beike/Admin/Services/FileManagerService.php @@ -11,8 +11,6 @@ namespace Beike\Admin\Services; -use Illuminate\Support\Facades\File; - class FileManagerService { private $fileBasePath = ''; @@ -176,6 +174,7 @@ class FileManagerService 'path' => $filePath, 'name' => $baseName, 'url' => image_resize("catalog{$filePath}"), + 'origin_url' => image_origin("catalog{$filePath}"), 'selected' => false, ]; } diff --git a/beike/Helpers.php b/beike/Helpers.php index d83b2525..db964e35 100644 --- a/beike/Helpers.php +++ b/beike/Helpers.php @@ -190,6 +190,20 @@ function image_resize($image, int $width = 100, int $height = 100) return (new \Beike\Services\ImageService($image))->resize($width, $height); } + +/** + * 获取原图地址 + * @throws Exception + */ +function image_origin($image) +{ + if (Str::startsWith($image, 'http')) { + return $image; + } + return (new \Beike\Services\ImageService($image))->originUrl(); +} + + /** * 当前语言ID * diff --git a/beike/Services/ImageService.php b/beike/Services/ImageService.php index de102d46..b484d8b8 100644 --- a/beike/Services/ImageService.php +++ b/beike/Services/ImageService.php @@ -61,4 +61,13 @@ class ImageService } return asset($newImage); } + + + /** + * 获取原图地址 + */ + public function originUrl(): string + { + return asset($this->image); + } }