diff --git a/app/Models/Brand.php b/app/Models/Brand.php index d173a09..cfc5721 100755 --- a/app/Models/Brand.php +++ b/app/Models/Brand.php @@ -63,12 +63,8 @@ class Brand extends Model { if (!empty($this->image)) { if (in_array(config('filesystems.default'), ['s3', 'minio'])) { - return Storage::temporaryUrl( - $this->image, - Date::now()->addMinutes(5) - ); + return rtrim(config('filesystems.disks.s3.url'), '/') . '/' . ltrim($this->image, '/'); } - ; return (string) '/' . $this->image; } diff --git a/app/Models/Category.php b/app/Models/Category.php index 4be5934..0954073 100755 --- a/app/Models/Category.php +++ b/app/Models/Category.php @@ -148,10 +148,7 @@ class Category extends Model { if (!in_array($this->image, ['null', null])) { if (in_array(config('filesystems.default'), ['s3', 'minio'])) { - return Storage::temporaryUrl( - $this->image, - Date::now()->addMinutes(5) - ); + return rtrim(config('filesystems.disks.s3.url'), '/') . '/' . ltrim($this->image, '/'); } return config('app.url') . '/' . $this->image; diff --git a/app/Models/Product.php b/app/Models/Product.php index b954c06..7c1da37 100755 --- a/app/Models/Product.php +++ b/app/Models/Product.php @@ -237,10 +237,7 @@ class Product extends Model { if (!empty($this->poster)) { if (in_array(config('filesystems.default'), ['s3', 'minio'])) { - return Storage::temporaryUrl( - $this->poster, - Date::now()->addMinutes(5) - ); + return rtrim(config('filesystems.disks.s3.url'), '/') . '/' . ltrim($this->poster, '/'); } return config('app.url') . '/' . $this->poster; } @@ -252,10 +249,7 @@ class Product extends Model { if (!empty($this->data_sheet) and ($this->data_sheet != null and $this->data_sheet != "null")) { if (in_array(config('filesystems.default'), ['s3', 'minio'])) { - return Storage::temporaryUrl( - $this->data_sheet, - Date::now()->addMinutes(5) - ); + return rtrim(config('filesystems.disks.s3.url'), '/') . '/' . ltrim($this->data_sheet, '/'); } return config('app.url') . '/' . $this->data_sheet; } @@ -266,10 +260,7 @@ class Product extends Model { if (!empty($this->poster_thumb)) { if (in_array(config('filesystems.default'), ['s3', 'minio'])) { - return Storage::temporaryUrl( - $this->poster_thumb, - Date::now()->addMinutes(5) - ); + return rtrim(config('filesystems.disks.s3.url'), '/') . '/' . ltrim($this->poster_thumb, '/'); } return config('app.url') . '/' . $this->poster_thumb; } diff --git a/app/Models/Screen.php b/app/Models/Screen.php index 09c7148..cce8b44 100755 --- a/app/Models/Screen.php +++ b/app/Models/Screen.php @@ -54,7 +54,7 @@ class Screen extends Model { if (!empty($this->path)) { if (in_array(config('filesystems.default'), ['s3', 'minio'])) { - return Storage::url($this->path); + return rtrim(config('filesystems.disks.s3.url'), '/') . '/' . ltrim($this->path, '/'); } return config('app.url') . '/' . $this->path; } @@ -69,7 +69,7 @@ class Screen extends Model { if (!empty($this->path_thumb)) { if (in_array(config('filesystems.default'), ['s3', 'minio'])) { - return Storage::url($this->path_thumb); + return rtrim(config('filesystems.disks.s3.url'), '/') . '/' . ltrim($this->path_thumb, '/'); } return config('app.url') . '/' . $this->path_thumb; }