update composer and roll to 397（v2.3.4)

update composer and roll to 396(v2.3.3)
2026-07-02 22:35:38 +08:00 · 2021-03-23 14:16:56 +08:00 · 2021-03-23 14:13:04 +08:00 · 2021-03-23 14:11:21 +08:00 · 2021-03-23 14:09:11 +08:00 · 2021-03-23 14:04:45 +08:00
84 changed files with 1867 additions and 1003 deletions
--- a/.entry.sh
+++ b/.entry.sh
@@ -1,5 +0,0 @@
-#!/bin/bash
-if [ ! -d "/app/zhamao-framework/bin" ]; then
-	cp -r /app/zhamao-framework-bak/* /app/zhamao-framework/
-fi
-php /app/zhamao-framework/bin/start
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,5 @@ composer.lock
 /bin/.phpunit.result.cache
 /resources/zhamao.service
 .phpunit.result.cache
-.daemon_pid
+.daemon_pid
+/runtime/
--- a/README.md
+++ b/README.md
@@ -66,6 +66,11 @@ public function index() {

 如果旧版框架使用过程中无问题且对新功能暂无需求，可以继续使用 v1 版本，后续也将维护安全类更新和修复致命 bug。

+## 下载源码
+框架源码可直接克隆本仓库进行编辑，如果你在国内，访问 GitHub 和 clone 仓库比较慢，可以将 `github.com` 替换为 `fgit.zhamao.me` 进行加速。
+
+例如：`git clone https://fgit.zhamao.me/zhamao-robot/zhamao-framework.git`。
+
 ## 贡献和捐赠
 如果你在使用过程中发现任何问题，可以提交 Issue 或自行 Fork 后修改并提交 Pull Request。

--- a/bin/phpunit-swoole
+++ b/bin/phpunit-swoole
@@ -1,5 +1,5 @@
 #!/usr/bin/env php
-<?php
+/** @noinspection ALL */<?php
 /**
 * Copyright: Swlib
 * Author: Twosee <twose@qq.com>
@@ -52,6 +52,7 @@ if (!defined('PHPUNIT_COMPOSER_INSTALL')) {
        }
    }
 }
+/** @noinspection PhpIncludeInspection */
 require PHPUNIT_COMPOSER_INSTALL;
 $starttime = microtime(true);
 go(function (){
--- a/bin/systemd
+++ b/bin/systemd
@@ -21,9 +21,9 @@ function generate($argv) {
    $s .= "\nGroup=" . exec("groups | awk '{print $1}'");
    $s .= "\nWorkingDirectory=" . getcwd();
    if ($argv[0] == "systemd" && !file_exists(getcwd() . '/systemd'))
-        $s .= "\nExecStart=" . getcwd() . "/vendor/bin/start server --disable-console-input";
+        $s .= "\nExecStart=" . getcwd() . "/vendor/bin/start server";
    else
-        $s .= "\nExecStart=" . getcwd() . "/bin/start server --disable-console-input";
+        $s .= "\nExecStart=" . getcwd() . "/bin/start server";
    $s .= "\nRestart=always\n\n[Install]\nWantedBy=multi-user.target\n";
    @mkdir(getcwd() . "/resources/");
    file_put_contents(getcwd() . "/resources/zhamao.service", $s);
--- a/build-runtime.sh
+++ b/build-runtime.sh
@@ -0,0 +1,226 @@
+#!/usr/bin/env bash
+
+_php_ver="7.4.16"
+_libiconv_ver="1.15"
+_openssl_ver="1.1.1j"
+_swoole_ver="4.6.3"
+_home_dir=$(pwd)"/"
+
+function checkEnv() {
+  echo -n "检测核心组件... "
+  _msg="请通过包管理安装此依赖！"
+  type git >/dev/null 2>&1 || { echo "失败，git 不存在！"$_msg; return 1; }
+  type gcc >/dev/null 2>&1 || { echo "失败，gcc 不存在！"$_msg; return 1; }
+  type g++ >/dev/null 2>&1 || { echo "失败，g++ 不存在！"$_msg; return 1; }
+  type unzip >/dev/null 2>&1 || { echo "失败，unzip 不存在！"$_msg; return 1; }
+  type autoconf >/dev/null 2>&1 || { echo "失败，autoconf 不存在！"; return 1; }
+  type pkg-config >/dev/null 2>&1 || { echo "失败，pkg-config 不存在！"$_msg; return 1; }
+  type wget >/dev/null 2>&1 || type curl >/dev/null 2>&1 || { echo "失败，curl/wget 不存在！"$_msg; return 1; }
+  echo "完成！"
+  echo "如果下载过程中出现错误，请删除 runtime/ 文件夹重试！"
+  echo "此脚本安装的php/swoole均为最小版本，不含其他扩展（如zip、xml、gd）等！"
+  echo -n "如果编译过程缺少依赖，请通过包管理安装对应的依赖！[按回车继续] "
+  # shellcheck disable=SC2034
+  read ents
+}
+
+function downloadIt() {
+  downloader="wget"
+  type wget >/dev/null 2>&1 || { downloader="curl"; }
+  if [ "$downloader" = "wget" ]; then
+    _down_prefix="O"
+  else
+    _down_prefix="o"
+  fi
+  _down_symbol=0
+  if [ ! -f "$2" ]; then
+    $downloader "$1" -$_down_prefix "$2" >/dev/null 2>&1 && \
+    echo "完成！" && _down_symbol=1
+  else
+    echo "已存在！" && _down_symbol=1
+  fi
+  if [ $_down_symbol == 0 ]; then
+    echo "失败！请检查网络连接！"
+    rm -rf "$2"
+    return 1
+  fi
+  return 0
+}
+
+function downloadAll() {
+  # 创建文件夹
+  mkdir "$_home_dir""runtime" >/dev/null 2>&1
+  mkdir "$_home_dir""runtime/tmp_download" >/dev/null 2>&1
+  mkdir "$_home_dir""runtime/cellar" >/dev/null 2>&1
+  _down_dir=$_home_dir"runtime/tmp_download/"
+
+  # 下载PHP
+  echo -n "正在下载 php 源码... "
+  downloadIt "http://mirrors.sohu.com/php/php-$_php_ver.tar.gz" "$_down_dir""php.tar.gz" || { exit; }
+
+  # 下载libiconv
+  echo -n "正在下载 libiconv 源码... "
+  downloadIt "https://mirrors.tuna.tsinghua.edu.cn/gnu/libiconv/libiconv-$_libiconv_ver.tar.gz" "$_down_dir""libiconv.tar.gz" || { exit; }
+
+  echo -n "正在下载 openssl 源码... "
+  downloadIt "http://mirrors.cloud.tencent.com/openssl/source/openssl-$_openssl_ver.tar.gz" "$_down_dir""openssl.tar.gz" || { exit; }
+
+  echo -n "正在下载 swoole 源码... "
+  downloadIt "https://dl.zhamao.me/swoole/swoole-$_swoole_ver.tgz" "$_down_dir""swoole.tar.gz" || { exit; }
+
+  echo -n "正在下载 composer ... "
+  downloadIt "https://mirrors.aliyun.com/composer/composer.phar" "$_home_dir""runtime/cellar/composer" || { exit; }
+
+  #echo -n "正在下载 libcurl 源码... "
+  #downloadIt "https://curl.se/download/curl-7.75.0.tar.gz" "$_down_dir""libcurl.tar.gz" || { exit; }
+}
+
+function compileIt() {
+  _down_dir="$_home_dir""runtime/tmp_download/"
+  _source_dir="$_home_dir""runtime/tmp_source/"
+  _cellar_dir="$_home_dir""runtime/cellar/"
+  case $1 in
+  "libiconv")
+    if [ -f "$_cellar_dir""libiconv/bin/iconv" ]; then
+      echo "已编译！" && return
+    fi
+    tar -xf "$_down_dir""libiconv.tar.gz" -C "$_source_dir" && \
+    cd "$_source_dir""libiconv-"$_libiconv_ver && \
+    ./configure --prefix="$_cellar_dir""libiconv" >/dev/null 2>&1 && \
+    make -j4 >/dev/null 2>&1 && \
+    make install >/dev/null 2>&1 && \
+    echo "完成！"
+    ;;
+  "libzip")
+    if [ -f "$_cellar_dir""libzip/bin/libzip" ]; then
+      echo "已编译！" && return
+    fi
+    tar -xf "$_down_dir""libzip.tar.gz" -C "$_source_dir" && \
+    cd "$_source_dir""libzip-1.7.3" && \
+    ./configure --prefix="$_cellar_dir""libzip" && \
+    make -j4 && \
+    make install && \
+    echo "完成！"
+    ;;
+  "libcurl")
+    if [ -f "$_cellar_dir""libcurl/bin/libcurl" ]; then
+      echo "已编译！" && return
+    fi
+    tar -xf "$_down_dir""libcurl.tar.gz" -C "$_source_dir" && \
+    cd "$_source_dir""libcurl-7.75.0" && \
+    ./configure --prefix="$_cellar_dir""libcurl" && \
+    make -j4 && \
+    make install && \
+    echo "完成！"
+    ;;
+  "php")
+    if [ -f "$_cellar_dir""php/bin/php" ]; then
+      echo "已编译！" && return
+    fi
+    tar -xf "$_down_dir""php.tar.gz" -C "$_source_dir" && \
+    cd "$_source_dir""php-"$_php_ver && \
+    ./buildconf --force && \
+    PKG_CONFIG_PATH="$_cellar_dir""openssl/lib/pkgconfig" ./configure --prefix="$_cellar_dir""php" \
+      --with-config-file-path="$_home_dir""runtime/etc" \
+      --disable-fpm \
+      --enable-cli \
+      --enable-posix \
+      --enable-ctype \
+      --enable-mysqlnd \
+      --enable-pdo \
+      --enable-pcntl \
+      --with-openssl="$_cellar_dir""openssl" \
+      --enable-sockets \
+      --disable-xml \
+      --disable-xmlreader \
+      --disable-xmlwriter \
+      --without-libxml \
+      --disable-dom \
+      --without-sqlite3 \
+      --without-pdo-sqlite \
+      --disable-simplexml \
+      --with-pdo-mysql=mysqlnd \
+      --with-zlib \
+      --with-iconv="$_cellar_dir""libiconv" \
+      --enable-phar && \
+    make -j4 && \
+    make install && \
+    cp "$_source_dir""php-$_php_ver/php.ini-production" "$_home_dir""runtime/etc/php.ini" && \
+    echo "完成！"
+    ;;
+  "openssl")
+    if [ -f "$_cellar_dir""openssl/bin/openssl" ]; then
+      echo "已编译！" && return
+    fi
+    tar -xf "$_down_dir""openssl.tar.gz" -C "$_source_dir" && \
+    cd "$_source_dir""openssl-""$_openssl_ver" && \
+    ./config --prefix="$_cellar_dir""openssl" && \
+    make -j4 && \
+    make install && \
+    echo "完成！"
+    ;;
+  "swoole")
+    "$_home_dir"runtime/cellar/php/bin/php --ri swoole >/dev/null 2>&1
+    # shellcheck disable=SC2181
+    if [ $? == 0 ]; then
+      echo "已编译！" && return
+    fi
+    tar -xf "$_down_dir""swoole.tar.gz" -C "$_source_dir" && \
+    cd "$_source_dir""swoole-""$_swoole_ver" && \
+    PATH="$_cellar_dir""php/bin:$PATH" phpize && \
+    PATH="$_cellar_dir""php/bin:$PATH" ./configure --prefix="$_cellar_dir""php" \
+      --enable-sockets \
+      --enable-http2 \
+      --enable-openssl \
+      --with-openssl-dir="$_cellar_dir""openssl" \
+      --enable-mysqlnd && \
+    make -j4 && \
+    make install && \
+    echo "extension=swoole.so" >> "$_home_dir""runtime/etc/php.ini" && \
+    echo "完成！"
+    ;;
+  esac
+}
+
+function compileAll() {
+  _down_dir=$_home_dir"runtime/tmp_download/"
+  _source_dir=$_home_dir"runtime/tmp_source/"
+  mkdir "$_source_dir" >/dev/null 2>&1
+  mkdir "$_home_dir""runtime/etc" >/dev/null 2>&1
+
+  echo -n "正在编译 libiconv ... "
+  compileIt libiconv || { return 1; }
+
+  #echo -n "正在编译 libcurl ... "
+  #compileIt libcurl || { exit; }
+
+  echo -n "正在编译 openssl ... "
+  compileIt openssl || { return 1; }
+
+  #echo -n "正在编译 libzip ... "
+  #compileIt libzip || { exit; }
+
+  echo -n "正在编译 php ... "
+  compileIt php || { return 1; }
+
+  echo -n "正在编译 swoole ... "
+  compileIt swoole || { return 1; }
+  return 0
+}
+
+function linkBin(){
+  mkdir "$_home_dir""runtime/bin" >/dev/null 2>&1
+  ln -s "$_home_dir""runtime/cellar/php/bin/php" "$_home_dir""runtime/bin/php" >/dev/null 2>&1
+  echo "runtime/cellar/php/bin/php runtime/cellar/composer \$@" > "$_home_dir""runtime/bin/composer" && chmod +x "$_home_dir""runtime/bin/composer"
+  echo "Done!"
+  runtime/bin/composer config repo.packagist composer https://mirrors.aliyun.com/composer/
+}
+
+checkEnv && \
+downloadAll && \
+compileAll && \
+linkBin && \
+echo "成功部署所有环境！" && \
+echo -e "composer更新依赖：\t\"runtime/bin/composer update\"" && \
+echo -e "启动框架(源码模式)：\t\"runtime/bin/php bin/start server\"" && \
+echo -e "启动框架(普通模式)：\t\"runtime/bin/php vendor/bin/start server\""
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,6 @@
    "description": "High performance chat robot and web server development framework",
    "minimum-stability": "stable",
    "license": "Apache-2.0",
