From 4d2538531ffef81cf6a773d8c38a8c79f7584fe9 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Tue, 11 Jun 2024 17:00:31 +0800
Subject: [PATCH] 1

---
 database/bcevent.sql                        |  4 ----
 server/web3webhooks/controllers/webhooks.js | 10 ++--------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/database/bcevent.sql b/database/bcevent.sql
index fcbd9be..a822a00 100644
--- a/database/bcevent.sql
+++ b/database/bcevent.sql
@@ -407,8 +407,6 @@ DROP TABLE IF EXISTS `t_webhook_event`;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `t_webhook_event` (
   `idx` bigint NOT NULL AUTO_INCREMENT COMMENT '自增id',
-  `message_type` varchar(255) NOT NULL DEFAULT '' COMMENT 'message_type',
-  `message_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'message_id',
   `event_name` varchar(255) NOT NULL DEFAULT '' COMMENT 'event_name',
   `event_id` varchar(255) NOT NULL DEFAULT '' COMMENT 'event_id',
   `chain` varchar(255) NOT NULL DEFAULT '' COMMENT 'chain',
@@ -419,8 +417,6 @@ CREATE TABLE `t_webhook_event` (
   UNIQUE KEY `event_id` (`event_id`),
   KEY `idx_event_name` (`event_name`),
   KEY `idx_chain` (`chain`),
-  KEY `idx_message_id` (`message_id`),
-  KEY `idx_message_type` (`message_type`),
   KEY `idx_event_name_chain` (`event_name`, `chain`)
 ) ENGINE=InnoDB AUTO_INCREMENT=10001 DEFAULT CHARSET=utf8 COLLATE=utf8_bin;
 /*!40101 SET character_set_client = @saved_cs_client */;
diff --git a/server/web3webhooks/controllers/webhooks.js b/server/web3webhooks/controllers/webhooks.js
index db0a244..50caf0c 100644
--- a/server/web3webhooks/controllers/webhooks.js
+++ b/server/web3webhooks/controllers/webhooks.js
@@ -12,18 +12,17 @@ async function procEvent(req, rsp) {
 async function webhooks(req, rsp) {
   console.log(req.body);
 
+  const events = [];
   await webhook.handle( // this method will handle the subscription confirmation and signature & sender verification
     req.body,
     config.Environment.SANDBOX, // or config.Environment.PRODUCTION
     {
       all: (event) => { // all events will trigger this handler, even if they have a specific handler already.
-        console.log(111111, event);
+        events.push(event);
       }
     }
   );
 
-  rsp.send(utils.jsonEncode({"status": "ok"}));
-  /*
   const idx = 0;
   const dbKey = 'BcEventDb' + idx;
   const {err, conn} = await app.getDbConn(dbKey);
@@ -34,8 +33,6 @@ async function webhooks(req, rsp) {
   }
   try {
     const body = req.body;
-    const messageType = body.Type;
-    const messageId = body.MessageId;
     const eventName = body.Message.event_name;
     const eventId = body.Message.event_id;
     const chain = body.Message.chain;
@@ -46,8 +43,6 @@ async function webhooks(req, rsp) {
       ],
       [],
       [
-        ['message_type', messageType],
-        ['message_id', messageId],
         ['event_name', eventName],
         ['event_id', eventId],
         ['chain', chain],
@@ -61,7 +56,6 @@ async function webhooks(req, rsp) {
   } finally {
     conn.release();
   }
-  */
 }
 
 function init() {