From ae70ef5e90b0dfe191826266ac06ece0b9184ad1 Mon Sep 17 00:00:00 2001
From: wangkeji <602823863@qq.com>
Date: Wed, 28 Feb 2018 17:32:55 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E5=9F=BA=E7=B1=BB=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF,?=
 =?UTF-8?q?=E7=94=9F=E6=95=88=E7=94=A8=E6=88=B7=E7=99=BB=E5=87=BA=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/controller/Base.php  |  7 ++++++-
 application/admin/controller/Login.php | 10 ++--------
 application/adminRoute.php             |  2 +-
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/application/admin/controller/Base.php b/application/admin/controller/Base.php
index 18893ab..d1580bf 100644
--- a/application/admin/controller/Base.php
+++ b/application/admin/controller/Base.php
@@ -12,9 +12,14 @@ use think\Controller;
 class Base extends Controller {
 
     private $debug = [];
+    protected $userInfo;
 
     public function _initialize() {
-
+        $ApiAuth = $this->request->get('ApiAuth');
+        if ($ApiAuth) {
+            $userInfo = cache($ApiAuth);
+            $this->userInfo = json_decode($userInfo, true);
+        }
     }
 
     public function buildSuccess($data, $msg = '操作成功', $code = ReturnCode::SUCCESS) {
diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php
index 10c7ba6..afa2f18 100644
--- a/application/admin/controller/Login.php
+++ b/application/admin/controller/Login.php
@@ -86,14 +86,8 @@ class Login extends Base {
     }
 
     public function logout() {
-        $userToken = $this->request->get('userToken');
-        if (!$userToken) {
-            return $this->buildFailed(ReturnCode::NOT_EXISTS, '缺少userToken!');
-        }
-        $userInfo = cache($userToken);
-        $userInfo = json_decode($userInfo, true);
-        cache($userToken, null);
-        cache($userInfo['id'], null);
+        cache($this->userInfo, null);
+        cache($this->userInfo['id'], null);
 
         return $this->buildSuccess(ReturnCode::SUCCESS, [], '登出成功');
     }
diff --git a/application/adminRoute.php b/application/adminRoute.php
index 582d0cc..ba9a527 100644
--- a/application/adminRoute.php
+++ b/application/adminRoute.php
@@ -9,7 +9,7 @@ return [
         ],
         'Login/logout'      => [
             'admin/Login/logout',
-            ['method' => 'get']
+            ['method' => 'get', 'after_behavior' => $afterBehavior]
         ],
         'Menu/index'        => [
             'admin/Menu/index',