From db7d5e0d031fa6f62cb3e1b2993010bb5374fd40 Mon Sep 17 00:00:00 2001
From: weigang <mr.shuixiang@aliyun.com>
Date: Tue, 20 Oct 2020 14:26:18 +0800
Subject: [PATCH] =?UTF-8?q?API=E7=99=BB=E5=BD=95=E6=A0=A1=E9=AA=8C?=
 =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=94=B9=E6=88=90=E6=97=A0=E9=99=90=E7=BB=AD?=
 =?UTF-8?q?=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Middleware/Auth/ApiMiddleware.php  | 11 ++++++++++-
 app/Middleware/Auth/UserMiddleware.php |  4 ----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/Middleware/Auth/ApiMiddleware.php b/app/Middleware/Auth/ApiMiddleware.php
index 635b6d4..a505360 100644
--- a/app/Middleware/Auth/ApiMiddleware.php
+++ b/app/Middleware/Auth/ApiMiddleware.php
@@ -97,8 +97,17 @@ class ApiMiddleware implements MiddlewareInterface
 
         if ($userToken) {
             $ssdb = ApplicationContext::getContainer()->get(SSDBTask::class);
+
             $exists = $ssdb->exec('exists', $userToken);
-            if ($exists) {
+
+            // TODO 临时进行登录状态续
+            if (!$exists) {
+                $ssdb->exec('setnx', $userToken, 1);
+                $loginExpired = config('auth.user.expire_time');
+                if (isset($loginExpired) && $loginExpired) {
+                    $ssdb->exec('expire', $hashIds, $loginExpired);
+                }
+            } else {
                 $hashIds = ApplicationContext::getContainer()->get(Hashids::class);
                 $user = $hashIds->decode($userToken);
                 $userModel = User::query()->find($user[0]);
diff --git a/app/Middleware/Auth/UserMiddleware.php b/app/Middleware/Auth/UserMiddleware.php
index d727cd7..b378be7 100644
--- a/app/Middleware/Auth/UserMiddleware.php
+++ b/app/Middleware/Auth/UserMiddleware.php
@@ -62,10 +62,6 @@ class UserMiddleware implements MiddlewareInterface
     private function checkLogin()
     {
 
-        if (env('APP_ENV') != 'prod') {
-            return true;
-        }
-
         $user = $this->request->user;
         if (is_null($user)) {
             return false;