Merge pull request Hanson#188 from HanSon/dev

修复扩展状态互相影响

Author: Hanson

src/Extension/AbstractMessageHandler.php

@@ -16,7 +16,7 @@ abstract class AbstractMessageHandler
 
     public $zhName;
 
-    public static $status = true;
+    public $status = true;
 
     public static $admin;
 
@@ -84,16 +84,16 @@ final public function messageHandler(Collection $collection)
             }
         }
 
-        if (!static::$status) {
+        if (!$this->status) {
             return;
         }
 
-        $this->handler($collection);
+        return $this->handler($collection);
     }
 
     final public function applicationInfo($collection)
     {
-        $status = static::$status ? '开' : '关';
+        $status = $this->status ? '开' : '关';
 
         $admin = static::$admin;
 
@@ -108,9 +108,9 @@ final public function applicationInfo($collection)
      */
     final public function setStatus(bool $boolean, $collection)
     {
-        static::$status = $boolean;
+        $this->status = $boolean;
 
-        $status = static::$status ? '开' : '关';
+        $status = $this->status ? '开' : '关';
 
         Text::send($collection['from']['UserName'], "应用：{$this->zhName} 状态已更改为：{$status}");
     }

src/Extension/MessageExtension.php

@@ -94,7 +94,9 @@ private function initBaseExtensions()
     public function exec($collection)
     {
         foreach ($this->serviceExtensions as $extension) {
-            $extension->messageHandler($collection);
+            if ($extension->messageHandler($collection)) {
+                return;
+            }
         }
     }