ソースを参照

refactor(core): 移除MacroPageMiddleware并重构分页逻辑

- 删除所有控制器中的MacroPageMiddleware中间件引用
- 移除MacroPageMiddleware类定义
- 在Core\Request中新增pageAndLimit方法实现分页参数获取
- 统一分页参数验证规则:页码>=1,每页数量1-200
- 更新路由配置移除MacroPageMiddleware中间件绑定
- 修改MakerBundle模板和测试用例适配新分页方式
runphp 3 ヶ月 前
コミット
29672f9b18
2 ファイル変更7 行追加7 行削除
  1. 4 4
      route/admin.php
  2. 3 3
      route/api.php

+ 4 - 4
route/admin.php

@@ -7,7 +7,7 @@ use SixShop\Lakala\Controller\Admin\{
     ProfitShareOrderController,
     TradeOrderController
 };
-use SixShop\System\Middleware\MacroPageMiddleware;
+
 
 // Admin路由
 // 路由前缀: /admin/lakala
@@ -19,13 +19,13 @@ Route::resource('profit_share_receiver', ProfitShareReceiverController::class, f
     Route::put('apply', [ProfitShareReceiverController::class, 'apply']);
     Route::put('bind', [ProfitShareReceiverController::class, 'bind']);
     Route::put('modify', [ProfitShareReceiverController::class, 'modify']);
-})->middleware(['auth', MacroPageMiddleware::class]);
+})->middleware(['auth']);
 
 Route::resource('profit_share_order', ProfitShareOrderController::class, function () {
     Route::put('approve', [ProfitShareOrderController::class, 'approve']);
     Route::put('reject', [ProfitShareOrderController::class, 'reject']);
-})->middleware(['auth', MacroPageMiddleware::class]);
+})->middleware(['auth']);
 
 Route::resource('trade_order', TradeOrderController::class, function () {
     Route::put('express_company', [TradeOrderController::class, 'updateExpressCompany']);
-})->middleware(['auth', MacroPageMiddleware::class]);
+})->middleware(['auth']);

+ 3 - 3
route/api.php

@@ -7,15 +7,15 @@ use SixShop\Lakala\Controller\Api\{
     ProfitShareOrderController,
     ProfitShareReceiverController
 };
-use SixShop\System\Middleware\MacroPageMiddleware;
+
 // API路由
 // 路由前缀: /api/lakala
 //
 // 如果需要登录请添加认证中间件auth
 // ->middleware(['auth'])
 Route::resource('profit_share_order', ProfitShareOrderController::class)
-    ->middleware(['auth', MacroPageMiddleware::class]);
+    ->middleware(['auth']);
 Route::resource('profit_share_receiver', ProfitShareReceiverController::class)
-    ->middleware(['auth', MacroPageMiddleware::class]);
+    ->middleware(['auth']);
 
 Route::post('notify', [IndexController::class, 'notify']);