From 34d4cbad8bbb6396ea250071e9eab71ce715f6fd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Wed, 16 Sep 2020 20:23:23 +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

---
 HttpServer/Events/OnWorkerStart.php |  2 +-
 HttpServer/Http/Response.php        | 11 +++++++++--
 HttpServer/Route/Router.php         | 10 +++++-----
 function.php                        | 16 ++++++++++++++++
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/HttpServer/Events/OnWorkerStart.php b/HttpServer/Events/OnWorkerStart.php
index e0ef12ed..0d85b41c 100644
--- a/HttpServer/Events/OnWorkerStart.php
+++ b/HttpServer/Events/OnWorkerStart.php
@@ -59,7 +59,7 @@ class OnWorkerStart extends Callback
 			}
 			$event->trigger(Event::SERVER_WORKER_START, [$worker_id]);
 		} catch (\Throwable $exception) {
-			Snowflake::app()->getLogger()->write($exception->getMessage(), 'worker');
+			write($exception->getMessage(), 'worker');
 		}
 	}
 
diff --git a/HttpServer/Http/Response.php b/HttpServer/Http/Response.php
index 0047b4c8..9307b977 100644
--- a/HttpServer/Http/Response.php
+++ b/HttpServer/Http/Response.php
@@ -100,8 +100,15 @@ class Response extends Application
 	 */
 	public function addHeader($key, $value)
 	{
+		/** @var Response $response */
 		$response = Context::getContext('response');
-		$response->header($key, $value);
+		if (!$response) {
+			return;
+		}
+		if (!($response->response instanceof \Swoole\Http\Response)) {
+			return;
+		}
+		$response->response->header($key, $value);
 	}
 
 	/**
@@ -201,7 +208,7 @@ class Response extends Application
 	 */
 	public static function create($response = null)
 	{
-		$ciResponse = Context::setContext('response',new Response());
+		$ciResponse = Context::setContext('response', new Response());
 		$ciResponse->response = $response;
 		$ciResponse->startTime = microtime(true);
 		$ciResponse->format = self::JSON;
diff --git a/HttpServer/Route/Router.php b/HttpServer/Route/Router.php
index b7b3ed2a..29498a3c 100644
--- a/HttpServer/Route/Router.php
+++ b/HttpServer/Route/Router.php
@@ -488,11 +488,11 @@ class Router extends Application implements RouterInterface
 			return null;
 		}
 		return $this->nodes[$method]['*'];
-		$node = $this->tree_search(['*'], $request->getMethod());
-		if (!($node instanceof Node)) {
-			return null;
-		}
-		return $node;
+//		$node = $this->tree_search(['*'], $request->getMethod());
+//		if (!($node instanceof Node)) {
+//			return null;
+//		}
+//		return $node;
 	}
 
 
diff --git a/function.php b/function.php
index 3cbb37ca..9b312377 100644
--- a/function.php
+++ b/function.php
@@ -69,6 +69,22 @@ if (!function_exists('loadByDir')) {
 }
 
 
+if (!function_exists('write')) {
+
+
+	/**
+	 * @param string $messages
+	 * @param string $category
+	 * @throws ComponentException
+	 */
+	function write(string $messages, $category = 'app')
+	{
+		$logger = Snowflake::app()->getLogger();
+		$logger->write($messages, $category);
+	}
+}
+
+
 if (!function_exists('instance_load')) {
 
 	function instance_load()