改名
This commit is contained in:
@@ -43,7 +43,7 @@ class Router extends HttpService implements RouterInterface
|
|||||||
|
|
||||||
public ?Closure $middleware = null;
|
public ?Closure $middleware = null;
|
||||||
|
|
||||||
public bool $useTree = false;
|
public int $useTree = ROUTER_TREE;
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -64,12 +64,13 @@ class Router extends HttpService implements RouterInterface
|
|||||||
$this->dir = Config::get('http.namespace', false, $this->dir);
|
$this->dir = Config::get('http.namespace', false, $this->dir);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param bool $useTree
|
* @param bool $useTree
|
||||||
*/
|
*/
|
||||||
public function setUseTree(bool $useTree): void
|
public function setUseTree(bool $useTree): void
|
||||||
{
|
{
|
||||||
$this->useTree = $useTree;
|
$this->useTree = $useTree ? ROUTER_TREE : ROUTER_HASH;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -101,7 +102,6 @@ class Router extends HttpService implements RouterInterface
|
|||||||
* @param $handler
|
* @param $handler
|
||||||
* @param string $method
|
* @param string $method
|
||||||
* @return ?Node
|
* @return ?Node
|
||||||
* @throws ConfigException
|
|
||||||
*/
|
*/
|
||||||
public function addRoute($path, $handler, $method = 'any'): ?Node
|
public function addRoute($path, $handler, $method = 'any'): ?Node
|
||||||
{
|
{
|
||||||
@@ -110,8 +110,7 @@ class Router extends HttpService implements RouterInterface
|
|||||||
$this->nodes[$method] = [];
|
$this->nodes[$method] = [];
|
||||||
}
|
}
|
||||||
|
|
||||||
$useTree = Config::get('router', false, ROUTER_TREE);
|
if ($this->useTree == ROUTER_TREE) {
|
||||||
if ($useTree == ROUTER_TREE) {
|
|
||||||
return $this->tree($path, $handler, $method);
|
return $this->tree($path, $handler, $method);
|
||||||
} else {
|
} else {
|
||||||
return $this->hash($path, $handler, $method);
|
return $this->hash($path, $handler, $method);
|
||||||
@@ -515,7 +514,7 @@ class Router extends HttpService implements RouterInterface
|
|||||||
}
|
}
|
||||||
return $node->afterDispatch($response);
|
return $node->afterDispatch($response);
|
||||||
} catch (\Throwable $exception) {
|
} catch (\Throwable $exception) {
|
||||||
$this->addError($exception,'throwable');
|
$this->addError($exception, 'throwable');
|
||||||
|
|
||||||
$Code = $exception->getCode() == 0 ? 500 : $exception->getCode();
|
$Code = $exception->getCode() == 0 ? 500 : $exception->getCode();
|
||||||
|
|
||||||
@@ -658,7 +657,7 @@ class Router extends HttpService implements RouterInterface
|
|||||||
$router = $this;
|
$router = $this;
|
||||||
include_once "{$files}";
|
include_once "{$files}";
|
||||||
} catch (\Throwable $exception) {
|
} catch (\Throwable $exception) {
|
||||||
$this->addError($exception,'throwable');
|
$this->addError($exception, 'throwable');
|
||||||
} finally {
|
} finally {
|
||||||
if (isset($exception)) {
|
if (isset($exception)) {
|
||||||
unset($exception);
|
unset($exception);
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ namespace Snowflake;
|
|||||||
|
|
||||||
|
|
||||||
use Annotation\Aspect;
|
use Annotation\Aspect;
|
||||||
|
use Closure;
|
||||||
use Console\Console;
|
use Console\Console;
|
||||||
use Console\ConsoleProviders;
|
use Console\ConsoleProviders;
|
||||||
use Database\DatabasesProviders;
|
use Database\DatabasesProviders;
|
||||||
@@ -58,6 +59,30 @@ class Application extends BaseApplication
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Closure|array $closure
|
||||||
|
* @return $this
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
public function middleware(Closure|array $closure): static
|
||||||
|
{
|
||||||
|
$this->getRouter()->setMiddleware($closure);
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param bool $useTree
|
||||||
|
* @return $this
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
public function setUseTree(bool $useTree): static
|
||||||
|
{
|
||||||
|
$this->getRouter()->setUseTree($useTree);
|
||||||
|
return $this;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @param string $service
|
* @param string $service
|
||||||
* @return $this
|
* @return $this
|
||||||
|
|||||||
Reference in New Issue
Block a user