Skip to content

Commit 0ecc717

Browse files
authored
修复admin个别配置不生效bug
修复admin个别配置不生效bug 更新后如果出现无法登录,或者登录页报null的请求,请将auth入口文件中index方法更新如下 public function index(){ $token = $this->request->cookie($this->getCookieName()); $userInfo = new UserEntity(); $setting = new UISettingEntity(config('admin')); #这里是重点 try { $user = Admin::user($token); $userInfo->setUsername($user->username); $userInfo->setName($user->name); $userInfo->setId($user->getId()); $userInfo->setAvatar($user->avatar); $userInfo->setToken($token); $menuTree = Admin::menu($user); $setting->setMenu(new MenuEntity($menuTree)); } catch (\Throwable $exception) { p("登录失败," . $exception->getMessage()); } $setting->setUser($userInfo); $setting->setUrl([ 'logout' => route('/auth/logout'), 'setting' => route('/auth/setting'), ]); $setting->setApiRoot(config('admin.route.api_prefix')); $setting->setHomeUrl(config('admin.route.home')); return UI::view($setting); }
1 parent 5f6db10 commit 0ecc717

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

src/Install/stubs/AuthController.stub

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ class AuthController
7272
{
7373
$token = $this->request->cookie($this->getCookieName());
7474
$userInfo = new UserEntity();
75-
$setting = new UISettingEntity();
75+
$setting = new UISettingEntity(config('admin'));
7676
try {
7777
$user = Admin::user($token);
7878
$userInfo->setUsername($user->username);
@@ -83,15 +83,14 @@ class AuthController
8383
$menuTree = Admin::menu($user);
8484
$setting->setMenu(new MenuEntity($menuTree));
8585
} catch (\Throwable $exception) {
86+
p("登录失败," . $exception->getMessage());
8687
}
8788
$setting->setUser($userInfo);
88-
$setting->setApiRoot(config('admin.route.api_prefix'));
8989
$setting->setUrl([
9090
'logout' => route('/auth/logout'),
9191
'setting' => route('/auth/setting'),
9292
]);
93-
$setting->setTitle(config('admin.title'));
94-
$setting->setName(config('admin.name'));
93+
$setting->setApiRoot(config('admin.route.api_prefix'));
9594
$setting->setHomeUrl(config('admin.route.home'));
9695
return UI::view($setting);
9796
}

0 commit comments

Comments
 (0)