From 08b147adec70071791f0c404513bb47b530cf32c Mon Sep 17 00:00:00 2001
From: wuliangbo <wuearl@qq.com>
Date: Wed, 18 Mar 2020 08:58:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=B8=89=E6=96=B9?=
 =?UTF-8?q?=E7=99=BB=E9=99=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Kernel/ServerGuard.php                       | 3 +--
 src/OpenPlatform/Authorizer/Mini/Application.php | 4 +++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Kernel/ServerGuard.php b/src/Kernel/ServerGuard.php
index 91bf4c6..93d8297 100644
--- a/src/Kernel/ServerGuard.php
+++ b/src/Kernel/ServerGuard.php
@@ -156,7 +156,6 @@ class ServerGuard
      * @throws BadRequestException
      * @throws \EasyAlipay\Kernel\Exceptions\InvalidArgumentException
      * @throws \EasyAlipay\Kernel\Exceptions\InvalidConfigException
-     * @throws InvalidSignException
      */
     public function getMessage()
     {
@@ -167,8 +166,8 @@ class ServerGuard
         if (!$this->rsaCheckV2($data, $sign, $publicKey, $signType)) {
             throw new InvalidSignException('签名失败');
         }
-        $message['msg_method'] = $data['msg_method'];
         $message = json_decode($data['biz_content'], 1);
+        $message['msg_method'] = $data['msg_method'];
 //        $message = $this->parseMessage($this->app['request']->getContent(false));
 //
 //        if (!is_array($message) || empty($message)) {
diff --git a/src/OpenPlatform/Authorizer/Mini/Application.php b/src/OpenPlatform/Authorizer/Mini/Application.php
index 89304be..f74f1c7 100644
--- a/src/OpenPlatform/Authorizer/Mini/Application.php
+++ b/src/OpenPlatform/Authorizer/Mini/Application.php
@@ -19,6 +19,7 @@ use EasyAlipay\Mini\Application as Mini;
  * @property \EasyAlipay\OpenPlatform\Authorizer\Mini\Experience\Client  $experience
  * @property \EasyAlipay\OpenPlatform\Authorizer\Mini\Members\Client     $members
  * @property \EasyAlipay\OpenPlatform\Authorizer\Mini\BaseInfo\Client    $base_info
+ * @property \EasyAlipay\Base\Oauth\Client                               $oauth
  */
 class Application extends Mini
 {
@@ -35,7 +36,8 @@ class Application extends Mini
             Domain\ServiceProvider::class,
             Experience\ServiceProvider::class,
             Members\ServiceProvider::class,
-            BaseInfo\ServiceProvider::class
+            BaseInfo\ServiceProvider::class,
+            \EasyAlipay\Base\Oauth\ServiceProvider::class,
         ];
 
         foreach ($providers as $provider) {