Skip to content

Commit 4c513d5

Browse files
committed
Merge remote-tracking branch 'origin/v2' into v2
2 parents 88cd018 + 0ecc717 commit 4c513d5

1 file changed

Lines changed: 3 additions & 4 deletions

File tree

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)