From f3f833cd9fa7fa8ba1b59ae1b1bc5f952524dd76 Mon Sep 17 00:00:00 2001
From: Anyon <zoujingli@qq.com>
Date: Mon, 5 Feb 2018 11:52:59 +0800
Subject: [PATCH] =?UTF-8?q?[=E6=9B=B4=E6=96=B0]=E4=BF=AE=E6=AD=A3=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8F=8F=E8=BF=B0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WeChat/Contracts/BasicPushEvent.php | 56 ++++++++++++++---------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/WeChat/Contracts/BasicPushEvent.php b/WeChat/Contracts/BasicPushEvent.php
index 1ab0c25..f4a8e73 100644
--- a/WeChat/Contracts/BasicPushEvent.php
+++ b/WeChat/Contracts/BasicPushEvent.php
@@ -115,34 +115,6 @@ class BasicPushEvent
         }
     }
 
-    /**
-     * 验证来自微信服务器
-     * @param string $str
-     * @return bool
-     */
-    private function checkSignature($str = '')
-    {
-        $nonce = $this->params->get('nonce');
-        $timestamp = $this->params->get('timestamp');
-        $msg_signature = $this->params->get('msg_signature');
-        $signature = empty($msg_signature) ? $this->params->get('signature') : $msg_signature;
-        $tmpArr = [$this->config->get('token'), $timestamp, $nonce, $str];
-        sort($tmpArr, SORT_STRING);
-        if (sha1(implode($tmpArr)) == $signature) {
-            return true;
-        }
-        return false;
-    }
-
-    /**
-     * 获取公众号推送对象
-     * @return array
-     */
-    public function getReceive()
-    {
-        return $this->receive->get();
-    }
-
     /**
      * 回复消息
      * @param array $data 消息内容
@@ -180,6 +152,34 @@ class BasicPushEvent
         echo $xml;
     }
 
+    /**
+     * 验证来自微信服务器
+     * @param string $str
+     * @return bool
+     */
+    private function checkSignature($str = '')
+    {
+        $nonce = $this->params->get('nonce');
+        $timestamp = $this->params->get('timestamp');
+        $msg_signature = $this->params->get('msg_signature');
+        $signature = empty($msg_signature) ? $this->params->get('signature') : $msg_signature;
+        $tmpArr = [$this->config->get('token'), $timestamp, $nonce, $str];
+        sort($tmpArr, SORT_STRING);
+        if (sha1(implode($tmpArr)) == $signature) {
+            return true;
+        }
+        return false;
+    }
+
+    /**
+     * 获取公众号推送对象
+     * @return array
+     */
+    public function getReceive()
+    {
+        return $this->receive->get();
+    }
+
     /**
      * 获取当前微信OPENID
      * @return string