Merge branch 'develop'

app/Repositories/FloorRepository.php

@@ -54,11 +54,6 @@ class FloorRepository
     public function info()
     {
         Log::debug('推荐内容楼层-开始请求');
-        $userInfo = $this->getUserInfo();
-        if(!$userInfo){
-            return jsonError('获取用户信息失败');
-        }
-        Log::debug('推荐内容楼层-用户信息'.json_encode($userInfo));
         $floor = $this->floor
             ->where('is_open', 1)
             ->whereIn('floor_type', [0,1,2,3])

app/Repositories/MemberGroupRepository.php

@@ -29,7 +29,7 @@ class MemberGroupRepository {
     public function isSuggestMember($request){
         $userInfo = $this->getUserInfo();
         if (empty($userInfo)) {
-            return jsonError('获取用户信息失败');
+            $userInfo['uid'] = 0;
         }
        $group = $this->memberGroup->where('is_suggest',1)->first();
        $take = 50;
@@ -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 = [];

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) {

routes/api.php

@@ -48,13 +48,14 @@ $api->version('v1', [
     ], function ($api) {
         //获取楼层信息
         $api->get('/floor/info', 'FloorController@info');
+        //热门视频ids
+        $api->get('/floor/hotVideoIds', 'FloorController@hotVideoIds');
+        //获取推荐用户组内容
+        $api->get('memberList', 'MemberGroupController@memberList');
+        
         $api->group(['middleware' => 'chxq_jwt_auth'], function ($api) {
             //楼层列表
             $api->get('/floor/index', 'FloorController@index');
-            //热门视频ids
-            $api->get('/floor/hotVideoIds', 'FloorController@hotVideoIds');
-            //获取推荐用户组内容
-            $api->get('memberList', 'MemberGroupController@memberList');
         });
     });
 });

routes/web.php

@@ -12,7 +12,7 @@
 */
 
 $router->get('/', function () use ($router) {
-    return $router->app->version();
+    return '欢迎来到由你';
 });