test
This commit is contained in:
@@ -63,10 +63,7 @@ class Brand extends Model
|
|||||||
{
|
{
|
||||||
if (!empty($this->image)) {
|
if (!empty($this->image)) {
|
||||||
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
||||||
return Storage::temporaryUrl(
|
return Storage::url($this->image);
|
||||||
$this->image,
|
|
||||||
Date::now()->addMinutes(5)
|
|
||||||
);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
return (string) '/' . $this->image;
|
return (string) '/' . $this->image;
|
||||||
|
|||||||
@@ -148,10 +148,7 @@ class Category extends Model
|
|||||||
{
|
{
|
||||||
if (!in_array($this->image, ['null', null])) {
|
if (!in_array($this->image, ['null', null])) {
|
||||||
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
||||||
return Storage::temporaryUrl(
|
return Storage::url($this->image);
|
||||||
$this->image,
|
|
||||||
Date::now()->addMinutes(5)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return config('app.url') . '/' . $this->image;
|
return config('app.url') . '/' . $this->image;
|
||||||
|
|||||||
@@ -56,13 +56,11 @@ class Post extends Model
|
|||||||
public function getImage(): string
|
public function getImage(): string
|
||||||
{
|
{
|
||||||
if (!empty($this->image)) {
|
if (!empty($this->image)) {
|
||||||
if (in_array(env('FILESYSTEM_DISK'), ['s3', 'minio'])) {
|
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
||||||
return Storage::temporaryUrl(
|
return Storage::url($this->image);
|
||||||
$this->image, Date::now()->addMinutes(5)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return $this->image;
|
return config('app.url') . '/' . $this->image;
|
||||||
}
|
}
|
||||||
|
|
||||||
return '/images/nophoto.jpg';
|
return '/images/nophoto.jpg';
|
||||||
|
|||||||
@@ -237,10 +237,7 @@ class Product extends Model
|
|||||||
{
|
{
|
||||||
if (!empty($this->poster)) {
|
if (!empty($this->poster)) {
|
||||||
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
||||||
return Storage::temporaryUrl(
|
return Storage::url($this->poster);
|
||||||
$this->poster,
|
|
||||||
Date::now()->addMinutes(5)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
return config('app.url') . '/' . $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 (!empty($this->data_sheet) and ($this->data_sheet != null and $this->data_sheet != "null")) {
|
||||||
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
||||||
return Storage::temporaryUrl(
|
return Storage::url($this->data_sheet);
|
||||||
$this->data_sheet,
|
|
||||||
Date::now()->addMinutes(5)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
return config('app.url') . '/' . $this->data_sheet;
|
return config('app.url') . '/' . $this->data_sheet;
|
||||||
}
|
}
|
||||||
@@ -266,10 +260,7 @@ class Product extends Model
|
|||||||
{
|
{
|
||||||
if (!empty($this->poster_thumb)) {
|
if (!empty($this->poster_thumb)) {
|
||||||
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
||||||
return Storage::temporaryUrl(
|
return Storage::url($this->poster_thumb);
|
||||||
$this->poster_thumb,
|
|
||||||
Date::now()->addMinutes(5)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
return config('app.url') . '/' . $this->poster_thumb;
|
return config('app.url') . '/' . $this->poster_thumb;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -45,12 +45,10 @@ class Slider extends Model
|
|||||||
public function getImage(): string
|
public function getImage(): string
|
||||||
{
|
{
|
||||||
if (!empty($this->image)) {
|
if (!empty($this->image)) {
|
||||||
if (in_array(env('FILESYSTEM_DISK'), ['s3', 'minio'])) {
|
if (in_array(config('filesystems.default'), ['s3', 'minio'])) {
|
||||||
return Storage::temporaryUrl(
|
return Storage::url($this->image);
|
||||||
$this->image, Date::now()->addMinutes(5)
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
return $this->image;
|
return config('app.url') . '/' . $this->image;
|
||||||
}
|
}
|
||||||
|
|
||||||
return '/images/nophoto.jpg';
|
return '/images/nophoto.jpg';
|
||||||
|
|||||||
@@ -62,6 +62,7 @@ return [
|
|||||||
'region' => env('MINIO_REGION', 'us-east-1'), // Your MinIO region, typically 'us-east-1'
|
'region' => env('MINIO_REGION', 'us-east-1'), // Your MinIO region, typically 'us-east-1'
|
||||||
'bucket' => env('MINIO_BUCKET'), // The name of your bucket
|
'bucket' => env('MINIO_BUCKET'), // The name of your bucket
|
||||||
'endpoint' => env('MINIO_ENDPOINT'), // MinIO server endpoint
|
'endpoint' => env('MINIO_ENDPOINT'), // MinIO server endpoint
|
||||||
|
'url' => env('MINIO_URL'), // Public URL for the browser
|
||||||
'use_path_style_endpoint' => env('MINIO_USE_PATH_STYLE', true), // MinIO path-style support
|
'use_path_style_endpoint' => env('MINIO_USE_PATH_STYLE', true), // MinIO path-style support
|
||||||
'visibility' => 'public', // Set the visibility (public/private)
|
'visibility' => 'public', // Set the visibility (public/private)
|
||||||
'signature_version' => 'v4', // Add this line
|
'signature_version' => 'v4', // Add this line
|
||||||
|
|||||||
Reference in New Issue
Block a user