From 4fee7253de6c9da2a19c0533d0103d97d74d4ef8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Sat, 18 Sep 2021 17:05:27 +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

---
 http-handler/Router.php | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/http-handler/Router.php b/http-handler/Router.php
index 37bdf85b..e6d84485 100644
--- a/http-handler/Router.php
+++ b/http-handler/Router.php
@@ -17,6 +17,9 @@ class Router
 	protected array $groupTack = [];
 
 
+	protected array $methods = ['GET', 'POST', 'HEAD', 'OPTIONS', 'PUT', 'DELETE'];
+
+
 	/**
 	 * @param $route
 	 * @param $handler
@@ -26,7 +29,7 @@ class Router
 	public static function socket($route, $handler): void
 	{
 		$router = Kiri::getDi()->get(Router::class);
-		$router->addRoute($route, $handler, 'SOCKET');
+		$router->addRoute('SOCKET', $route, $handler);
 	}
 
 
@@ -39,7 +42,7 @@ class Router
 	public static function post($route, $handler): void
 	{
 		$router = Kiri::getDi()->get(Router::class);
-		$router->addRoute($route, $handler, 'POST');
+		$router->addRoute('POST', $route, $handler);
 	}
 
 	/**
@@ -51,7 +54,7 @@ class Router
 	public static function get($route, $handler): void
 	{
 		$router = Kiri::getDi()->get(Router::class);
-		$router->addRoute($route, $handler, 'GET');
+		$router->addRoute('GET', $route, $handler);
 	}
 
 
@@ -64,7 +67,7 @@ class Router
 	public static function options($route, $handler): void
 	{
 		$router = Kiri::getDi()->get(Router::class);
-		$router->addRoute($route, $handler, 'OPTIONS');
+		$router->addRoute('OPTIONS', $route, $handler);
 	}
 
 
@@ -77,7 +80,7 @@ class Router
 	{
 		$router = Kiri::getDi()->get(Router::class);
 		foreach ($router->methods as $method) {
-			$router->addRoute($route, $handler, $method);
+			$router->addRoute($method, $route, $handler);
 		}
 	}
 
@@ -90,7 +93,7 @@ class Router
 	public static function delete($route, $handler): void
 	{
 		$router = Kiri::getDi()->get(Router::class);
-		$router->addRoute($route, $handler, 'DELETE');
+		$router->addRoute('DELETE', $route, $handler);
 	}
 
 
@@ -103,7 +106,7 @@ class Router
 	public static function head($route, $handler): void
 	{
 		$router = Kiri::getDi()->get(Router::class);
-		$router->addRoute($route, $handler, 'HEAD');
+		$router->addRoute('HEAD', $route, $handler);
 	}
 
 
@@ -116,7 +119,7 @@ class Router
 	public static function put($route, $handler): void
 	{
 		$router = Kiri::getDi()->get(Router::class);
-		$router->addRoute($route, $handler, 'PUT');
+		$router->addRoute('PUT', $route, $handler);
 	}