From 37bdfe7566a89f99944abaceb97c73c598133b8f Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Wed, 9 Dec 2020 17:04:44 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E5=A2=9E=E5=8A=A0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3token=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/data/service/UserService.php | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/app/data/service/UserService.php b/app/data/service/UserService.php
index 84f668d40..5d7dab35d 100644
--- a/app/data/service/UserService.php
+++ b/app/data/service/UserService.php
@@ -15,7 +15,7 @@ class UserService extends Service
      * 认证有效时间
      * @var integer
      */
-    private $expire = 3600;
+    private $expire = 7200;
 
     /**
      * 获取用户数据
@@ -27,7 +27,7 @@ class UserService extends Service
      * @throws \think\db\exception\DbException
      * @throws \think\db\exception\ModelNotFoundException
      */
-    public function get(string $type, int $uuid)
+    public function get(string $type, int $uuid): array
     {
         $user = $this->app->db->name('DataUser')->where(['id' => $uuid, 'deleted' => 0])->findOrEmpty();
         $data = $this->app->db->name('DataUserToken')->where(['uid' => $uuid, 'type' => $type])->findOrEmpty();
@@ -100,6 +100,20 @@ class UserService extends Service
         }
     }
 
+    /**
+     * 延期TOKEN有效时间
+     * @param string $type 接口类型
+     * @param string $token 授权令牌
+     * @throws \think\db\exception\DbException
+     */
+    public function expireUserToken(string $type, string $token)
+    {
+        $map = ['type' => $type, 'token' => $token];
+        $this->app->db->name('DataUserToken')->where($map)->update([
+            'time' => time() + $this->expire,
+        ]);
+    }
+
     /**
      * 检查接口授权 TOKEN 是否有效
      * @param string $type 接口类型
@@ -117,12 +131,13 @@ class UserService extends Service
             $data = $this->app->db->name('DataUserToken')->where($map)->find();
         }
         if (empty($data) || empty($data['uid'])) {
-            return [0, '接口认证令牌无效', 0, 0];
+            return [0, '请重新登录，接口认证令牌无效', 0, 0];
         } elseif ($data['time'] < time()) {
-            return [0, '接口认证令牌已失效', 0, 0];
+            return [0, '请重新登录，接口认证令牌已失效', 0, 0];
         } elseif ($data['tokenv'] !== $this->_buildTokenVerify()) {
-            return [0, '接口请求客户端已更换', 0, 0];
+            return [0, '请重新登录，接口请求客户端已更换', 0, 0];
         } else {
+            $this->expireUserToken($type, $token);
             return [1, '接口认证令牌验证成功', $data['uid'], $data['time']];
         }
     }