Merge branch 'develop' of http://git.caihongxingqiu.net/rainbow/community-service into develop

app/Http/Controllers/V1/CategoryController.php

@@ -24,7 +24,7 @@ class CategoryController extends Controller {
     //列表
     public function index(Request $request) {
         $categoryList = $this->categoryRepository->lists($request->all());
-        return $this->jsonSuccess($categoryList);
+        return jsonSuccess($categoryList);
     }
     //获取多个话题
     public function getTopics(Request $request){
@@ -36,6 +36,6 @@ class CategoryController extends Controller {
             return jsonError($validator->errors()->first());
         }
         $categoryList = $this->categoryRepository->getTopics($data['ids']);
-        return $this->jsonSuccess($categoryList);
+        return jsonSuccess($categoryList);
     }
 }

app/Http/Controllers/V1/PostChareController.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019-06-18
+ * Time: 17:18
+ */
+
+namespace App\Http\Controllers\V1;
+
+
+class PostChareController extends Controller {
+
+}

app/Http/Controllers/V1/PostCollectController.php

@@ -0,0 +1,30 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019-06-18
+ * Time: 17:17
+ */
+
+namespace App\Http\Controllers\V1;
+
+
+use App\Repositories\PostCollectRepository;
+use Illuminate\Http\Request;
+class PostCollectController extends Controller {
+
+    public function __construct(PostCollectRepository $postCollectRepository) {
+        $this->postCollectRepository = $postCollectRepository;
+    }
+
+    public function index(Request $request)
+    {
+        $list = $this->postCollectRepository->lists($request->all());
+//        $fractal = new Manager();
+//        $resource = new Collection($list, new ListTransformer($userInfo['uid']));
+//        $resource->setPaginator(new IlluminatePaginatorAdapter($list));
+//        $data = $fractal->createData($resource)->toArray();
+
+        return jsonSuccess($list);
+    }
+}

app/Models/PostShare.php

@@ -2,15 +2,17 @@
 /**
  * Created by PhpStorm.
  * User: Administrator
- * Date: 2019/6/15
- * Time: 13:35
+<<<<<<< HEAD
+ * Date: 2019-06-18
+ * Time: 17:14
  */
+
 namespace App\Models;
+
+
 use Illuminate\Database\Eloquent\Model;
 
-class PostShare extends Model
-{
-//
+class PostShare extends Model {
     protected $table = 'post_share';
     protected $guarded = [];
 }

app/Repositories/PostCollectRepository.php

@@ -0,0 +1,31 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019-06-18
+ * Time: 17:19
+ */
+
+namespace App\Repositories;
+namespace App\Repositories;
+
+use App\Models\PostCollect;
+use Tymon\JWTAuth\JWTAuth;
+
+class PostCollectRepository {
+    public function __construct(PostCollect $postCollect) {
+        $this->postCollect = $postCollect;
+    }
+    //列表
+    public function lists($request){
+        $token =  JWTAuth::decode(JWTAuth::getToken());
+        $uid = $token['user']->uid;
+        $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
+
+        return $this->postCollect
+            ->join('post', 'post.id', '=', 'post_collect.post_id')
+            ->select('post_collect.id','post_collect.uid','post.*')
+            ->where(['post.uid'=>$uid])
+            ->paginate($perPage);
+    }
+}

app/Repositories/PostShareRepository.php

@@ -0,0 +1,14 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: Administrator
+ * Date: 2019-06-18
+ * Time: 17:20
+ */
+
+namespace App\Repositories;
+
+
+class PostShareRepository {
+
+}

app/Transformers/Topic/TopicDetailTransformer.php

@@ -23,7 +23,7 @@ class TopicDetailTransformer extends TransformerAbstract
             'id' => $topic['id'],
             'name' => $topic['name'],
             'img' => $topic['img'],
-            'follow_count' => $topic->follow->count(),
+            'follow_count' => $topic->follow->count() + 9876,
             'is_follow' => $topic->follow->where('uid', $this->uid)->count()?1:0,
         ];
     }

routes/api.php

@@ -56,6 +56,8 @@ $api->version('v1', [
         $api->delete('memberFollowTopic/cancel', 'MemberFollowTopic@cancelFollowTopic');
         //关注话题列表
         $api->get('memberFollowTopic', 'MemberFollowTopic@index');
+        //列表
+        $api->get('postCollect', 'PostCollectController@index');
     });
 
 });