update

Author: edenleung

README.md

@@ -29,7 +29,7 @@ $ php think jwt:make
 * `model` 用户模型
 * `refresh` Token过期抛异常code = 50001
 * `relogin` Token失效异常code = 50002
-* `automaticRenewal` [开启过期自动续签](#过期自动续签)
+* `automaticRenewal` [开启过期自动续签](过期自动续签)
 
 以下两个异常都会抛一个HTTP异常 StatusCode = 401
 * `xiaodi\Exception\HasLoggedException`
@@ -142,10 +142,6 @@ return [
 
 `automaticRenewal => true`
 
-满足以下条件 就可以实现过期自动续签
-
-* Token 刷新时间 必须是在有效时间内 
-
 系统检测到 Token 已过期， 会自动续期并返回以下 header 信息。 
 
 * Automatic-Renewal-Token

src/Middleware/Jwt.php

@@ -14,26 +14,26 @@
 class Jwt
 {
     private $app;
-    private $user;
 
-    public function __construct(App $app, User $user)
+    public function __construct(App $app)
     {
         $this->app = $app;
-        $this->user = $user;
     }
 
     public function handle($request, \Closure $next, $type = 'admin')
     {
         if (true === $this->app->jwt->config($type)->verify()) {
+
+            $user = $this->app['jwt.user'];
             // 自动注入用户模型
-            if ($this->user->hasInject()) {
-                $user = $this->user->get();
+            if ($user->hasInject()) {
+                $userModel = $user->get();
                 // 路由注入
-                $request->user = $user;
+                $request->user = $userModel;
 
                 // 绑定当前用户模型
-                $model = $this->user->getModel();
-                $this->app->bind($model, $user);
+                $model = $user->getModel();
+                $this->app->bind($model, $userModel);
             }
 
             return $next($request);

src/User.php

@@ -56,7 +56,7 @@ public function getModel()
     public function get(): Model
     {
         $token = $this->jwt->getToken();
-
+        
         if (!$token) {
             throw new JWTException('未登录.', 500);
         }