refactor: 重构用户信息状态代码写法。

This commit is contained in:
augushong
2025-04-14 19:58:41 +08:00
parent 651efc5814
commit 18ba49e1c5
5 changed files with 39 additions and 24 deletions

View File

@@ -21,11 +21,11 @@ class AjaxBase extends AdminController
*/
public function initAdmin()
{
$cacheData = Cache::get('initAdmin_' . session('admin.id'));
$cacheData = Cache::get('initAdmin_' . $this->sessionAdmin->id);
if (!empty($cacheData)) {
return json($cacheData);
}
$menuService = new MenuService(session('admin.id'));
$menuService = new MenuService($this->sessionAdmin->id);
$data = [
'logoInfo' => [
'title' => sysconfig('site', 'logo_title'),
@@ -35,7 +35,7 @@ class AjaxBase extends AdminController
'homeInfo' => $menuService->getHomeInfo(),
'menuInfo' => $menuService->getMenuTree(),
];
Cache::tag('initAdmin')->set('initAdmin_' . session('admin.id'), $data);
Cache::tag('initAdmin')->set('initAdmin_' . $this->sessionAdmin->id, $data);
return json($data);
}

View File

@@ -19,7 +19,7 @@ class IndexBase extends AdminController
public function index()
{
return $this->fetch('', [
'admin' => session('admin'),
'admin' => $this->sessionAdmin,
]);
}
@@ -50,7 +50,7 @@ class IndexBase extends AdminController
*/
public function editAdmin()
{
$id = session('admin.id');
$id = $this->sessionAdmin->id;
$row = (new SystemAdmin())
->withoutField('password')
->find($id);
@@ -96,7 +96,7 @@ class IndexBase extends AdminController
*/
public function editPassword()
{
$id = session('admin.id');
$id = $this->sessionAdmin->id;
$row = (new SystemAdmin())
->withoutField('password')
->find($id);
@@ -140,7 +140,7 @@ class IndexBase extends AdminController
{
$pid = $this->request->param('pid', 0);
$menuService = new MenuService(session('admin.id'));
$menuService = new MenuService($this->sessionAdmin->id);
$home_info = $menuService->getHomeInfo();

View File

@@ -22,7 +22,7 @@ class LoginBase extends AdminController
{
parent::initialize();
$action = $this->request->action();
if (!empty(session('admin')) && !in_array($action, ['out'])) {
if (!empty($this->sessionAdmin) && !in_array($action, ['out'])) {
$adminModuleName = config('app.admin_alias_name');
$this->success('已登录,无需再次登录', [], __url("@{$adminModuleName}"));
}