This commit is contained in:
2025-12-13 13:38:50 +08:00
parent 22a4c9fb8f
commit 160e8416a2
2 changed files with 13 additions and 5 deletions
+6 -2
View File
@@ -127,8 +127,12 @@ class PostController extends BaseController
$ossservice = new OssService(); $ossservice = new OssService();
if (isset($data['id'])){ if (isset($data['id'])){
$data['media'] = PostMedia::where('post_id', $data['id'])->get()->toArray(); $data['media'] = PostMedia::where('post_id', $data['id'])->get()->toArray();
foreach ($data['media'] as &$media) { foreach ($data['media'] as $key => $media) {
$media['url_pull'] = $ossservice->generatePrivateUrl($media['url']); if(empty($media['url'])){
unset($data['media'][$key]);
continue;
}
$data['media'][$key]['url_pull'] = $ossservice->generatePrivateUrl($media['url']);
} }
} }
if (isset($data['user_id'])){ if (isset($data['user_id'])){
@@ -54,6 +54,7 @@ class PostFavoriteController extends BaseController
if (isset($data['updated_at'])) if (isset($data['updated_at']))
$data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
if (isset($data['post_id'])){ if (isset($data['post_id'])){
var_dump($data['post_id']);
$ossservice = new OssService(); $ossservice = new OssService();
$post = Post::where('id', $data['post_id'])->first()->toArray(); $post = Post::where('id', $data['post_id'])->first()->toArray();
@@ -73,8 +74,11 @@ class PostFavoriteController extends BaseController
$ossservice = new OssService(); $ossservice = new OssService();
if (isset($post['id'])){ if (isset($post['id'])){
$post['media'] = PostMedia::where('post_id', $post['id'])->get()->toArray(); $post['media'] = PostMedia::where('post_id', $post['id'])->get()->toArray();
foreach ($post['media'] as &$media) { foreach ($post['media'] as &$media) {
$media['url_pull'] = $ossservice->generatePrivateUrl($media['url']); if(!empty($media['url'])){
$media['url_pull'] = $ossservice->generatePrivateUrl($media['url']);
}
} }
} }
$post['is_favorite'] = 1; $post['is_favorite'] = 1;
@@ -82,7 +86,7 @@ class PostFavoriteController extends BaseController
if (isset($post['sku_id'])){ if (isset($post['sku_id'])){
$sku = Sku::where('id', $post['sku_id'])->first()->toArray(); $sku = Sku::where('id', $post['sku_id'])->first()->toArray();
if($sku){ if($sku && !empty($sku['main_image'])){
$sku['main_image_pull'] = $ossservice->generatePrivateUrl($sku['main_image']); $sku['main_image_pull'] = $ossservice->generatePrivateUrl($sku['main_image']);
} }
@@ -97,7 +101,7 @@ class PostFavoriteController extends BaseController
$post['sku'] = $sku; $post['sku'] = $sku;
} }
$post['post'] = $post; $data['post'] = $post;
} }
return $data; return $data;
} }