From 86a0e1a2ca1c37efa303676e4678e76be8996251 Mon Sep 17 00:00:00 2001
From: wenhao <854854321@qq.com>
Date: Fri, 25 Dec 2020 15:48:41 +0800
Subject: [PATCH 1/4] =?UTF-8?q?[MOD]=20add=20global=20function=20->=20getA?=
 =?UTF-8?q?llFdByConnectType=20=20=E6=A0=B9=E6=8D=AE=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E8=8E=B7=E5=8F=96=E6=89=80=E6=9C=89fd.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ZM/global_functions.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/ZM/global_functions.php b/src/ZM/global_functions.php
index 3a4a6971..e1f4b3d0 100644
--- a/src/ZM/global_functions.php
+++ b/src/ZM/global_functions.php
@@ -288,6 +288,16 @@ function bot() {
     }
 }
 
+function getAllFdByConnectType(string $type = 'default'): array
+{
+    $fd = [];
+    foreach (ManagerGM::getAllByName($type) as $ConnectionObjectObj) {
+        array_push($fd, $ConnectionObjectObj->getFd());
+    }
+    return $fd;
+}
+
+
 
 
 

From 775c275288117f0b1fecd32bfbd0de61ae6157a1 Mon Sep 17 00:00:00 2001
From: wenhao <854854321@qq.com>
Date: Fri, 25 Dec 2020 16:28:21 +0800
Subject: [PATCH 2/4] =?UTF-8?q?[MOD]=20=E8=A7=A3=E5=86=B3php=20Notice=20<P?=
 =?UTF-8?q?HP=20Notice:=20=20Undefined=20index:=20x-self-id>?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/ZM/Event/ServerEventHandler.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ZM/Event/ServerEventHandler.php b/src/ZM/Event/ServerEventHandler.php
index e1b75265..a887480c 100644
--- a/src/ZM/Event/ServerEventHandler.php
+++ b/src/ZM/Event/ServerEventHandler.php
@@ -369,7 +369,7 @@ class ServerEventHandler
         ManagerGM::pushConnect($request->fd, $type_conn);
         $conn = ManagerGM::get($request->fd);
         set_coroutine_params(["server" => $server, "request" => $request, "connection" => $conn, "fd" => $request->fd]);
-        $conn->setOption("connect_id", strval($request->header["x-self-id"]) ?? "");
+        $conn->setOption("connect_id", strval($request->header["x-self-id"] ?? ""));
 
         $dispatcher = new EventDispatcher(OnSwooleEvent::class);
         $dispatcher->setRuleFunction(function ($v) {

From 6e866001d6f4b863caec8b39c20cf01b60d9a09b Mon Sep 17 00:00:00 2001
From: Whale <jesse2061@outlook.com>
Date: Fri, 25 Dec 2020 16:40:02 +0800
Subject: [PATCH 3/4] Update global_functions.php

---
 src/ZM/global_functions.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/ZM/global_functions.php b/src/ZM/global_functions.php
index e1f4b3d0..ce107a90 100644
--- a/src/ZM/global_functions.php
+++ b/src/ZM/global_functions.php
@@ -288,16 +288,15 @@ function bot() {
     }
 }
 
-function getAllFdByConnectType(string $type = 'default'): array
-{
-    $fd = [];
-    foreach (ManagerGM::getAllByName($type) as $ConnectionObjectObj) {
-        array_push($fd, $ConnectionObjectObj->getFd());
+/**
+ * 获取同类型所有连接的文件描述符 ID
+ * @author 854854321
+ * @return array
+ */
+function getAllFdByConnectType(string $type = 'default'): array {
+    $fds = [];
+    foreach (ManagerGM::getAllByName($type) as $obj) {
+        array_push($fd, $obj->getFd());
     }
-    return $fd;
+    return $fds;
 }
-
-
-
-
-

From f5d5929cb9cff683423c538f109340bb1cf84265 Mon Sep 17 00:00:00 2001
From: Whale <jesse2061@outlook.com>
Date: Fri, 25 Dec 2020 16:41:14 +0800
Subject: [PATCH 4/4] Update global_functions.php

---
 src/ZM/global_functions.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/ZM/global_functions.php b/src/ZM/global_functions.php
index ce107a90..b10a5069 100644
--- a/src/ZM/global_functions.php
+++ b/src/ZM/global_functions.php
@@ -296,7 +296,7 @@ function bot() {
 function getAllFdByConnectType(string $type = 'default'): array {
     $fds = [];
     foreach (ManagerGM::getAllByName($type) as $obj) {
-        array_push($fd, $obj->getFd());
+        $fds[] = $obj->getFd();
     }
     return $fds;
 }