From ee0111ad0ca2c785b86d4d04a30eb5b7518ae72b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mr=C2=B7x?= <as2252258@163.com>
Date: Wed, 21 Jul 2021 15:58:33 +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

---
 Server/ServerManager.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Server/ServerManager.php b/Server/ServerManager.php
index f4708715..d147e3c8 100644
--- a/Server/ServerManager.php
+++ b/Server/ServerManager.php
@@ -9,6 +9,7 @@ use Server\SInterface\CustomProcess;
 use Server\SInterface\TaskExecute;
 use Server\Task\ServerTask;
 use Snowflake\Abstracts\Config;
+use Snowflake\Exception\ConfigException;
 use Snowflake\Exception\NotFindClassException;
 use Snowflake\Snowflake;
 use Swoole\Http\Server as HServer;
@@ -251,6 +252,7 @@ class ServerManager extends Abstracts\Server
 	 * @param array $settings
 	 * @throws NotFindClassException
 	 * @throws ReflectionException
+	 * @throws ConfigException
 	 */
 	private function createBaseServer(string $type, string $host, int $port, int $mode, array $settings = [])
 	{
@@ -261,7 +263,10 @@ class ServerManager extends Abstracts\Server
 			Constant::SERVER_TYPE_WEBSOCKET => WServer::class
 		};
 		$this->server = new $match($host, $port, SWOOLE_PROCESS, $mode);
-		$this->server->set($settings['settings']);
+		$this->server->set(array_merge(
+			Config::get('server.setting', []),
+			$settings['settings']
+		));
 		$this->addDefaultListener($type, $settings);
 	}