From a029b4f05d7cb25c1d09962622598163cbb3b2d2 Mon Sep 17 00:00:00 2001
From: zhaoxiang <zhaoxiang051405@gmail.com>
Date: Sat, 10 Mar 2018 16:07:37 +0800
Subject: [PATCH] =?UTF-8?q?modified=20=E8=A7=84=E8=8C=83=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E5=89=8D=E7=BC=80=EF=BC=8C=E4=BE=BF=E4=BA=8E=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/admin/behavior/AdminLog.php      | 4 ++--
 application/admin/behavior/ApiAuth.php       | 2 +-
 application/admin/behavior/ApiPermission.php | 2 +-
 application/admin/controller/Base.php        | 2 +-
 application/admin/controller/Login.php       | 8 ++++----
 application/config.php                       | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/application/admin/behavior/AdminLog.php b/application/admin/behavior/AdminLog.php
index 41091e7..f876cbb 100644
--- a/application/admin/behavior/AdminLog.php
+++ b/application/admin/behavior/AdminLog.php
@@ -26,8 +26,8 @@ class AdminLog {
         $header = config('apiAdmin.CROSS_DOMAIN');
         $request = Request::instance();
         $route = $request->routeInfo();
-        $userToken = $request->header('ApiAuth', '');
-        $userInfo = cache($userToken);
+        $ApiAuth = $request->header('ApiAuth', '');
+        $userInfo = cache('Login:' . $ApiAuth);
         $userInfo = json_decode($userInfo, true);
         $menuInfo = AdminMenu::get(['url' => $route['route']]);
 
diff --git a/application/admin/behavior/ApiAuth.php b/application/admin/behavior/ApiAuth.php
index db8ee55..19f755a 100644
--- a/application/admin/behavior/ApiAuth.php
+++ b/application/admin/behavior/ApiAuth.php
@@ -23,7 +23,7 @@ class ApiAuth {
         $header = config('apiAdmin.CROSS_DOMAIN');
         $ApiAuth = $request->header('ApiAuth', '');
         if ($ApiAuth) {
-            $userInfo = cache($ApiAuth);
+            $userInfo = cache('Login:' . $ApiAuth);
             $userInfo = json_decode($userInfo, true);
             if (!$userInfo || !isset($userInfo['id'])) {
                 $data = ['code' => ReturnCode::AUTH_ERROR, 'msg' => 'ApiAuth不匹配', 'data' => []];
diff --git a/application/admin/behavior/ApiPermission.php b/application/admin/behavior/ApiPermission.php
index 1dd2489..4f01fa2 100644
--- a/application/admin/behavior/ApiPermission.php
+++ b/application/admin/behavior/ApiPermission.php
@@ -30,7 +30,7 @@ class ApiPermission {
         $route = $request->routeInfo();
         $header = config('apiAdmin.CROSS_DOMAIN');
         $ApiAuth = $request->header('ApiAuth', '');
-        $userInfo = cache($ApiAuth);
+        $userInfo = cache('Login:' . $ApiAuth);
         $userInfo = json_decode($userInfo, true);
         if (!$this->checkAuth($userInfo['id'], $route['route'])) {
             $data = ['code' => ReturnCode::INVALID, 'msg' => '非常抱歉，您没有权限怎么做！', 'data' => []];
diff --git a/application/admin/controller/Base.php b/application/admin/controller/Base.php
index ade31c5..4245d49 100644
--- a/application/admin/controller/Base.php
+++ b/application/admin/controller/Base.php
@@ -17,7 +17,7 @@ class Base extends Controller {
     public function _initialize() {
         $ApiAuth = $this->request->header('ApiAuth');
         if ($ApiAuth) {
-            $userInfo = cache($ApiAuth);
+            $userInfo = cache('Login:' . $ApiAuth);
             $this->userInfo = json_decode($userInfo, true);
         }
     }
diff --git a/application/admin/controller/Login.php b/application/admin/controller/Login.php
index 11c32ec..904884d 100644
--- a/application/admin/controller/Login.php
+++ b/application/admin/controller/Login.php
@@ -64,8 +64,8 @@ class Login extends Base {
             return $this->buildFailed(ReturnCode::LOGIN_ERROR, '用户名密码不正确');
         }
         $apiAuth = md5(uniqid() . time());
-        cache($apiAuth, json_encode($userInfo), config('apiAdmin.ONLINE_TIME'));
-        cache($userInfo['id'], $apiAuth, config('apiAdmin.ONLINE_TIME'));
+        cache('Login:' . $apiAuth, json_encode($userInfo), config('apiAdmin.ONLINE_TIME'));
+        cache('Login:' . $userInfo['id'], $apiAuth, config('apiAdmin.ONLINE_TIME'));
 
         $return['access'] = 1000000;
         $isSupper = Tools::isAdministrator($userInfo['id']);
@@ -92,8 +92,8 @@ class Login extends Base {
 
     public function logout() {
         $ApiAuth = $this->request->header('ApiAuth');
-        cache($ApiAuth, null);
-        cache($this->userInfo['id'], null);
+        cache('Login:' . $ApiAuth, null);
+        cache('Login:' . $this->userInfo['id'], null);
 
         return $this->buildSuccess([], '登出成功');
     }
diff --git a/application/config.php b/application/config.php
index bab7925..a3c00ca 100755
--- a/application/config.php
+++ b/application/config.php
@@ -191,7 +191,7 @@ return [
         // 缓存保存目录
         'path'   => CACHE_PATH,
         // 缓存前缀
-        'prefix' => '',
+        'prefix' => 'ApiAdmin:',
         // 缓存有效期 0表示永久缓存
         'expire' => 0,
     ],