diff --git a/app/common/controller/PostController.php b/app/common/controller/PostController.php index a554a59..da8c281 100644 --- a/app/common/controller/PostController.php +++ b/app/common/controller/PostController.php @@ -6,6 +6,8 @@ use app\common\model\PostComment; use app\common\model\PostFavorite; use app\common\model\PostLike; use app\common\model\PostMedia; +use app\common\model\User; +use app\common\service\OssService; use app\common\traits\crud\CrudControllerTrait; use app\common\service\PostService; use support\Request; @@ -64,9 +66,20 @@ class PostController extends BaseController $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']); if (isset($data['updated_at'])) $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']); + $ossservice = new OssService(); if (isset($data['id'])){ - $data['media'] = PostMedia::where('post_id', $data['id'])->get(); + $data['media'] = PostMedia::where('post_id', $data['id'])->get()->toArray(); + foreach ($data['media'] as &$media) { + $media['url_pull'] = $ossservice->generatePrivateUrl($media['url']); + } + } + if (isset($data['user_id'])){ + $data['user'] = User::where('id', $data['user_id'])->first(); + $data['user']['avatar_pull'] = $data['user']['avatar']; + if(!str_contains($data['user']['avatar'], 'http') && !empty($data['user']['avatar'])){ + $data['user']['avatar_pull'] = $ossservice->generatePrivateUrl($data['user']['avatar']); + } } return $data; }