|
@@ -36,12 +36,12 @@ app()->singleton(Content::class, function () use ($newContent) {
|
|
|
|
|
|
|
|
|
// 覆盖默认配置
|
|
|
-config(['admin' => user_admin_config()]);
|
|
|
-config(['app.locale' => config('admin.lang') ?: config('app.locale')]);
|
|
|
+//config(['admin' => user_admin_config()]);
|
|
|
+//config(['app.locale' => config('admin.lang') ?: config('app.locale')]);
|
|
|
|
|
|
|
|
|
// 获取当前登录用户
|
|
|
$user = Admin::guard()->check() ? Admin::user() : null;
|
|
|
|
|
|
// 设置应用程序的本地化
|
|
|
-config(['app.locale' => $user && $user->language ? $user->language : config('app.locale')]);
|
|
|
+config(['app.locale' => Session::get('lang') ?: config('app.locale')]);
|