我的收藏

app/common/controller/PostFavoriteController.php

@@ -2,6 +2,9 @@
 namespace app\common\controller;
 
 use app\common\controller\BaseController;
+use app\common\model\Post;
+use app\common\model\User;
+use app\common\service\OssService;
 use app\common\traits\crud\CrudControllerTrait;
 use app\common\service\PostFavoriteService;
 use support\Request;
@@ -23,7 +26,7 @@ class PostFavoriteController extends BaseController
      * @param Request $request 请求对象
      * @return mixed 返回分页数据及总数
      */
-    public function index(Request $request)
+    public function self(Request $request)
     {
         try {
             $raw = $this->service->serviceSelfList($request);
@@ -48,6 +51,24 @@ class PostFavoriteController 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']);
+         if (isset($data['post_id'])){
+             $ossservice = new OssService();
+             $post = Post::where('id', $data['post_id'])->first()->toArray();
+
+             if (isset( $post['user_id'])){
+                 $user = User::where('id', $post['user_id'])->first();
+                 $postUser = [];
+                 $postUser['name'] = $user['name'];
+                 $postUser['nickname'] = $user['nickname'];
+                 $postUser['avatar'] = $user['avatar'];
+                 $postUser['avatar_pull'] = $user['avatar'];
+                 if(!str_contains($postUser['avatar'], 'http') && !empty($postUser['avatar'])){
+                     $postUser['avatar_pull'] = $ossservice->generatePrivateUrl($postUser['avatar']);
+                 }
+                 $post['user'] = $postUser;
+             }
+             $data['post'] = $post;
+         }
          return $data;
      }