-    "version": "2.2.9",
    "extra": {
        "exclude_annotate": [
            "src/ZM"
--- a/config/global.php
+++ b/config/global.php
@@ -109,15 +109,22 @@ $config['static_file_server'] = [

 /** 注册 Swoole Server 事件注解的类列表 */
 $config['server_event_handler_class'] = [
-    \ZM\Event\ServerEventHandler::class,
+    // 这里添加例如 \ZM\Event\ServerEventHandler::class 这样的启动注解类
 ];

 /** 服务器启用的外部第三方和内部插件 */
-$config['modules'] = [
-    'onebot' => [
-        'status' => true,
-        'single_bot_mode' => false
-    ], // QQ机器人事件解析器，如果取消此项则默认为 true 开启状态，否则你手动填写 false 才会关闭
+$config['modules']['onebot'] = [
+    // 机器人解析模块，关闭后无法使用如@CQCommand等注解
+    'status' => true,
+    'single_bot_mode' => false
+];
+
+$config['modules']['remote_terminal'] = [
+    // 一个远程简易终端，使用nc直接连接即可，但是不建议开放host为0.0.0.0(远程连接)
+    'status' => false,
+    'host' => '127.0.0.1',
+    'port' => 20002,
+    'token' => ''
 ];

 return $config;
--- a/docs/advanced/custom-start.md
+++ b/docs/advanced/custom-start.md
@@ -85,7 +85,6 @@ bin/start server # 通过源码模式启动框架
 - `--debug-mode`：启用调试模式，调试模式的作用是关闭一键协程化和终端交互，减少 Swoole 本身对代码逻辑的干扰（比如执行 `shell_exec()` 报错的话可以开启这个进行调试）。
 - `--log-{mode}`：设置 log 等级。支持 `--log-debug`，`--log-verbose`，`--log-info`，`--log-warning`，`--log-error`。
 - `--log-theme`：设置终端信息的主题。这个选项适用于多种终端信息显示的兼容，例如白色终端和不支持颜色的终端。详见 [Console - 主题设置](/component/console/#_2)。
- `--disable-console-input`：关闭终端交互，如果你使用的不是 tmux、screen 而是直接将进程使用 systemd 等方式运行到 init 守护进程下，则需要关闭终端交互输入，关闭后不可以使用 `stop, reload, logtest` 等交互命令。
 - `--disable-coroutine`：关闭一键协程化。
 - `--daemon`：以守护进程方式运行框架，此参数将直接在输出 motd 后将进程挂到 init 下运行，后台常驻。
 - `--watch`：监控 `src/` 目录下的文件变化，有变化则自动重新载入代码。开启监控需要安装 PHP 扩展：inotify。使用 pecl 就可以安装：`pecl install inotify`。
--- a/docs/advanced/inside-class.md
+++ b/docs/advanced/inside-class.md
@@ -27,3 +27,44 @@
 TODO：先放一放。
 ```

+## ZM\Entity\MatchObject
+
+此类是调用方法 `MessageUtil::matchCommand()` 返回的对象体，含有匹配成功与否和匹配到的注解相关的信息。
+
+### 属性
+
+- `$match`：`bool` 类型，返回匹配是否成功
+- `$object`：`CQCommand` 注解类，如果匹配成功则返回对应的 `@CQCommand` 信息
+- `match`：`array` 类型，如果匹配成功则返回匹配到的参数
+
+```php
+// 假设我有一个注解事件 @CQCommand(match="你好")，绑定的函数是 \Module\Example\Hello 下的 hello123()
+
+$obj = MessageUtil::matchCommand("你好 我叫顺溜 我今年二十八", ctx()->getData());
+/* 以下是返回信息，仅供参考
+$obj->match ==> true
+$obj->object ==> \ZM\Annotation\CQ\CQCommand: (
+	match: "你好",
+    pattern: "",
+    regex: "",
+    start_with: "",
+    end_with: "",
+    keyword: "",
+    alias: [],
+    message_type: "",
+    user_id: 0,
+    group_id: 0,
+    discuss_id: 0,
+    level: 20,
+    method: "hello123",
+    class: \Module\Example\Hello::class
+)
+$obj->match ==> [
+	"我叫顺溜",
+	"我今年二十八"
+]
+*/
+```
+
+
+
--- a/docs/advanced/task-worker.md
+++ b/docs/advanced/task-worker.md
@@ -0,0 +1,3 @@
+# 使用 TaskWorker 进程处理密集运算
+
+> 新开个坑，有时间补上。（__填坑标记__）
--- a/docs/assets/face_id.html
+++ b/docs/assets/face_id.html
--- a/docs/assets/img/image-20210321193956832.png
+++ b/docs/assets/img/image-20210321193956832.png
--- a/docs/component/cqcode.md
+++ b/docs/component/cqcode.md
@@ -128,8 +128,9 @@ $str = CQ::removeCQ("[CQ:at,qq=all]这是带表情的全体消息[CQ:face,id=8]"

 解析 CQ 码。

- 参数：`getCQ($msg);`：要解析出 CQ 码的消息。
- 返回：`数组 | null`，见下表
+- 定义：`getCQ($msg, $is_object = false)`
+- 参数 `$is_object` 为 true 时，返回一个 `\ZM\Entity\CQObject` 对象，此对象的属性和下表相同。（2.3.0+ 版本可用）
+- 返回：`数组 | CQObject | null`，见下表。

 | 键名   | 说明                                                         |
 | ------ | ------------------------------------------------------------ |
@@ -140,6 +141,10 @@ $str = CQ::removeCQ("[CQ:at,qq=all]这是带表情的全体消息[CQ:face,id=8]"

 ### CQ::getAllCQ()

+定义：`CQ::getAllCQ($msg, $is_object = false)`
+
+参数 `$is_object` 为 true 时，返回一个 `\ZM\Entity\CQObject[]` 对象数组，此对象的属性和上面的表格内相同。（2.3.0+ 版本可用）
+
 解析 CQ 码，和 `getCQ()` 的区别是，这个会将字符串中的所有 CQ 码都解析出来，并以同样上方解析出来的数组格式返回。

 ```php
@@ -174,7 +179,7 @@ CQ::getAllCQ("[CQ:at,qq=123]你好啊[CQ:at,qq=456]");

 定义：`CQ::face($id)`

-参数：`$id` 为 QQ 表情对应的 ID 号，一些常见的表情 ID 对应的表情样式见 [QQ 对应表情ID表](/assets/face_id.html)。
+参数：`$id` 为 QQ 表情对应的 ID 号，一些常见的表情 ID 对应的表情样式见 [QQ 对应表情ID表](https://static.zhamao.me/face_id.html)。

 ```php
 /**
--- a/docs/component/global-functions.md
+++ b/docs/component/global-functions.md
@@ -134,10 +134,6 @@ set_coroutine_params(["data" => [

 别名：`context()`，获取当前协程的上下文，见 [上下文](/component/context/)。

-## zm_debug()
-
-同 `Console::debug($msg)`。
-
 ## zm_sleep()

 协程版 `sleep()` 函数。
@@ -255,4 +251,58 @@ bot()->sendPrivateMsg(123456, "你好啊！！");

 定义：`getAllFdByConnectType(string $type = 'default'): array`

-当 `$type` 为 `qq` 时，则返回所有 OneBot 机器人接入的 WebSocket 连接号。
+当 `$type` 为 `qq` 时，则返回所有 OneBot 机器人接入的 WebSocket 连接号。
+
+## zm_dump()
+
+更漂亮地输出变量值，可替代 `var_dump()`。
+
+```php
+class Pass {
+    public $foo = 123;
+    public $bar = ["a", "b"];
+}
+$pass = new Pass();
+$pass->obj = true;
+zm_dump($pass);
+```
+
+<img src="../assets/img/image-20210321193956832.png" alt="image-20210321193956832" style="zoom:50%;" />
+
+## zm_config()
+
+同 `ZMConfig::get()`。
+
+定义：`zm_config($name, $key = null)`。
+
+有关 ZMConfig 模块的说明，见 [指南 - 基本配置](/guide/basic-config/)。
+
+```php
+zm_config("global"); //等同于 ZMConfig::get("global");
+zm_config("global", "swoole"); //等同于 ZMConfig::get("global", "swoole");
+```
+
+## zm_info()
+
+同 `Console::info($msg)`。
+
+## zm_debug()
+
+同 `Console::debug($msg)`。
+
+## zm_warning()
+
+同 `Console::warning($msg)`。
+
+## zm_success()
+
+同 `Console::success($msg)`。
+
+## zm_error()
+
+同 `Console::error($msg)`。
+
+## zm_verbose()
+
+同 `Console::verbose($msg)`。
+
--- a/docs/component/message-util.md
+++ b/docs/component/message-util.md
@@ -0,0 +1,89 @@
+# MessageUtil 消息处理工具类
+
+类定义：`\ZM\Utils\MessageUtil`
+
+> 2.3.0 版本起可用。
+
+这里放置一些机器人聊天消息处理的便捷静态方法，例如下载图片等。
+
+## 方法
+
+### downloadCQImage()
+
+下载用户消息中所带的所有图片，并返回文件路径。
+
+定义：`downloadCQImage($msg, $path = null)`
+
+参数 `$msg` 为带图片的用户消息，例如 `你好啊！\n[CQ:image,file=a.jpg,url=https://zhamao.xin/file/hello.jpg]`
+
+参数 `$path` 为图片下载的路径，如果不填（默认 null）则指定为 `zm_data/images/` 目录，且不存在会自动创建。
+
+```php
+$r = MessageUtil::downloadCQImage("你好啊！\n[CQ:image,file=a.jpg,url=https://zhamao.xin/file/hello.jpg]");
+/*
+$r == [
+    "/path-to/zhamao-framework/zm_data/images/a.jpg"
+];
+*/
+```
+
+如果返回的是空数组 `[ ]`，则表明消息中没有图片。如果返回的是 `false`，则表明其中至少一张下载失败或路径有误。
+
+### containsImage()
+
+检查消息中是否含有图片。
+
+定义：`containsImage($msg)`
+
+返回：`bool`，你懂的，true 就是有，false 就没有。
+
+```php
+MessageUtil::containsImage("[CQ:image,file=a.jpg,url=http://xxx]"); // true
+MessageUtil::containsImage("[CQ:face,id=140] 咦，这是一条带表情的消息"); // false
+```
+
+### getImageCQFromLocal()
+
+通过文件路径获取图片的发送 CQ 码。
+
+定义：`getImageCQFromLocal($file, $type = 0)`
+
+参数 `$file` 为图片的绝对路径。
+
+返回：图片的 CQ 码，如 `[CQ:image,file=xxxxx]`
+
+参数 `$type`：
+
+- `0`：以 base64 的方式发送图片，返回结果如 `[CQ:image,file=base64://xxxxxx]`
+- `1`：以 `file://` 本地文件的方式发送图片，返回结果如 `[CQ:image,file=file:///path-to/images/a.jpg]`
+- `2`：返回图片的 http:// CQ 码（默认为 /images/ 路径就是文件对应所在的目录），如 `[CQ:image,file=http://127.0.0.1:20001/images/a.jpg]`
+
+### splitCommand()
+
+切割用户消息为数组形式（`@CQCommand` 就是使用此方式切割的）
+
+定义：`splitCommand($msg): array`
+
+返回：数组，切分后的。
+
+!!! tip "为什么不直接使用 explode 呢"
+
+	因为 `explode()` 只会简单粗暴的切割字符串，假设用户输入的消息中两个词中间有多个空格，则会有空的词出现。例如 `你好     我是一个长空格`。此函数会将多个空格当作一个空格来对待。
+
+```php
+MessageUtil::splitCommand("你好 我是傻瓜\n我是傻瓜二号"); // ["你好","我是傻瓜","我是傻瓜二号"]
+MessageUtil::splitCommand("我有   三个空格"); // ["我有","三个空格"]
+```
+
+### matchCommand()
+
+匹配一条消息到 `@CQCommand` 规则的注解事件，返回要执行的类和函数位置。
+
+定义：`matchCommand($msg, $obj)`
+
+参数 `$msg` 为消息内容。
+
+参数 `$obj` 为事件的对象，可使用 `ctx()->getData()` 获取原先的事件体（仅限 OneBot 消息类型事件中使用）
+
+返回：`\ZM\Entity\MatchObject` 对象，含有匹配成功与否，匹配到的注解对象，匹配到的分割词等，见 []
+
--- a/docs/component/route-manager.md
+++ b/docs/component/route-manager.md
@@ -0,0 +1,54 @@
+# HTTP 路由管理
+
+HTTP 路由管理器用作管理炸毛框架内 `@RequestMapping` 和静态目录的路由操作的，可在运行过程中编写添加路由。
+
+类定义：`\ZM\Http\RouteManager`
+
+> 2.3.0 版本起可用。
+
+!!! warning "注意"
+
+	因为炸毛框架的路由实现是不基于跨进程的共享内存的，所以每次使用这里面的工具函数都需要单独在所有 Worker 进程中执行一次，最好的办法就是在启动框架时执行（`@OnStart(-1)` 即可，代表此注解事件将在每个工作进程中都被执行一次）。
+
+## 方法
+
+### importRouteByAnnotation()
+
+通过注解类导入路由。（注：此方法一般为框架内部使用）
+
+定义：`importRouteByAnnotation(RequestMapping $vss, $method, $class, $methods_annotations)`
+
+参数 `$vss`：RequestMapping 注解类，类中定义 `route` 和 `request_method` 即可。
+
+参数 `$method, $class`：执行的目标注解事件函数位置，比如 `$class = \Module\Example\Hello::class`，`$method = 'hitokoto'`。
+
+参数 `$methods_annotations`：需要绑定的 Controller 注解类数组，一般数组内建议只带有一个 Controller，如 `[$controller]`。
+
+### addStaticFileRoute()
+
+添加一个单目录（此目录下无子目录，只有文件）并绑定为一个路由。
+
+定义：`addStaticFileRoute($route, $path)`
+
+参数 `$route`：绑定的目标路由，如 `/images/`。
+
+参数 `$path`：绑定的文件目录位置，如 `/root/zhamao-framework-starter/zm_data/images/`。
+
+```php
+/**
+ * @OnStart(-1)
+ */
+public function onStart() {
+    RouteManager::addStaticFileRoute("/images/", DataProvider::getDataFolder()."images/");
+}
+```
+
+## 属性
+
+### RouteManager::$routes
+
+此为存放路由树的变量，请谨慎操作。
+
+定义：`\Symfony\Component\Routing\RouteCollection | null`
+
+炸毛框架使用了 Symfony 框架的 route 组件，有关详情请查阅 [文档](https://symfony.com/doc/current/routing.html)。
--- a/docs/component/task-worker.md
+++ b/docs/component/task-worker.md
@@ -0,0 +1,26 @@
+# TaskManager 工作进程管理
+
+此类管理的是 TaskWorker 相关工作。有关使用 TaskWorker 的教程，见 [进阶 - 使用 TaskWorker 进程处理密集运算](/advanced/task-worker)
+
+类定义：`\ZM\Utils\TaskManager`
+
+使用 TaskWorker 需要先在 `global.php` 配置文件中开启！
+
+## 方法
+
+### runTask()
+
+在 TaskWorker 运行任务。
+
+定义：`runTask($task_name, $timeout = -1, ...$params)`
+
+参数 `$task_name`：对应 `@OnTask` 注解绑定的任务函数。
+
+参数 `$timeout`：等待任务函数最长运行的时间（秒），如果超过此时间将返回 false。
+
+参数 `剩余`：将变量传入 TaskWorker 进程，除 Closure，资源类型外，可序列化的变量均可。
+
+```php
+TaskManager::runTask("heavy_task", 100, "param1", "param2");
+```
+
--- a/docs/component/zmutil.md
+++ b/docs/component/zmutil.md
@@ -21,3 +21,47 @@ class ASD{
 ZMUtil::getModInstance(ASD::class)->test = 5;
 ```

+## ZMUtil::getReloadableFiles()
+
+返回可通过热重启（reload）来重新加载的 php 文件列表。
+
+以下是示例模块下的例子（直接拉取最新的框架源码并运行框架后获取的）。
+
+```php
+array:31 [
+  94 => "src/ZM/Context/Context.php"
+  95 => "src/ZM/Context/ContextInterface.php"
+  96 => "src/ZM/Annotation/AnnotationParser.php"
+  97 => "src/Custom/Annotation/Example.php"
+  98 => "src/ZM/Annotation/Interfaces/CustomAnnotation.php"
+  99 => "src/Module/Example/Hello.php"
+  100 => "src/ZM/Annotation/Swoole/OnStart.php"
+  101 => "src/ZM/Annotation/CQ/CQCommand.php"
+  102 => "src/ZM/Annotation/Interfaces/Level.php"
+  103 => "src/ZM/Annotation/Command/TerminalCommand.php"
+  104 => "src/ZM/Annotation/Http/RequestMapping.php"
+  105 => "src/ZM/Annotation/Http/RequestMethod.php"
+  106 => "src/ZM/Annotation/Http/Middleware.php"
+  107 => "src/ZM/Annotation/Interfaces/ErgodicAnnotation.php"
+  108 => "src/ZM/Annotation/Swoole/OnOpenEvent.php"
+  109 => "src/ZM/Annotation/Swoole/OnSwooleEventBase.php"
+  110 => "src/ZM/Annotation/Interfaces/Rule.php"
+  111 => "src/ZM/Annotation/Swoole/OnCloseEvent.php"
+  112 => "src/ZM/Annotation/Swoole/OnRequestEvent.php"
+  113 => "src/ZM/Http/RouteManager.php"
+  114 => "vendor/symfony/routing/RouteCollection.php"
+  115 => "vendor/symfony/routing/Route.php"
+  116 => "src/Module/Middleware/TimerMiddleware.php"
+  117 => "src/ZM/Http/MiddlewareInterface.php"
+  118 => "src/ZM/Annotation/Http/MiddlewareClass.php"
+  119 => "src/ZM/Annotation/Http/HandleBefore.php"
+  120 => "src/ZM/Annotation/Http/HandleAfter.php"
+  121 => "src/ZM/Annotation/Http/HandleException.php"
+  122 => "src/ZM/Event/EventManager.php"
+  123 => "src/ZM/Annotation/Swoole/OnSwooleEvent.php"
+  124 => "src/ZM/Event/EventDispatcher.php"
+]
+```
+
+> 为什么不能重载所有文件？因为框架是多进程模型，而重载相当于只重新启动了一次 Worker 进程，Manager 和 Master 进程未重启，所以被 Manager、Master 进程已经加载的 PHP 文件无法使用 reload 命令重新加载。详见 [进阶 - 进程间隔离](/advanced/multi-process/#_5)。
+
--- a/docs/event/framework-annotations.md
+++ b/docs/event/framework-annotations.md
@@ -221,6 +221,27 @@
 | tick_ms   | `int`，**必填**，间隔的毫秒数，例如 1 秒间隔为 `1000`，范围大于 0，小于 86400000。 |                          |      |
 | worker_id | `int`，要在哪个 Worker 进程上执行，默认为 0，范围是 0～{你设定的 Worker 数量-1}，如果是 -1 的话，则会在所有 Worker 进程上触发。 | 限定只执行的 Worker 进程 |      |

+## OnTask()
+
+定义一个在工作进程中运行的任务函数。详情见 [进阶 - 使用 TaskWorker 进程处理密集运算](/advanced/task-worker)。
+
+### 属性
+
+| 类型       | 值                            |
+| ---------- | ----------------------------- |
+| 名称       | `@OnTask`                     |
+| 触发前提   | 在框架加载后激活              |
+| 命名空间   | `ZM\Annotation\Swoole\OnTask` |
+| 适用位置   | 方法                          |
+| 返回值处理 | 有，返回 Worker 进程的结果    |
+
+### 注解参数
+
+| 参数名称  | 参数范围                                                     | 用途         | 默认 |
+| --------- | ------------------------------------------------------------ | ------------ | ---- |
+| task_name | `string`，**必填**，任务函数的名称，不建议重复。             |              |      |
+| rule      | 设置触发前提，PHP 代码，返回 bool 值即可，参考 OnRequestEvent | 限定是否执行 | 空   |
+
 ## OnSetup()

 在框架加载前执行的代码。此部分代码是在主进程执行的，不可在此事件中使用任何协程相关的功能。
@@ -241,6 +262,27 @@

 无。

+## TerminalCommand()
+
+添加一个远程终端的自定义命令。（2.4.0 版本起可用）
+
+### 属性
+
+| 类型       | 值                                      |
+| ---------- | --------------------------------------- |
+| 名称       | `@TerminalCommand`                      |
+| 触发前提   | 连接到远程终端可触发                    |
+| 命名空间   | `ZM\Annotation\Command\TerminalCommand` |
+| 适用位置   | 方法                                    |
+| 返回值处理 | 无                                      |
+
+### 注解参数
+
+| 参数名称    | 参数范围                       | 默认 |
+| ----------- | ------------------------------ | ---- |
+| command     | `string`，**必填**，命令字符串 |      |
+| description | `string`，要显示的帮助文本     | 空   |
+
 ## 示例1（机器人连接框架后输出信息）

 ```php
@@ -385,3 +427,6 @@ public function onCrawl() {
 }
 ```

+## 示例6（创建一个远程终端命令并调试框架）
+
+> 开个坑，以后填。（__填坑标记__）
--- a/docs/guide/basic-config.md
+++ b/docs/guide/basic-config.md
@@ -36,12 +36,14 @@

 ### 子表 **swoole**

-| 配置名称        | 说明                                                         | 默认值                              |
-| --------------- | ------------------------------------------------------------ | ----------------------------------- |
-| `log_file`      | Swoole 的日志文件                                            | `crash_dir` 下的 `swoole_error.log` |
-| `worker_num`    | Worker 工作进程数                                            | 运行框架的主机 CPU 核心数           |
-| `dispatch_mode` | 数据包分发策略，见 [文档](https://wiki.swoole.com/#/server/setting?id=dispatch_mode) | 2                                   |
-| `max_coroutine` | 最大协程并发数                                               | 300000                              |
+| 配置名称                | 说明                                                         | 默认值                              |
+| ----------------------- | ------------------------------------------------------------ | ----------------------------------- |
+| `log_file`              | Swoole 的日志文件                                            | `crash_dir` 下的 `swoole_error.log` |
+| `worker_num`            | Worker 工作进程数                                            | 运行框架的主机 CPU 核心数           |
+| `dispatch_mode`         | 数据包分发策略，见 [文档](https://wiki.swoole.com/#/server/setting?id=dispatch_mode) | 2                                   |
+| `max_coroutine`         | 最大协程并发数                                               | 300000                              |
+| `task_worker_num`       | TaskWorker 工作进程数                                        | 默认不开启（此参数被注释）          |
+| `task_enable_coroutine` | TaskWorker 工作进程启用协程                                  | 默认不开启（此参数被注释）或 `bool` |

 ### 子表 **light_cache**

--- a/docs/update/v2.md
+++ b/docs/update/v2.md
@@ -1,5 +1,63 @@
 # 更新日志（v2 版本）

+## v2.3.4 (build 397)
+
+> 更新时间：2021.3.23
+
+- 修复：版本号显示
+
+## v2.3.3 (build 396)
+
+> 更新时间：2021.3.23
+
+- 修复：Composer 调试时出现加载重复的问题
+
+## v2.3.2 (build 395)
+
+> 更新时间：2021.3.23
+
+- 修复：数据库查询部分情况无法正常使用的 bug
+- 修复：内存泄漏问题
+
+## v2.3.1
+
+> 更新时间：2021.3.18
+
+- 规范代码，修复一个小报错的 bug
+
+
+## v2.3.0
+
+> 更新时间：2021.3.16
+
+- 新增：MessageUtil 消息处理工具类
+- 新增：TaskManager，封装了 TaskWorker 进程的应用
+- 新增：CQObject，使用 `CQ::getCQ()` 可获取对象形式的 CQ 码解析结果
+- 新增：`@OnTask` 注解，绑定任务函数
+- 新增：RouteManager 路由管理类，可快速添加路由
+- 修复：`ZM_DATA` 和 `DataProvider::getDataFolder()` 返回 false 的问题
+- 优化：关闭显示停止框架后多余的输出信息
+
+注：本次升级建议升级后合并全局配置文件，有一些新加的内容。
+
+## v2.2.11
+
+> 更新时间：2021.3.13
+
+- 新增：内部 ID 版本号（ZM_VERSION_ID）
+- 优化：启动时 log 的等级
+- 移除：终端输入命令
+- 修复：纯 HTTP 服务器的启动 bug
+- 新增：`zm_timer` 的报错处理，防止服务器直接崩掉
+
+## v2.2.10
+
+> 更新时间：2021.3.8
+
+- 新增：用户态 php 编译脚本 `build-runtime.sh`
+- 移除：无用的调试信息
+- 新增：`--show-php-ver` 启动参数
+
 ## v2.2.9

 > 更新时间：2021.3.6
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -72,9 +72,12 @@ nav:
      - 事件分发器: event/event-dispatcher.md
  - 框架组件:
      - 框架组件: component/index.md
-      - 机器人 API: component/robot-api.md
-      - CQ 码（多媒体消息）: component/cqcode.md
      - 上下文: component/context.md
+      - 聊天机器人组件:
+          - 机器人 API: component/robot-api.md
+          - CQ 码（多媒体消息）: component/cqcode.md
+          - 机器人消息处理: component/message-util.md
+          - Token 验证: component/access-token.md
      - 存储:
          - LightCache 轻量缓存: component/light-cache.md
          - MySQL 数据库: component/mysql.md
@@ -82,13 +85,15 @@ nav:
          - ZMAtomic 原子计数器: component/atomics.md
          - SpinLock 自旋锁: component/spin-lock.md
          - 文件管理: component/data-provider.md
+      - HTTP 服务器工具类:
+          - HTTP 和 WebSocket 客户端: component/zmrequest.md
+          - HTTP 路由管理: component/route-manager.md
      - 协程池: component/coroutine-pool.md
      - 单例类: component/singleton-trait.md
      - ZMUtil 杂项: component/zmutil.md
      - 全局方法: component/global-functions.md
-      - HTTP 和 WebSocket 客户端: component/zmrequest.md
      - Console 终端: component/console.md
-      - Token 验证: component/access-token.md
+      - TaskWorker 管理: component/task-worker.md
  - 进阶开发:
      - 进阶开发: advanced/index.md
      - 框架剖析: advanced/framework-structure.md
@@ -97,6 +102,7 @@ nav:
      - 内部类文件手册: advanced/inside-class.md
      - 接入 WebSocket 客户端: advanced/connect-ws-client.md
      - 框架多进程: advanced/multi-process.md
+      - TaskWorker 提高并发: advanced/task-worker.md
      - 开发实战教程:
          - 编写管理员才能触发的功能: advanced/example/admin.md
  - FAQ: FAQ.md
--- a/src/Custom/global_function.php
+++ b/src/Custom/global_function.php
@@ -1,6 +1,11 @@
 <?php /** @noinspection PhpFullyQualifiedNameUsageInspection */ #plain

 //这里写你的全局函数
+/**
+ * @param callable $func
+ * @param string $name
+ * @noinspection PhpUnused
+ */
 function pgo(callable $func, $name = "default") {
    \ZM\Utils\CoroutinePool::go($func, $name);
 }
--- a/src/Module/Example/Hello.php
+++ b/src/Module/Example/Hello.php
@@ -1,17 +1,25 @@
-<?php
+<?php /** @noinspection PhpMissingReturnTypeInspection */

 namespace Module\Example;

+use ZM\Annotation\Command\TerminalCommand;
+use ZM\Annotation\CQ\CQBefore;
+use ZM\Annotation\CQ\CQMessage;
 use ZM\Annotation\Http\Middleware;
 use ZM\Annotation\Swoole\OnCloseEvent;
 use ZM\Annotation\Swoole\OnOpenEvent;
 use ZM\Annotation\Swoole\OnRequestEvent;
+use ZM\Annotation\Swoole\OnStart;
+use ZM\API\CQ;
+use ZM\API\TuringAPI;
 use ZM\ConnectionManager\ConnectionObject;
 use ZM\Console\Console;
 use ZM\Annotation\CQ\CQCommand;
 use ZM\Annotation\Http\RequestMapping;
 use ZM\Event\EventDispatcher;
+use ZM\Exception\InterruptException;
 use ZM\Requests\ZMRequest;
+use ZM\Utils\MessageUtil;
 use ZM\Utils\ZMUtil;

 /**
@@ -21,6 +29,20 @@ use ZM\Utils\ZMUtil;
 */
 class Hello
 {
+    /**
+     * @OnStart()
+     */
+    public function onStart() {
+    }
+
+    /*
+     * 默认的图片监听路由对应目录，如需要使用可取消下面的注释，把上面的 /* 换成 /**
+     * @OnStart(-1)
+     */
+    //public function onStart() {
+    //    \ZM\Http\RouteManager::addStaticFileRoute("/images/", \ZM\Utils\DataProvider::getWorkingDir()."/zm_data/images/");
+    //}
+
    /**
     * 使用命令 .reload 发给机器人远程重载，注意将 user_id 换成你自己的 QQ
     * @CQCommand(".reload",user_id=627577391)
@@ -58,6 +80,34 @@ class Hello
        return $obj["hitokoto"] . "\n----「" . $obj["from"] . "」";
    }

+    /**
+     * @CQCommand(start_with="机器人",end_with="机器人",message_type="group")
+     * @CQMessage(message_type="private",level=1)
+     */
+    public function turingAPI() {
+        $user_id = ctx()->getUserId();
+        $api = "83513e3d316f44de9c952cda4c9aed30"; // 请在这里填入你的图灵机器人的apikey
+        if ($api === "") return false; //如果没有填入apikey则此功能关闭
+        if (($this->_running_annotation ?? null) instanceof CQCommand) {
+            $msg = ctx()->getFullArg("我在！有什么事吗？");
+        } else {
+            $msg = ctx()->getMessage();
+        }
+        zm_dump($msg);
+        return TuringAPI::getTuringMsg($msg, $user_id, $api);
+    }
+
+    /**
+     * @CQBefore("message")
+     */
+    public function changeAt() {
+        if (MessageUtil::isAtMe(ctx()->getMessage(), ctx()->getRobotId())) {
+            $msg = str_replace(CQ::at(ctx()->getRobotId()), "", ctx()->getMessage());
+            ctx()->setMessage("机器人 ".$msg);
+        }
+        return true;
+    }
+
    /**
     * 一个简单随机数的功能demo
     * 问法1：随机数 1 20
@@ -126,6 +176,7 @@ class Hello
    /**
     * 阻止 Chrome 自动请求 /favicon.ico 导致的多条请求并发和干扰
     * @OnRequestEvent(rule="ctx()->getRequest()->server['request_uri'] == '/favicon.ico'",level=200)
+     * @throws InterruptException
     */
    public function onRequest() {
        EventDispatcher::interrupt();
--- a/src/Module/Middleware/TimerMiddleware.php
+++ b/src/Module/Middleware/TimerMiddleware.php
@@ -24,7 +24,7 @@ class TimerMiddleware implements MiddlewareInterface
     * @HandleBefore()
     * @return bool
     */
-    public function onBefore() {
+    public function onBefore(): bool {
        $this->starttime = microtime(true);
        return true;
    }
--- a/src/ZM/API/CQ.php
+++ b/src/ZM/API/CQ.php
@@ -1,10 +1,13 @@
-<?php
+<?php /** @noinspection PhpUnused */
+
+/** @noinspection PhpMissingReturnTypeInspection */


 namespace ZM\API;


 use ZM\Console\Console;
+use ZM\Entity\CQObject;

 class CQ
 {
@@ -305,9 +308,10 @@ class CQ
    /**
     * 获取消息中第一个CQ码
     * @param $msg
-     * @return array|null
+     * @param bool $is_object
+     * @return array|CQObject|null
     */
-    public static function getCQ($msg) {
+    public static function getCQ($msg, $is_object = false) {
        if (($head = mb_strpos($msg, "[CQ:")) !== false) {
            $key_offset = mb_substr($msg, $head);
            $close = mb_strpos($key_offset, "]");
@@ -322,7 +326,7 @@ class CQ
            }
            $cq["start"] = $head;
            $cq["end"] = $close + $head;
-            return $cq;
+            return !$is_object ? $cq : CQObject::fromArray($cq);
        } else {
            return null;
        }
@@ -331,9 +335,10 @@ class CQ
    /**
     * 获取消息中所有的CQ码
     * @param $msg
-     * @return array
+     * @param bool $is_object
+     * @return array|CQObject[]
     */
-    public static function getAllCQ($msg) {
+    public static function getAllCQ($msg, $is_object = false) {
        $cqs = [];
        $offset = 0;
        while (($head = mb_strpos(($submsg = mb_substr($msg, $offset)), "[CQ:")) !== false) {
@@ -352,7 +357,7 @@ class CQ
            $cq["start"] = $offset + $head;
            $cq["end"] = $offset + $tmpmsg + $head;
            $offset += $tmpmsg + 1;
-            $cqs[] = $cq;
+            $cqs[] = (!$is_object ? $cq : CQObject::fromArray($cq));
        }
        return $cqs;
    }
--- a/src/ZM/API/CQAPI.php
+++ b/src/ZM/API/CQAPI.php
@@ -29,25 +29,15 @@ trait CQAPI
    public function processWebsocketAPI($connection, $reply, $function = false) {
        $api_id = ZMAtomic::get("wait_msg_id")->add(1);
        $reply["echo"] = $api_id;
-        SpinLock::lock("wait_api");
-        $r = LightCacheInside::get("wait_api", "wait_api");
-        $r[$api_id] = [
-            "data" => $reply,
-            "time" => microtime(true),
-            "self_id" => $connection->getOption("connect_id"),
-            "echo" => $api_id
-        ];
-        LightCacheInside::set("wait_api", "wait_api", $r);
-        SpinLock::unlock("wait_api");
        if (server()->push($connection->getFd(), json_encode($reply))) {
            if ($function === true) {
-                return CoMessage::yieldByWS($r[$api_id], ["echo"], 60);
-            } else {
-                SpinLock::lock("wait_api");
-                $r = LightCacheInside::get("wait_api", "wait_api");
-                unset($r[$api_id]);
-                LightCacheInside::set("wait_api", "wait_api", $r);
-                SpinLock::unlock("wait_api");
+                $obj = [
+                    "data" => $reply,
+                    "time" => microtime(true),
+                    "self_id" => $connection->getOption("connect_id"),
+                    "echo" => $api_id
+                ];
+                return CoMessage::yieldByWS($obj, ["echo"], 60);
            }
            return true;
        } else {
@@ -75,10 +65,11 @@ trait CQAPI
     * @return bool
     * @noinspection PhpUnusedParameterInspection
     */
-    public function processHttpAPI($connection, $reply, $function = null) {
+    public function processHttpAPI($connection, $reply, $function = null): bool {
        return false;
    }

+    /** @noinspection PhpMissingReturnTypeInspection */
    public function __call($name, $arguments) {
        return false;
    }
--- a/src/ZM/API/TuringAPI.php
+++ b/src/ZM/API/TuringAPI.php
@@ -0,0 +1,118 @@
+<?php
+
+
+namespace ZM\API;
+
+
+use Swoole\Coroutine\Http\Client;
+use ZM\Console\Console;
+
+class TuringAPI
+{
+    /**
+     * 请求图灵API，返回图灵的消息
+     * @param $msg
+     * @param $user_id
+     * @param $api
+     * @return string
+     */
+    public static function getTuringMsg($msg, $user_id, $api) {
+        $origin = $msg;
+        if (($cq = CQ::getCQ($msg)) !== null) {//如有CQ码则去除
+            if ($cq["type"] == "image") {
+                $url = $cq["params"]["url"];
+                $msg = str_replace(mb_substr($msg, $cq["start"], $cq["end"] - $cq["start"] + 1), "", $msg);
+            }
+            $msg = trim($msg);
+        }
+        //构建将要发送的json包给图灵
+        $content = [
+            "reqType" => 0,
+            "userInfo" => [
+                "apiKey" => $api,
+                "userId" => $user_id
+            ]
+        ];
+        if ($msg != "") {
+            $content["perception"]["inputText"]["text"] = $msg;
+        }
+        $msg = trim($msg);
+        if (mb_strlen($msg) < 1 && !isset($url)) return "请说出你想说的话";
+        if (isset($url)) {
+            $content["perception"]["inputImage"]["url"] = $url;
+            $content["reqType"] = 1;
+        }
+        if (!isset($content["perception"])) return "请说出你想说的话";
+        $client = new Client("openapi.tuling123.com", 80);
+        $client->setHeaders(["Content-type" => "application/json"]);
+        $client->post("/openapi/api/v2", json_encode($content, JSON_UNESCAPED_UNICODE));
+        $api_return = json_decode($client->body, true);
+        if (!isset($api_return["intent"]["code"])) return "XD 哎呀，我脑子突然短路了，请稍后再问我吧！";
+        $status = self::getResultStatus($api_return);
+        if ($status !== true) {
+            if ($status == "err:输入文本内容超长(上限150)") return "你的话太多了！！！";
+            if ($api_return["intent"]["code"] == 4003) {
+                return "哎呀，我刚才有点走神了，可能忘记你说什么了，可以重说一遍吗";
+            }
+            Console::error("图灵机器人发送错误！\n错误原始内容：" . $origin . "\n来自：" . $user_id . "\n错误信息：" . $status);
+            //echo json_encode($r, 128|256);
+            return "哎呀，我刚才有点走神了，要不一会儿换一种问题试试？";
+        }
+        $result = $api_return["results"];
+        //Console::info(Console::setColor(json_encode($result, 128 | 256), "green"));
+        $final = "";
+        foreach ($result as $k => $v) {
+            switch ($v["resultType"]) {
+                case "url":
+                    $final .= "\n" . $v["values"]["url"];
+                    break;
+                case "text":
+                    $final .= "\n" . $v["values"]["text"];
+                    break;
+                case "image":
+                    $final .= "\n" . CQ::image($v["values"]["image"]);
+                    break;
+            }
+        }
+        return trim($final);
+    }
+
+    public static function getResultStatus($r) {
+        switch ($r["intent"]["code"]) {
+            case 5000:
+                return "err:无解析结果";
+            case 4000:
+            case 6000:
+                return "err:暂不支持该功能";
+            case 4001:
+                return "err:加密方式错误";
+            case 4005:
+            case 4002:
+                return "err:无功能权限";
+            case 4003:
+                return "err:该apikey没有可用请求次数";
+            case 4007:
+                return "err:apikey不合法";
+            case 4100:
+                return "err:userid获取失败";
+            case 4200:
+                return "err:上传格式错误";
+            case 4300:
+                return "err:批量操作超过限制";
+            case 4400:
+                return "err:没有上传合法userid";
+            case 4500:
+                return "err:userid申请个数超过限制";
+            case 4600:
+                return "err:输入内容为空";
+            case 4602:
+                return "err:输入文本内容超长(上限150)";
+            case 7002:
+                return "err:上传信息失败";
+            case 8008:
+                return "err:服务器错误";
+            default:
+                return true;
+        }
+    }
+}
--- a/src/ZM/API/ZMRobot.php
+++ b/src/ZM/API/ZMRobot.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpUnused */
+<?php /** @noinspection PhpMissingReturnTypeInspection */
+
+/** @noinspection PhpUnused */


 namespace ZM\API;
--- a/src/ZM/Annotation/AnnotationBase.php
+++ b/src/ZM/Annotation/AnnotationBase.php
@@ -12,7 +12,7 @@ abstract class AnnotationBase

    public $class;

-    public function __toString() {
+    public function __toString(): string {
        $str = __CLASS__ . ": ";
        foreach ($this as $k => $v) {
            $str .= "\n\t" . $k . " => ";
--- a/src/ZM/Annotation/AnnotationParser.php
+++ b/src/ZM/Annotation/AnnotationParser.php
@@ -125,10 +125,7 @@ class AnnotationParser
        Console::debug("解析注解完毕！");
    }

-    /**
-     * @return array
-     */
-    public function generateAnnotationEvents() {
+    public function generateAnnotationEvents(): array {
        $o = [];
        foreach ($this->annotation_map as $module => $obj) {
            foreach (($obj["class_annotations"] ?? []) as $class_annotation) {
@@ -151,17 +148,17 @@ class AnnotationParser
    /**
     * @return array
     */
-    public function getMiddlewares() { return $this->middlewares; }
+    public function getMiddlewares(): array { return $this->middlewares; }

    /**
     * @return array
     */
-    public function getMiddlewareMap() { return $this->middleware_map; }
+    public function getMiddlewareMap(): array { return $this->middleware_map; }

    /**
     * @return array
     */
-    public function getReqMapping() { return $this->req_mapping; }
+    public function getReqMapping(): array { return $this->req_mapping; }

    /**
     * @param $path
@@ -171,7 +168,7 @@ class AnnotationParser

    //private function below

-    private function registerMiddleware(MiddlewareClass $vs, ReflectionClass $reflection_class) {
+    private function registerMiddleware(MiddlewareClass $vs, ReflectionClass $reflection_class): array {
        $result = [
            "class" => "\\" . $reflection_class->getName(),
            "name" => $vs->name
--- a/src/ZM/Annotation/CQ/CQAfter.php
+++ b/src/ZM/Annotation/CQ/CQAfter.php
@@ -26,7 +26,7 @@ class CQAfter extends AnnotationBase implements Level
    /**
     * @return mixed
     */
-    public function getLevel() {
+    public function getLevel(): int {
        return $this->level;
    }

--- a/src/ZM/Annotation/CQ/CQBefore.php
+++ b/src/ZM/Annotation/CQ/CQBefore.php
@@ -28,7 +28,7 @@ class CQBefore extends AnnotationBase implements Level
    /**
     * @return mixed
     */
-    public function getLevel() {
+    public function getLevel(): int {
        return $this->level;
    }

--- a/src/ZM/Annotation/CQ/CQMessage.php
+++ b/src/ZM/Annotation/CQ/CQMessage.php
@@ -32,7 +32,7 @@ class CQMessage extends AnnotationBase implements Level
    /** @var int */
    public $level = 20;

-    public function getLevel() { return $this->level; }
+    public function getLevel(): int { return $this->level; }

    public function setLevel(int $level) {
        $this->level = $level;
--- a/src/ZM/Annotation/CQ/CQMetaEvent.php
+++ b/src/ZM/Annotation/CQ/CQMetaEvent.php
@@ -27,7 +27,7 @@ class CQMetaEvent extends AnnotationBase implements Level
    /**
     * @return mixed
     */
-    public function getLevel() { return $this->level; }
+    public function getLevel(): int { return $this->level; }

    /**
     * @param int $level
--- a/src/ZM/Annotation/Command/TerminalCommand.php
+++ b/src/ZM/Annotation/Command/TerminalCommand.php
@@ -0,0 +1,27 @@
+<?php
+
+
+namespace ZM\Annotation\Command;
+
+use Doctrine\Common\Annotations\Annotation\Required;
+use Doctrine\Common\Annotations\Annotation\Target;
+
+/**
+ * Class TerminalCommand
+ * @package ZM\Annotation\Command
+ * @Annotation
+ * @Target("METHOD")
+ */
+class TerminalCommand
+{
+    /**
+     * @var string
+     * @Required()
+     */
+    public $command;
+
+    /**
+     * @var string
+     */
+    public $description = "";
+}
--- a/src/ZM/Annotation/Swoole/OnTask.php
+++ b/src/ZM/Annotation/Swoole/OnTask.php
@@ -0,0 +1,36 @@
+<?php
+
+
+namespace ZM\Annotation\Swoole;
+
+use Doctrine\Common\Annotations\Annotation\Required;
+use Doctrine\Common\Annotations\Annotation\Target;
+use ZM\Annotation\AnnotationBase;
+use ZM\Annotation\Interfaces\Rule;
+
+/**
+ * Class OnTask
+ * @package ZM\Annotation\Swoole
+ * @Annotation
+ * @Target("METHOD")
+ */
+class OnTask extends AnnotationBase implements Rule
+{
+    /**
+     * @var string
+     * @Required()
+     */
+    public $task_name;
+
+    /**
+     * @var string
+     */
+    public $rule = "";
+
+    /**
+     * @return mixed
+     */
+    public function getRule(): string {
+        return $this->rule;
+    }
+}
--- a/src/ZM/Annotation/Swoole/OnTaskEvent.php
+++ b/src/ZM/Annotation/Swoole/OnTaskEvent.php
@@ -0,0 +1,16 @@
+<?php
+
+
+namespace ZM\Annotation\Swoole;
+
+use Doctrine\Common\Annotations\Annotation\Target;
+
+/**
+ * Class OnTaskEvent
+ * @package ZM\Annotation\Swoole
+ * @Annotation
+ * @Target("METHOD")
+ */
+class OnTaskEvent extends OnSwooleEventBase
+{
+}
--- a/src/ZM/Command/BuildCommand.php
+++ b/src/ZM/Command/BuildCommand.php
@@ -26,7 +26,7 @@ class BuildCommand extends Command
        // ...
    }

-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output): int {
        $this->output = $output;
        $target_dir = $input->getOption("target") ?? (__DIR__ . '/../../../resources/');
        if (mb_strpos($target_dir, "../")) $target_dir = realpath($target_dir);
--- a/src/ZM/Command/DaemonCommand.php
+++ b/src/ZM/Command/DaemonCommand.php
@@ -13,7 +13,7 @@ abstract class DaemonCommand extends Command
 {
    protected $daemon_file = null;

-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output): int {
        $pid_path = DataProvider::getWorkingDir() . "/.daemon_pid";
        if (!file_exists($pid_path)) {
            $output->writeln("<comment>没有检测到正在运行的守护进程！</comment>");
--- a/src/ZM/Command/DaemonReloadCommand.php
+++ b/src/ZM/Command/DaemonReloadCommand.php
@@ -15,7 +15,7 @@ class DaemonReloadCommand extends DaemonCommand
        $this->setDescription("重载守护进程下的用户代码（仅限--daemon模式可用）");
    }

-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output): int {
        parent::execute($input, $output);
        system("kill -USR1 " . intval($this->daemon_file["pid"]));
        $output->writeln("<info>成功重载！</info>");
--- a/src/ZM/Command/DaemonStatusCommand.php
+++ b/src/ZM/Command/DaemonStatusCommand.php
@@ -15,7 +15,7 @@ class DaemonStatusCommand extends DaemonCommand
        $this->setDescription("查看守护进程框架的运行状态（仅限--daemon模式可用）");
    }

-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output): int {
        parent::execute($input, $output);
        $output->writeln("<info>框架运行中，pid：" . $this->daemon_file["pid"] . "</info>");
        $output->writeln("<comment>----- 以下是stdout内容 -----</comment>");
--- a/src/ZM/Command/DaemonStopCommand.php
+++ b/src/ZM/Command/DaemonStopCommand.php
@@ -16,9 +16,9 @@ class DaemonStopCommand extends DaemonCommand
        $this->setDescription("停止守护进程下运行的框架（仅限--daemon模式可用）");
    }

-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output): int {
        parent::execute($input, $output);
-        system("kill -TERM " . intval($this->daemon_file["pid"]));
+        system("kill -INT " . intval($this->daemon_file["pid"]));
        unlink(DataProvider::getWorkingDir() . "/.daemon_pid");
        $output->writeln("<info>成功停止！</info>");
        return Command::SUCCESS;
--- a/src/ZM/Command/InitCommand.php
+++ b/src/ZM/Command/InitCommand.php
@@ -30,7 +30,7 @@ class InitCommand extends Command
        // ...
    }

-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output): int {
        if (LOAD_MODE === 1) { // 从composer依赖而来的项目模式，最基本的需要初始化的模式
            $output->writeln("<comment>Initializing files</comment>");
            $base_path = LOAD_MODE_COMPOSER_PATH;
@@ -96,7 +96,7 @@ class InitCommand extends Command
        return Command::FAILURE;
    }

-    private function getExtractFiles() {
+    private function getExtractFiles(): array {
        return $this->extract_files;
    }
 }
--- a/src/ZM/Command/PureHttpCommand.php
+++ b/src/ZM/Command/PureHttpCommand.php
@@ -5,7 +5,6 @@ namespace ZM\Command;


 use Swoole\Atomic;
-use Swoole\Coroutine;
 use Swoole\Http\Request;
 use Swoole\Http\Response;
 use Swoole\Http\Server;
@@ -17,7 +16,9 @@ use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
 use ZM\Config\ZMConfig;
 use ZM\Console\Console;
+use ZM\Framework;
 use ZM\Store\ZMAtomic;
+use ZM\Utils\DataProvider;
 use ZM\Utils\HttpUtil;

 class PureHttpCommand extends Command
@@ -34,23 +35,32 @@ class PureHttpCommand extends Command
        // ...
    }

-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output): int {
        $tty_width = explode(" ", trim(exec("stty size")))[1];
        if (realpath($input->getArgument('dir') ?? '.') === false) {
            $output->writeln("<error>Directory error(" . ($input->getArgument('dir') ?? '.') . "): no such file or directory.</error>");
            return self::FAILURE;
        }
+        ZMConfig::setDirectory(DataProvider::getWorkingDir() . '/config');
        $global = ZMConfig::get("global");
        $host = $input->getOption("host") ?? $global["host"];
        $port = $input->getOption("port") ?? $global["port"];
+
+        $index = ["index.html", "index.htm"];
+        $out = [
+            "listen" => $host.":".$port,
+            "version" => ZM_VERSION,
+            "web_root" => realpath($input->getArgument('dir') ?? '.'),
+            "index" => implode(",", $index)
+        ];
+        Framework::printProps($out, $tty_width);
        $server = new Server($host, $port);
        $server->set(ZMConfig::get("global", "swoole"));
-        Console::init(0, $server);
+        Console::init(2, $server);
        ZMAtomic::$atomics["request"] = [];
        for ($i = 0; $i < 32; ++$i) {
            ZMAtomic::$atomics["request"][$i] = new Atomic(0);
        }
-        $index = ["index.html", "index.htm"];
        $server->on("request", function (Request $request, Response $response) use ($input, $index, $server) {
            ZMAtomic::$atomics["request"][$server->worker_id]->add(1);
            HttpUtil::handleStaticPage(
@@ -60,10 +70,11 @@ class PureHttpCommand extends Command
                    "document_root" => realpath($input->getArgument('dir') ?? '.'),
                    "document_index" => $index
                ]);
-            echo "\r" . Coroutine::stats()["coroutine_peak_num"];
+            //echo "\r" . Coroutine::stats()["coroutine_peak_num"];
        });
        $server->on("start", function ($server) {
            Process::signal(SIGINT, function () use ($server) {
+                echo "\r";
                Console::warning("Server interrupted by keyboard.");
                for ($i = 0; $i < 32; ++$i) {
                    $num = ZMAtomic::$atomics["request"][$i]->get();
@@ -75,13 +86,6 @@ class PureHttpCommand extends Command
            });
            Console::success("Server started. Use Ctrl+C to stop.");
        });
-        $out = [
-            "host" => $host,
-            "port" => $port,
-            "document_root" => realpath($input->getArgument('dir') ?? '.'),
-            "document_index" => implode(", ", $index)
-        ];
-        Console::printProps($out, $tty_width);
        $server->start();
        // return this if there was no problem running the command
        // (it's equivalent to returning int(0))
--- a/src/ZM/Command/RunServerCommand.php
+++ b/src/ZM/Command/RunServerCommand.php
@@ -22,17 +22,19 @@ class RunServerCommand extends Command
            new InputOption("log-warning", null, null, "调整消息等级到warning (log-level=1)"),
            new InputOption("log-error", null, null, "调整消息等级到error (log-level=0)"),
            new InputOption("log-theme", null, InputOption::VALUE_REQUIRED, "改变终端的主题配色"),
-            new InputOption("disable-console-input", null, null, "禁止终端输入内容 (后台服务时需要)"),
+            new InputOption("disable-console-input", null, null, "禁止终端输入内容 (废弃)"),
+            new InputOption("remote-terminal", null, null, "启用远程终端，配置使用global.php中的"),
            new InputOption("disable-coroutine", null, null, "关闭协程Hook"),
            new InputOption("daemon", null, null, "以守护进程的方式运行框架"),
            new InputOption("watch", null, null, "监听 src/ 目录的文件变化并热更新"),
+            new InputOption("show-php-ver", null, null, "启动时显示PHP和Swoole版本"),
            new InputOption("env", null, InputOption::VALUE_REQUIRED, "设置环境类型 (production, development, staging)"),
        ]);
        $this->setDescription("Run zhamao-framework | 启动框架");
        $this->setHelp("直接运行可以启动");
    }

-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output): int {
        if (($opt = $input->getOption("env")) !== null) {
            if (!in_array($opt, ["production", "staging", "development", ""])) {
                $output->writeln("<error> \"--env\" option only accept production, development, staging and [empty] ! </error>");
--- a/src/ZM/Command/SystemdCommand.php
+++ b/src/ZM/Command/SystemdCommand.php
@@ -13,7 +13,7 @@ class SystemdCommand extends Command
    // the name of the command (the part after "bin/console")
    protected static $defaultName = 'systemd:generate';

-    protected function execute(InputInterface $input, OutputInterface $output) {
+    protected function execute(InputInterface $input, OutputInterface $output): int {
        //TODO: 写一个生成systemd配置的功能，给2.0
        return Command::SUCCESS;
    }
--- a/src/ZM/ConsoleApplication.php
+++ b/src/ZM/ConsoleApplication.php
@@ -18,12 +18,16 @@ use ZM\Utils\DataProvider;

 class ConsoleApplication extends Application
 {
+    const VERSION_ID = 397;
+    const VERSION = "2.3.4";
+
    public function __construct(string $name = 'UNKNOWN') {
-        $version = json_decode(file_get_contents(__DIR__ . "/../../composer.json"), true)["version"] ?? "UNKNOWN";
-        parent::__construct($name, $version);
+        define("ZM_VERSION_ID", self::VERSION_ID);
+        define("ZM_VERSION", self::VERSION);
+        parent::__construct($name, ZM_VERSION);
    }

-    public function initEnv() {
+    public function initEnv(): ConsoleApplication {
        $this->selfCheck();

        if (!is_dir(__DIR__ . '/../../vendor')) {
@@ -50,7 +54,7 @@ class ConsoleApplication extends Application
                    $composer["autoload"]["psr-4"]["Custom\\"] = "src/Custom";
                    $r = file_put_contents(DataProvider::getWorkingDir() . "/composer.json", json_encode($composer, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
                    if ($r !== false) {
-                        echo "成功添加！请重新进行 composer update ！\n";
+                        echo "成功添加！请运行 composer dump-autoload ！\n";
                        exit(1);
                    } else {
                        echo "添加失败！请按任意键继续！";
@@ -86,7 +90,7 @@ class ConsoleApplication extends Application
     * @param OutputInterface|null $output
     * @return int
     */
-    public function run(InputInterface $input = null, OutputInterface $output = null) {
+    public function run(InputInterface $input = null, OutputInterface $output = null): int {
        try {
            return parent::run($input, $output);
        } catch (Exception $e) {
@@ -94,9 +98,9 @@ class ConsoleApplication extends Application
        }
    }

-    private function selfCheck() {
+    private function selfCheck(): bool {
        if (!extension_loaded("swoole")) die("Can not find swoole extension.\nSee: https://github.com/zhamao-robot/zhamao-framework/issues/19\n");
-        if (version_compare(SWOOLE_VERSION, "4.4.13") == -1) die("You must install swoole version >= 4.4.13 !");
+        if (version_compare(SWOOLE_VERSION, "4.5.0") == -1) die("You must install swoole version >= 4.5.0 !");
        if (version_compare(PHP_VERSION, "7.2") == -1) die("PHP >= 7.2 required.");
        return true;
    }
--- a/src/ZM/Context/Context.php
+++ b/src/ZM/Context/Context.php
@@ -8,11 +8,12 @@ use Co;
 use Exception;
 use Swoole\Http\Request;
 use Swoole\WebSocket\Frame;
-use swoole_server;
+use Swoole\WebSocket\Server;
 use ZM\ConnectionManager\ConnectionObject;
 use ZM\ConnectionManager\ManagerGM;
 use ZM\Console\Console;
 use ZM\Event\EventDispatcher;
+use ZM\Exception\InterruptException;
 use ZM\Exception\InvalidArgumentException;
 use ZM\Exception\WaitTimeoutException;
 use ZM\Http\Response;
@@ -27,19 +28,19 @@ class Context implements ContextInterface
    public function __construct($cid) { $this->cid = $cid; }

    /**
-     * @return swoole_server|null
+     * @return Server
     */
-    public function getServer() { return self::$context[$this->cid]["server"] ?? server(); }
+    public function getServer(): ?Server { return self::$context[$this->cid]["server"] ?? server(); }

    /**
     * @return Frame|null
     */
-    public function getFrame() { return self::$context[$this->cid]["frame"] ?? null; }
+    public function getFrame(): ?Frame { return self::$context[$this->cid]["frame"] ?? null; }

-    public function getFd() { return self::$context[$this->cid]["fd"] ?? $this->getFrame()->fd ?? null; }
+    public function getFd(): ?int { return self::$context[$this->cid]["fd"] ?? $this->getFrame()->fd ?? null; }

    /**
-     * @return array|null
+     * @return mixed
     */
    public function getData() { return self::$context[$this->cid]["data"] ?? null; }

@@ -48,25 +49,25 @@ class Context implements ContextInterface
    /**
     * @return Request|null
     */
-    public function getRequest() { return self::$context[$this->cid]["request"] ?? null; }
+    public function getRequest(): ?Request { return self::$context[$this->cid]["request"] ?? null; }

    /**
     * @return Response|null
     */
-    public function getResponse() { return self::$context[$this->cid]["response"] ?? null; }
+    public function getResponse(): ?Response { return self::$context[$this->cid]["response"] ?? null; }

-    /** @return ConnectionObject|null */
+    /** @return ConnectionObject|null|Response */
    public function getConnection() { return ManagerGM::get($this->getFd()); }

    /**
     * @return int|null
     */
-    public function getCid() { return $this->cid; }
+    public function getCid(): ?int { return $this->cid; }

    /**
     * @return ZMRobot|null
     */
-    public function getRobot() {
+    public function getRobot(): ?ZMRobot {
        $conn = ManagerGM::get($this->getFrame()->fd);
        return $conn instanceof ConnectionObject ? new ZMRobot($conn) : null;
    }
@@ -87,7 +88,7 @@ class Context implements ContextInterface

    public function setDiscussId($id) { self::$context[$this->cid]["data"]["discuss_id"] = $id; }

-    public function getMessageType() { return $this->getData()["message_type"] ?? null; }
+    public function getMessageType(): ?string { return $this->getData()["message_type"] ?? null; }

    public function setMessageType($type) { self::$context[$this->cid]["data"]["message_type"] = $type; }

@@ -104,6 +105,7 @@ class Context implements ContextInterface
     * @param $msg
     * @param bool $yield
     * @return mixed
+     * @noinspection PhpMissingReturnTypeInspection
     */
    public function reply($msg, $yield = false) {
        $data = $this->getData();
@@ -131,6 +133,12 @@ class Context implements ContextInterface
        }
    }

+    /**
+     * @param $msg
+     * @param false $yield
+     * @return mixed|void
+     * @throws InterruptException
+     */
    public function finalReply($msg, $yield = false) {
        self::$context[$this->cid]["cache"]["block_continue"] = true;
        if ($msg != "") $this->reply($msg, $yield);
@@ -144,6 +152,7 @@ class Context implements ContextInterface
     * @return string
     * @throws InvalidArgumentException
     * @throws WaitTimeoutException
+     * @noinspection PhpMissingReturnTypeInspection
     */
    public function waitMessage($prompt = "", $timeout = 600, $timeout_prompt = "") {
        if (!isset($this->getData()["user_id"], $this->getData()["message"], $this->getData()["self_id"]))
@@ -258,6 +267,7 @@ class Context implements ContextInterface
     */
    public function getNumArg($prompt_msg = "") { return $this->getArgs(ZM_MATCH_NUMBER, $prompt_msg); }

+    /** @noinspection PhpMissingReturnTypeInspection */
    public function cloneFromParent() {
        set_coroutine_params(self::$context[Co::getPcid()] ?? self::$context[$this->cid]);
        return context();
--- a/src/ZM/Context/ContextInterface.php
+++ b/src/ZM/Context/ContextInterface.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpMissingReturnTypeInspection */


 namespace ZM\Context;
--- a/src/ZM/DB/DB.php
+++ b/src/ZM/DB/DB.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpComposerExtensionStubsInspection */
+<?php /** @noinspection PhpUnused */
+
+/** @noinspection PhpComposerExtensionStubsInspection */


 namespace ZM\DB;
@@ -34,7 +36,7 @@ class DB
     * @return Table
     * @throws DbException
     */
-    public static function table($table_name) {
+    public static function table($table_name): Table {
        if (Table::getTableInstance($table_name) === null) {
            if (in_array($table_name, self::$table_list))
                return new Table($table_name);
@@ -60,7 +62,7 @@ class DB
     * @return bool
     * @throws DbException
     */
-    public static function unprepared($line) {
+    public static function unprepared($line): bool {
        try {
            $conn = SqlPoolStorage::$sql_pool->get();
            if ($conn === false) {
@@ -134,7 +136,7 @@ class DB
        }
    }

-    public static function isTableExists($table) {
+    public static function isTableExists($table): bool {
        return in_array($table, self::$table_list);
    }
 }
--- a/src/ZM/DB/SelectBody.php
+++ b/src/ZM/DB/SelectBody.php
@@ -32,7 +32,7 @@ class SelectBody
    /**
     * @throws DbException
     */
-    public function count() {
+    public function count(): int {
        $this->select_thing = ["count(*)"];
        $str = $this->queryPrepare();
        $this->result = DB::rawQuery($str[0], $str[1]);
@@ -81,7 +81,7 @@ class SelectBody

    public function getResult() { return $this->result; }

-    public function equals(SelectBody $body) {
+    public function equals(SelectBody $body): bool {
        if ($this->select_thing != $body->getSelectThing()) return false;
        elseif ($this->where_thing == $body->getWhereThing()) return false;
        else return true;
@@ -95,9 +95,9 @@ class SelectBody
    /**
     * @return array
     */
-    public function getWhereThing() { return $this->where_thing; }
+    public function getWhereThing(): array { return $this->where_thing; }

-    private function queryPrepare() {
+    private function queryPrepare(): array {
        $msg = "SELECT " . implode(", ", $this->select_thing) . " FROM " . $this->table->getTableName();
        $sql = $this->table->paintWhereSQL($this->where_thing['='] ?? [], '=');
        if ($sql[0] != '') {
--- a/src/ZM/DB/Table.php
+++ b/src/ZM/DB/Table.php
@@ -1,4 +1,6 @@
-<?php
+<?php /** @noinspection PhpUnused */
+
+/** @noinspection PhpMissingReturnTypeInspection */


 namespace ZM\DB;
@@ -59,7 +61,7 @@ class Table
            if ($msg == "") {
                $msg .= $k . " $operator ? ";
            } else {
-                $msg .= "AND " . $k . " $operator ?";
+                $msg .= " AND " . $k . " $operator ?";
            }
            $param[] = $v;
        }
--- a/src/ZM/DB/WhereBody.php
+++ b/src/ZM/DB/WhereBody.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpMissingReturnTypeInspection */


 namespace ZM\DB;
--- a/src/ZM/Entity/CQObject.php
+++ b/src/ZM/Entity/CQObject.php
@@ -0,0 +1,26 @@
+<?php
+
+
+namespace ZM\Entity;
+
+
+class CQObject
+{
+    public $type;
+    public $params;
+    public $start;
+    public $end;
+
+    public function __construct($type = "", $params = [], $start = 0, $end = 0) {
+        if ($type !== "") {
+            $this->type = $type;
+            $this->params = $params;
+            $this->start = $start;
+            $this->end = $end;
+        }
+    }
+
+    public static function fromArray($arr): CQObject {
+        return new CQObject($arr["type"], $arr["params"] ?? [], $arr["start"], $arr["end"]);
+    }
+}
--- a/src/ZM/Entity/MatchResult.php
+++ b/src/ZM/Entity/MatchResult.php
@@ -0,0 +1,17 @@
+<?php
+
+
+namespace ZM\Entity;
+
+
+use ZM\Annotation\CQ\CQCommand;
+
+class MatchResult
+{
+    /** @var bool */
+    public $status = false;
+    /** @var CQCommand|null */
+    public $object = null;
+    /** @var array */
+    public $match = [];
+}
--- a/src/ZM/Event/EventDispatcher.php
+++ b/src/ZM/Event/EventDispatcher.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */


 namespace ZM\Event;
@@ -9,7 +9,6 @@ use Error;
 use Exception;
 use ZM\Console\Console;
 use ZM\Exception\InterruptException;
-use ZM\Exception\ZMException;
 use ZM\Store\LightCacheInside;
 use ZM\Store\Lock\SpinLock;
 use ZM\Store\ZMAtomic;
@@ -32,7 +31,7 @@ class EventDispatcher
    /** @var bool */
    private $log = false;
    /** @var int */
-    private $eid = 0;
+    private $eid;
    /** @var int */
    public $status = self::STATUS_NORMAL;
    /** @var mixed */
@@ -64,22 +63,18 @@ class EventDispatcher

    public function __construct(string $class = '') {
        $this->class = $class;
-        try {
-            $this->eid = ZMAtomic::get("_event_id")->add(1);
-            $list = LightCacheInside::get("wait_api", "event_trace");
-        } catch (ZMException $e) {
-            $list = [];
-        }
+        $this->eid = ZMAtomic::get("_event_id")->add(1);
+        $list = LightCacheInside::get("wait_api", "event_trace");
        if (isset($list[$class])) $this->log = true;
        if ($this->log) Console::verbose("[事件分发{$this->eid}] 开始分发事件: " . $class);
    }

-    public function setRuleFunction(callable $rule = null) {
+    public function setRuleFunction(callable $rule = null): EventDispatcher {
        $this->rule = $rule;
        return $this;
    }

-    public function setReturnFunction(callable $return_func) {
+    public function setReturnFunction(callable $return_func): EventDispatcher {
        $this->return_func = $return_func;
        return $this;
    }
@@ -100,6 +95,7 @@ class EventDispatcher
                }
            }
            if ($this->status === self::STATUS_RULE_FAILED) $this->status = self::STATUS_NORMAL;
+            //TODO:没有过滤before的false，可能会导致一些问题，先观望一下
        } catch (InterruptException $e) {
            $this->store = $e->return_var;
            $this->status = self::STATUS_INTERRUPTED;
@@ -116,6 +112,7 @@ class EventDispatcher
     * @return bool
     * @throws InterruptException
     * @throws AnnotationException
+     * @noinspection PhpMissingReturnTypeInspection
     */
    public function dispatchEvent($v, $rule_func = null, ...$params) {
        $q_c = $v->class;
@@ -155,6 +152,7 @@ class EventDispatcher
            if ($before_result) {
                try {
                    $q_o = ZMUtil::getModInstance($q_c);
+                    $q_o->_running_annotation = $v;
                    if ($this->log) Console::verbose("[事件分发{$this->eid}] 正在执行方法 " . $q_c . "::" . $q_f . " ...");
                    $this->store = $q_o->$q_f(...$params);
                } catch (Exception $e) {
@@ -191,6 +189,7 @@ class EventDispatcher
            return false;
        } else {
            $q_o = ZMUtil::getModInstance($q_c);
+            $q_o->_running_annotation = $v;
            if ($this->log) Console::verbose("[事件分发{$this->eid}] 正在执行方法 " . $q_c . "::" . $q_f . " ...");
            $this->store = $q_o->$q_f(...$params);
            $this->status = self::STATUS_NORMAL;
--- a/src/ZM/Event/EventManager.php
+++ b/src/ZM/Event/EventManager.php
@@ -9,7 +9,6 @@ use Exception;
 use Swoole\Timer;
 use ZM\Annotation\AnnotationBase;
 use ZM\Annotation\AnnotationParser;
-use ZM\Annotation\Swoole\OnSave;
 use ZM\Annotation\Swoole\OnTick;
 use ZM\Config\ZMConfig;
 use ZM\Console\Console;
@@ -37,6 +36,7 @@ class EventManager

    /**
     * 注册所有计时器给每个进程
+     * @throws Exception
     */
    public static function registerTimerTick() {
        $dispatcher = new EventDispatcher(OnTick::class);
--- a/src/ZM/Event/ServerEventHandler.php
+++ b/src/ZM/Event/ServerEventHandler.php
@@ -17,15 +17,18 @@ use Swoole\Database\PDOConfig;
 use Swoole\Database\PDOPool;
 use Swoole\Event;
 use Swoole\Process;
+use Swoole\Timer;
+use Throwable;
 use ZM\Annotation\AnnotationParser;
 use ZM\Annotation\Http\RequestMapping;
 use ZM\Annotation\Swoole\OnCloseEvent;
 use ZM\Annotation\Swoole\OnMessageEvent;
 use ZM\Annotation\Swoole\OnOpenEvent;
-use ZM\Annotation\Swoole\OnPipeMessageEvent;
 use ZM\Annotation\Swoole\OnRequestEvent;
 use ZM\Annotation\Swoole\OnStart;
 use ZM\Annotation\Swoole\OnSwooleEvent;
+use ZM\Annotation\Swoole\OnTask;
+use ZM\Annotation\Swoole\OnTaskEvent;
 use ZM\Config\ZMConfig;
 use ZM\ConnectionManager\ManagerGM;
 use ZM\Console\Console;
@@ -46,11 +49,9 @@ use ZM\Store\LightCache;
 use ZM\Store\LightCacheInside;
 use ZM\Store\MySQL\SqlPoolStorage;
 use ZM\Store\Redis\ZMRedisPool;
-use ZM\Store\WorkerCache;
-use ZM\Store\ZMBuf;
 use ZM\Utils\DataProvider;
 use ZM\Utils\HttpUtil;
-use ZM\Utils\Terminal;
+use ZM\Utils\ProcessManager;
 use ZM\Utils\ZMUtil;

 class ServerEventHandler
@@ -59,9 +60,9 @@ class ServerEventHandler
     * @SwooleHandler("start")
     */
    public function onStart() {
-        global $terminal_id;
+        //global $terminal_id;
        $r = null;
-        if ($terminal_id !== null) {
+        /*if ($terminal_id !== null) {
            ZMBuf::$terminal = $r = STDIN;
            Event::add($r, function () use ($r) {
                $fget = fgets($r);
@@ -78,11 +79,11 @@ class ServerEventHandler
                    Console::error("Uncaught error " . get_class($e) . ": " . $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")");
                }
            });
-        }
+        }*/
        Process::signal(SIGINT, function () use ($r) {
            if (zm_atomic("_int_is_reload")->get() === 1) {
                zm_atomic("_int_is_reload")->set(0);
-                ZMUtil::reload();
+                \server()->reload();
            } else {
                echo "\r";
                Console::warning("Server interrupted(SIGINT) on Master.");
@@ -126,22 +127,31 @@ class ServerEventHandler
     * @SwooleHandler("WorkerStop")
     * @param $server
     * @param $worker_id
+     * @throws Exception
     */
    public function onWorkerStop(Server $server, $worker_id) {
        if ($worker_id == (ZMConfig::get("worker_cache")["worker"] ?? 0)) {
            LightCache::savePersistence();
        }
-        Console::debug(($server->taskworker ? "Task" : "") . "Worker #$worker_id 已停止");
+        Console::verbose(($server->taskworker ? "Task" : "") . "Worker #$worker_id 已停止");
    }

    /**
     * @SwooleHandler("WorkerStart")
     * @param Server $server
     * @param $worker_id
+     * @throws Exception
     */
    public function onWorkerStart(Server $server, $worker_id) {
+        zm_atomic("_#worker_".$worker_id)->set($server->worker_pid);
        //if (ZMBuf::atomic("stop_signal")->get() != 0) return;
+        Process::signal(SIGUSR1, function() use ($worker_id){
+            Timer::clearAll();
+            ProcessManager::resumeAllWorkerCoroutines();
+        });
        Process::signal(SIGINT, function () use ($worker_id, $server) {
+            Timer::clearAll();
+            ProcessManager::resumeAllWorkerCoroutines();
            Console::debug("正在关闭 " . ($server->taskworker ? "Task" : "") . "Worker 进程 " . Console::setColor("#" . \server()->worker_id, "gold") . TermColor::frontColor256(59) . ", pid=" . posix_getpid());
            server()->stop($worker_id);
        });
@@ -159,7 +169,7 @@ class ServerEventHandler
                    else server()->shutdown();
                });

-                Console::info("Worker #{$server->worker_id} 启动中");
+                Console::verbose("Worker #{$server->worker_id} 启动中");
                Framework::$server = $server;
                //ZMBuf::resetCache(); //清空变量缓存
                //ZMBuf::set("wait_start", []); //添加队列，在workerStart运行完成前先让其他协程等待执行
@@ -233,7 +243,7 @@ class ServerEventHandler
                $this->loadAnnotations(); //加载composer资源、phar外置包、注解解析注册等

                //echo json_encode(debug_backtrace(), 128|256);
-                Console::success("Worker #" . $worker_id . " 已启动");
+
                EventManager::registerTimerTick(); //启动计时器
                //ZMBuf::unsetCache("wait_start");
                set_coroutine_params(["server" => $server, "worker_id" => $worker_id]);
@@ -244,6 +254,7 @@ class ServerEventHandler
                $dispatcher->dispatchEvents($server, $worker_id);
                if ($dispatcher->status === EventDispatcher::STATUS_NORMAL) Console::debug("@OnStart 执行完毕");
                else Console::warning("@OnStart 执行异常！");
+                Console::success("Worker #" . $worker_id . " 已启动");
            } catch (Exception $e) {
                Console::error("Worker加载出错！停止服务！");
                Console::error($e->getMessage() . "\n" . $e->getTraceAsString());
@@ -260,7 +271,7 @@ class ServerEventHandler
            try {
                Framework::$server = $server;
                $this->loadAnnotations();
-                Console::debug("TaskWorker #" . $server->worker_id . " 已启动");
+                Console::success("TaskWorker #" . $server->worker_id . " 已启动");
            } catch (Exception $e) {
                Console::error("Worker加载出错！停止服务！");
                Console::error($e->getMessage() . "\n" . $e->getTraceAsString());
@@ -316,7 +327,7 @@ class ServerEventHandler
            Console::trace();
        } catch (Error $e) {
            $error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
-            Console::error("Uncaught Error " . get_class($e) . " when calling \"message\": " . $error_msg);
+            Console::error("Uncaught " . get_class($e) . " when calling \"message\": " . $error_msg);
            Console::trace();
        }

@@ -466,10 +477,9 @@ class ServerEventHandler
            Console::trace();
        } catch (Error $e) {
            $error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
-            Console::error("Uncaught Error " . get_class($e) . " when calling \"open\": " . $error_msg);
+            Console::error("Uncaught " . get_class($e) . " when calling \"open\": " . $error_msg);
            Console::trace();
        }
-        //EventHandler::callSwooleEvent("open", $server, $request);
    }

    /**
@@ -513,7 +523,7 @@ class ServerEventHandler
            Console::trace();
        } catch (Error $e) {
            $error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
-            Console::error("Uncaught Error " . get_class($e) . " when calling \"close\": " . $error_msg);
+            Console::error("Uncaught " . get_class($e) . " when calling \"close\": " . $error_msg);
            Console::trace();
        }
        ManagerGM::popConnect($fd);
@@ -525,90 +535,80 @@ class ServerEventHandler
     * @param $src_worker_id
     * @param $data
     * @throws Exception
+     * @noinspection PhpUnusedParameterInspection
     */
    public function onPipeMessage(Server $server, $src_worker_id, $data) {
        //var_dump($data, $server->worker_id);
        //unset(Context::$context[Co::getCid()]);
        $data = json_decode($data, true);
-        switch ($data["action"] ?? '') {
-            case "resume_ws_message":
-                $obj = $data["data"];
-                Co::resume($obj["coroutine"]);
-                break;
-            case "getWorkerCache":
-                $r = WorkerCache::get($data["key"]);
-                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
-                $server->sendMessage(json_encode($action, 256), $src_worker_id);
-                break;
-            case "setWorkerCache":
-                $r = WorkerCache::set($data["key"], $data["value"]);
-                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
-                $server->sendMessage(json_encode($action, 256), $src_worker_id);
-                break;
-            case "unsetWorkerCache":
-                $r = WorkerCache::unset($data["key"]);
-                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
-                $server->sendMessage(json_encode($action, 256), $src_worker_id);
-                break;
-            case "hasKeyWorkerCache":
-                $r = WorkerCache::hasKey($data["key"], $data["subkey"]);
-                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
-                $server->sendMessage(json_encode($action, 256), $src_worker_id);
-                break;
-            case "asyncAddWorkerCache":
-                WorkerCache::add($data["key"], $data["value"], true);
-                break;
-            case "asyncSubWorkerCache":
-                WorkerCache::sub($data["key"], $data["value"], true);
-                break;
-            case "asyncSetWorkerCache":
-                WorkerCache::set($data["key"], $data["value"], true);
-                break;
-            case "asyncUnsetWorkerCache":
-                WorkerCache::unset($data["key"], true);
-                break;
-            case "addWorkerCache":
-                $r = WorkerCache::add($data["key"], $data["value"]);
-                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
-                $server->sendMessage(json_encode($action, 256), $src_worker_id);
-                break;
-            case "subWorkerCache":
-                $r = WorkerCache::sub($data["key"], $data["value"]);
-                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
-                $server->sendMessage(json_encode($action, 256), $src_worker_id);
-                break;
-            case "returnWorkerCache":
-                WorkerCache::$transfer[$data["cid"]] = $data["value"];
-                zm_resume($data["cid"]);
-                break;
-            default:
-                $dispatcher = new EventDispatcher(OnPipeMessageEvent::class);
-                $dispatcher->setRuleFunction(function (OnPipeMessageEvent $v) use ($data) {
-                    return $v->action == $data["action"];
-                });
-                $dispatcher->dispatchEvents($data);
-                break;
+        ProcessManager::workerAction($src_worker_id, $data);
+    }
+
+    /**
+     * @SwooleHandler("beforeReload")
+     */
+    public function onBeforeReload() {
+        for($i = 0; $i < ZM_WORKER_NUM; ++$i) {
+            $pid = zm_atomic("_#worker_".$i)->get();
+            Process::kill($pid, SIGUSR1);
        }
+
+        Console::info(Console::setColor("Reloading server...", "gold"));
+        usleep(800 * 1000);
+        LightCacheInside::unset("wait_api", "wait_api");
    }

    /**
     * @SwooleHandler("task")
     * @param Server|null $server
     * @param Server\Task $task
-     * @return mixed
     * @noinspection PhpUnusedParameterInspection
     */
    public function onTask(?Server $server, Server\Task $task) {
-        $data = $task->data;
-        switch ($data["action"]) {
-            case "runMethod":
-                $c = $data["class"];
-                $ss = new $c();
-                $method = $data["method"];
-                $ps = $data["params"];
-                $task->finish($ss->$method(...$ps));
+        if (isset($task->data["task"])) {
+            $dispatcher = new EventDispatcher(OnTask::class);
+            $dispatcher->setRuleFunction(function ($v) use ($task) {
+                /** @var OnTask $v */
+                return $v->task_name == $task->data["task"];
+            });
+            $dispatcher->setReturnFunction(function ($return) {
+                EventDispatcher::interrupt($return);
+            });
+            $params = $task->data["params"];
+            try {
+                $dispatcher->dispatchEvents(...$params);
+            } catch (Throwable $e) {
+                $finish["throw"] = $e;
+            }
+            if ($dispatcher->status === EventDispatcher::STATUS_EXCEPTION) {
+                $finish["result"] = null;
+                $finish["retcode"] = -1;
+            } else {
+                $finish["result"] = $dispatcher->store;
+                $finish["retcode"] = 0;
+            }
+            if (zm_atomic("server_is_stopped")->get() === 1) {
+                return;
+            }
+            $task->finish($finish);
+        } else {
+            try {
+                $dispatcher = new EventDispatcher(OnTaskEvent::class);
+                $dispatcher->setRuleFunction(function ($v) {
+                    /** @var OnTaskEvent $v */
+                    return eval("return " . $v->getRule() . ";");
+                });
+                $dispatcher->dispatchEvents();
+            } catch (Exception $e) {
+                $error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
+                Console::error("Uncaught exception " . get_class($e) . " when calling \"task\": " . $error_msg);
+                Console::trace();
+            } catch (Error $e) {
+                $error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
+                Console::error("Uncaught " . get_class($e) . " when calling \"task\": " . $error_msg);
+                Console::trace();
+            }
        }
-        return null;
    }

    /**
@@ -641,7 +641,8 @@ class ServerEventHandler
        $composer = json_decode(file_get_contents(DataProvider::getWorkingDir() . "/composer.json"), true);
        foreach ($dir as $v) {
            if (is_dir($path . "/" . $v) && isset($composer["autoload"]["psr-4"][$v . "\\"]) && !in_array($composer["autoload"]["psr-4"][$v . "\\"], $composer["extra"]["exclude_annotate"] ?? [])) {
-                Console::verbose("Add " . $v . " to register path");
+                if (\server()->worker_id == 0)
+                    Console::verbose("Add " . $v . " to register path");
                $parser->addRegisterPath(DataProvider::getWorkingDir() . "/src/" . $v . "/", $v);
            }
        }
--- a/src/ZM/Framework.php
+++ b/src/ZM/Framework.php
@@ -5,7 +5,9 @@ namespace ZM;


 use Doctrine\Common\Annotations\AnnotationReader;
+use Error;
 use Exception;
+use Swoole\Server\Port;
 use ZM\Annotation\Swoole\OnSetup;
 use ZM\Config\ZMConfig;
 use ZM\ConnectionManager\ManagerGM;
@@ -23,6 +25,7 @@ use Swoole\Runtime;
 use Swoole\WebSocket\Server;
 use ZM\Annotation\Swoole\SwooleHandler;
 use ZM\Console\Console;
+use ZM\Utils\Terminal;
 use ZM\Utils\ZMUtil;

 class Framework
@@ -35,25 +38,30 @@ class Framework
     * @var Server
     */
    public static $server;
+    /**
+     * @var string[]
+     */
+    public static $loaded_files = [];
    /**
     * @var array|bool|mixed|null
     */
    private $server_set;

+    /** @noinspection PhpUnusedParameterInspection */
    public function __construct($args = []) {
        $tty_width = $this->getTtyWidth();

        self::$argv = $args;

-        //定义常量
-        include_once "global_defines.php";
-
        ZMConfig::setDirectory(DataProvider::getWorkingDir() . '/config');
        ZMConfig::setEnv($args["env"] ?? "");
        if (ZMConfig::get("global") === false) {
            die ("Global config load failed: " . ZMConfig::$last_error . "\nPlease init first!\n");
        }
-        ZMAtomic::init();
+
+        //定义常量
+        include_once "global_defines.php";
+
        try {
            $sw = ZMConfig::get("global");
            if (!is_dir($sw["zm_data"])) mkdir($sw["zm_data"]);
@@ -74,7 +82,6 @@ class Framework
            die($e->getMessage());
        }
        try {
-
            Console::init(
                ZMConfig::get("global", "info_level") ?? 2,
                self::$server,
@@ -82,11 +89,17 @@ class Framework
                ($o = ZMConfig::get("console_color")) === false ? [] : $o
            );

+            $worker = ZMConfig::get("global", "swoole")["worker_num"] ?? swoole_cpu_num();
+            define("ZM_WORKER_NUM", $worker);
+            ZMAtomic::init();
            $timezone = ZMConfig::get("global", "timezone") ?? "Asia/Shanghai";
            date_default_timezone_set($timezone);

            $this->server_set = ZMConfig::get("global", "swoole");
-            $this->parseCliArgs(self::$argv);
+            $this->server_set["log_level"] = SWOOLE_LOG_DEBUG;
+            $add_port = ZMConfig::get("global", "modules")["remote_terminal"]["status"] ?? false;
+
+            $this->parseCliArgs(self::$argv, $add_port);

            // 打印初始信息
            $out["listen"] = ZMConfig::get("global", "host") . ":" . ZMConfig::get("global", "port");
@@ -94,7 +107,7 @@ class Framework
            else $out["worker"] = ZMConfig::get("global", "swoole")["worker_num"];
            $out["environment"] = $args["env"] === null ? "default" : $args["env"];
            $out["log_level"] = Console::getLevel();
-            $out["version"] = ZM_VERSION;
+            $out["version"] = ZM_VERSION . (LOAD_MODE == 0 ? (" (build " . ZM_VERSION_ID . ")") : "");
            if (APP_VERSION !== "unknown") $out["app_version"] = APP_VERSION;
            if (isset(ZMConfig::get("global", "swoole")["task_worker_num"])) {
                $out["task_worker"] = ZMConfig::get("global", "swoole")["task_worker_num"];
@@ -110,14 +123,88 @@ class Framework
            if (ZMConfig::get("global", "static_file_server")["status"] !== false) {
                $out["static_file_server"] = "enabled";
            }
+            if (self::$argv["show-php-ver"] !== false) {
+                $out["php_version"] = PHP_VERSION;
+                $out["swoole_version"] = SWOOLE_VERSION;
+            }
+            if ($add_port) {
+                $conf = ZMConfig::get("global", "modules")["remote_terminal"];
+                $out["terminal"] = $conf["host"] . ":" . $conf["port"];
+            }

            $out["working_dir"] = DataProvider::getWorkingDir();
            self::printProps($out, $tty_width, $args["log-theme"] === null);

            self::$server = new Server(ZMConfig::get("global", "host"), ZMConfig::get("global", "port"));

-            self::$server->set($this->server_set);
+            if ($add_port) {
+                $welcome_msg = Console::setColor("Welcome! You can use `help` for usage.", "green");
+                /** @var Port $port */
+                $port = self::$server->listen("127.0.0.1", 20002, SWOOLE_SOCK_TCP);
+                $port->set([
+                    'open_http_protocol' => false
+                ]);
+                $port->on('connect', function (?\Swoole\Server $serv, $fd) use ($port, $welcome_msg) {
+                    ManagerGM::pushConnect($fd, "terminal");
+                    $serv->send($fd, file_get_contents(working_dir() . "/config/motd.txt"));
+                    if (!empty(ZMConfig::get("global", "modules")["remote_terminal"]["token"] ?? '')) {
+                        $serv->send($fd, "Please input token: ");
+                    } else {
+                        $serv->send($fd, $welcome_msg . "\n>>> ");
+                    }
+                });

+                $port->on('receive', function ($serv, $fd, $reactor_id, $data) use ($welcome_msg) {
+                    ob_start();
+                    try {
+                        $arr = LightCacheInside::get("light_array", "input_token") ?? [];
+                        if (empty($arr[$fd] ?? '')) {
+                            if (ZMConfig::get("global", "modules")["remote_terminal"]["token"] != '') {
+                                $token = trim($data);
+                                if ($token === ZMConfig::get("global", "modules")["remote_terminal"]["token"]) {
+                                    SpinLock::transaction("input_token", function () use ($fd, $token) {
+                                        $arr = LightCacheInside::get("light_array", "input_token");
+                                        $arr[$fd] = $token;
+                                        LightCacheInside::set("light_array", "input_token", $arr);
+                                    });
+                                    $serv->send($fd, Console::setColor("Auth success!!\n", "green"));
+                                    $serv->send($fd, $welcome_msg . "\n>>> ");
+                                } else {
+                                    $serv->send($fd, Console::setColor("Auth failed!!\n", "red"));
+                                    $serv->close($fd);
+                                }
+                                return;
+                            }
+                        }
+                        if (trim($data) == "exit" || trim($data) == "q") {
+                            $serv->send($fd, Console::setColor("Bye!\n", "blue"));
+                            $serv->close($fd);
+                            return;
+                        }
+                        Terminal::executeCommand(trim($data));
+                    } catch (Exception $e) {
+                        $error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
+                        Console::error("Uncaught exception " . get_class($e) . " when calling \"open\": " . $error_msg);
+                        Console::trace();
+                    } catch (Error $e) {
+                        $error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
+                        Console::error("Uncaught " . get_class($e) . " when calling \"open\": " . $error_msg);
+                        Console::trace();
+                    }
+
+                    $r = ob_get_clean();
+                    if (!empty($r)) $serv->send($fd, $r);
+                    if (!in_array(trim($data), ['r', 'reload', 'stop'])) $serv->send($fd, ">>> ");
+                });
+
+                $port->on('close', function ($serv, $fd) {
+                    ManagerGM::popConnect($fd);
+                    //echo "Client: Close.\n";
+                });
+            }
+
+            self::$server->set($this->server_set);
+            Console::setServer(self::$server);
            self::printMotd($tty_width);

            global $asd;
@@ -191,7 +278,9 @@ class Framework
    }

    public function start() {
+        self::$loaded_files = get_included_files();
        self::$server->start();
+        zm_atomic("server_is_stopped")->set(1);
    }

    /**
@@ -237,9 +326,9 @@ class Framework
    /**
     * 解析命令行的 $argv 参数们
     * @param $args
-     * @throws Exception
+     * @param $add_port
     */
-    private function parseCliArgs($args) {
+    private function parseCliArgs($args, &$add_port) {
        $coroutine_mode = true;
        global $terminal_id;
        $terminal_id = uuidgen();
@@ -290,6 +379,10 @@ class Framework
                        Console::$theme = $y;
                    }
                    break;
+                case 'remote-terminal':
+                    $add_port = true;
+                    break;
+                case 'show-php-ver':
                default:
                    //Console::info("Calculating ".$x);
                    //dump($y);
@@ -297,6 +390,7 @@ class Framework
            }
        }
        if ($coroutine_mode) Runtime::enableCoroutine(true, SWOOLE_HOOK_ALL);
+        else Runtime::enableCoroutine(false, SWOOLE_HOOK_ALL);
    }

    private static function writeNoDouble($k, $v, &$line_data, &$line_width, &$current_line, $colorful, $max_border) {
@@ -333,7 +427,7 @@ class Framework
                } else {  // 输出很小，写到前面并分片
                    //Console::info("输出很小，写到前面并分片");
                    $space = intval($max_border / 2) - 2 - strlen($tmp_line);
-                    $line_data[$current_line] .= str_pad("", $space, " ");
+                    $line_data[$current_line] .= str_pad("", $space);
                    $line_data[$current_line] .= "|  "; // 添加分片
                    $line_width[$current_line] -= (strlen($tmp_line) + 3 + $space);
                }
@@ -385,7 +479,7 @@ class Framework
        echo str_pad("", $max_border, "=") . PHP_EOL;
    }

-    public static function getTtyWidth() {
+    public static function getTtyWidth(): string {
        return explode(" ", trim(exec("stty size")))[1];
    }
 }
--- a/src/ZM/Http/Response.php
+++ b/src/ZM/Http/Response.php
@@ -1,4 +1,6 @@
-<?php
+<?php /** @noinspection PhpUnused */
+
+/** @noinspection PhpMissingReturnTypeInspection */


 namespace ZM\Http;
--- a/src/ZM/Http/RouteManager.php
+++ b/src/ZM/Http/RouteManager.php
@@ -9,6 +9,7 @@ use Symfony\Component\Routing\RouteCollection;
 use ZM\Annotation\Http\Controller;
 use ZM\Annotation\Http\RequestMapping;
 use ZM\Console\Console;
+use ZM\Store\LightCacheInside;

 class RouteManager
 {
@@ -34,4 +35,26 @@ class RouteManager

        self::$routes->add(md5($route_name), $route);
    }
+
+    public static function addStaticFileRoute($route, $path) {
+        $tail = trim($route, "/");
+        $route_name = ($tail === "" ? "" : "/") . $tail . "/{filename}";
+        Console::debug("添加静态文件路由：" . $route_name);
+        $route = new Route($route_name, ['_class' => RouteManager::class, '_method' => "onStaticRoute"]);
+        //echo $path.PHP_EOL;
+        LightCacheInside::set("static_route", $route->getPath(), $path);
+
+        self::$routes->add(md5($route_name), $route);
+    }
+
+    public function onStaticRoute($params) {
+        $route_path = self::$routes->get($params["_route"])->getPath();
+        if(($path = LightCacheInside::get("static_route", $route_path)) === null) {
+            ctx()->getResponse()->endWithStatus(404);
+            return false;
+        }
+        unset($params["_route"]);
+        $obj = array_shift($params);
+        return new StaticFileHandler($obj, $path);
+    }
 }
--- a/src/ZM/Module/QQBot.php
+++ b/src/ZM/Module/QQBot.php
@@ -15,6 +15,7 @@ use ZM\Event\EventDispatcher;
 use ZM\Exception\InterruptException;
 use ZM\Exception\WaitTimeoutException;
 use ZM\Utils\CoMessage;
+use ZM\Utils\MessageUtil;

 /**
 * Class QQBot
@@ -55,7 +56,7 @@ class QQBot
     * @return EventDispatcher
     * @throws Exception
     */
-    public function dispatchBeforeEvents($data) {
+    public function dispatchBeforeEvents($data): EventDispatcher {
        $before = new EventDispatcher(CQBefore::class);
        $before->setRuleFunction(function ($v) use ($data) {
            return $v->cq_event == $data["post_type"];
@@ -70,63 +71,25 @@ class QQBot
    /**
     * @param $data
     * @throws InterruptException
+     * @throws Exception
     */
    private function dispatchEvents($data) {
        //Console::warning("最xia数据包：".json_encode($data));
        switch ($data["post_type"]) {
            case "message":
-                $word = explodeMsg(str_replace("\r", "", context()->getMessage()));
-                if (empty($word)) $word = [""];
-                if (count(explode("\n", $word[0])) >= 2) {
-                    $enter = explode("\n", context()->getMessage());
-                    $first = split_explode(" ", array_shift($enter));
-                    $word = array_merge($first, $enter);
-                    foreach ($word as $k => $v) {
-                        $word[$k] = trim($word[$k]);
-                    }
-                }
                //分发CQCommand事件
                $dispatcher = new EventDispatcher(CQCommand::class);
-                $dispatcher->setRuleFunction(function (CQCommand $v) use ($word) {
-                    if (array_diff([$v->match, $v->pattern, $v->regex, $v->keyword, $v->end_with, $v->start_with], [""]) == []) return false;
-                    elseif (($v->user_id == 0 || ($v->user_id != 0 && $v->user_id == ctx()->getUserId())) &&
-                        ($v->group_id == 0 || ($v->group_id != 0 && $v->group_id == (ctx()->getGroupId() ?? 0))) &&
-                        ($v->message_type == '' || ($v->message_type != '' && $v->message_type == ctx()->getMessageType()))
-                    ) {
-                        if (($word[0] != "" && $v->match == $word[0]) || in_array($word[0], $v->alias)) {
-                            array_shift($word);
-                            ctx()->setCache("match", $word);
-                            return true;
-                        } elseif ($v->start_with != "" && mb_strpos(ctx()->getMessage(), $v->start_with) === 0) {
-                            ctx()->setCache("match", [mb_substr(ctx()->getMessage(), mb_strlen($v->start_with))]);
-                            return true;
-                        } elseif ($v->end_with != "" && strlen(ctx()->getMessage()) == (strripos(ctx()->getMessage(), $v->end_with) + strlen($v->end_with))) {
-                            ctx()->setCache("match", [substr(ctx()->getMessage(), 0, strripos(ctx()->getMessage(), $v->end_with))]);
-                            return true;
-                        } elseif ($v->keyword != "" && mb_strpos(ctx()->getMessage(), $v->keyword) !== false) {
-                            ctx()->setCache("match", explode($v->keyword, ctx()->getMessage()));
-                            return true;
-                        } elseif ($v->pattern != "") {
-                            $match = matchArgs($v->pattern, ctx()->getMessage());
-                            if ($match !== false) {
-                                ctx()->setCache("match", $match);
-                                return true;
-                            }
-                        } elseif ($v->regex != "") {
-                            if (preg_match("/" . $v->regex . "/u", ctx()->getMessage(), $word2) != 0) {
-                                ctx()->setCache("match", $word2);
-                                return true;
-                            }
-                        }
-                    }
-                    return false;
-                });
                $dispatcher->setReturnFunction(function ($result) {
                    if (is_string($result)) ctx()->reply($result);
                    if (ctx()->getCache("has_reply") === true) EventDispatcher::interrupt();
                });
-                $dispatcher->dispatchEvents();
-                if ($dispatcher->status == EventDispatcher::STATUS_INTERRUPTED) EventDispatcher::interrupt();
+                $s = MessageUtil::matchCommand(ctx()->getMessage(), ctx()->getData());
+                if ($s->status !== false) {
+                    if (!empty($s->match)) ctx()->setCache("match", $s->match);
+                    $dispatcher->dispatchEvent($s->object, null);
+                    if (is_string($dispatcher->store)) ctx()->reply($dispatcher->store);
+                    if (ctx()->getCache("has_reply") === true) EventDispatcher::interrupt();
+                }

                //分发CQMessage事件
                $msg_dispatcher = new EventDispatcher(CQMessage::class);
--- a/src/ZM/Store/LightCache.php
+++ b/src/ZM/Store/LightCache.php
@@ -7,7 +7,6 @@ namespace ZM\Store;
 use Exception;
 use Swoole\Table;
 use ZM\Annotation\Swoole\OnSave;
-use ZM\Config\ZMConfig;
 use ZM\Console\Console;
 use ZM\Event\EventDispatcher;
 use ZM\Exception\ZMException;
@@ -27,6 +26,7 @@ class LightCache
     * @param $config
     * @return bool|mixed
     * @throws Exception
+     * @noinspection PhpMissingReturnTypeInspection
     */
    public static function init($config) {
        self::$config = $config;
@@ -87,6 +87,7 @@ class LightCache
     * @param int $expire
     * @return mixed
     * @throws ZMException
+     * @noinspection PhpMissingReturnTypeInspection
     */
    public static function set(string $key, $value, int $expire = -1) {
        if (self::$kv_table === null) throw new ZMException("not initialized LightCache");
@@ -120,6 +121,7 @@ class LightCache
     * @param $value
     * @return bool|mixed
     * @throws ZMException
+     * @noinspection PhpMissingReturnTypeInspection
     */
    public static function update(string $key, $value) {
        if (self::$kv_table === null) throw new ZMException("not initialized LightCache.");
@@ -154,7 +156,7 @@ class LightCache
     * @return bool
     * @throws Exception
     */
-    public static function isset(string $key) {
+    public static function isset(string $key): bool {
        return self::get($key) !== null;
    }

@@ -162,7 +164,7 @@ class LightCache
        return self::$kv_table->del($key);
    }

-    public static function getAll() {
+    public static function getAll(): array {
        $r = [];
        $del = [];
        foreach (self::$kv_table as $k => $v) {
@@ -178,15 +180,13 @@ class LightCache
        return $r;
    }

-    public static function savePersistence($only_worker = false) {
-
-        // 下面将OnSave激活一下
-        if (server()->worker_id == (ZMConfig::get("global", "worker_cache")["worker"] ?? 0)) {
-            $dispatcher = new EventDispatcher(OnSave::class);
-            $dispatcher->dispatchEvents();
-        }
-
-        if($only_worker) return;
+    /**
+     * 这个只能在唯一一个工作进程中执行
+     * @throws Exception
+     */
+    public static function savePersistence() {
+        $dispatcher = new EventDispatcher(OnSave::class);
+        $dispatcher->dispatchEvents();

        if (self::$kv_table === null) return;
        $r = [];
@@ -201,8 +201,7 @@ class LightCache
            $r = file_put_contents(self::$config["persistence_path"], json_encode($r, 128 | 256));
            if ($r === false) Console::error("Not saved, please check your \"persistence_path\"!");
        }
-
-
+        Console::verbose("Saved.");
    }

    private static function checkExpire($key) {
--- a/src/ZM/Store/LightCacheInside.php
+++ b/src/ZM/Store/LightCacheInside.php
@@ -13,30 +13,25 @@ class LightCacheInside
    /** @var Table[]|null */
    private static $kv_table = [];

-    public static $last_error = '';
-
-    public static function init() {
-        self::$kv_table["wait_api"] = new Table(3, 0);
-        self::$kv_table["wait_api"]->column("value", Table::TYPE_STRING, 65536);
-        self::$kv_table["connect"] = new Table(8, 0);
-        self::$kv_table["connect"]->column("value", Table::TYPE_STRING, 256);
-        $result = self::$kv_table["wait_api"]->create() && self::$kv_table["connect"]->create();
-        if ($result === false) {
-            self::$last_error = '系统内存不足，申请失败';
+    public static function init(): bool {
+        try {
+            self::createTable("wait_api", 3, 65536);
+            self::createTable("connect", 3, 64);        //用于存单机器人模式下的机器人fd的
+            self::createTable("static_route", 64, 256);//用于存储
+            self::createTable("light_array", 8, 512, 0.6);
+        } catch (ZMException $e) {
            return false;
-        } else {
-            return true;
-        }
+        }    //用于存协程等待的状态内容的
+        //self::createTable("worker_start", 2, 1024);//用于存启动服务器时的状态的
+        return true;
    }

    /**
     * @param string $table
     * @param string $key
     * @return mixed|null
-     * @throws ZMException
     */
    public static function get(string $table, string $key) {
-        if (!isset(self::$kv_table[$table])) throw new ZMException("not initialized LightCache");
        $r = self::$kv_table[$table]->get($key);
        return $r === false ? null : json_decode($r["value"], true);
    }
@@ -46,10 +41,8 @@ class LightCacheInside
     * @param string $key
     * @param string|array|int $value
     * @return mixed
-     * @throws ZMException
     */
-    public static function set(string $table, string $key, $value) {
-        if (self::$kv_table === null) throw new ZMException("not initialized LightCache");
+    public static function set(string $table, string $key, $value): bool {
        try {
            return self::$kv_table[$table]->set($key, [
                "value" => json_encode($value, 256)
@@ -62,4 +55,18 @@ class LightCacheInside
    public static function unset(string $table, string $key) {
        return self::$kv_table[$table]->del($key);
    }
+
+    /**
+     * @param $name
+     * @param $size
+     * @param $str_size
+     * @param int $conflict_proportion
+     * @throws ZMException
+     */
+    private static function createTable($name, $size, $str_size, $conflict_proportion = 0) {
+        self::$kv_table[$name] = new Table($size, $conflict_proportion);
+        self::$kv_table[$name]->column("value", Table::TYPE_STRING, $str_size);
+        $r = self::$kv_table[$name]->create();
+        if ($r === false) throw new ZMException("内存不足，创建静态表失败！");
+    }
 }
--- a/src/ZM/Store/Lock/SpinLock.php
+++ b/src/ZM/Store/Lock/SpinLock.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */


 namespace ZM\Store\Lock;
@@ -29,7 +29,7 @@ class SpinLock
        }
    }

-    public static function tryLock(string $key) {
+    public static function tryLock(string $key): bool {
        if (($r = self::$kv_lock->incr($key, 'lock_num')) > 1) {
            return false;
        }
--- a/src/ZM/Store/Redis/ZMRedis.php
+++ b/src/ZM/Store/Redis/ZMRedis.php
@@ -1,4 +1,6 @@
-<?php /** @noinspection PhpComposerExtensionStubsInspection */
+<?php /** @noinspection PhpUnused */
+
+/** @noinspection PhpComposerExtensionStubsInspection */


 namespace ZM\Store\Redis;
@@ -36,7 +38,7 @@ class ZMRedis
    /**
     * @return Redis
     */
-    public function get() {
+    public function get(): Redis {
        return $this->conn;
    }

--- a/src/ZM/Store/WorkerCache.php
+++ b/src/ZM/Store/WorkerCache.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpMissingReturnTypeInspection */


 namespace ZM\Store;
--- a/src/ZM/Store/ZMAtomic.php
+++ b/src/ZM/Store/ZMAtomic.php
@@ -16,7 +16,7 @@ class ZMAtomic
     * @param $name
     * @return Atomic|null
     */
-    public static function get($name) {
+    public static function get($name): ?Atomic {
        return self::$atomics[$name] ?? null;
    }

@@ -31,6 +31,10 @@ class ZMAtomic
        self::$atomics["_int_is_reload"] = new Atomic(0);
        self::$atomics["wait_msg_id"] = new Atomic(0);
        self::$atomics["_event_id"] = new Atomic(0);
+        self::$atomics["server_is_stopped"] = new Atomic(0);
+        for($i = 0; $i < ZM_WORKER_NUM; ++$i) {
+            self::$atomics["_#worker_".$i] = new Atomic(0);
+        }
        for ($i = 0; $i < 10; ++$i) {
            self::$atomics["_tmp_" . $i] = new Atomic(0);
        }
--- a/src/ZM/Utils/CoMessage.php
+++ b/src/ZM/Utils/CoMessage.php
@@ -5,7 +5,6 @@ namespace ZM\Utils;


 use Co;
-use Exception;
 use ZM\Store\LightCacheInside;
 use ZM\Store\Lock\SpinLock;
 use ZM\Store\ZMAtomic;
@@ -17,7 +16,7 @@ class CoMessage
     * @param array $compare
     * @param int $timeout
     * @return mixed
-     * @throws Exception
+     * @noinspection PhpMissingReturnTypeInspection
     */
    public static function yieldByWS(array $hang, array $compare, $timeout = 600) {
        $cid = Co::getuid();
@@ -40,7 +39,7 @@ class CoMessage
        Co::suspend();
        SpinLock::lock("wait_api");
        $sess = LightCacheInside::get("wait_api", "wait_api");
-        $result = $sess[$api_id]["result"];
+        $result = $sess[$api_id]["result"] ?? null;
        unset($sess[$api_id]);
        LightCacheInside::set("wait_api", "wait_api", $sess);
        SpinLock::unlock("wait_api");
@@ -49,7 +48,7 @@ class CoMessage
        return $result;
    }

-    public static function resumeByWS() {
+    public static function resumeByWS(): bool {
        $dat = ctx()->getData();
        $last = null;
        SpinLock::lock("wait_api");
--- a/src/ZM/Utils/DataProvider.php
+++ b/src/ZM/Utils/DataProvider.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */


 namespace ZM\Utils;
@@ -11,7 +11,7 @@ class DataProvider
 {
    public static $buffer_list = [];

-    public static function getResourceFolder() {
+    public static function getResourceFolder(): string {
        return self::getWorkingDir() . '/resources/';
    }

--- a/src/ZM/Utils/HttpUtil.php
+++ b/src/ZM/Utils/HttpUtil.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpMissingReturnTypeInspection */


 namespace ZM\Utils;
@@ -17,6 +17,7 @@ use ZM\Http\RouteManager;

 class HttpUtil
 {
+    /** @noinspection PhpMissingReturnTypeInspection */
    public static function parseUri($request, $response, $uri, &$node, &$params) {
        $context = new RequestContext();
        $context->setMethod($request->server['request_method']);
--- a/src/ZM/Utils/MessageUtil.php
+++ b/src/ZM/Utils/MessageUtil.php
@@ -0,0 +1,163 @@
+<?php /** @noinspection PhpUnused */
+
+
+namespace ZM\Utils;
+
+
+use ZM\Annotation\CQ\CQCommand;
+use ZM\API\CQ;
+use ZM\Config\ZMConfig;
+use ZM\Console\Console;
+use ZM\Entity\MatchResult;
+use ZM\Event\EventDispatcher;
+use ZM\Event\EventManager;
+use ZM\Requests\ZMRequest;
+
+class MessageUtil
+{
+    /**
+     * 下载消息中 CQ 码的所有图片，通过 url
+     * @param $msg
+     * @param null $path
+     * @return array|false
+     */
+    public static function downloadCQImage($msg, $path = null) {
+        $path = $path ?? DataProvider::getDataFolder() . "images/";
+        if (!is_dir($path)) mkdir($path);
+        $path = realpath($path);
+        if ($path === false) {
+            Console::warning("指定的路径错误不存在！");
+            return false;
+        }
+        $files = [];
+        $cq = CQ::getAllCQ($msg, true);
+        foreach ($cq as $v) {
+            if ($v->type == "image") {
+                $result = ZMRequest::downloadFile($v->params["url"], $path . "/" . $v->params["file"]);
+                if ($result === false) {
+                    Console::warning("图片 " . $v->params["url"] . " 下载失败！");
+                    return false;
+                }
+                $files[] = $path . "/" . $v->params["file"];
+            }
+        }
+        return $files;
+    }
+
+    /**
+     * 检查消息中是否含有图片 CQ 码
+     * @param $msg
+     * @return bool
+     */
+    public static function containsImage($msg): bool {
+        $cq = CQ::getAllCQ($msg, true);
+        foreach ($cq as $v) {
+            if ($v->type == "image") {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    public static function isAtMe($msg, $me_id) {
+        return strpos($msg, CQ::at($me_id)) !== false;
+    }
+
+    /**
+     * 通过本地地址返回图片的 CQ 码
+     * type == 0 : 返回图片的 base64 CQ 码
+     * type == 1 : 返回图片的 file://路径 CQ 码（路径必须为绝对路径）
+     * type == 2 : 返回图片的 http://xxx CQ 码（默认为 /images/ 路径就是文件对应所在的目录）
+     * @param $file
+     * @param int $type
+     * @return string
+     */
+    public static function getImageCQFromLocal($file, $type = 0): string {
+        switch ($type) {
+            case 0:
+                return CQ::image("base64://" . base64_encode(file_get_contents($file)));
+            case 1:
+                return CQ::image("file://" . $file);
+            case 2:
+                $info = pathinfo($file);
+                return CQ::image(ZMConfig::get("global", "http_reverse_link") . "/images/" . $info["basename"]);
+        }
+        return "";
+    }
+
+    /**
+     * 分割字符，将用户消息通过空格或换行分割为数组
+     * @param $msg
+     * @return array|string[]
+     */
+    public static function splitCommand($msg) {
+        $word = explodeMsg(str_replace("\r", "", $msg));
+        if (empty($word)) $word = [""];
+        if (count(explode("\n", $word[0])) >= 2) {
+            $enter = explode("\n", $msg);
+            $first = split_explode(" ", array_shift($enter));
+            $word = array_merge($first, $enter);
+            foreach ($word as $k => $v) {
+                $word[$k] = trim($word[$k]);
+            }
+        }
+        return $word;
+    }
+
+    /**
+     * @param $msg
+     * @param $obj
+     * @return MatchResult
+     */
+    public static function matchCommand($msg, $obj) {
+        $ls = EventManager::$events[CQCommand::class];
+        $word = self::splitCommand($msg);
+        $matched = new MatchResult();
+        foreach ($ls as $k => $v) {
+            if (array_diff([$v->match, $v->pattern, $v->regex, $v->keyword, $v->end_with, $v->start_with], [""]) == []) continue;
+            elseif (($v->user_id == 0 || ($v->user_id != 0 && $v->user_id == $obj["user_id"])) &&
+                ($v->group_id == 0 || ($v->group_id != 0 && $v->group_id == ($obj["group_id"] ?? 0))) &&
+                ($v->message_type == '' || ($v->message_type != '' && $v->message_type == $obj["message_type"]))
+            ) {
+                if (($word[0] != "" && $v->match == $word[0]) || in_array($word[0], $v->alias)) {
+                    array_shift($word);
+                    $matched->match = $word;
+                    $matched->object = $v;
+                    $matched->status = true;
+                    break;
+                } elseif ($v->start_with != "" && mb_strpos($msg, $v->start_with) === 0) {
+                    $matched->match = [mb_substr($msg, mb_strlen($v->start_with))];
+                    $matched->object = $v;
+                    $matched->status = true;
+                    break;
+                } elseif ($v->end_with != "" && strlen($msg) == (strripos($msg, $v->end_with) + strlen($v->end_with))) {
+                    $matched->match = [substr($msg, 0, strripos($msg, $v->end_with))];
+                    $matched->object = $v;
+                    $matched->status = true;
+                    break;
+                } elseif ($v->keyword != "" && mb_strpos($msg, $v->keyword) !== false) {
+                    $matched->match = explode($v->keyword, $msg);
+                    $matched->object = $v;
+                    $matched->status = true;
+                    break;
+                } elseif ($v->pattern != "") {
+                    $match = matchArgs($v->pattern, $msg);
+                    if ($match !== false) {
+                        $matched->match = $match;
+                        $matched->object = $v;
+                        $matched->status = true;
+                        break;
+                    }
+                } elseif ($v->regex != "") {
+                    if (preg_match("/" . $v->regex . "/u", $msg, $word2) != 0) {
+                        $matched->match = $word2;
+                        $matched->object = $v;
+                        $matched->status = true;
+                        break;
+                    }
+                }
+            }
+        }
+        return $matched;
+    }
+}
--- a/src/ZM/Utils/ProcessManager.php
+++ b/src/ZM/Utils/ProcessManager.php
@@ -1,17 +1,113 @@
-<?php
+<?php /** @noinspection PhpUnused */


 namespace ZM\Utils;


+use Co;
+use ZM\Annotation\Swoole\OnPipeMessageEvent;
+use ZM\Console\Console;
+use ZM\Event\EventDispatcher;
+use ZM\Store\LightCache;
+use ZM\Store\LightCacheInside;
+use ZM\Store\WorkerCache;
+
 class ProcessManager
 {
-    public static function runOnTask($param, $timeout = 0.5, $dst_worker_id = -1) {
-        return server()->taskwait([
-            "action" => "runMethod",
-            "class" => $param["class"],
-            "method" => $param["method"],
-            "params" => $param["params"]
-        ], $timeout, $dst_worker_id);
+    public static function workerAction($src_worker_id, $data) {
+        $server = server();
+        switch ($data["action"] ?? '') {
+            case "eval":
+                eval($data["data"]);
+                break;
+            case "call_static":
+                call_user_func_array([$data["data"]["class"], $data["data"]["method"]], $data["data"]["params"]);
+                break;
+            case "save_persistence":
+                LightCache::savePersistence();
+                break;
+            case "resume_ws_message":
+                $obj = $data["data"];
+                Co::resume($obj["coroutine"]);
+                break;
+            case "getWorkerCache":
+                $r = WorkerCache::get($data["key"]);
+                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
+                $server->sendMessage(json_encode($action, 256), $src_worker_id);
+                break;
+            case "setWorkerCache":
+                $r = WorkerCache::set($data["key"], $data["value"]);
+                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
+                $server->sendMessage(json_encode($action, 256), $src_worker_id);
+                break;
+            case "unsetWorkerCache":
+                $r = WorkerCache::unset($data["key"]);
+                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
+                $server->sendMessage(json_encode($action, 256), $src_worker_id);
+                break;
+            case "hasKeyWorkerCache":
+                $r = WorkerCache::hasKey($data["key"], $data["subkey"]);
+                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
+                $server->sendMessage(json_encode($action, 256), $src_worker_id);
+                break;
+            case "asyncAddWorkerCache":
+                WorkerCache::add($data["key"], $data["value"], true);
+                break;
+            case "asyncSubWorkerCache":
+                WorkerCache::sub($data["key"], $data["value"], true);
+                break;
+            case "asyncSetWorkerCache":
+                WorkerCache::set($data["key"], $data["value"], true);
+                break;
+            case "asyncUnsetWorkerCache":
+                WorkerCache::unset($data["key"], true);
+                break;
+            case "addWorkerCache":
+                $r = WorkerCache::add($data["key"], $data["value"]);
+                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
+                $server->sendMessage(json_encode($action, 256), $src_worker_id);
+                break;
+            case "subWorkerCache":
+                $r = WorkerCache::sub($data["key"], $data["value"]);
+                $action = ["action" => "returnWorkerCache", "cid" => $data["cid"], "value" => $r];
+                $server->sendMessage(json_encode($action, 256), $src_worker_id);
+                break;
+            case "returnWorkerCache":
+                WorkerCache::$transfer[$data["cid"]] = $data["value"];
+                zm_resume($data["cid"]);
+                break;
+            default:
+                $dispatcher = new EventDispatcher(OnPipeMessageEvent::class);
+                $dispatcher->setRuleFunction(function (OnPipeMessageEvent $v) use ($data) {
+                    return $v->action == $data["action"];
+                });
+                $dispatcher->dispatchEvents($data);
+                break;
+        }
+    }
+
+    public static function sendActionToWorker($worker_id, $action, $data) {
+        $obj = ["action" => $action, "data" => $data];
+        if (server()->worker_id === -1 && server()->getManagerPid() != posix_getpid()) {
+            Console::warning("Cannot send worker action from master or manager process!");
+            return;
+        }
+        if (server()->worker_id == $worker_id) {
+            self::workerAction($worker_id, $obj);
+        } else {
+            server()->sendMessage(json_encode($obj), $worker_id);
+        }
+    }
+
+    public static function resumeAllWorkerCoroutines() {
+        if (server()->worker_id === -1) {
+            Console::warning("Cannot call '".__FUNCTION__."' in non-worker process!");
+            return;
+        }
+        foreach ((LightCacheInside::get("wait_api", "wait_api") ?? []) as $k => $v) {
+            if (($v["result"] ?? false) === null && isset($v["coroutine"], $v["worker_id"])) {
+                if (server()->worker_id == $v["worker_id"]) Co::resume($v["coroutine"]);
+            }
+        }
    }
 }
--- a/src/ZM/Utils/SingletonTrait.php
+++ b/src/ZM/Utils/SingletonTrait.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */


 namespace ZM\Utils;
@@ -15,6 +15,7 @@ trait SingletonTrait

    /**
     * @return self
+     * @noinspection PhpMissingReturnTypeInspection
     */
    public static function getInstance() {
        if (null === self::$instance) {
--- a/src/ZM/Utils/TaskManager.php
+++ b/src/ZM/Utils/TaskManager.php
@@ -0,0 +1,26 @@
+<?php /** @noinspection PhpUnused */
+
+
+namespace ZM\Utils;
+
+
+use ZM\Console\Console;
+
+class TaskManager
+{
+    /**
+     * @noinspection PhpMissingReturnTypeInspection
+     * @param $task_name
+     * @param int $timeout
+     * @param mixed ...$params
+     * @return false|mixed
+     */
+    public static function runTask($task_name, $timeout = -1, ...$params) {
+        if (!isset(server()->setting["task_worker_num"])) {
+            Console::warning("未开启 TaskWorker 进程，请先修改 global 配置文件启用！");
+            return false;
+        }
+        $r = server()->taskwait(["task" => $task_name, "params" => $params], $timeout);
+        return $r === false ? false : $r["result"];
+    }
+}
--- a/src/ZM/Utils/Terminal.php
+++ b/src/ZM/Utils/Terminal.php
@@ -1,4 +1,4 @@
-<?php
+<?php /** @noinspection PhpUnused */


 namespace ZM\Utils;
@@ -6,20 +6,38 @@ namespace ZM\Utils;

 use Exception;
 use Psy\Shell;
-use Swoole\Event;
+use ZM\Annotation\Command\TerminalCommand;
+use ZM\ConnectionManager\ManagerGM;
 use ZM\Console\Console;
+use ZM\Event\EventDispatcher;
+use ZM\Event\EventManager;
 use ZM\Framework;

 class Terminal
 {
    /**
     * @param string $cmd
-     * @param $resource
     * @return bool
+     * @noinspection PhpMissingReturnTypeInspection
+     * @noinspection PhpUnused
+     * @throws Exception
     */
-    public static function executeCommand(string $cmd, $resource) {
+    public static function executeCommand(string $cmd) {
        $it = explodeMsg($cmd);
        switch ($it[0] ?? '') {
+            case 'help':
+                $help[] = "exit | q:\t断开远程终端";
+                $help[] = "logtest:\t输出所有可以打印的log等级示例消息，用于测试Console";
+                $help[] = "call:\t\t用于执行不需要参数的动态函数，比如 `call \Module\Example\Hello hitokoto`";
+                $help[] = "level:\t\t设置log等级，例如 `level 0|1|2|3|4`";
+                $help[] = "bc:\t\teval执行代码，但输入必须是将代码base64之后的，如 `bc em1faW5mbygn5L2g5aW9Jyk7`";
+                $help[] = "stop:\t\t停止服务器";
+                $help[] = "reload | r:\t热重启用户编写的模块代码";
+                foreach(EventManager::$events[TerminalCommand::class] as $v) {
+                    $help[]=$v->command.":\t\t".(empty($v->description) ? "<用户自定义指令>" : $v->description);
+                }
+                echo implode("\n", $help) . PHP_EOL;
+                return true;
            case 'logtest':
                Console::log(date("[H:i:s]") . " [L] This is normal msg. (0)");
                Console::error("This is error msg. (0)");
@@ -33,7 +51,8 @@ class Terminal
                $class_name = $it[1];
                $function_name = $it[2];
                $class = new $class_name([]);
-                $class->$function_name();
+                $r = $class->$function_name();
+                if (is_string($r)) Console::success($r);
                return true;
            case 'psysh':
                if (Framework::$argv["disable-coroutine"]) {
@@ -41,6 +60,11 @@ class Terminal
                } else
                    Console::error("Only \"--disable-coroutine\" mode can use psysh!!!");
                return true;
+            case 'level':
+                $level = intval(is_numeric($it[1] ?? 99) ? ($it[1] ?? 99) : 99);
+                if ($level > 4 || $level < 0) Console::warning("Usage: 'level 0|1|2|3|4'");
+                else Console::setLevel($level) || Console::success("Success!!");
+                break;
            case 'bc':
                $code = base64_decode($it[1] ?? '', true);
                try {
@@ -55,7 +79,6 @@ class Terminal
                Console::log($it[2], $it[1]);
                return true;
            case 'stop':
-                Event::del($resource);
                ZMUtil::stop();
                return false;
            case 'reload':
@@ -65,8 +88,35 @@ class Terminal
            case '':
                return true;
            default:
-                Console::info("Command not found: " . $cmd);
-                return true;
+                $dispatcher = new EventDispatcher(TerminalCommand::class);
+                $dispatcher->setRuleFunction(function ($v) use ($it) {
+                    /** @var TerminalCommand $v */
+                    return $v->command == $it[0];
+                });
+                $dispatcher->setReturnFunction(function () {
+                    EventDispatcher::interrupt('none');
+                });
+                $dispatcher->dispatchEvents($it);
+                if ($dispatcher->store !== 'none') {
+                    Console::info("Command not found: " . $cmd);
+                    return true;
+                }
+        }
+        return false;
+    }
+
+    public static function log($type, $log_msg) {
+        ob_start();
+        if (!in_array($type, ["log", "info", "debug", "success", "warning", "error", "verbose"])) {
+            ob_get_clean();
+            return;
+        }
+        Console::$type($log_msg);
+        $r = ob_get_clean();
+        $all = ManagerGM::getAllByName("terminal");
+        foreach ($all as $k => $v) {
+            server()->send($v->getFd(), "\r" . $r);
+            server()->send($v->getFd(), ">>> ");
        }
    }
 }
--- a/src/ZM/Utils/ZMUtil.php
+++ b/src/ZM/Utils/ZMUtil.php
@@ -4,52 +4,37 @@
 namespace ZM\Utils;


-use Co;
 use Exception;
-use Swoole\Event;
-use Swoole\Timer;
+use Swoole\Process;
 use ZM\Console\Console;
-use ZM\Store\LightCache;
-use ZM\Store\LightCacheInside;
+use ZM\Framework;
 use ZM\Store\Lock\SpinLock;
 use ZM\Store\ZMAtomic;
 use ZM\Store\ZMBuf;

 class ZMUtil
 {
+    /**
+     * @throws Exception
+     */
    public static function stop() {
        if (SpinLock::tryLock("_stop_signal") === false) return;
        Console::warning(Console::setColor("Stopping server...", "red"));
-        Console::trace();
-        LightCache::savePersistence();
-        if (ZMBuf::$terminal !== null)
-            Event::del(ZMBuf::$terminal);
+        if (Console::getLevel() >= 4) Console::trace();
        ZMAtomic::get("stop_signal")->set(1);
-        try {
-            LightCache::set('stop', 'OK');
-        } catch (Exception $e) {
+        for($i = 0; $i < ZM_WORKER_NUM; ++$i) {
+            Process::kill(zm_atomic("_#worker_".$i)->get(), SIGUSR1);
        }
        server()->shutdown();
        server()->stop();
    }

-    public static function reload($delay = 800) {
-        if (server()->worker_id !== -1) {
-            Console::info(server()->worker_id);
-            zm_atomic("_int_is_reload")->set(1);
-            system("kill -INT " . intval(server()->master_pid));
-            return;
-        }
-        Console::info(Console::setColor("Reloading server...", "gold"));
-        usleep($delay * 1000);
-        foreach ((LightCacheInside::get("wait_api", "wait_api") ?? []) as $k => $v) {
-            if (($v["result"] ?? false) === null && isset($v["coroutine"])) Co::resume($v["coroutine"]);
-        }
-        LightCacheInside::unset("wait_api", "wait_api");
-        LightCache::savePersistence();
-        //DataProvider::saveBuffer();
-        Timer::clearAll();
-        server()->reload();
+    /**
+     * @throws Exception
+     */
+    public static function reload() {
+        zm_atomic("_int_is_reload")->set(1);
+        system("kill -INT " . intval(server()->master_pid));
    }

    public static function getModInstance($class) {
@@ -62,6 +47,22 @@ class ZMUtil
    }

    public static function sendActionToWorker($target_id, $action, $data) {
+        Console::verbose($action . ": " . $data);
        server()->sendMessage(json_encode(["action" => $action, "data" => $data]), $target_id);
    }
+
+    /**
+     * 在工作进程中返回可以通过reload重新加载的php文件列表
+     * @return string[]|string[][]
+     */
+    public static function getReloadableFiles() {
+        return array_map(
+            function ($x) {
+                return str_replace(DataProvider::getWorkingDir() . "/", "", $x);
+            }, array_diff(
+                get_included_files(),
+                Framework::$loaded_files
+            )
+        );
+    }
 }
--- a/src/ZM/global_defines.php
+++ b/src/ZM/global_defines.php
@@ -5,7 +5,6 @@ use ZM\Utils\DataProvider;

 define("ZM_START_TIME", microtime(true));
 define("ZM_DATA", ZMConfig::get("global", "zm_data"));
-define("ZM_VERSION", json_decode(file_get_contents(__DIR__ . "/../../composer.json"), true)["version"] ?? "unknown");
 define("APP_VERSION", LOAD_MODE == 1 ? (json_decode(file_get_contents(DataProvider::getWorkingDir() . "/composer.json"), true)["version"] ?? "unknown") : "unknown");
 define("CRASH_DIR", ZMConfig::get("global", "crash_dir"));
@mkdir(ZM_DATA);
--- a/src/ZM/global_functions.php
+++ b/src/ZM/global_functions.php
@@ -1,6 +1,9 @@
-<?php #plain
+<?php /** @noinspection PhpUnused */ #plain

+use Swoole\Atomic;
 use Swoole\Coroutine;
+use Swoole\WebSocket\Server;
+use Symfony\Component\VarDumper\VarDumper;
 use ZM\API\ZMRobot;
 use ZM\Config\ZMConfig;
 use ZM\ConnectionManager\ManagerGM;
@@ -11,6 +14,7 @@ use ZM\Exception\RobotNotFoundException;
 use ZM\Exception\ZMException;
 use ZM\Framework;
 use ZM\Store\LightCacheInside;
+use ZM\Store\ZMAtomic;
 use ZM\Store\ZMBuf;
 use ZM\Utils\DataProvider;
 use Swoole\Coroutine\System;
@@ -52,7 +56,7 @@ function getClassPath($class_name) {
 * @param bool $ban_comma
 * @return array
 */
-function explodeMsg($msg, $ban_comma = false) {
+function explodeMsg($msg, $ban_comma = false): array {
    $msg = str_replace(" ", "\n", trim($msg));
    if (!$ban_comma) {
        //$msg = str_replace("，", "\n", $msg);
@@ -79,7 +83,7 @@ function unicode_decode($str) {
 * @param $indoor_name
 * @return array
 */
-function getAllClasses($dir, $indoor_name) {
+function getAllClasses($dir, $indoor_name): array {
    if (!is_dir($dir)) return [];
    $list = scandir($dir);
    $classes = [];
@@ -104,7 +108,7 @@ function getAllClasses($dir, $indoor_name) {
    return $classes;
 }

-function matchPattern($pattern, $context) {
+function matchPattern($pattern, $context): bool {
    if (mb_substr($pattern, 0, 1) == "" && mb_substr($context, 0, 1) == "")
        return true;
    if ('*' == mb_substr($pattern, 0, 1) && "" != mb_substr($pattern, 1, 1) && "" == mb_substr($context, 0, 1))
@@ -116,7 +120,7 @@ function matchPattern($pattern, $context) {
    return false;
 }

-function split_explode($del, $str, $divide_en = false) {
+function split_explode($del, $str, $divide_en = false): array {
    $str = explode($del, $str);
    for ($i = 0; $i < mb_strlen($str[0]); $i++) {
        if (
@@ -178,19 +182,19 @@ function matchArgs($pattern, $context) {
    } else return false;
 }

-function connectIsQQ() {
+function connectIsQQ(): bool {
    return ctx()->getConnection()->getName() == 'qq';
 }

-function connectIsDefault() {
+function connectIsDefault(): bool {
    return ctx()->getConnection()->getName() == 'default';
 }

-function connectIs($type) {
+function connectIs($type): bool {
    return ctx()->getConnection()->getName() == $type;
 }

-function getAnnotations() {
+function getAnnotations(): array {
    $s = debug_backtrace()[1];
    //echo json_encode($s, 128|256);
    $list = [];
@@ -218,14 +222,14 @@ function set_coroutine_params($array) {
 /**
 * @return ContextInterface|null
 */
-function context() {
+function context(): ?ContextInterface {
    return ctx();
 }

 /**
 * @return ContextInterface|null
 */
-function ctx() {
+function ctx(): ?ContextInterface {
    $cid = Co::getCid();
    $c_class = ZMConfig::get("global", "context_class");
    if (isset(Context::$context[$cid])) {
@@ -240,48 +244,72 @@ function ctx() {
    }
 }

-function zm_debug($msg) { Console::debug($msg); }
-
-function onebot_target_id_name($message_type) {
+function onebot_target_id_name($message_type): string {
    return ($message_type == "group" ? "group_id" : "user_id");
 }

-function zm_sleep($s = 1) {
+function zm_sleep($s = 1): bool {
    if (Coroutine::getCid() != -1) System::sleep($s);
    else usleep($s * 1000 * 1000);
    return true;
 }

-function zm_exec($cmd): array { return System::exec($cmd); }
+function zm_exec($cmd): array {
+    return System::exec($cmd);
+}

-function zm_cid() { return Co::getCid(); }
+function zm_cid() {
+    return Co::getCid();
+}

-function zm_yield() { Co::yield(); }
+function zm_yield() {
+    Co::yield();
+}

-function zm_resume(int $cid) { Co::resume($cid); }
+function zm_resume(int $cid) {
+    Co::resume($cid);
+}

 function zm_timer_after($ms, callable $callable) {
-    go(function () use ($ms, $callable) {
-        Swoole\Timer::after($ms, $callable);
+    Swoole\Timer::after($ms, function () use ($callable) {
+        call_with_catch($callable);
    });
 }

+function call_with_catch($callable) {
+    try {
+        $callable();
+    } catch (Exception $e) {
+        $error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
+        Console::error("Uncaught exception " . get_class($e) . " when calling \"message\": " . $error_msg);
+        Console::trace();
+    } catch (Error $e) {
+        $error_msg = $e->getMessage() . " at " . $e->getFile() . "(" . $e->getLine() . ")";
+        Console::error("Uncaught " . get_class($e) . " when calling \"message\": " . $error_msg);
+        Console::trace();
+    }
+}
+
 function zm_timer_tick($ms, callable $callable) {
    if (zm_cid() === -1) {
        return go(function () use ($ms, $callable) {
            Console::debug("Adding extra timer tick of " . $ms . " ms");
-            Swoole\Timer::tick($ms, $callable);
+            Swoole\Timer::tick($ms, function () use ($callable) {
+                call_with_catch($callable);
+            });
        });
    } else {
-        return Swoole\Timer::tick($ms, $callable);
+        return Swoole\Timer::tick($ms, function () use ($callable) {
+            call_with_catch($callable);
+        });
    }
 }

-function zm_data_hash($v) {
+function zm_data_hash($v): string {
    return md5($v["user_id"] . "^" . $v["self_id"] . "^" . $v["message_type"] . "^" . ($v[$v["message_type"] . "_id"] ?? $v["user_id"]));
 }

-function server() {
+function server(): ?Server {
    return Framework::$server;
 }

@@ -290,7 +318,7 @@ function server() {
 * @throws RobotNotFoundException
 * @throws ZMException
 */
-function bot() {
+function bot(): ZMRobot {
    if (($conn = LightCacheInside::get("connect", "conn_fd")) == -2) {
        return ZMRobot::getRandom();
    } elseif ($conn != -1) {
@@ -315,11 +343,11 @@ function getAllFdByConnectType(string $type = 'default'): array {
    return $fds;
 }

-function zm_atomic($name) {
-    return \ZM\Store\ZMAtomic::get($name);
+function zm_atomic($name): ?Atomic {
+    return ZMAtomic::get($name);
 }

-function uuidgen($uppercase = false) {
+function uuidgen($uppercase = false): string {
    try {
        $data = random_bytes(16);
    } catch (Exception $e) {
@@ -337,3 +365,32 @@ function working_dir() {
    elseif (LOAD_MODE == 2) return realpath('.');
    return null;
 }
+
+/** @noinspection PhpMissingReturnTypeInspection */
+function zm_dump($var, ...$moreVars) {
+    VarDumper::dump($var);
+
+    foreach ($moreVars as $v) {
+        VarDumper::dump($v);
+    }
+
+    if (1 < func_num_args()) {
+        return func_get_args();
+    }
+
+    return $var;
+}
+
+function zm_info($obj) { Console::info($obj); }
+
+function zm_warning($obj) { Console::warning($obj); }
+
+function zm_success($obj) { Console::success($obj); }
+
+function zm_debug($obj) { Console::debug($obj); }
+
+function zm_verbose($obj) { Console::verbose($obj); }
+
+function zm_error($obj) { Console::error($obj); }
+
+function zm_config($name, $key = null) { return ZMConfig::get($name, $key); }
--- a/test/ZMTest/Mock/Context.php
+++ b/test/ZMTest/Mock/Context.php
@@ -1,256 +0,0 @@
-<?php
-
-
-namespace ZMTest\Mock;
-
-
-use Swoole\Http\Request;
-use Swoole\WebSocket\Frame;
-use Swoole\WebSocket\Server;
-use ZM\API\ZMRobot;
-use ZM\ConnectionManager\ConnectionObject;
-use ZM\Context\ContextInterface;
-use ZM\Http\Response;
-
-class Context implements ContextInterface
-{
-
-    /**
-     * Context constructor.
-     * @param $cid
-     */
-    public function __construct($cid) { }
-
-    /**
-     * @return Server
-     */
-    public function getServer() {
-        // TODO: Implement getServer() method.
-    }
-
-    /**
-     * @return Frame
-     */
-    public function getFrame() {
-        // TODO: Implement getFrame() method.
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getData() {
-        // TODO: Implement getData() method.
-    }
-
-    /**
-     * @param $data
-     * @return mixed
-     */
-    public function setData($data) {
-        // TODO: Implement setData() method.
-    }
-
-    /**
-     * @return ConnectionObject
-     */
-    public function getConnection() {
-        // TODO: Implement getConnection() method.
-    }
-
-    /**
-     * @return int|null
-     */
-    public function getFd() {
-        // TODO: Implement getFd() method.
-    }
-
-    /**
-     * @return int
-     */
-    public function getCid() {
-        // TODO: Implement getCid() method.
-    }
-
-    /**
-     * @return Response
-     */
-    public function getResponse() {
-        // TODO: Implement getResponse() method.
-    }
-
-    /**
-     * @return Request
-     */
-    public function getRequest() {
-        // TODO: Implement getRequest() method.
-    }
-
-    /**
-     * @return ZMRobot
-     */
-    public function getRobot() {
-        // TODO: Implement getRobot() method.
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getUserId() {
-        // TODO: Implement getUserId() method.
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getGroupId() {
-        // TODO: Implement getGroupId() method.
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getDiscussId() {
-        // TODO: Implement getDiscussId() method.
-    }
-
-    /**
-     * @return string
-     */
-    public function getMessageType() {
-        // TODO: Implement getMessageType() method.
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getRobotId() {
-        // TODO: Implement getRobotId() method.
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getMessage() {
-        // TODO: Implement getMessage() method.
-    }
-
-    /**
-     * @param $msg
-     * @return mixed
-     */
-    public function setMessage($msg) {
-        // TODO: Implement setMessage() method.
-    }
-
-    /**
-     * @param $id
-     * @return mixed
-     */
-    public function setUserId($id) {
-        // TODO: Implement setUserId() method.
-    }
-
-    /**
-     * @param $id
-     * @return mixed
-     */
-    public function setGroupId($id) {
-        // TODO: Implement setGroupId() method.
-    }
-
-    /**
-     * @param $id
-     * @return mixed
-     */
-    public function setDiscussId($id) {
-        // TODO: Implement setDiscussId() method.
-    }
-
-    /**
-     * @param $type
-     * @return mixed
-     */
-    public function setMessageType($type) {
-        // TODO: Implement setMessageType() method.
-    }
-
-    /**
-     * @return mixed
-     */
-    public function getCQResponse() {
-        // TODO: Implement getCQResponse() method.
-    }
-
-    /**
-     * @param $msg
-     * @param bool $yield
-     * @return mixed
-     */
-    public function reply($msg, $yield = false) {
-        echo $msg.PHP_EOL;
-        // TODO: Implement reply() method.
-    }
-
-    /**
-     * @param $msg
-     * @param bool $yield
-     * @return mixed
-     */
-    public function finalReply($msg, $yield = false) {
-        // TODO: Implement finalReply() method.
-    }
-
-    /**
-     * @param string $prompt
-     * @param int $timeout
-     * @param string $timeout_prompt
-     * @return mixed
-     */
-    public function waitMessage($prompt = "", $timeout = 600, $timeout_prompt = "") {
-        // TODO: Implement waitMessage() method.
-    }
-
-    /**
-     * @param $arg
-     * @param $mode
-     * @param $prompt_msg
-     * @return mixed
-     */
-    public function getArgs(&$arg, $mode, $prompt_msg) {
-        $r = $arg;
-        array_shift($r);
-        return array_shift($r);
-        // TODO: Implement getArgs() method.
-    }
-
-    /**
-     * @param $key
-     * @param $value
-     * @return mixed
-     */
-    public function setCache($key, $value) {
-        // TODO: Implement setCache() method.
-    }
-
-    /**
-     * @param $key
-     * @return mixed
-     */
-    public function getCache($key) {
-        // TODO: Implement getCache() method.
-    }
-
-    /**
-     * @return mixed
-     */
-    public function cloneFromParent() {
-        // TODO: Implement cloneFromParent() method.
-    }
-
-    /**
-     * @return mixed
-     */
-    public function copy() {
-        // TODO: Implement copy() method.
-    }
-}
--- a/test/ZMTest/Mock/global.php
+++ b/test/ZMTest/Mock/global.php
@@ -1,111 +0,0 @@
-<?php
-/** @noinspection PhpFullyQualifiedNameUsageInspection */
-/** @noinspection PhpComposerExtensionStubsInspection */
-global $config;
-
-/** bind host */
-$config['host'] = '0.0.0.0';
-
-/** bind port */
-$config['port'] = 20001;
-
-/** 框架开到公网或外部的HTTP访问链接，通过 DataProvider::getFrameworkLink() 获取 */
-$config['http_reverse_link'] = "http://127.0.0.1:" . $config['port'];
-
-/** 框架是否启动debug模式 */
-$config['debug_mode'] = false;
-
-/** 存放框架内文件数据的目录 */
-$config['zm_data'] = realpath(__DIR__ . "/../") . '/zm_data/';
-
-/** 存放崩溃和运行日志的目录 */
-$config['crash_dir'] = $config['zm_data'] . 'crash/';
-
-/** 对应swoole的server->set参数 */
-$config['swoole'] = [
-    'log_file' => $config['crash_dir'] . 'swoole_error.log',
-    'worker_num' => 8,
-    'dispatch_mode' => 2,
-    'max_coroutine' => 30000,
-    //'task_worker_num' => 4,
-    //'task_enable_coroutine' => true
-];
-
-/** 轻量字符串缓存，默认开启 */
-$config['light_cache'] = [
-    "status" => true,
-    "size" => 2048,                     //最多允许储存的条数（需要2的倍数）
-    "max_strlen" => 4096,               //单行字符串最大长度（需要2的倍数）
-    "hash_conflict_proportion" => 0.6   //Hash冲突率（越大越好，但是需要的内存更多）
-];
-
-/** MySQL数据库连接信息，host留空则启动时不创建sql连接池 */
-$config['sql_config'] = [
-    'sql_host' => '',
-    'sql_port' => 3306,
-    'sql_username' => 'name',
-    'sql_database' => 'db_name',
-    'sql_password' => '',
-    'sql_enable_cache' => true,
-    'sql_reset_cache' => '0300',
-    'sql_options' => [
-        PDO::ATTR_STRINGIFY_FETCHES => false,
-        PDO::ATTR_EMULATE_PREPARES => false
-    ],
-    'sql_no_exception' => false,
-    'sql_default_fetch_mode' => PDO::FETCH_ASSOC         // added in 1.5.6
-];
-
-/** CQHTTP连接约定的token */
-$config["access_token"] = "";
-
-/** HTTP服务器固定请求头的返回 */
-$config['http_header'] = [
-    'X-Powered-By' => 'zhamao-framework',
-    'Content-Type' => 'text/html; charset=utf-8'
-];
-
-/** HTTP服务器在指定状态码下回复的页面（默认） */
-$config['http_default_code_page'] = [
-    '404' => '404.html'
-];
-
-/** zhamao-framework在框架启动时初始化的atomic们 */
-$config['init_atomics'] = [
-    //'custom_atomic_name' => 0,  //自定义添加的Atomic
-];
-
-/** 终端日志显示等级（0-4） */
-$config["info_level"] = 2;
-
-/** 自动保存计时器的缓存保存时间（秒） */
-$config['auto_save_interval'] = 900;
-
-/** 上下文接口类 implemented from ContextInterface */
-$config['context_class'] = \ZMTest\Mock\Context::class;
-
-/** 静态文件访问 */
-$config['static_file_server'] = [
-    'status' => false,
-    'document_root' => realpath(__DIR__ . "/../") . '/resources/html',
-    'document_index' => [
-        'index.html'
-    ]
-];
-
-/** 注册 Swoole Server 事件注解的类列表 */
-$config['server_event_handler_class'] = [
-    \ZM\Event\ServerEventHandler::class,
-];
-
-/** 注册自定义指令的类 */
-$config['command_register_class'] = [
-    //\Custom\Command\CustomCommand::class
-];
-
-/** 服务器启用的外部第三方和内部插件 */
-$config['modules'] = [
-    'onebot' => true, // QQ机器人事件解析器，如果取消此项则默认为 true 开启状态，否则你手动填写 false 才会关闭
-];
-
-return $config;
--- a/test/ZMTest/Testing/EventDispatcherTest.php
+++ b/test/ZMTest/Testing/EventDispatcherTest.php
@@ -40,10 +40,7 @@ class EventDispatcherTest extends TestCase
        $dispatcher->setRuleFunction(function ($v) { return $v->match == "你好"; });
        //$dispatcher->setRuleFunction(fn ($v) => $v->match == "qwe");
        ob_start();
-        try {
-            $dispatcher->dispatchEvents();
-        } catch (AnnotationException $e) {
-        }
+        $dispatcher->dispatchEvents();
        $r = ob_get_clean();
        echo $r;
        $this->assertStringContainsString("你好啊", $r);
Author	SHA1	Message	Date
crazywhalecc	626d569858	update composer and roll to 397（v2.3.4)	2021-03-23 14:16:56 +08:00
crazywhalecc	0492179bdd	update composer and roll to 396(v2.3.3)	2021-03-23 14:13:04 +08:00
crazywhalecc	1dfd1de5c1	update composer and roll to 396(v2.3.3)	2021-03-23 14:11:21 +08:00
crazywhalecc	d15d01c32b	update docs	2021-03-23 14:09:11 +08:00
jerry	c9f4278d9b	update forgotten docs	2021-03-23 14:04:45 +08:00
jerry	6aa0540c9e	Merge branch 'master' of https://github.com/zhamao-robot/zhamao-framework	2021-03-23 14:03:14 +08:00
jerry	9689dc9db1	rename	2021-03-23 14:02:58 +08:00
Whale	c20e3324d4	Merge pull request #35 from zhamao-robot/2.3.x 2.3.x	2021-03-23 13:28:18 +08:00
crazywhalecc	303f44cd2b	update to version 2.3.2 (build 395) fix overflow bug	2021-03-23 13:11:59 +08:00
crazywhalecc	66b73973b4	update to version 2.3.2 (build 394) fix mysql error bugs	2021-03-23 12:47:00 +08:00
jerry	0ff4e52ed3	tmp connect	2021-03-22 07:44:11 +08:00
crazywhalecc	b6d1f724e9	update to build 389 add various global functions	2021-03-18 16:36:28 +08:00
crazywhalecc	e77b9d4970	update to 2.3.1 version (build 388) cleanup code and fix a bug	2021-03-18 14:56:35 +08:00
jerry	456b102c15	update docs	2021-03-16 01:39:55 +08:00
jerry	cc57997abc	update to build 387	2021-03-16 01:35:01 +08:00
jerry	19e61c7cc3	update to build 386 fix ZM_DATA equals null add containsImage, getImageCQFromLocal function for MessageUtil	2021-03-16 01:34:17 +08:00
jerry	f908513dca	update to build 385 add CQObject for CQ add after-stop action(set terminal level 0) update global.php modules, add http_proxy_server add MessageUtil.php for message parsing add RouteManager::addStaticFileRoute() for quick handling static file finish onTask function finally!! add TaskManager::runTask()	2021-03-15 02:54:16 +08:00
jerry	7dc39e6ada	update to 2.2.11 verion add build version (start from 384) make 启动中 log as verbose remove console input fix pure http server bug add error handler for zm_timer_tick and zm_timer_after	2021-03-13 15:16:10 +08:00
jerry	b0be53554d	Merge remote-tracking branch 'origin/master'	2021-03-13 03:03:14 +08:00
jerry	b98048bd39	update docs	2021-03-13 03:03:01 +08:00
Whale	fffd3fdc95	Update README.md	2021-03-12 19:45:53 +08:00
jerry	dea9ed2ccd	update docs	2021-03-08 00:56:35 +08:00
jerry	de5744c9e4	update to 2.2.10 version add build-runtime.sh remove debug msg when stopping add --show-php-ver argument for server	2021-03-08 00:48:51 +08:00