wzq il y a 5 ans
Parent
commit
6d988dd9ed
2 fichiers modifiés avec 22 ajouts et 13 suppressions
  1. 1 4
      app/Repositories/MemberGroupRepository.php
  2. 21 9
      app/Traits/UserTrait.php

+ 1 - 4
app/Repositories/MemberGroupRepository.php

@@ -46,10 +46,7 @@ class MemberGroupRepository {
            if($ids){
                $data = [];
                foreach($ids as $uid){
-                   $user = Redis::HGETALL('userInfo:'.$uid);
-                   if(!$user){
-                       $user = $this->userInfo($uid);
-                   }
+                   $user = $this->userInfo($uid);
                    if($user){
                        $topics = Redis::zrevrange('topic.user_uid' . $user['uid'], 0, 2, 'withscores');
                        $names = [];

+ 21 - 9
app/Traits/UserTrait.php

@@ -29,17 +29,29 @@ 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()]
+        $user = Redis::HGETALL('userInfo:' . $uid);
+        if(!$user){
+            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()]
+                ];
+                $user =  http($url,$array,'get');
+            } catch (\Exception $e) {
+                $user =  [];
+            }
+        }
+        if(!$user){
+            $user = [
+                'uid' => $uid,
+                'username' => '老板',
+                'avatar' => 'http://oss.caihongxingqiu.net/201907/1564471458_5d3ff0a231721.png?280_280',
+                'gender' => 2,
+                'invite_code' => ''
             ];
-            return http($url,$array,'get');
-        } catch (\Exception $e) {
-            return [];
         }
-
+        return $user;
     }
 
     public function getBanner($ids) {