更新
This commit is contained in:
+15
-3
@@ -39,9 +39,19 @@ class AdminTokenCache extends BaseCache
|
||||
*/
|
||||
public function getAdminInfo($token)
|
||||
{
|
||||
if (!is_string($token) || $token === '') { return false; }
|
||||
// 撤销记录优先于缓存;提交前的请求可能在提交后回填旧缓存,不能仅靠delete保证失效。
|
||||
$session = AdminSession::where('token', $token)->where('expire_time', '>', time())
|
||||
->field('admin_id,expire_time')->findOrEmpty();
|
||||
if ($session->isEmpty() || !Admin::where('id', (int) $session['admin_id'])->where('disable', 0)->count()) {
|
||||
$this->deleteAdminInfo($token);
|
||||
return false;
|
||||
}
|
||||
//直接从缓存获取
|
||||
$adminInfo = $this->get($this->prefix . $token);
|
||||
if ($adminInfo) {
|
||||
if ($adminInfo && (int) ($adminInfo['admin_id'] ?? 0) === (int) $session['admin_id']) {
|
||||
// 保持原登录IP绑定,不用当前请求IP重建已有的登录上下文。
|
||||
$adminInfo['expire_time'] = (int) $session['expire_time'];
|
||||
return $adminInfo;
|
||||
}
|
||||
|
||||
@@ -72,8 +82,10 @@ class AdminTokenCache extends BaseCache
|
||||
return [];
|
||||
}
|
||||
$admin = Admin::where('id', '=', $adminSession->admin_id)
|
||||
->where('disable', 0)
|
||||
->append(['role_id'])
|
||||
->find();
|
||||
if (empty($admin)) { return []; }
|
||||
|
||||
$roleName = '';
|
||||
$roleLists = SystemRole::column('name', 'id');
|
||||
@@ -101,7 +113,7 @@ class AdminTokenCache extends BaseCache
|
||||
'work_wechat_userid' => $admin->work_wechat_userid ?? '',
|
||||
];
|
||||
$this->set($this->prefix . $token, $adminInfo, new \DateTime(Date('Y-m-d H:i:s', $adminSession->expire_time)));
|
||||
return $this->getAdminInfo($token);
|
||||
return $adminInfo;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -117,4 +129,4 @@ class AdminTokenCache extends BaseCache
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user