as2252258/kiri-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

改名

Browse Source
This commit is contained in:
Mr·x
2020-09-04 18:23:31 +08:00
parent 3914fa22d9
commit 0f07ddd6a5
1 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
HttpServer/Route/Router.php
+17 -16
View File
@@ -6,6 +6,7 @@ namespace HttpServer\Route;
use Closure; use Closure;
use Exception; use Exception;
use HttpServer\Http\Context; use HttpServer\Http\Context;
use HttpServer\Http\Request;
use HttpServer\IInterface\RouterInterface; use HttpServer\IInterface\RouterInterface;
use HttpServer\Application; use HttpServer\Application;
use HttpServer\Route\Annotation\Annotation; use HttpServer\Route\Annotation\Annotation;
@@ -46,14 +47,14 @@ class Router extends Application implements RouterInterface
*/ */
public function addRoute($path, $handler, $method = 'any') public function addRoute($path, $handler, $method = 'any')
{ {
if (!isset($this->nodes[$method])) { if (!isset($this->nodes[$path])) {
$this->nodes[$method] = []; $this->nodes[$path] = [];
} }
list($first, $explode) = $this->split($path); list($first, $explode) = $this->split($path);
$parent = $this->nodes[$method][$first] ?? null; $parent = $this->nodes[$first] ?? null;
if (empty($parent)) { if (empty($parent)) {
$parent = $this->NodeInstance($first, 0, $method); $parent = $this->NodeInstance($first, 0, $method);
$this->nodes[$method][$first] = $parent; $this->nodes[$first] = $parent;
} }
if ($first !== '/') { if ($first !== '/') {
$parent = $this->bindNode($parent, $explode, $method); $parent = $this->bindNode($parent, $explode, $method);
@@ -220,7 +221,7 @@ class Router extends Application implements RouterInterface
$node->childes = []; $node->childes = [];
$node->path = $value; $node->path = $value;
$node->index = $index; $node->index = $index;
$node->method = $method; $node->method = [$method];
$name = array_column($this->groupTacks, 'namespace'); $name = array_column($this->groupTacks, 'namespace');
@@ -294,17 +295,16 @@ class Router extends Application implements RouterInterface
/** /**
* @param array $explode * @param array $explode
* @param $method
* @return Node|null * @return Node|null
* 查找指定路由 * 查找指定路由
*/ */
public function tree_search($explode, $method) public function tree_search($explode)
{ {
if (empty($explode)) { if (empty($explode)) {
return $this->nodes[$method]['/'] ?? null; return $this->nodes['/'] ?? null;
} }
$first = array_shift($explode); $first = array_shift($explode);
if (!($parent = $this->nodes[$method][$first] ?? null)) { if (!($parent = $this->nodes[$first] ?? null)) {
return null; return null;
} }
if (empty($explode)) { if (empty($explode)) {
@@ -357,7 +357,7 @@ class Router extends Application implements RouterInterface
if ($_node->path == '/') { if ($_node->path == '/') {
continue; continue;
} }
$path = strtoupper($_node->method) . ' : ' . $_node->path; $path = strtoupper(implode('_', $_node->method)) . ' : ' . $_node->path;
if (!empty($_node->childes)) { if (!empty($_node->childes)) {
$path = $this->readByChild($_node->childes, $path); $path = $this->readByChild($_node->childes, $path);
} }
@@ -408,7 +408,7 @@ class Router extends Application implements RouterInterface
} else { } else {
[$first, $route] = explode(' : ', $paths); [$first, $route] = explode(' : ', $paths);
$newPath[] = strtoupper($item->method) . ' : ' . $route . '/' . $item->path; $newPath[] = strtoupper(implode('_', $item->method)) . ' : ' . $route . '/' . $item->path;
} }
} }
@@ -421,14 +421,15 @@ class Router extends Application implements RouterInterface
*/ */
public function dispatch() public function dispatch()
{ {
/** @var Request $request */
$request = Context::getContext('request'); $request = Context::getContext('request');
if (!($node = $this->find_path($request))) { if (!($node = $this->find_path($request))) {
return JSON::to(404, 'Page not found.'); return JSON::to(404, 'Page not found.');
} }
if (!in_array($request->getMethod(), $node->method)) {
return JSON::to(405, 'Page not found.');
}
if (empty($node->callback)) { if (empty($node->callback)) {
if (!empty($node->getError())) {
return JSON::to(500, $node->getError());
}
return JSON::to(404, 'Page not found.'); return JSON::to(404, 'Page not found.');
} }
return call_user_func($node->callback, $request); return call_user_func($node->callback, $request);
@@ -440,14 +441,14 @@ class Router extends Application implements RouterInterface
*/ */
private function find_path($request) private function find_path($request)
{ {
$node = $this->tree_search($request->getExplode(), $request->getMethod()); $node = $this->tree_search($request->getExplode());
if ($node instanceof Node) { if ($node instanceof Node) {
return $node; return $node;
} }
if (!$request->isOption) { if (!$request->isOption) {
return null; return null;
} }
$node = $this->tree_search(['*'], $request->getMethod()); $node = $this->tree_search(['*']);
if (!($node instanceof Node)) { if (!($node instanceof Node)) {
return null; return null;
} }