perf(Middleware): Fix Middleware behaviour

Rhilip · Mar 10, 2019 · eb9c905 · eb9c905
1 parent 169440c
commit eb9c905
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 21 deletions.
diff --git a/apps/commands/ServiceCommand.php b/apps/commands/ServiceCommand.php
@@ -86,7 +86,7 @@ public function actionReload()
             println('rid-httpd is not running.');
             return ExitCode::UNSPECIFIED_ERROR;
         }
-        println('rid-httpd worker process restart completed.');
+        println('rid-httpd worker process reload completed.');
         return ExitCode::OK; // 返回退出码
     }
 

diff --git a/apps/config/http_base.php b/apps/config/http_base.php
@@ -14,11 +14,11 @@
     // 控制器命名空间
     'controllerNamespace' => 'apps\controllers',
 
-    // 中间件命名空间
-    'middlewareNamespace' => 'apps\middleware',
-
     // 全局中间件
-    'middleware'          => ["IpBan"],
+    'middleware'          => [
+        apps\middleware\IpBanMiddleware::class,
+        apps\middleware\DebugMiddleware::class
+    ],
 
     // 组件配置
     'components'          => [
@@ -36,8 +36,12 @@
             'rules'          => [
                 'GET tracker/{tracker_action}' => ['tracker','index'],
                 'GET captcha' => ['captcha', 'index'],
-                'api/v1/{controller}/{action}' => ['api/{controller}', '{action}', 'middleware' => ['Api']],
-                '{controller}/{action}' => ['{controller}', '{action}', 'middleware' => ['Before']],
+                'api/v1/{controller}/{action}' => ['api/{controller}', '{action}', 'middleware' => [
+                    apps\middleware\ApiMiddleware::class
+                ]],
+                '{controller}/{action}' => ['{controller}', '{action}', 'middleware' => [
+                    apps\middleware\AuthMiddleware::class
+                ]],
             ],
         ],
 

diff --git a/apps/middleware/BeforeMiddleware.php → apps/middleware/AuthMiddleware.php b/apps/middleware/BeforeMiddleware.php → apps/middleware/AuthMiddleware.php
@@ -3,7 +3,7 @@
 namespace apps\middleware;
 
 
-class BeforeMiddleware
+class AuthMiddleware
 {
 
     public function handle($callable, \Closure $next)

diff --git a/apps/middleware/AfterMiddleware.php → apps/middleware/DebugMiddleware.php b/apps/middleware/AfterMiddleware.php → apps/middleware/DebugMiddleware.php
@@ -2,17 +2,12 @@
 
 namespace apps\middleware;
 
-/**
- * 后置中间件
- */
-class AfterMiddleware
+class DebugMiddleware
 {
 
     public function handle($callable, \Closure $next)
     {
-        // 添加中间件执行代码
         $response = $next();
-        list($controller, $action) = $callable;
 
         if (env('APP_DEBUG')) {
             println('NOW() :' . date('Y-m-d H:i:s')) ;
@@ -24,8 +19,6 @@ public function handle($callable, \Closure $next)
             var_dump(memory_get_usage());
         }
 
-        // ...
-        // 返回响应内容
         return $response;
     }
 

diff --git a/framework/Http/Application.php b/framework/Http/Application.php
@@ -14,9 +14,6 @@ class Application extends \Rid\Base\Application
     // 控制器命名空间
     public $controllerNamespace = '';
 
-    // 中间件命名空间
-    public $middlewareNamespace = '';
-
     // 全局中间件
     public $middleware = [];
 
@@ -103,8 +100,7 @@ protected function runMiddleware($callable, $middleware)
     protected function newMiddlewareInstance($routeMiddleware)
     {
         $middleware = [];
-        foreach (array_merge($this->middleware, $routeMiddleware) as $key => $name) {
-            $class            = "{$this->middlewareNamespace}\\{$name}Middleware";
+        foreach (array_merge($this->middleware, $routeMiddleware) as $key => $class) {
             $middleware[$key] = new $class();
         }
         return $middleware;