update to 2.1.0 version

add @OnCloseEvent, @OnOpenEvent, @OnMessageEvent, @OnRequestEvent
update EventDispatcher.php and change it to status-based schema
fix @CQBefore bugs

src/ZM/Annotation/AnnotationParser.php

@@ -33,7 +33,7 @@ class AnnotationParser
      */
     public function __construct() {
         $this->start_time = microtime(true);
-        $this->loadAnnotationClasses();
+        //$this->loadAnnotationClasses();
         $this->req_mapping[0] = [
             'id' => 0,
             'pid' => -1,
@@ -100,7 +100,7 @@ class AnnotationParser
                         unset($this->annotation_map[$v]);
                         continue 2;
                     } elseif ($vs instanceof MiddlewareClass) {
-                        Console::verbose("正在注册中间件 " . $reflection_class->getName());
+                        Console::debug("正在注册中间件 " . $reflection_class->getName());
                         $rs = $this->registerMiddleware($vs, $reflection_class);
                         $this->middlewares[$rs["name"]] = $rs;
                     }
@@ -297,7 +297,7 @@ class AnnotationParser
         return $result;
     }
 
-    private function sortByLevel(&$events, string $class_name, $prefix = "") {
+    public function sortByLevel(&$events, string $class_name, $prefix = "") {
         if (is_a($class_name, Level::class, true)) {
             $class_name .= $prefix;
             usort($events[$class_name], function ($a, $b) {

src/ZM/Annotation/Swoole/OnCloseEvent.php

@@ -0,0 +1,22 @@
+<?php
+
+
+namespace ZM\Annotation\Swoole;
+
+
+use Doctrine\Common\Annotations\Annotation\Target;
+use ZM\Annotation\Interfaces\Rule;
+
+/**
+ * @Annotation
+ * @Target("METHOD")
+ * Class OnCloseEvent
+ * @package ZM\Annotation\Swoole
+ */
+class OnCloseEvent extends OnSwooleEventBase
+{
+    /**
+     * @var string
+     */
+    public $connect_type = "default";
+}

src/ZM/Annotation/Swoole/OnMessageEvent.php

@@ -0,0 +1,21 @@
+<?php
+
+
+namespace ZM\Annotation\Swoole;
+
+
+use Doctrine\Common\Annotations\Annotation\Target;
+
+/**
+ * @Annotation
+ * @Target("METHOD")
+ * Class OnMessageEvent
+ * @package ZM\Annotation\Swoole
+ */
+class OnMessageEvent extends OnSwooleEventBase
+{
+    /**
+     * @var string
+     */
+    public $connect_type = "default";
+}

src/ZM/Annotation/Swoole/OnOpenEvent.php

@@ -0,0 +1,21 @@
+<?php
+
+
+namespace ZM\Annotation\Swoole;
+
+
+use Doctrine\Common\Annotations\Annotation\Target;
+
+/**
+ * @Annotation
+ * @Target("METHOD")
+ * Class OnOpenEvent
+ * @package ZM\Annotation\Swoole
+ */
+class OnOpenEvent extends OnSwooleEventBase
+{
+    /**
+     * @var string
+     */
+    public $connect_type = "default";
+}

src/ZM/Annotation/Swoole/OnRequestEvent.php

@@ -0,0 +1,17 @@
+<?php
+
+
+namespace ZM\Annotation\Swoole;
+
+
+use Doctrine\Common\Annotations\Annotation\Target;
+
+/**
+ * @Annotation
+ * @Target("METHOD")
+ * Class OnRequestEvent
+ * @package ZM\Annotation\Swoole
+ */
+class OnRequestEvent extends OnSwooleEventBase
+{
+}

src/ZM/Annotation/Swoole/OnStart.php

@@ -10,7 +10,7 @@ use ZM\Annotation\AnnotationBase;
  * Class OnWorkerStart
  * @package ZM\Annotation\Swoole
  * @Annotation
- * @Target("ALL")
+ * @Target("METHOD")
  */
 class OnStart extends AnnotationBase
 {

src/ZM/Annotation/Swoole/OnSwooleEvent.php

@@ -5,17 +5,14 @@ namespace ZM\Annotation\Swoole;
 
 use Doctrine\Common\Annotations\Annotation\Required;
 use Doctrine\Common\Annotations\Annotation\Target;
-use ZM\Annotation\AnnotationBase;
-use ZM\Annotation\Interfaces\Level;
-use ZM\Annotation\Interfaces\Rule;
 
 /**
  * Class OnSwooleEvent
  * @Annotation
- * @Target("ALL")
+ * @Target("METHOD")
  * @package ZM\Annotation\Swoole
  */
-class OnSwooleEvent extends AnnotationBase implements Rule, Level
+class OnSwooleEvent extends OnSwooleEventBase
 {
     /**
      * @var string
@@ -23,14 +20,6 @@ class OnSwooleEvent extends AnnotationBase implements Rule, Level
      */
     public $type;
 
-    /** @var string */
-    public $rule = "";
-
-    /** @var int */
-    public $level = 20;
-
-    public $callback = null;
-
     /**
      * @return string
      */
@@ -44,33 +33,4 @@ class OnSwooleEvent extends AnnotationBase implements Rule, Level
     public function setType(string $type) {
         $this->type = $type;
     }
-
-    /**
-     * @return string
-     */
-    public function getRule(): string {
-        return $this->rule;
-    }
-
-    /**
-     * @param string $rule
-     */
-    public function setRule(string $rule) {
-        $this->rule = $rule;
-    }
-
-    /**
-     * @return int
-     */
-    public function getLevel(): int {
-        return $this->level;
-    }
-
-    /**
-     * @param int $level
-     */
-    public function setLevel(int $level) {
-        $this->level = $level;
-    }
-
 }

src/ZM/Annotation/Swoole/OnSwooleEventBase.php

@@ -0,0 +1,49 @@
+<?php
+
+
+namespace ZM\Annotation\Swoole;
+
+
+use ZM\Annotation\AnnotationBase;
+use ZM\Annotation\Interfaces\Level;
+use ZM\Annotation\Interfaces\Rule;
+
+abstract class OnSwooleEventBase extends AnnotationBase implements Level, Rule
+{
+    /**
+     * @var string
+     */
+    public $rule = "";
+    /**
+     * @var int
+     */
+    public $level = 20;
+
+    /**
+     * @return string
+     */
+    public function getRule(): string {
+        return $this->rule !== "" ? $this->rule : true;
+    }
+
+    /**
+     * @param string $rule
+     */
+    public function setRule(string $rule) {
+        $this->rule = $rule;
+    }
+
+    /**
+     * @return int
+     */
+    public function getLevel(): int {
+        return $this->level;
+    }
+
+    /**
+     * @param int $level
+     */
+    public function setLevel(int $level) {
+        $this->level = $level;
+    }
+}