diff --git a/app/admin/controller/PostController.php b/app/admin/controller/PostController.php index c7bf68c..9c0cd46 100644 --- a/app/admin/controller/PostController.php +++ b/app/admin/controller/PostController.php @@ -4,6 +4,8 @@ namespace app\admin\controller; use app\common\controller\BaseController; use app\common\model\PostCategory; 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; @@ -34,6 +36,22 @@ class PostController extends BaseController $data['media'] = PostMedia::where('post_id', $data['id'])->get(); if (isset($data['category_id'])) $data['category_name'] = PostCategory::where('id', $data['category_id'])->value('name')??''; + + $ossservice = new OssService(); + if (isset($data['id'])){ + $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(); + unset($data['user']['password']); + $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; } @@ -53,6 +71,22 @@ class PostController extends BaseController $data['media'] = PostMedia::where('post_id', $data['id'])->get(); if (isset($data['category_id'])) $data['category_name'] = PostCategory::where('id', $data['category_id'])->value('name')??''; + + $ossservice = new OssService(); + if (isset($data['id'])){ + $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(); + unset($data['user']['password']); + $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; } } \ No newline at end of file