From ef326907032a2d82638d1c6b6301d86fd011b9cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E6=99=AF=E7=AB=8B?= <zoujingli@qq.com>
Date: Mon, 6 Nov 2023 22:41:55 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9B=9E=E6=98=BE=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicPushEvent.php | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/WeChat/Contracts/BasicPushEvent.php b/WeChat/Contracts/BasicPushEvent.php
index 6940124..dc6f30d 100644
--- a/WeChat/Contracts/BasicPushEvent.php
+++ b/WeChat/Contracts/BasicPushEvent.php
@@ -72,10 +72,11 @@ class BasicPushEvent
 
     /**
      * BasicPushEvent constructor.
-     * @param array $options
+     * @param array $options 配置参数
+     * @param boolean $showEchoStr 回显内容
      * @throws \WeChat\Exceptions\InvalidResponseException
      */
-    public function __construct(array $options)
+    public function __construct(array $options, $showEchoStr = true)
     {
         if (empty($options['appid'])) {
             throw new InvalidArgumentException("Missing Config -- [appid]");
@@ -108,13 +109,27 @@ class BasicPushEvent
             }
             $this->receive = new DataArray(Tools::xml2arr($this->postxml));
         } elseif ($_SERVER['REQUEST_METHOD'] == "GET" && $this->checkSignature()) {
-            @ob_clean();
-            echo $this->input->get('echostr');
+            if ($showEchoStr && ob_clean()) {
+                echo($this->input->get('echostr'));
+            }
         } else {
             throw new InvalidResponseException('Invalid interface request.', '0');
         }
     }
 
+    /**
+     * 获取回显字串
+     * @return string
+     */
+    public function getEchoStr()
+    {
+        if ($_SERVER['REQUEST_METHOD'] == "GET" && $this->checkSignature()) {
+            return $this->input->get('echostr');
+        } else {
+            return '';
+        }
+    }
+
     /**
      * 消息是否需要加密
      * @return boolean