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

app/Repositories/PostRepositories.php

@@ -286,6 +286,18 @@ class PostRepositories
                         ->orWhere('content', 'like', "%{$request['keyword']}%");
                 }
             })
+            ->where(function($query) use ($request){
+                if(isset($request['topic_ids'])){
+                    $topicIds = json_decode($request['topic_ids'], true);
+                    foreach ($topicIds as $key=>$id) {
+                        if ($key==0) {
+                            $query->whereRaw('FIND_IN_SET('.$id.', post.topic_ids)');
+                        } else {
+                            $query->orWhereRaw('FIND_IN_SET('.$id.', post.topic_ids)');
+                        }
+                    }
+                }
+            })
             ->orderBy('weight','desc')
             ->paginate($perPage);
     }

routes/api.php

@@ -20,16 +20,29 @@ $api->version('v1', [
     $api->get('getBehaviorByIdentify', 'BehaviorController@getBehaviorByIdentify');
     //登录+验签
     $api->group(['middleware' => ['chxq_jwt_auth']], function ($api) {
+        //发布内容
         $api->post('post', 'PostController@create');
+        //内容列表
         $api->get('post', 'PostController@index');
+        //视频列表
+        $api->get('post/video', 'PostController@video');
+        //内容详情
         $api->get('post/detail', 'PostController@detail');
+        //推荐内容
         $api->get('post/suggest', 'PostController@suggestPost');
+        //评价&回复
         $api->post('post/comment', 'PostController@comment');
+        //评价列表
         $api->get('post/comment', 'PostController@commentList');
+        //回复列表
         $api->get('post/reply', 'PostController@replyList');
+        //话题分类
         $api->get('topicCategory', 'CategoryController@index');
+        //获取话题
         $api->get('topicCategory/getTopics', 'CategoryController@getTopics');
+        //话题内容列表
         $api->get('post/topic', 'PostController@topicPost');
+        //话题详情
         $api->get('topic/detail', 'PostController@topicDetail');
         //关注推荐话题
         $api->post('memberFollowTopic', 'MemberFollowTopic@memberFollowTopic');