Merge branch 'master' into release

app/Http/Controllers/V1/PostController.php

@@ -191,7 +191,7 @@ class PostController extends Controller
         }
 
         $param = $request->all();
-        $list = $this->postRepositories->suggestPost($param);
+        $list = $this->postRepositories->suggestPost($param,$uid);
         $fractal = new Manager();
         $resource = new Collection($list, new SuggestTransformer($uid, $inviteCode));
         $resource->setPaginator(new IlluminatePaginatorAdapter($list));

app/Repositories/FeedRepositories.php

@@ -81,7 +81,7 @@ class FeedRepositories
             $data = [];
             foreach ($fans as $fan) {
                 // 不记录自己的其他行为到自己的关注列表，除了发布
-                if($fan ==$request['target_id'] && $feedType != 6){
+                if ($fan == $request['target_id'] && $feedType != 6) {
                     continue;
                 }
                 $number = substr($fan, -1);
@@ -118,20 +118,20 @@ class FeedRepositories
                 Log::debug('创建Feed流-data:' . json_encode($data));
                 //目前只有评论可以重复出现在别人的feed流中，其他类型如果出现过一次不再产生新的feed信息
                 if (in_array($feedType, [4])) {
-                    DB::table('feed_'.$number)->insert($data);
+                    DB::table('feed_' . $number)->insert($data);
                 } else {
                     //此处需要优化，如果feed表需要清理历史数据怎么处理
                     //以下判断可以控制virus的行为，重复不添加feed，但是关注用户不行，关注用户不存在is_existing字段
                     //if (isset($request['is_existing']) && intval($request['is_existing']) == 0) {
                     //    DB::table('feed_'.$number)->insert($data);
                     //}
-                    $feedRow = DB::table('feed_'.$number)->where('uid',$data['uid'])
-                        ->where('follow_uid',$data['follow_uid'])
-                        ->where('type',$data['type'])
-                        ->where('relate_id',$data['relate_id'])
+                    $feedRow = DB::table('feed_' . $number)->where('uid', $data['uid'])
+                        ->where('follow_uid', $data['follow_uid'])
+                        ->where('type', $data['type'])
+                        ->where('relate_id', $data['relate_id'])
                         ->first();
-                    if(empty($feedRow)){
-                        DB::table('feed_'.$number)->insert($data);
+                    if (empty($feedRow)) {
+                        DB::table('feed_' . $number)->insert($data);
                     }
                 }
 
@@ -146,17 +146,23 @@ class FeedRepositories
         $userInfo = $this->getUserInfo();
         if (empty($userInfo)) {
             $userInfo['uid'] = 0;
+            $blacklist = [];
+        } else {
+            $blacklist = Redis::smembers('blacklist_' . $userInfo['uid']);
         }
         $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
         $where[] = ['uid', $userInfo['uid']];
         $number = substr($userInfo['uid'], -1);
-        $table_name = 'feed_'.$number;
+        $table_name = 'feed_' . $number;
         $feedModel = new Feed();
         $feedModel->setTable($table_name);
 
-        $data = $feedModel
-            ->where($where)
-            ->whereIn('type',[4,5,6])//目前只展示发布，评论 关注
+        $data = $feedModel->where(function ($query) use ($blacklist) {
+            if ($blacklist) {
+                $query->whereNotIn('follow_uid', $blacklist);
+            }
+        })->where($where)
+            ->whereIn('type', [4, 5, 6])//目前只展示发布，评论 关注
             ->orderBy('id', 'desc')
             ->paginate($perPage);
         if ($data) {
@@ -201,10 +207,10 @@ class FeedRepositories
         }
         $user = $this->userInfo($postInfo['uid']);
         return [
-            'id' => (int) $postInfo['id'],
+            'id' => (int)$postInfo['id'],
             'type' => $postInfo['type'],
             'created_at' => Carbon::parse($postInfo['created_at'])->diffForHumans(),
-            'uid' => (int) $postInfo['uid'],
+            'uid' => (int)$postInfo['uid'],
             'username' => $user['username'],
             'avatar' => $user['avatar'],
             'topic' => $this->getTopic($postInfo['topic_ids']),
@@ -220,9 +226,9 @@ class FeedRepositories
             'available_bean' => $postInfo['available_bean'],
             'will_collect_bean' => $postInfo['will_collect_bean'],
             'post_comment' => $this->getNewComment($postInfo['id']),
-            'is_like' => Redis::SISMEMBER('post_like_'.$postInfo['id'], $uid),
-            'is_dislike' => Redis::SISMEMBER('post_unlike_'.$postInfo['id'], $uid),
-            'is_collect' => Redis::SISMEMBER('post_collect_'.$postInfo['id'], $uid),
+            'is_like' => Redis::SISMEMBER('post_like_' . $postInfo['id'], $uid),
+            'is_dislike' => Redis::SISMEMBER('post_unlike_' . $postInfo['id'], $uid),
+            'is_collect' => Redis::SISMEMBER('post_collect_' . $postInfo['id'], $uid),
             'follow_status' => $isFollow,
             'h5url' => config('customer.share_post_h5url') . "?post_id={$postInfo['id']}&invite_code={$userInfo['invite_code']}",
             'desc_url' => $postInfo['type'] == 'html' ? config('customer.app_service_url') . '/community/fragment/detail/' . $postInfo['id'] : '',
@@ -237,7 +243,7 @@ class FeedRepositories
     {
         $number = substr($data['uid'], -1);
         try {
-            DB::table('feed_'.$number)->where('uid', $data['uid'])->where('follow_uid', $data['follow_uid'])->delete();
+            DB::table('feed_' . $number)->where('uid', $data['uid'])->where('follow_uid', $data['follow_uid'])->delete();
             Log::debug("取消关注删除对应feed成功uid{$data['uid']}followUid{$data['follow_uid']}");
         } catch (\Exception $exception) {
             Log::error('取消关注删除对应feed失败' . json_encode($data) . $exception->getMessage());

app/Repositories/PostRepositories.php

@@ -39,6 +39,7 @@ class PostRepositories
     use UserTrait;
     use PostTrait;
     use CmsTrait;
+
     public function __construct(Post $post,
                                 PostData $postData,
                                 PostImgs $postImgs,
@@ -74,64 +75,65 @@ class PostRepositories
         if (empty($userInfo)) {
             return jsonError('获取用户信息失败');
         }
-        if(!$userInfo['sns_status']){
+        if (!$userInfo['sns_status']) {
             return jsonError('您已被禁言');
         }
         $isValid = 0;
-        if($userInfo['strength']){
+        if ($userInfo['strength']) {
             $isValid = 1;
         }
         $oneHourTime = Carbon::now()->addHours(-1)->toDateTimeString();
         $oneHourPostCount = $this->post->where('uid', $userInfo['uid'])->where('created_at', '>', $oneHourTime)->count();
-        if($oneHourPostCount > 5){
+        if ($oneHourPostCount > 5) {
             return jsonError('创作欲望太强啦，休息一下，看看其他用户的内容吧！');
         }
 
-        $detectionText = $request['title'] .'，'. $request['content'];
+        $detectionText = $request['title'] . '，' . $request['content'];
         $detectionTextResult = $this->detectionService->checkText($detectionText);
-        if ($detectionTextResult['code']<0) {
+        if ($detectionTextResult['code'] < 0) {
             return jsonError('内容违规，请修正哦');
         }
 
         $topicIds = json_decode($request['topic_ids'], true);
         $topicCount = count($topicIds);
-        if($topicCount == 0 || $topicCount > 5){
+        if ($topicCount == 0 || $topicCount > 5) {
             return jsonError('所选话题必须1-5个');
         }
         //验证话题
         $hasTopicCount = $this->topic->whereIn('id', $topicIds)->count();
-        if($topicCount != $hasTopicCount){
-            Log::error('所选话题非法'.$request['topic_ids']);
+        if ($topicCount != $hasTopicCount) {
+            Log::error('所选话题非法' . $request['topic_ids']);
             return jsonError('所选话题非法');
         }
         $imgs = [];
-        if($request['type'] == 'image'){
+        if ($request['type'] == 'image') {
             $imgs = json_decode($request['imgs'], true);
             $imgCount = count($imgs);
-            if($imgCount == 0 || $imgCount > 9){
+            if ($imgCount == 0 || $imgCount > 9) {
                 return jsonError('所传图集必须1-9个');
             }
         }
         $allImg = array_merge($imgs, [$request['img']]);
-        foreach($allImg as &$img){
-            $img = $img .'&x-oss-process=image/resize,p_50/quality,Q_50';
+        foreach ($allImg as &$img) {
+            $img = $img . '&x-oss-process=image/resize,p_50/quality,Q_50';
         }
         $detectionImageResult = $this->detectionService->checkImg($allImg);
-        if ($detectionImageResult['code']<0) {
+        if ($detectionImageResult['code'] < 0) {
+            Log::debug('图片违规，请修正哦' . json_encode($detectionImageResult));
             return jsonError('图片违规，请修正哦');
         }
         $videoUrl = "";
         $videoId = "";
-        if(isset($request['video']) && $request['video']){
+        if (isset($request['video']) && $request['video']) {
             $videoId = $request['video'];
-            for($i=0;$i<3;$i++){
+            for ($i = 0; $i < 3; $i++) {
                 $videoUrl = $this->aliYunVodService->getPlayUrlByVideoId($request['video']);
-                Log::debug('video-url:'.$videoUrl);
-                if($videoUrl){
+                Log::debug('video-url:' . $videoUrl);
+                if ($videoUrl) {
                     break;
                 }
             }
-            if(empty($videoUrl)){
+            if (empty($videoUrl)) {
                 return jsonError('发布失败,请重试');
             }
         }
@@ -142,15 +144,15 @@ class PostRepositories
             'uid' => $userInfo['uid'],
             'username' => $userInfo['username'],
             'mobile' => $userInfo['mobile'],
-            'avatar' => $userInfo['avatar']??'',
+            'avatar' => $userInfo['avatar'] ?? '',
             'type' => $request['type'],
             'img' => $request['img'],
             'video' => $videoUrl,
             'video_id' => $videoId,
             'topic_ids' => implode(',', $topicIds),
-            'title' => isset($request['title'])? $request['title'] : '',
+            'title' => isset($request['title']) ? $request['title'] : '',
             'content' => $request['content'],
-            'location' => isset($request['location'])? $request['location'] : '',
+            'location' => isset($request['location']) ? $request['location'] : '',
             'is_suggest' => 0,
             'is_hide' => 0,
             'weight' => $score
@@ -159,7 +161,7 @@ class PostRepositories
         $date = date('Y-m-d H:i:s');
 
         DB::beginTransaction();
-        try{
+        try {
             $post = $this->post->create($data);
 
             $postData = $this->postData->create([
@@ -179,9 +181,9 @@ class PostRepositories
                 'collect_bean' => 0
             ]);
 
-            if($imgs){
+            if ($imgs) {
                 $imgData = [];
-                foreach($imgs as $img){
+                foreach ($imgs as $img) {
                     $imgData[] = [
                         'post_id' => $post->id,
                         'img' => $img,
@@ -194,11 +196,11 @@ class PostRepositories
 
             DB::commit();
             Redis::zadd('post_trigger_type', $isValid, $post->id);
-            foreach($topicIds as $id){
-                Redis::zincrby('topic.user_uid'.$userInfo['uid'], 1, $id);
+            foreach ($topicIds as $id) {
+                Redis::zincrby('topic.user_uid' . $userInfo['uid'], 1, $id);
                 Redis::zincrby('topic.just_use_count', 1, $id);
             }
-            Redis::HSET('post_info_'.$post->id,
+            Redis::HSET('post_info_' . $post->id,
                 'id', $post->id,
                 'uid', $post->uid,
                 'type', $post->type,
@@ -220,16 +222,16 @@ class PostRepositories
                 'create_bean', $postData->create_bean,
                 'collect_bean', $postData->collect_bean,
                 'created_at', $post->created_at);
-            Log::info('post_create:'.$post->id.',post_author:'.$post->uid.',author_ip:'.getClientIp());
+            Log::info('post_create:' . $post->id . ',post_author:' . $post->uid . ',author_ip:' . getClientIp());
             return jsonSuccess([
                 'post_id' => $post->id,
-                'h5url' => config('customer.share_post_h5url')."?post_id={$post->id}&invite_code={$userInfo['invite_code']}",
+                'h5url' => config('customer.share_post_h5url') . "?post_id={$post->id}&invite_code={$userInfo['invite_code']}",
                 'bean' => $postData->available_bean,
             ]);
 
-        }catch (QueryException $exception){
+        } catch (QueryException $exception) {
             DB::rollBack();
-            Log::debug('发布内容失败：'.$exception->getMessage());
+            Log::debug('发布内容失败：' . $exception->getMessage());
             return jsonError('发布内容失败，请重试');
         }
     }
@@ -245,23 +247,23 @@ class PostRepositories
             return jsonError('获取用户信息失败');
         }
 
-        if(!$userInfo['sns_status']){
+        if (!$userInfo['sns_status']) {
             return jsonError('您已被禁言');
         }
 
         $oneHourTime = Carbon::now()->addHours(-1)->toDateTimeString();
         $oneHourCommentCount = $this->postComment->where('uid', $userInfo['uid'])->where('created_at', '>', $oneHourTime)->count();
-        if($oneHourCommentCount > 59){
+        if ($oneHourCommentCount > 59) {
             return jsonError('回复了这么多，休息休息，喝口水吧！');
         }
 
         $detectionTextResult = $this->detectionService->checkText($request['content']);
-        if ($detectionTextResult['code']<0) {
+        if ($detectionTextResult['code'] < 0) {
             return jsonError('内容违规，请修正哦');
         }
 
         $post = $this->post->find($request['post_id']);
-        if(!$post){
+        if (!$post) {
             return jsonError('获取内容信息失败');
         }
         $data = [
@@ -271,51 +273,51 @@ class PostRepositories
             'username' => $userInfo['username'],
             'reply_uid' => 0,
             'reply_username' => '',
-            'avatar' => $userInfo['avatar']??'',
+            'avatar' => $userInfo['avatar'] ?? '',
             'content' => $request['content'],
             'is_delete' => 0,
         ];
-        if(isset($request['parent_id']) && $request['parent_id'] != 0){
+        if (isset($request['parent_id']) && $request['parent_id'] != 0) {
             $comment = $this->postComment->find($request['parent_id']);
-            if(!$comment || $comment->post_id != $post->id){
+            if (!$comment || $comment->post_id != $post->id) {
                 return jsonError('获取评论信息失败');
             }
-            if($comment->parent_id){
+            if ($comment->parent_id) {
                 return jsonError('只能回复评论');
             }
-            if($comment->is_delete){
+            if ($comment->is_delete) {
                 return jsonError('不能回复已删除评论');
             }
             $data['parent_id'] = $request['parent_id'];
 
-            if(isset($request['reply_uid']) && isset($request['reply_username'])){
+            if (isset($request['reply_uid']) && isset($request['reply_username'])) {
                 $data['reply_uid'] = $request['reply_uid'];
                 $data['reply_username'] = $request['reply_username'];
-            }else{
+            } else {
                 $data['reply_uid'] = 0;
                 $data['reply_username'] = '';
             }
         }
 
         DB::beginTransaction();
-        try{
+        try {
             $newComment = $this->postComment->create($data);
 
-            if($newComment->parent_id){
+            if ($newComment->parent_id) {
                 $this->postComment->where('id', $newComment->parent_id)->increment('reply_count');
             }
 
             DB::commit();
-            if($newComment->parent_id){
-                Redis::DEL('post_new_reply_'.$newComment->parent_id);
-            }else{
-                Redis::DEL('post_new_comment_'.$newComment->post_id);
+            if ($newComment->parent_id) {
+                Redis::DEL('post_new_reply_' . $newComment->parent_id);
+            } else {
+                Redis::DEL('post_new_comment_' . $newComment->post_id);
             }
             return jsonSuccess(['id' => $newComment->id], '评论成功');
 
-        }catch (QueryException $exception){
+        } catch (QueryException $exception) {
             DB::rollBack();
-            Log::debug('评论内容失败：'.$exception->getMessage());
+            Log::debug('评论内容失败：' . $exception->getMessage());
             return jsonError('评论内容失败，请重试');
         }
     }
@@ -334,7 +336,7 @@ class PostRepositories
             return jsonError('获取评论信息失败');
         }
 
-        if($userInfo['uid'] != $comment->uid){
+        if ($userInfo['uid'] != $comment->uid) {
             return jsonError('只能删除自己的评论');
         }
 
@@ -348,10 +350,10 @@ class PostRepositories
             $comment->save();
 
             DB::commit();
-            if(!$comment->parent_id){
-                Redis::DEL('post_new_comment_'.$comment->post_id);
-            }else{
-                Redis::DEL('post_new_reply_'.$comment->id);
+            if (!$comment->parent_id) {
+                Redis::DEL('post_new_comment_' . $comment->post_id);
+            } else {
+                Redis::DEL('post_new_reply_' . $comment->id);
             }
             Redis::SADD('delete_post_comment_ids', $comment->id);
             return jsonSuccess('删除评论成功');
@@ -368,30 +370,30 @@ class PostRepositories
      */
     public function lists($request)
     {
-        Log::debug('内容列表'.json_encode($request));
+        Log::debug('内容列表' . json_encode($request));
         $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
 
         return $this->post
-            ->where(function($query) use ($request){
-                if(isset($request['keyword'])){
+            ->where(function ($query) use ($request) {
+                if (isset($request['keyword'])) {
                     $query->where('title', 'like', "%{$request['keyword']}%")
                         ->orWhere('content', 'like', "%{$request['keyword']}%");
                 }
             })
-            ->where(function($query) use ($request){
-                if(isset($request['topic_ids']) && $request['topic_ids']){
+            ->where(function ($query) use ($request) {
+                if (isset($request['topic_ids']) && $request['topic_ids']) {
                     $topicIds = json_decode($request['topic_ids'], true);
-                    foreach ($topicIds as $key=>$id) {
-                        if ($key==0) {
-                            $query = $query->whereRaw('FIND_IN_SET('.$id.', topic_ids)');
+                    foreach ($topicIds as $key => $id) {
+                        if ($key == 0) {
+                            $query = $query->whereRaw('FIND_IN_SET(' . $id . ', topic_ids)');
                         } else {
-                            $query = $query->orWhereRaw('FIND_IN_SET('.$id.', topic_ids)');
+                            $query = $query->orWhereRaw('FIND_IN_SET(' . $id . ', topic_ids)');
                         }
                     }
                 }
             })
-            ->orderBy('weight','desc')
-            ->orderBy('id','desc')
+            ->orderBy('weight', 'desc')
+            ->orderBy('id', 'desc')
             ->paginate($perPage);
     }
 
@@ -404,20 +406,20 @@ class PostRepositories
 
         $where = [];
         $id = 0;
-        if(isset($request['id'])){
+        if (isset($request['id'])) {
             $id = $request['id'];
         }
         $where[] = ['type', 'video'];
-        if(isset($request['type']) && $request['type']){
-            if($request['type'] == 'hot'){
+        if (isset($request['type']) && $request['type']) {
+            if ($request['type'] == 'hot') {
                 $ids = Redis::get('hotVideoIds');
-                if(!$ids){
+                if (!$ids) {
                     $ids = $this->hotVideoIds();
-                    if(!$ids){
+                    if (!$ids) {
                         $ids = '';
                     }
                 }
-                Log::debug('热门视频ids'.$ids);
+                Log::debug('热门视频ids' . $ids);
                 return $this->post
                     ->select('*', DB::raw("IF (id = {$id},1,0) as sort"))
                     ->where($where)
@@ -425,7 +427,7 @@ class PostRepositories
                     ->orderBy('sort', 'desc')
                     ->orderByRaw(DB::raw("FIELD(id,{$ids})"))
                     ->paginate($perPage);
-            }elseif($request['type'] == 'one'){
+            } elseif ($request['type'] == 'one') {
                 $where[] = ['id', $id];
                 return $this->post
                     ->where($where)
@@ -436,14 +438,14 @@ class PostRepositories
         return $this->post
             ->select('*', DB::raw("IF (id = {$id},1,0) as sort"))
             ->where($where)
-            ->where(function($query) use ($request){
-                if(isset($request['topic_id']) && $request['topic_id']){
-                    $query->whereRaw('FIND_IN_SET('.$request['topic_id'].', topic_ids)');
+            ->where(function ($query) use ($request) {
+                if (isset($request['topic_id']) && $request['topic_id']) {
+                    $query->whereRaw('FIND_IN_SET(' . $request['topic_id'] . ', topic_ids)');
                 }
             })
             ->orderBy('sort', 'desc')
-            ->orderBy('weight','desc')
-            ->orderBy('id','desc')
+            ->orderBy('weight', 'desc')
+            ->orderBy('id', 'desc')
             ->paginate($perPage);
     }
 
@@ -456,15 +458,15 @@ class PostRepositories
         $perPage = isset($request['per_page']) ? $request['per_page'] : 18;
 
         $where = [];
-        if($type == 'create'){
+        if ($type == 'create') {
             $where[] = ['post.uid', $uid];
             $post = $this->post;
             $order = 'post.id';
-        }elseif($type == 'collect'){
+        } elseif ($type == 'collect') {
             $post = $this->post->withTrashed()->join('post_collect', 'post_collect.post_id', '=', 'post.id');
             $where[] = ['post_collect.uid', $uid];
             $order = 'post_collect.id';
-        }else{
+        } else {
             $post = $this->post->withTrashed()->join('post_share', 'post_share.post_id', '=', 'post.id');
             $where[] = ['post_share.uid', $uid];
             $order = 'post_share.updated_at';
@@ -472,7 +474,7 @@ class PostRepositories
         return $post
             ->select('post.*')
             ->where($where)
-            ->orderBy($order,'desc')
+            ->orderBy($order, 'desc')
             ->paginate($perPage);
     }
 
@@ -496,15 +498,24 @@ class PostRepositories
     /**
      * 推荐内容列表
      */
-    public function suggestPost($request)
+    public function suggestPost($request, $uid)
     {
         $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
+        if ($uid) {
+            $blacklist = Redis::smembers('blacklist_' . $uid);
+        } else {
+            $blacklist = [];
+        }
 
-        return $this->post
+        return $this->post->where(function ($query) use ($blacklist) {
+            if ($blacklist) {
+                $query->whereNotIn('uid', $blacklist);
+            }
+        })
             ->where('is_hide', 0)
-            ->orderBy('is_suggest','desc')
-            ->orderBy('weight','desc')
-            ->orderBy('id','desc')
+            ->orderBy('is_suggest', 'desc')
+            ->orderBy('weight', 'desc')
+            ->orderBy('id', 'desc')
             ->paginate($perPage);
     }
 
@@ -517,7 +528,7 @@ class PostRepositories
 
         return $this->post
             ->whereRaw('FIND_IN_SET(' . $request['id'] . ',topic_ids)')
-            ->orderBy('id','desc')
+            ->orderBy('id', 'desc')
             ->paginate($perPage);
     }
 
@@ -532,7 +543,7 @@ class PostRepositories
         return $this->postComment
             ->where('post_id', $request['post_id'])
             ->where('parent_id', 0)
-            ->orderBy('id','desc')
+            ->orderBy('id', 'desc')
             ->paginate($perPage);
     }
 
@@ -545,7 +556,7 @@ class PostRepositories
 
         return $this->postComment
             ->where('parent_id', $request['id'])
-            ->orderBy('id','desc')
+            ->orderBy('id', 'desc')
             ->paginate($perPage);
     }
 
@@ -558,26 +569,26 @@ class PostRepositories
 
         $where = [];
         $topic = $this->topic;
-        if(isset($request['name'])){
+        if (isset($request['name'])) {
             $where[] = ['topic.name', 'like', "%{$request['name']}%"];
         }
 
-        if(isset($request['category_id']) && $request['category_id']){
-            if($request['category_id'] == -2){
+        if (isset($request['category_id']) && $request['category_id']) {
+            if ($request['category_id'] == -2) {
                 $where[] = ['topic.is_hot', 1];
-            }else{
-                $topic = $topic->join('category_topic', 'category_topic.topic_id', '=', 'topic.id')->select('topic.*','category_topic.id as cid');
+            } else {
+                $topic = $topic->join('category_topic', 'category_topic.topic_id', '=', 'topic.id')->select('topic.*', 'category_topic.id as cid');
                 $where[] = ['category_topic.category_id', $request['category_id']];
                 return $topic
                     ->where($where)
-                    ->orderBy('cid','asc')
+                    ->orderBy('cid', 'asc')
                     ->paginate($perPage);
             }
         }
 
         return $topic
             ->where($where)
-            ->orderBy('id','desc')
+            ->orderBy('id', 'desc')
             ->paginate($perPage);
     }
 
@@ -589,13 +600,13 @@ class PostRepositories
         $perPage = isset($request['per_page']) ? $request['per_page'] : 20;
         $uid = 0;
         $user = $this->getUserInfo();
-        if($user){
+        if ($user) {
             $uid = $user['uid'];
         }
 
         return $this->memberFollowTopic
             ->where('uid', $uid)
-            ->orderBy('id','desc')
+            ->orderBy('id', 'desc')
             ->paginate($perPage);
     }
 
@@ -607,86 +618,86 @@ class PostRepositories
      */
     public function updatePostData($request)
     {
-        $postId = isset($request['post_id'])?$request['post_id']:0;
-        if(empty($postId)){
-            Log::debug("非帖子类操作，不操作帖子统计数量".json_encode($request));
+        $postId = isset($request['post_id']) ? $request['post_id'] : 0;
+        if (empty($postId)) {
+            Log::debug("非帖子类操作，不操作帖子统计数量" . json_encode($request));
             return true;
         }
         //帖子缓存信息key
-        $postInfoKey = "post_info_".$postId;
+        $postInfoKey = "post_info_" . $postId;
         $post = PostData::where('post_id', $postId)->first();
-        if(!$post) return true;
+        if (!$post) return true;
         if (isset($request['behavior_flag']) && $request['behavior_flag'] == 'read') {
             $post->pv += 1;
             $post->pv_real += 1;
-            Redis::HINCRBY($postInfoKey,'pv',1);
-            $topicIdStr = Redis::HGET($postInfoKey,'topic_ids');
-            if($topicIdStr){
-                Log::debug('话题增加浏览量'.$topicIdStr);
+            Redis::HINCRBY($postInfoKey, 'pv', 1);
+            $topicIdStr = Redis::HGET($postInfoKey, 'topic_ids');
+            if ($topicIdStr) {
+                Log::debug('话题增加浏览量' . $topicIdStr);
                 $topicIds = explode(',', $topicIdStr);
-                foreach($topicIds as $id){
+                foreach ($topicIds as $id) {
                     $this->topic->where('id', $id)->increment('pv');
                 }
             }
-            Log::debug("帖子：".$postId."被阅读，pv +1");
+            Log::debug("帖子：" . $postId . "被阅读，pv +1");
         } elseif (isset($request['behavior_flag']) && $request['behavior_flag'] == 'unlike') {
             //用户不喜欢帖子key
-            $postUnLikeKey = "post_unlike_".$postId;
+            $postUnLikeKey = "post_unlike_" . $postId;
             $post->dislike_count += 1;
-            PostDislike::create(['uid'=>$request['target_id'],'post_id'=>$request['post_id']]);
-            Redis::sadd($postUnLikeKey,$request['target_id']);
-            Redis::HINCRBY($postInfoKey,'dislike_count',1);
-            Log::debug("帖子：".$postId."被不喜欢，unlike +1");
+            PostDislike::create(['uid' => $request['target_id'], 'post_id' => $request['post_id']]);
+            Redis::sadd($postUnLikeKey, $request['target_id']);
+            Redis::HINCRBY($postInfoKey, 'dislike_count', 1);
+            Log::debug("帖子：" . $postId . "被不喜欢，unlike +1");
         } elseif (isset($request['behavior_flag']) && $request['behavior_flag'] == 'like') {
             //用户点赞帖子
-            $postLikeKey = "post_like_".$postId;
-            if($request['behavior_value']){
+            $postLikeKey = "post_like_" . $postId;
+            if ($request['behavior_value']) {
                 $post->praise_count += 1;
                 $post->praise_real_count += 1;
-                PostLike::create(['uid'=>$request['target_id'],'post_id'=>$request['post_id']]);
-                Redis::sadd($postLikeKey,$request['target_id']);
-                Redis::HINCRBY($postInfoKey,'praise_count',1);
-                Log::debug("帖子：".$postId."被点赞，praise_count +1");
-            }else{
+                PostLike::create(['uid' => $request['target_id'], 'post_id' => $request['post_id']]);
+                Redis::sadd($postLikeKey, $request['target_id']);
+                Redis::HINCRBY($postInfoKey, 'praise_count', 1);
+                Log::debug("帖子：" . $postId . "被点赞，praise_count +1");
+            } else {
                 $post->praise_count -= 1;
                 $post->praise_real_count -= 1;
-                PostLike::where(['uid'=>$request['target_id'],'post_id'=>$request['post_id']])->delete();
-                Redis::srem($postLikeKey,$request['target_id']);
-                Redis::HINCRBY($postInfoKey,'praise_count',-1);
-                Log::debug("帖子：".$postId."被取消点赞，praise_count -1");
+                PostLike::where(['uid' => $request['target_id'], 'post_id' => $request['post_id']])->delete();
+                Redis::srem($postLikeKey, $request['target_id']);
+                Redis::HINCRBY($postInfoKey, 'praise_count', -1);
+                Log::debug("帖子：" . $postId . "被取消点赞，praise_count -1");
             }
         } elseif (isset($request['behavior_flag']) && $request['behavior_flag'] == 'forward') {
             $post->share_count += 1;
             $post->share_real_count += 1;
-            Redis::HINCRBY($postInfoKey,'share_count',1);
-            $shareRow = PostShare::where(['uid'=>$request['target_id'],'post_id'=>$request['post_id']])->first();
-            if($shareRow){
-                PostShare::where(['uid'=>$request['target_id'],'post_id'=>$request['post_id']])->update(['uid'=>$request['target_id'],'post_id'=>$request['post_id']]);
-            }else{
-                PostShare::create(['uid'=>$request['target_id'],'post_id'=>$request['post_id']]);
+            Redis::HINCRBY($postInfoKey, 'share_count', 1);
+            $shareRow = PostShare::where(['uid' => $request['target_id'], 'post_id' => $request['post_id']])->first();
+            if ($shareRow) {
+                PostShare::where(['uid' => $request['target_id'], 'post_id' => $request['post_id']])->update(['uid' => $request['target_id'], 'post_id' => $request['post_id']]);
+            } else {
+                PostShare::create(['uid' => $request['target_id'], 'post_id' => $request['post_id']]);
             }
-            Log::debug("帖子：".$postId."被分享，share_count +1");
+            Log::debug("帖子：" . $postId . "被分享，share_count +1");
         } elseif (isset($request['behavior_flag']) && $request['behavior_flag'] == 'comment') {
             $post->comment_count += 1;
-            Redis::HINCRBY($postInfoKey,'comment_count',1);
-            Log::debug("帖子：".$postId."被评论，comment_count +1");
+            Redis::HINCRBY($postInfoKey, 'comment_count', 1);
+            Log::debug("帖子：" . $postId . "被评论，comment_count +1");
         } elseif (isset($request['behavior_flag']) && $request['behavior_flag'] == 'collect') {
             //用户收藏帖子
-            $postCollectKey = "post_collect_".$postId;
-            if($request['behavior_value']) {
+            $postCollectKey = "post_collect_" . $postId;
+            if ($request['behavior_value']) {
                 $post->collect_count += 1;
                 $post->collect_real_count += 1;
-                PostCollect::create(['uid'=>$request['target_id'],'post_id'=>$request['post_id']]);
-                Redis::sadd($postCollectKey,$request['target_id']);
-                Redis::HINCRBY($postInfoKey,'collect_count',1);
-                Log::debug("帖子：".$postId."被收藏，collect_count +1");
-            }else{
+                PostCollect::create(['uid' => $request['target_id'], 'post_id' => $request['post_id']]);
+                Redis::sadd($postCollectKey, $request['target_id']);
+                Redis::HINCRBY($postInfoKey, 'collect_count', 1);
+                Log::debug("帖子：" . $postId . "被收藏，collect_count +1");
+            } else {
                 $post->collect_count -= 1;
                 $post->collect_real_count -= 1;
-                PostCollect::where(['uid'=>$request['target_id'],'post_id'=>$request['post_id']])->delete();
-                Redis::srem($postCollectKey,$request['target_id']);
-                Redis::HINCRBY($postInfoKey,'collect_count',-1);
-                Log::debug("帖子：".$postId."被取消收藏，collect_count -1");
+                PostCollect::where(['uid' => $request['target_id'], 'post_id' => $request['post_id']])->delete();
+                Redis::srem($postCollectKey, $request['target_id']);
+                Redis::HINCRBY($postInfoKey, 'collect_count', -1);
+                Log::debug("帖子：" . $postId . "被取消收藏，collect_count -1");
             }
         }
         $this->collectPostId($request['post_id']);
@@ -701,8 +712,8 @@ class PostRepositories
     public function collectPostId($id)
     {
         $key = "community_calc_post_score";
-        Redis::sadd($key,$id);
-        Log::debug('存入帖子'.$id.'到权重列表');
+        Redis::sadd($key, $id);
+        Log::debug('存入帖子' . $id . '到权重列表');
     }
 
 
@@ -721,11 +732,11 @@ class PostRepositories
     public function getTopic($ids)
     {
         $topics = $this->topic
-            ->whereIn('id', explode(',',$ids))
+            ->whereIn('id', explode(',', $ids))
             ->orderByRaw(DB::raw("FIELD(id,{$ids})"))
             ->get();
         $data = [];
-        foreach($topics as $topic){
+        foreach ($topics as $topic) {
             $data[] = [
                 'id' => $topic->id,
                 'name' => $topic->name,
@@ -743,22 +754,24 @@ class PostRepositories
     {
         $posts = $this->post
             ->select('id', 'img', 'uid')
-            ->whereIn('id', explode(',',$ids))
+            ->whereIn('id', explode(',', $ids))
             ->where('type', 'video')
             ->get();
-        foreach($posts as &$post){
+        foreach ($posts as &$post) {
             $user = $this->userInfo($post->uid);
             $post->username = $user['username'];
             $post->avatar = $user['avatar'];
         }
         return $posts;
     }
+
     //用户内容数，转发数，收藏数统计
-    public function memberPostStatistics($uid){
-        $postCount = $this->post->where('uid',$uid)->count();
-        $postCollectCount = $this->postCollect->where('uid',$uid)->count();
-        $postShareCount = $this->postShare->where('uid',$uid)->count();
-        $data = ['post_count'=>$postCount,'share_count'=>$postShareCount,'collect_count'=>$postCollectCount];
+    public function memberPostStatistics($uid)
+    {
+        $postCount = $this->post->where('uid', $uid)->count();
+        $postCollectCount = $this->postCollect->where('uid', $uid)->count();
+        $postShareCount = $this->postShare->where('uid', $uid)->count();
+        $data = ['post_count' => $postCount, 'share_count' => $postShareCount, 'collect_count' => $postCollectCount];
         return jsonSuccess($data);
     }
 
@@ -774,10 +787,10 @@ class PostRepositories
         }
 
         $post = $this->post->find($request['id']);
-        if(!$post){
+        if (!$post) {
             return jsonError('获取内容信息失败');
         }
-        if($post->uid != $userInfo['uid']){
+        if ($post->uid != $userInfo['uid']) {
             return jsonError('只能删除自己发布的内容');
         }
         $logData = [
@@ -790,19 +803,19 @@ class PostRepositories
         ];
 
         DB::beginTransaction();
-        try{
+        try {
             $post->delete();
 
             $this->postLog->create($logData);
 
             DB::commit();
             Redis::SADD('delete_post_ids', $request['id']);
-            Log::debug('删除内容失败：'.$request['id']);
+            Log::debug('删除内容失败：' . $request['id']);
             return jsonSuccess('删除内容成功');
 
-        }catch (QueryException $exception){
+        } catch (QueryException $exception) {
             DB::rollBack();
-            Log::debug('删除内容失败：'.$request['id'].$exception->getMessage());
+            Log::debug('删除内容失败：' . $request['id'] . $exception->getMessage());
             return jsonError('删除内容失败，请重试');
         }
     }
@@ -814,7 +827,7 @@ class PostRepositories
     {
         $commentCount = 0;
         $post = $this->post->find($id);
-        if($post){
+        if ($post) {
             $commentCount = $post->data->comment_count;
         }
         return $commentCount;