From aa3a7f2fec0552318e6bd5841a6036ac3fc883aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E6=98=A5=E6=B3=A2?= <adb9@qq.com>
Date: Sat, 20 Jul 2024 15:52:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E6=B6=88=E6=81=AF=E4=B8=8E=E4=BA=8B=E4=BB=B6=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/service/wechat/OpenPlatform.php     | 11 +++++++----
 front/src/views/message/modules/authorizer.vue |  2 +-
 front/src/views/message/modules/event.vue      |  6 +++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/app/common/service/wechat/OpenPlatform.php b/app/common/service/wechat/OpenPlatform.php
index 8f2162b..a929343 100644
--- a/app/common/service/wechat/OpenPlatform.php
+++ b/app/common/service/wechat/OpenPlatform.php
@@ -69,7 +69,8 @@ class OpenPlatform extends BaseServices {
             $symfony_request = new SymfonyRequest($request->get(), $request->post(), [], $request->cookie(), [], [], $request->rawBody());
             $symfony_request->headers = new HeaderBag($request->header());
             $this->app->rebind('request', $symfony_request);
-            $this->app->server->push(function ($message) use ($appid) {
+            // 授权事件
+            $this->app->server->push(function ($message) {
                 if (isset($message['InfoType'])) {
                     // 授权事件 日志记录
                     $this->addComponentCallBackRecord($message);
@@ -84,11 +85,13 @@ class OpenPlatform extends BaseServices {
                         default:
                             break;
                     }
-                } else if (isset($message['MsgType'])) {
-                    // 消息与事件通知 日志记录
-                    $this->addWxcallbackBizRecord($message, $appid);
                 }
             });
+            // 消息与事件通知 日志记录
+            $message = $this->app->server->getMessage();
+            if (isset($message['Event'])) {
+                $this->addWxcallbackBizRecord($message, $appid);
+            }
 
             $response = $this->app->server->serve();
             return $response->getContent();
diff --git a/front/src/views/message/modules/authorizer.vue b/front/src/views/message/modules/authorizer.vue
index 1f801c5..cd8b313 100644
--- a/front/src/views/message/modules/authorizer.vue
+++ b/front/src/views/message/modules/authorizer.vue
@@ -78,7 +78,7 @@ const columns = [
     width: 180
   },
   {
-    title: 'appid',
+    title: 'component_appid',
     dataIndex: 'appid',
     width: 180
   },
diff --git a/front/src/views/message/modules/event.vue b/front/src/views/message/modules/event.vue
index 509c4f0..afff988 100644
--- a/front/src/views/message/modules/event.vue
+++ b/front/src/views/message/modules/event.vue
@@ -76,13 +76,13 @@ const columns = [
     width: 180
   },
   {
-    title: 'appid',
+    title: 'authorizer_appid',
     dataIndex: 'appid',
     width: 180
   },
   {
-    title: 'MsgType',
-    dataIndex: 'msgtype',
+    title: 'event',
+    dataIndex: 'event',
     width: 220
   },
   {