Kirin 2 years ago
parent
commit
415485cfd4
2 changed files with 11 additions and 1 deletions
  1. 3 1
      app/http/middleware/AuthTokenMiddleware.php
  2. 8 0
      app/models/user/Achievement.php

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

@@ -4,6 +4,7 @@
 namespace app\http\middleware;
 
 
+use app\models\user\Achievement;
 use app\models\user\User;
 use app\models\user\UserToken;
 use app\Request;
@@ -25,9 +26,10 @@ class AuthTokenMiddleware implements MiddlewareInterface
     {
         $authInfo = null;
         $token = trim(ltrim($request->header('Authori-zation'), 'Bearer'));
-        if(!$token)  $token = trim(ltrim($request->header('Authorization'), 'Bearer'));//正式版,删除此行,某些服务器无法获取到token调整为 Authori-zation
+        if (!$token) $token = trim(ltrim($request->header('Authorization'), 'Bearer'));//正式版,删除此行,某些服务器无法获取到token调整为 Authori-zation
         try {
             $authInfo = UserRepository::parseToken($token);
+            $authInfo['user']['achievement'] = Achievement::achievement($authInfo['user']['uid']);
         } catch (AuthException $e) {
             if ($force)
                 return app('json')->make($e->getCode(), $e->getMessage());

+ 8 - 0
app/models/user/Achievement.php

@@ -42,6 +42,14 @@ class Achievement extends BaseModel
         return $achievement;
     }
 
+    public static function achievement($uid)
+    {
+        $achievement = self::where('uid', $uid)
+            ->where('from_uid', '<>', $uid)
+            ->sum('achievement');
+        return $achievement;
+    }
+
 
     public static function setLastMonthAchievementUse()
     {