wzq 5 年之前
父节点
当前提交
46d0085c9d
共有 2 个文件被更改,包括 28 次插入6 次删除
  1. 12 6
      app/Repositories/FeedRepositories.php
  2. 16 0
      app/Traits/UserTrait.php

+ 12 - 6
app/Repositories/FeedRepositories.php

@@ -14,6 +14,7 @@ use App\Models\Feed;
 use App\Models\PostComment;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Log;
+use Illuminate\Support\Facades\Redis;
 use Tymon\JWTAuth\Facades\JWTAuth;
 use App\Models\PostDislike;
 use App\Models\PostLike;
@@ -131,12 +132,17 @@ class FeedRepositories
                 }
                 if($value['type'] == 5){
                     $value['content'] = null;
-                    $relate_data = $this->getFollowMemberFans($value['relate_id']);
-                    if($relate_data){
-                        if(!empty($relate_data['username'])){
-                            $relate_data['username'] = subtext($relate_data['username'],10);
-                        }
-                        $value['relate_data'] = $relate_data;
+                    $user = Redis::HGETALL('userInfo:'.$value['relate_id']);
+                    if(!$user){
+                        $user = $this->userInfo($value['relate_id']);
+                    }
+                    if($user){
+                        $value['relate_data'] = [
+                            'uid' => $user['uid'],
+                            'username' => subtext($user['username'],10),
+                            'avatar' => $user['avatar'],
+                            'follow_status' => $this->getFollowStatus($userInfo['uid'],$value['relate_id']),
+                        ];
                     }else{
                         unset($data[$key]);
                     }

+ 16 - 0
app/Traits/UserTrait.php

@@ -27,6 +27,22 @@ trait UserTrait
         }
 
     }
+
+    //获取用户信息
+    public function userInfo($uid) {
+        try {
+            $sign = generateSign(['uid' => $uid], config('customer.app_secret'));
+            $url = config("customer.app_service_url").'/user/getUserInfo';
+            $array = [
+                'json' => ['sign' => $sign,'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)
     {