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

[积分商城]优化对接API

Browse Source
This commit is contained in:
zhenhui
2026-03-30 11:47:32 +08:00
parent b30ef21780
commit 4a42899bfe
55 changed files with 835 additions and 1241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/middleware/AllowCrossDomain.php
View File

@@ -30,7 +30,7 @@ class AllowCrossDomain implements MiddlewareInterface
'Access-Control-Allow-Credentials' => 'true',
'Access-Control-Max-Age' => '1800',
'Access-Control-Allow-Methods' => 'GET, POST, PUT, DELETE, PATCH, OPTIONS',
'Access-Control-Allow-Headers' => 'Content-Type, Authorization, batoken, ba-user-token, think-lang',
'Access-Control-Allow-Headers' => 'Content-Type, Authorization, batoken, ba-user-token, think-lang, lang',
];
$origin = $request->header('origin');
if (is_array($origin)) {

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

@@ -11,6 +11,9 @@ use Webman\Http\Response;
/**
* 加载控制器语言包中间件（Webman 迁移版，等价 ThinkPHP LoadLangPack）
* 根据当前路由加载对应控制器的语言包到 Translator
*
* 对外 api/：优先请求头 lang（zh / zh-cn → 中文包 zh-cn，en → 英文包），未传则 think-lang，再默认 zh-cn（不根据浏览器 Accept-Language）
* admin/：think-lang → Accept-Language → 配置默认
*/
class LoadLangPack implements MiddlewareInterface
{
@@ -25,22 +28,61 @@ class LoadLangPack implements MiddlewareInterface
protected function loadLang(Request $request): void
{
// 优先从请求头 think-lang 获取前端选择的语言（与前端 axios 发送的 header 对应）
// 安装页等未发送 think-lang 时，回退到 Accept-Language 或配置默认值
$headerLang = $request->header('think-lang');
$path = trim($request->path(), '/');
$isApi = str_starts_with($path, 'api/');
$isAdmin = str_starts_with($path, 'admin/');
$allowLangList = config('lang.allow_lang_list', ['zh-cn', 'en']);
if ($headerLang && in_array(str_replace('_', '-', strtolower($headerLang)), $allowLangList)) {
$langSet = str_replace('_', '-', strtolower($headerLang));
} else {
$acceptLang = $request->header('accept-language', '');
if (preg_match('/^zh[-_]?cn|^zh/i', $acceptLang)) {
$langSet = null;
// 对外 API（PlayX、H5 等）：优先 lang 请求头，默认中文 zh-cn，不跟随浏览器 Accept-Language
if ($isApi) {
$langHeader = $request->header('lang');
if (is_array($langHeader)) {
$langHeader = $langHeader[0] ?? '';
}
$langHeader = is_string($langHeader) ? trim($langHeader) : '';
if ($langHeader !== '') {
$langSet = $this->normalizeLangHeader($langHeader, $allowLangList);
}
}
// 与后台 Vue 一致的 think-lang（对外 API 在 lang 未设置时仍可生效）
if ($langSet === null) {
$headerLang = $request->header('think-lang');
if (is_array($headerLang)) {
$headerLang = $headerLang[0] ?? '';
}
$headerLang = is_string($headerLang) ? trim($headerLang) : '';
if ($headerLang !== '') {
$normalized = str_replace('_', '-', strtolower($headerLang));
if (in_array($normalized, $allowLangList, true)) {
$langSet = $normalized;
}
}
}
if ($langSet === null) {
if ($isApi) {
$langSet = 'zh-cn';
} elseif (preg_match('/^en/i', $acceptLang)) {
$langSet = 'en';
} elseif ($isAdmin) {
$acceptLang = $request->header('accept-language', '');
if (is_array($acceptLang)) {
$acceptLang = $acceptLang[0] ?? '';
}
$acceptLang = is_string($acceptLang) ? $acceptLang : '';
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((string) $langSet));
} else {
$langSet = config('lang.default_lang', config('translation.locale', 'zh-cn'));
$langSet = str_replace('_', '-', strtolower((string) $langSet));
}
$langSet = str_replace('_', '-', strtolower($langSet));
}
// 设置当前请求的翻译语言，使 __() 和 trans() 使用正确的语言
@@ -48,7 +90,6 @@ class LoadLangPack implements MiddlewareInterface
locale($langSet);
}
$path = trim($request->path(), '/');
$parts = explode('/', $path);
$app = $parts[0] ?? 'api';
@@ -81,4 +122,26 @@ class LoadLangPack implements MiddlewareInterface
}
}
}
/**
* 将 lang 请求头取值映射为语言包标识（zh / zh-cn → zh-cn，en → en）
*/
private function normalizeLangHeader(string $raw, array $allowLangList): ?string
{
$s = str_replace('_', '-', strtolower(trim($raw)));
if ($s === '') {
return null;
}
if (in_array($s, $allowLangList, true)) {
return $s;
}
if (str_starts_with($s, 'en')) {
return in_array('en', $allowLangList, true) ? 'en' : null;
}
if ($s === 'zh' || str_starts_with($s, 'zh-')) {
return in_array('zh-cn', $allowLangList, true) ? 'zh-cn' : null;
}
return null;
}
}