Merge branch 'feature/admin' into develop

# Conflicts:
#	config/middleware.php
This commit is contained in:
2025-04-18 15:42:55 +08:00
19 changed files with 1491 additions and 9 deletions
+18
View File
@@ -12,6 +12,24 @@
* @license http://www.opensource.org/licenses/mit-license.php MIT License
*/
// 初始化 Laravel 容器
use Illuminate\Container\Container;
use Illuminate\Support\Facades\Facade;
$container = Container::getInstance();
// 将容器设置为 Facade 的根
Facade::setFacadeApplication($container);
// 注册验证器服务(关键步骤)
$container->singleton('validator', function () {
return new \Illuminate\Validation\Factory(
new \Illuminate\Translation\Translator(
new \Illuminate\Translation\ArrayLoader(), 'en' // 默认语言
)
);
});
return [
support\bootstrap\Session::class,
];
+1
View File
@@ -18,6 +18,7 @@ return [
app\middleware\CrossDomain::class, // 全局跨域中间件
app\middleware\AuthMiddleware::class, // 鉴权中间件
app\middleware\DataTracker::class, //埋点
app\admin\middleware\PermissionCheck::class, // 后端权限
],
// 路由中间件