From 109764ad53234a28144c29b49281a4fdb8162714 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 15 Jul 2019 21:06:50 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=94=B9=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=B6=88=E6=81=AF=E5=A4=84=E7=90=86=E6=9C=BA?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/service/handler/PublishHandler.php | 5 +----
 application/service/handler/ReceiveHandler.php | 7 +------
 application/wechat/controller/api/Push.php     | 4 ++--
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/application/service/handler/PublishHandler.php b/application/service/handler/PublishHandler.php
index 7369b661c..9a564e3bd 100644
--- a/application/service/handler/PublishHandler.php
+++ b/application/service/handler/PublishHandler.php
@@ -52,10 +52,7 @@ class PublishHandler
             case 'text':
                 $receive = $wechat->getReceive();
                 if ($receive['Content'] === 'TESTCOMPONENT_MSG_TYPE_TEXT') {
-                    $xml = $wechat->text('TESTCOMPONENT_MSG_TYPE_TEXT_callback')->reply([], true);
-                    p('====测试回复文本======');
-                    p($xml);
-                    return $xml;
+                    return $wechat->text('TESTCOMPONENT_MSG_TYPE_TEXT_callback')->reply([], true);
                 } else {
                     $key = str_replace("QUERY_AUTH_CODE:", '', $receive['Content']);
                     WechatService::instance('Service')->getQueryAuthorizerInfo($key);
diff --git a/application/service/handler/ReceiveHandler.php b/application/service/handler/ReceiveHandler.php
index 28a0b15d3..293ea09c3 100644
--- a/application/service/handler/ReceiveHandler.php
+++ b/application/service/handler/ReceiveHandler.php
@@ -55,12 +55,7 @@ class ReceiveHandler
             $input = ['openid' => $openid, 'appid' => $appid, 'receive' => serialize($data), 'encrypt' => intval($wechat->isEncrypt())];
             if (is_string($result = http_post($config['appuri'], $input, ['timeout' => 30]))) {
                 if (is_array($json = json_decode($result, true))) {
-                    $xml = $wechat->reply($json, true, $wechat->isEncrypt());
-                    p("");
-                    p("====== 准备回复的内容如下 ========");
-                    p($xml);
-                    ob_clean();
-                    exit($xml);
+                    return $wechat->reply($json, true, $wechat->isEncrypt());
                 } else {
                     return $result;
                 }
diff --git a/application/wechat/controller/api/Push.php b/application/wechat/controller/api/Push.php
index 033cf0c8d..a4cdeddd9 100644
--- a/application/wechat/controller/api/Push.php
+++ b/application/wechat/controller/api/Push.php
@@ -95,8 +95,8 @@ class Push extends Controller
     {
         try {
             if ($this->request->has('receive', 'post') && WechatService::getType() === 'thr') {
-                $this->forceJson = true; // 强制返回JSON到服务端再转发
-                $this->forceCustom = false; // 暂停使用客户消息模式
+                $this->forceJson = false; // 强制返回JSON到服务端再转发
+                $this->forceCustom = true; // 强制使用客户消息模式
                 $this->appid = $this->request->post('appid', '', null);
                 $this->openid = $this->request->post('openid', '', null);
                 $this->encrypt = boolval($this->request->post('encrypt', 0));