Kirin 3 jaren geleden
bovenliggende
commit
6ede74a617
2 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 1 1
      app/admin/model/user/User.php
  2. 3 3
      app/http/middleware/AuthTokenMiddleware.php

+ 1 - 1
app/admin/model/user/User.php

@@ -223,7 +223,7 @@ class User extends BaseModel
                         $uids = \app\models\user\User::where('spread_uid', 'in', $uids)->column('uid');
                         $all = array_merge($all, $uids);
                     }
-                    return count($uids);
+                    return count($all);
                 };
                 $item['achievement'] = $achievement($item['uid']);
                 $item['small_achievement'] = $small_achivement($item['uid']);

+ 3 - 3
app/http/middleware/AuthTokenMiddleware.php

@@ -33,9 +33,9 @@ class AuthTokenMiddleware implements MiddlewareInterface
 //        if (!$token) $token = trim(ltrim($request->header('Authorization'), 'Bearer'));//正式版,删除此行,某些服务器无法获取到token调整为 Authori-zation
         try {
             $authInfo = UserRepository::parseToken($token, $request->site_id());
-            if (!in_array($request->action(), ['binding_phone', 'user', 'userInfo', 'verify']) && ($authInfo['user']['account'] != $authInfo['user']['phone'] && $authInfo['user']['account'] != $authInfo['user']['email'])) {
-                return app('json')->make('400', '请先绑定手机号或邮箱');
-            }
+//            if (!in_array($request->action(), ['binding_phone', 'user', 'userInfo', 'verify']) && ($authInfo['user']['account'] != $authInfo['user']['phone'] && $authInfo['user']['account'] != $authInfo['user']['email'])) {
+//                return app('json')->make('400', '请先绑定手机号或邮箱');
+//            }
             $authInfo['user']['level_info'] = UserLevel::getUserLevelInfo(UserLevel::getUserLevel($authInfo['user']['uid']));
             $authInfo['user']['point'] = UserPointPlan::where('uid', $authInfo['user']['uid'])->select();
         } catch (AuthException $e) {