关注状态

app/Http/Controllers/V1/PostController.php

@@ -11,7 +11,6 @@ namespace App\Http\Controllers\V1;
 use App\Models\Post;
 use App\Repositories\PostRepositories;
 use App\Traits\CmsTrait;
-use App\Traits\FollowStatusTrait;
 use App\Traits\UserTrait;
 use App\Transformers\Post\CommentTransformer;
 use App\Transformers\Post\DetailTransformer;
@@ -37,7 +36,6 @@ class PostController extends Controller
 {
     use UserTrait;
     use CmsTrait;
-    use FollowStatusTrait;
 
     public function __construct(PostRepositories $postRepositories)
     {
@@ -207,7 +205,7 @@ class PostController extends Controller
                         } elseif ($floor[$key + 1]['show_type'] == 'user') {
                             $userData = [];
                             foreach ($floor[$key + 1]['data'] as $item) {
-                                $userData[] = array_merge($item, ['follow_status' => $this->followStatus($userInfo['uid'], $item['uid'])]);
+                                $userData[] = array_merge($item, ['follow_status' => $this->getFollowStatus($userInfo['uid'], $item['uid'])]);
                             }
                             if ($userData) {
                                 $newData[] = [
@@ -215,21 +213,6 @@ class PostController extends Controller
                                     'data' => $userData,
                                 ];
                             }
-//                            $uidArray = array_column($floor[$key + 1]['data'], 'uid');
-//                            $followMembersStatus = $this->getFollowMembersStatus(implode(',', $uidArray));
-//                            if ($followMembersStatus) {
-//                                $userData = [];
-//                                foreach ($floor[$key + 1]['data'] as $item) {
-//                                    if (!isset($followMembersStatus[$item['uid']])) continue;
-//                                    $userData[] = array_merge($item, ['follow_status' => $followMembersStatus[$item['uid']]['follow_status']]);
-//                                }
-//                                if ($userData) {
-//                                    $newData[] = [
-//                                        'show_type' => 'user',
-//                                        'data' => $userData,
-//                                    ];
-//                                }
-//                            }
                         } elseif ($floor[$key + 1]['show_type'] == 'video') {
                             $newData[] = [
                                 'show_type' => 'video',

app/Traits/FollowStatusTrait.php

@@ -1,27 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: Administrator
- * Date: 2019/7/3
- * Time: 18:05
- */
-namespace App\Traits;
-
-use Illuminate\Support\Facades\Redis;
-
-trait FollowStatusTrait
-{
-
-    //获取关注状态
-    public function followStatus($uid, $followUid)
-    {
-        $status = 0;
-        if(Redis::ZSCORE('follow:'.$uid, $followUid)){
-            $status = 1;
-            if(Redis::ZSCORE('follow:'.$followUid, $uid)){
-                $status = 2;
-            }
-        }
-        return $status;
-    }
-}

app/Traits/UserTrait.php

@@ -8,6 +8,7 @@
  */
 namespace App\Traits;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Redis;
 use Tymon\JWTAuth\Facades\JWTAuth;
 
 trait UserTrait
@@ -26,20 +27,17 @@ trait UserTrait
         }
 
     }
-    //检查关注状态
-    public function getFollowStatus($uid, $followUid) {
-        try {
-            $sign = generateSign(['uid' => $followUid, 'follow_uid' => $uid], config('customer.app_secret'));
-            $url = config("customer.app_service_url").'/user/v2/follow/checkStatus';
-            //$url = 'http://localhost:8080/v2/follow/checkStatus';
-            $array = [
-                'json' => ['sign' => $sign, 'uid' => $followUid, 'follow_uid' => $uid], 'query' => [], 'http_errors' => false,'headers'=>['Authorization'=>"Bearer ".JWTAuth::getToken()]
-            ];
-            return http($url,$array,'get');
-        } catch (\Exception $e) {
-            return [];
+    //获取关注状态
+    public function getFollowStatus($uid, $followUid)
+    {
+        $status = 0;
+        if(Redis::ZSCORE('follow:'.$uid, $followUid)){
+            $status = 1;
+            if(Redis::ZSCORE('follow:'.$followUid, $uid)){
+                $status = 2;
+            }
         }
-
+        return $status;
     }
     //检查关注状态 多个uid
     public function getFollowMembersStatus($uids) {

app/Transformers/Post/SuggestTransformer.php

@@ -13,15 +13,13 @@ use App\Models\PostCollect;
 use App\Models\PostComment;
 use App\Models\PostDislike;
 use App\Models\PostLike;
-use App\Traits\FollowStatusTrait;
 use App\Traits\UserTrait;
 use Carbon\Carbon;
 use League\Fractal\TransformerAbstract;
 
 class SuggestTransformer extends TransformerAbstract
 {
-//    use UserTrait;
-    use FollowStatusTrait;
+    use UserTrait;
     public function __construct($uid, $invite_code)
     {
         $this->uid = $uid;
@@ -49,11 +47,6 @@ class SuggestTransformer extends TransformerAbstract
                 'name' => $val
             ];
         }
-//        $isFollow = 0;
-//        $followStatus = $this->getFollowStatus($this->uid, $post['uid']);
-//        if($followStatus){
-//            $isFollow = $followStatus;
-//        }
         return [
             'show_type' => 'post',
             'id' => $post['id'],
@@ -78,7 +71,7 @@ class SuggestTransformer extends TransformerAbstract
             'is_dislike' => PostDislike::where('post_id', $post['id'])->where('uid', $this->uid)->exists()?1:0,
             'is_collect' => PostCollect::where('post_id', $post['id'])->where('uid', $this->uid)->exists()?1:0,
             'comment' => $comment,
-            'is_follow' => $this->followStatus($this->uid, $post['uid']),
+            'is_follow' => $this->getFollowStatus($this->uid, $post['uid']),
             'h5url' => config('customer.share_post_h5url')."?post_id={$post['id']}&invite_code={$this->invite_code}",
             'desc_url' => $post['type'] == 'html'?config('customer.app_service_url').'/community/fragment/detail/'.$post['id']:'',
         ];