From 5de283d30c98e1fcfe00d0352ce5752540d7b3f7 Mon Sep 17 00:00:00 2001
From: jerry <jesse2061@outlook.com>
Date: Mon, 27 Jul 2020 09:52:52 +0800
Subject: [PATCH] fix issue #15 at version 1.6.2

---
 composer.json                     |  2 +-
 config/global.php                 | 12 ++++++------
 src/Framework/FrameworkLoader.php | 15 ++++-----------
 3 files changed, 11 insertions(+), 18 deletions(-)

diff --git a/composer.json b/composer.json
index 4780c3ef..7c47d87b 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,7 @@
     "description": "High performance QQ robot and web server development framework",
     "minimum-stability": "stable",
     "license": "Apache-2.0",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "authors": [
         {
             "name": "whale",
diff --git a/config/global.php b/config/global.php
index 6c25346f..2a3627ea 100644
--- a/config/global.php
+++ b/config/global.php
@@ -8,23 +8,23 @@ $config['host'] = '0.0.0.0';
 $config['port'] = 20001;
 
 /** 框架开到公网或外部的HTTP访问链接，通过 DataProvider::getFrameworkLink() 获取 */
-$config['http_reverse_link'] = "http://127.0.0.1:".$config['port'];
+$config['http_reverse_link'] = "http://127.0.0.1:" . $config['port'];
 
 /** 框架是否启动debug模式 */
 $config['debug_mode'] = false;
 
 /** 存放框架内文件数据的目录 */
-$config['zm_data'] = realpath(__DIR__ . "/../").'/zm_data/';
+$config['zm_data'] = realpath(__DIR__ . "/../") . '/zm_data/';
 
 /** 存放各个模块配置文件的目录 */
-$config['config_dir'] = $config['zm_data'].'config/';
+$config['config_dir'] = $config['zm_data'] . 'config/';
 
 /** 存放崩溃和运行日志的目录 */
-$config['crash_dir'] = $config['zm_data'].'crash/';
+$config['crash_dir'] = $config['zm_data'] . 'crash/';
 
 /** 对应swoole的server->set参数 */
 $config['swoole'] = [
-    'log_file' => $config['crash_dir'].'swoole_error.log',
+    'log_file' => $config['crash_dir'] . 'swoole_error.log',
     'worker_num' => 1,
     'dispatch_mode' => 2,
     //'task_worker_num' => 1,
@@ -88,7 +88,7 @@ $config['static_file_server'] = [
 
 /** 注册 Swoole Server 事件注解的类列表 */
 $config['server_event_handler_class'] = [
-    \Framework\ServerEventHandler::class, //默认不可删除，否则会不能使用框架
+    \Framework\ServerEventHandler::class,
 ];
 
 return $config;
diff --git a/src/Framework/FrameworkLoader.php b/src/Framework/FrameworkLoader.php
index 99cf3048..3a93219d 100644
--- a/src/Framework/FrameworkLoader.php
+++ b/src/Framework/FrameworkLoader.php
@@ -76,7 +76,10 @@ class FrameworkLoader
                 self::$argv[] = "--disable-console-input";
             }
             $this->server->set($settings);
-            $all_event_class = self::$settings->get("server_event_handler_class");
+            $all_event_class = self::$settings->get("server_event_handler_class") ?? [];
+            if (!in_array(ServerEventHandler::class, $all_event_class)) {
+                $all_event_class[] = ServerEventHandler::class;
+            }
             $event_list = [];
             foreach ($all_event_class as $v) {
                 $reader = new AnnotationReader();
@@ -125,15 +128,6 @@ class FrameworkLoader
             }
             if (in_array("--debug-mode", self::$argv))
                 Console::warning("You are in debug mode, do not use in production!");
-            register_shutdown_function(function() {
-                $error = error_get_last();
-                if(isset($error["type"]) && $error["type"] == 1) {
-                    if(mb_strpos($error["message"], "require") !== false && mb_strpos($error["message"], "callback") !== false) {
-                        echo "\e[38;5;203mYou may need to update your \"global.php\" config!\n";
-                        echo "Please see: https://github.com/zhamao-robot/zhamao-framework/issues/15\e[m\n";
-                    }
-                }
-            });
             $this->server->start();
         } catch (Exception $e) {
             Console::error("Framework初始化出现错误，请检查！");
@@ -177,7 +171,6 @@ class FrameworkLoader
         //if (!file_exists(CRASH_DIR . "last_error.log")) die("Can not find log file.\n");
         return true;
     }
-
 }
 
 global $motd;