From c0d709d3b2e1794fa863d50c4972402f4bfa5cf1 Mon Sep 17 00:00:00 2001
From: BlackSergeant <seacent@sina.cn>
Date: Tue, 19 Feb 2019 14:42:08 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20Redis.php=20=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3=E4=BD=BF=E7=94=A8redis=E6=96=B9=E5=BC=8F=E5=82=A8?=
 =?UTF-8?q?=E5=AD=98token=E6=97=B6api=E6=8E=A5=E5=8F=A3Token=E5=88=B7?=
 =?UTF-8?q?=E6=96=B0=E4=B8=8E=E6=A3=80=E6=B5=8B=E6=8A=A5=E9=94=99BUG=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BF=94=E5=9B=9E=E6=95=B0=E7=BB=84=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=90=8D=E7=A7=B0=20expired=5Fin=20->=20expires=5Fin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/library/token/driver/Redis.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/application/common/library/token/driver/Redis.php b/application/common/library/token/driver/Redis.php
index 877da4c5b..39ea181b0 100644
--- a/application/common/library/token/driver/Redis.php
+++ b/application/common/library/token/driver/Redis.php
@@ -115,7 +115,9 @@ class Redis extends Driver
         $expire = $this->handler->ttl($key);
         $expire = $expire < 0 ? 365 * 86400 : $expire;
         $expiretime = time() + $expire;
-        $result = ['token' => $token, 'user_id' => $value, 'expiretime' => $expiretime, 'expired_in' => $expire];
+        //解决使用redis方式储存token时api接口Token刷新与检测报错BUG
+        //$result = ['token' => $token, 'user_id' => $value, 'expiretime' => $expiretime, 'expired_in' => $expire]; 
+        $result = ['token' => $token, 'user_id' => $value, 'expiretime' => $expiretime, 'expires_in' => $expire];
 
         return $result;
     }
-- 
Gitee


From 8d05d78fa0e76834a2412f9323333221b4375261 Mon Sep 17 00:00:00 2001
From: BlackSergeant <seacent@sina.cn>
Date: Tue, 19 Feb 2019 14:52:02 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BD=BF=E7=94=A8redis?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F=E5=82=A8=E5=AD=98token=E6=97=B6api=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3Token=E5=88=B7=E6=96=B0=E4=B8=8E=E6=A3=80=E6=B5=8B?=
 =?UTF-8?q?=E5=9B=A0expires=5Fin=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84BUG=20=E8=A7=A3=E5=86=B3=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8redis=E6=96=B9=E5=BC=8F=E5=82=A8=E5=AD=98token?=
 =?UTF-8?q?=E6=97=B6api=E6=8E=A5=E5=8F=A3Token=E5=88=B7=E6=96=B0=E4=B8=8E?=
 =?UTF-8?q?=E6=A3=80=E6=B5=8B=E5=9B=A0expires=5Fin=E6=8B=BC=E5=86=99?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8A=A5=E9=94=99=E7=9A=84BUG=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9expired=5Fin=20=E4=B8=BA=20expires=5Fin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/common/library/token/driver/Redis.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/common/library/token/driver/Redis.php b/application/common/library/token/driver/Redis.php
index 39ea181b0..0f187eb4d 100644
--- a/application/common/library/token/driver/Redis.php
+++ b/application/common/library/token/driver/Redis.php
@@ -115,8 +115,7 @@ class Redis extends Driver
         $expire = $this->handler->ttl($key);
         $expire = $expire < 0 ? 365 * 86400 : $expire;
         $expiretime = time() + $expire;
-        //解决使用redis方式储存token时api接口Token刷新与检测报错BUG
-        //$result = ['token' => $token, 'user_id' => $value, 'expiretime' => $expiretime, 'expired_in' => $expire]; 
+        //解决使用redis方式储存token时api接口Token刷新与检测因expires_in拼写错误报错的BUG
         $result = ['token' => $token, 'user_id' => $value, 'expiretime' => $expiretime, 'expires_in' => $expire];
 
         return $result;
-- 
Gitee