From d7b926918a4139d7bb48e156068287d4645965da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Tue, 1 Sep 2020 03:16:30 +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-server/Route/Router.php | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/http-server/Route/Router.php b/http-server/Route/Router.php
index 0a8c302f..8ea3deb0 100644
--- a/http-server/Route/Router.php
+++ b/http-server/Route/Router.php
@@ -469,13 +469,9 @@ class Router extends Application implements RouterInterface
 	/**
 	 * @throws
 	 */
-	public function loader()
+	public function loadRouterSetting()
 	{
-		try {
-			$this->loadDir(APP_PATH . '/routes');
-		} catch (Exception $exception) {
-			$this->error($exception->getMessage());
-		}
+		$this->loadRouteDir(APP_PATH . '/routes');
 	}
 
 	/**
@@ -483,19 +479,22 @@ class Router extends Application implements RouterInterface
 	 * @throws Exception
 	 * 加载目录下的路由文件
 	 */
-	private function loadDir($path)
+	private function loadRouteDir($path)
 	{
-		try {
-			$files = glob($path . '/*');
-			for ($i = 0; $i < count($files); $i++) {
+		$files = glob($path . '/*');
+		for ($i = 0; $i < count($files); $i++) {
+			try {
 				if (is_dir($files[$i])) {
-					$this->loadDir($files[$i]);
-				} else {
-					$this->loadFile($files[$i]);
+					$this->loadRouteDir($files[$i]);
+				}
+				$this->loadRouteFile($files[$i]);
+			} catch (Exception $exception) {
+				$this->error($exception->getMessage());
+			} finally {
+				if (isset($exception)) {
+					unset($exception);
 				}
 			}
-		} catch (Exception $exception) {
-			$this->error($exception->getMessage());
 		}
 	}
 
@@ -504,7 +503,7 @@ class Router extends Application implements RouterInterface
 	 * @throws ReflectionException
 	 * @throws Exception
 	 */
-	private function loadFile($file)
+	private function loadRouteFile($file)
 	{
 		$router = $this;
 
@@ -512,7 +511,7 @@ class Router extends Application implements RouterInterface
 
 		/** @var Annotation $annotation */
 		$annotation = Snowflake::get()->annotation;
-		$annotation->register('http',Annotation::class);
+		$annotation->register('http', Annotation::class);
 
 		$annotation = $annotation->get('http');
 		$annotation->registration_notes($prefix . 'Interceptor', 'App\Http\Interceptor');