改名

2021-07-21 17:55:34 +08:00
parent 503a188dd7
commit ad43351306
3 changed files with 95 additions and 104 deletions
@@ -545,21 +545,17 @@ class Router extends HttpService implements RouterInterface
 	 */
 	public function find_path(Request $request): ?Node
 	{
-//        return $this->Branch_search($request);
 		$method = $request->getMethod();
 		$uri = $request->headers->get('request_uri', '/');

-		if (!isset(static::$nodes[$method])) {
-			return null;
-		}
-		$methods = static::$nodes[$method];
-		if (isset($methods[$uri])) {
+		$methods = static::$nodes[$method][$uri] ?? null;
+		if (!is_null($methods[$uri])) {
 			return $methods[$uri];
 		}
-		if (!$request->isOption || !isset($methods['/'])) {
-			return null;
+		if ($request->isOption) {
+			return static::$nodes[$method]['*'] ?? null;
 		}
-		return $methods['/'];
+		return null;
 	}