diff --git a/application/admin/controller/Base.php b/application/admin/controller/Base.php index 18893abe06a32f6a3d96b17c72d60fc4af22ed46..d1580bf776f58b30cc0057e4c01371c7fe1dffe7 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 10c7ba6735f9198f5af699f789651794be136af3..afa2f187041034a849edfa2bd7d43b139fdd269b 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 582d0ccb31b3a5eca7ad4fe171996c1d6c80c9a8..ba9a5278391ba00f50ccd6e13f169987beba12b0 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',