|
@@ -133,11 +133,11 @@ class ProductController extends BaseController |
|
@@ -133,11 +133,11 @@ class ProductController extends BaseController |
|
133
|
}
|
133
|
}
|
|
134
|
}
|
134
|
}
|
|
135
|
if(!empty($v['video'])){
|
135
|
if(!empty($v['video'])){
|
|
136
|
- $v['video']['url'] = getFileUrl($v['video']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location'],$this->user['file_cdn']);
|
136
|
+ $v['video']['url'] = getFileUrl($v['video']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location'],$this->user['file_cdn'] ?? 0);
|
|
137
|
$v['video']['video_image'] = getImageUrl($v['video']['video_image'] ?? '',$this->user['storage_type'] ?? 0,$this->user['project_location']);
|
137
|
$v['video']['video_image'] = getImageUrl($v['video']['video_image'] ?? '',$this->user['storage_type'] ?? 0,$this->user['project_location']);
|
|
138
|
}
|
138
|
}
|
|
139
|
if(!empty($v['files']) && !empty($v['files']['url'])){
|
139
|
if(!empty($v['files']) && !empty($v['files']['url'])){
|
|
140
|
- $v['files']['url'] = getFileUrl($v['files']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location'],$this->user['file_cdn']);
|
140
|
+ $v['files']['url'] = getFileUrl($v['files']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location'],$this->user['file_cdn'] ?? 0);
|
|
141
|
}
|
141
|
}
|
|
142
|
return $this->success($v);
|
142
|
return $this->success($v);
|
|
143
|
}
|
143
|
}
|
|
@@ -379,9 +379,9 @@ class ProductController extends BaseController |
|
@@ -379,9 +379,9 @@ class ProductController extends BaseController |
|
379
|
foreach ($arr1 as $k1=>$v1){
|
379
|
foreach ($arr1 as $k1=>$v1){
|
|
380
|
$v1 = (array)$v1;
|
380
|
$v1 = (array)$v1;
|
|
381
|
if(isset($v1['url'])){
|
381
|
if(isset($v1['url'])){
|
|
382
|
- $v1['url'] = getFileUrl($v1['url'],$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn']);
|
382
|
+ $v1['url'] = getFileUrl($v1['url'],$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn'] ?? 0);
|
|
383
|
}else{
|
383
|
}else{
|
|
384
|
- $v1 = getFileUrl($v1,$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn']);
|
384
|
+ $v1 = getFileUrl($v1,$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn'] ?? 0);
|
|
385
|
}
|
385
|
}
|
|
386
|
$arr1[$k1] = $v1;
|
386
|
$arr1[$k1] = $v1;
|
|
387
|
}
|
387
|
}
|