mojiahui/webman-buildadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化install安装流程

Browse Source
This commit is contained in:
zhenhui
2026-03-18 17:15:01 +08:00
parent 299c012063
commit e8c77943b5
32 changed files with 330 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/common/middleware/LoadLangPack.php
View File

@@ -26,12 +26,20 @@ class LoadLangPack implements MiddlewareInterface
protected function loadLang(Request $request): void
{
// 优先从请求头 think-lang 获取前端选择的语言（与前端 axios 发送的 header 对应）
// 安装页等未发送 think-lang 时，回退到 Accept-Language 或配置默认值
$headerLang = $request->header('think-lang');
$allowLangList = config('lang.allow_lang_list', ['zh-cn', 'en']);
if ($headerLang && in_array(str_replace('_', '-', strtolower($headerLang)), $allowLangList)) {
$langSet = str_replace('_', '-', strtolower($headerLang));
} else {
$langSet = config('lang.default_lang', config('translation.locale', 'zh-cn'));
$acceptLang = $request->header('accept-language', '');
if (preg_match('/^zh[-_]?cn|^zh/i', $acceptLang)) {
$langSet = 'zh-cn';
} elseif (preg_match('/^en/i', $acceptLang)) {
$langSet = 'en';
} else {
$langSet = config('lang.default_lang', config('translation.locale', 'zh-cn'));
}
$langSet = str_replace('_', '-', strtolower($langSet));
}
@@ -59,6 +67,7 @@ class LoadLangPack implements MiddlewareInterface
}
// 2. 加载控制器专用语言包（如 zh-cn/auth/group.php），供 get_route_remark 等使用
// 同时加载到 messages 域，使 __() 能正确翻译控制器内的文案（如安装页错误提示）
$controllerPath = get_controller_path($request);
if ($controllerPath) {
$controllerPathForFile = str_replace('.', '/', $controllerPath);
@@ -68,6 +77,7 @@ class LoadLangPack implements MiddlewareInterface
$controllerLangFile = $appLangDir . $langSet . DIRECTORY_SEPARATOR . str_replace('/', DIRECTORY_SEPARATOR, $controllerPathForFile) . '.php';
if (is_file($controllerLangFile)) {
$translator->addResource('phpfile', $controllerLangFile, $langSet, $controllerPath);
$translator->addResource('phpfile', $controllerLangFile, $langSet, 'messages');
}
}
}