From 04ed73b902286fdb1676b2f8f339c163bceedb81 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mr=C2=B7x?= Date: Fri, 4 Sep 2020 18:49:36 +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 --- HttpServer/Route/Middleware.php | 17 +++++++---------- HttpServer/Route/Router.php | 26 -------------------------- 2 files changed, 7 insertions(+), 36 deletions(-) diff --git a/HttpServer/Route/Middleware.php b/HttpServer/Route/Middleware.php index e0553136..22ce5fa2 100644 --- a/HttpServer/Route/Middleware.php +++ b/HttpServer/Route/Middleware.php @@ -49,16 +49,13 @@ class Middleware */ public function getGenerate($node) { - foreach ($node->handler as $key => $value) { - $last = function ($passable) use ($node) { - return Dispatch::create($node->handler, $passable)->dispatch(); - }; - $middleWares = $this->annotation($node); - $data = array_reduce(array_reverse($middleWares), $this->core(), $last); - $this->middleWares = []; - $node->callback[$key] = $data; - } - return $node; + $last = function ($passable) use ($node) { + return Dispatch::create($node->handler, $passable)->dispatch(); + }; + $middleWares = $this->annotation($node); + $data = array_reduce(array_reverse($middleWares), $this->core(), $last); + $this->middleWares = []; + return $node->callback = $data; } diff --git a/HttpServer/Route/Router.php b/HttpServer/Route/Router.php index f042a42a..655aaca3 100644 --- a/HttpServer/Route/Router.php +++ b/HttpServer/Route/Router.php @@ -100,32 +100,6 @@ class Router extends Application implements RouterInterface } - /** - * @param $route - * @param $handler - * @param int $port - * @return Node|mixed|null - */ - public function gRpc($route, $handler, $port = 33007) - { - $route = ltrim($route, '/'); - if (!empty($port)) { - $route = $port . '/' . $route; - } - return $this->addRoute($route, $handler, 'grpc'); - } - - - /** - * @param $route - * @param $handler - * @return Node|mixed|null - */ - public function task($route, $handler) - { - return $this->addRoute($route, $handler, 'Task'); - } - /** * @param $route * @param $handler