This commit is contained in:
2021-09-06 16:04:51 +08:00
parent b1f9ac335d
commit c1552a4c88
+3 -5
View File
@@ -32,9 +32,7 @@ class Router extends HttpService implements RouterInterface
/** @var Node[] $nodes */ /** @var Node[] $nodes */
public array $nodes = []; public array $nodes = [];
public array $groupTacks = []; public array $groupTacks = [];
public ?string $dir = 'App\\Http\\Controllers'; public ?string $namespace = 'App\\Http\\Controllers';
const NOT_FOUND = 'Page not found or method not allowed.';
/** @var string[] */ /** @var string[] */
public array $methods = ['GET', 'POST', 'OPTIONS', 'PUT', 'DELETE', 'RECEIVE', 'HEAD']; public array $methods = ['GET', 'POST', 'OPTIONS', 'PUT', 'DELETE', 'RECEIVE', 'HEAD'];
@@ -70,7 +68,7 @@ class Router extends HttpService implements RouterInterface
*/ */
public function init() public function init()
{ {
$this->dir = Config::get('http.namespace', $this->dir); $this->namespace = Config::get('http.namespace', $this->namespace);
$this->response = Kiri::app()->get('response'); $this->response = Kiri::app()->get('response');
} }
@@ -343,7 +341,7 @@ class Router extends HttpService implements RouterInterface
private function loadNamespace(): array private function loadNamespace(): array
{ {
$name = array_column($this->groupTacks, 'namespace'); $name = array_column($this->groupTacks, 'namespace');
array_unshift($name, $this->dir); array_unshift($name, $this->namespace);
return array_filter($name); return array_filter($name);
} }