From 158973c6bedb371200cb0f32094e21b8e511a693 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Thu, 3 Sep 2020 17:32:17 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- http-server/Route/Middleware.php | 2 +- http-server/Route/Node.php | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/http-server/Route/Middleware.php b/http-server/Route/Middleware.php index b037cfab..22ce5fa2 100644 --- a/http-server/Route/Middleware.php +++ b/http-server/Route/Middleware.php @@ -55,7 +55,7 @@ class Middleware $middleWares = $this->annotation($node); $data = array_reduce(array_reverse($middleWares), $this->core(), $last); $this->middleWares = []; - return $data; + return $node->callback = $data; } diff --git a/http-server/Route/Node.php b/http-server/Route/Node.php index 3ebeacc5..49f80de3 100644 --- a/http-server/Route/Node.php +++ b/http-server/Route/Node.php @@ -287,20 +287,7 @@ class Node extends Application if (empty($middles)) { return; } - foreach ($middles as $middle) { - if (empty($middle)) { - continue; - } - try { - if (is_array($middle)) { - $_tmp = $this->each($middle, $_tmp); - } else { - $_tmp[] = Snowflake::createObject($middle); - } - } catch (Exception $exception) { - } - } - $this->middleware = $_tmp; + $this->middleware = $this->each($middles, $_tmp); $this->newExec(); } @@ -313,7 +300,7 @@ class Node extends Application if (!empty($this->handler)) { $made = new Middleware(); $made->setMiddleWares($this->middleware); - $this->callback = $made->getGenerate($this); + $made->getGenerate($this); } return $this; }