From e1a5d74d8a9b8bb81c73b5b21999b54ef40b9555 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Mon, 21 Sep 2020 14:02:29 +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/OnRequest.php | 6 ++++--
 System/Jwt/Jwt.php              | 6 +++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/HttpServer/Events/OnRequest.php b/HttpServer/Events/OnRequest.php
index 48cc7ef1..265a06ab 100644
--- a/HttpServer/Events/OnRequest.php
+++ b/HttpServer/Events/OnRequest.php
@@ -49,9 +49,11 @@ class OnRequest extends Callback
 		} catch (Error | \Throwable $exception) {
 			$params = $this->sendErrorMessage($sResponse ?? null, $exception, $response);
 		} finally {
-			unset($sResponse, $response);
-			Context::deleteId('response');
 			$events = Snowflake::app()->getEvent();
+			if (!$events->exists(Event::EVENT_AFTER_REQUEST)) {
+				return;
+			}
+			$sRequest = $sRequest ?? null;
 			$events->trigger(Event::EVENT_AFTER_REQUEST, [$sRequest, $params]);
 		}
 	}
diff --git a/System/Jwt/Jwt.php b/System/Jwt/Jwt.php
index b0231474..ec02fb9b 100644
--- a/System/Jwt/Jwt.php
+++ b/System/Jwt/Jwt.php
@@ -379,13 +379,13 @@ mlAZUEjsoaT9vjvjGTxl3uCm0TX5KTgtSJIt2kA1tYVjQef+/iZTHxY=
 		$this->data = request()->headers->getHeaders();
 		$model = $this->getUserModel();
 		if (empty($model)) {
-			throw new AuthException('授权信息已过期！');
+			return $this->addError('授权信息已过期！');
 		}
 		if (!isset($model['user'])) {
-			throw new AuthException('授权信息错误！');
+			return $this->addError('授权信息错误！');
 		}
 		if (!$this->check($this->data, $model['user'])) {
-			throw new AuthException('授权信息不合法！');
+			return $this->addError('授权信息不合法！');
 		}
 		$this->expireRefresh();