From 875f15dc8daf210f37e36988b16a76372152486f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Thu, 13 Jul 2023 14:52:36 +0800
Subject: [PATCH] 1

---
 server/common/dbpool.js                      | 31 ++++++++++++++++----
 server/web3bcspider/services/pull_bcevent.js |  9 ++++--
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/server/common/dbpool.js b/server/common/dbpool.js
index b0cfd15..8b91427 100644
--- a/server/common/dbpool.js
+++ b/server/common/dbpool.js
@@ -42,16 +42,35 @@ async function internalCreateConn(app, name) {
   return dbObj.conn;
 }
 
-async function getBcEventConn(app) {
-  return await internalCreateConn(app, constant.BCEVENTDB_NAME);
+async function getBcEventConn(app, method, ...args) {
+  try {
+    const conn = await internalCreateConn(app, constant.BCEVENTDB_NAME);
+    const ret = await conn[method](...args);
+    if (ret.err) {
+      return {
+        'err': ret.err,
+        'conn': null,
+        'row': null,
+        'rows': null
+      };
+    }
+
+  } catch (err) {
+    return {
+      'err': err,
+      'conn': null,
+      'row': null,
+      'rows': null
+    };
+  }
 }
 
-async function getBcNftConn(app) {
-  return await internalCreateConn(app, constant.BCNFTDB_NAME);
+async function getBcNftConn(app, method, ...args) {
+  const conn = await internalCreateConn(app, constant.BCNFTDB_NAME);
 }
 
-async function getGameConn(app) {
-  return await internalCreateConn(app, constant.GAMEDB_NAME);
+async function getGameConn(app, method, ...args) {
+  const conn = await internalCreateConn(app, constant.GAMEDB_NAME);
 }
 
 exports.getBcEventConn = getBcEventConn;
diff --git a/server/web3bcspider/services/pull_bcevent.js b/server/web3bcspider/services/pull_bcevent.js
index 922a40b..2003694 100644
--- a/server/web3bcspider/services/pull_bcevent.js
+++ b/server/web3bcspider/services/pull_bcevent.js
@@ -86,7 +86,8 @@ class PullBcEvent extends BaseService {
     const firstBlockNumber = this.getInitBlock();
     while (this.lastBlockNumber < 1) {
       try {
-        const {err, row} = await dbpool.getBcEventConn(app).ormSelectOne(
+        const {err, row} = await dbpool.getBcEventConn(app)(
+          'ormSelectOne',
           't_last_block',
           [
             ['net_id', this.getNetId()],
@@ -132,7 +133,8 @@ class PullBcEvent extends BaseService {
   async saveLastBlockNumber(blockNumber) {
     const logHead = this.genLogHead(' event_process.saveLastBlockNumber: ');
     while (true) {
-      const {err} = await dbpool.getBcEventConn(app).upsert(
+      const {err} = await dbpool.getBcEventConn(app)(
+        'upsert',
         't_last_block',
         [
           ['net_id', this.getNetId()],
@@ -168,7 +170,8 @@ class PullBcEvent extends BaseService {
       const nowTime = utils.getUtcTime();
       const returnValues = event['returnValues'];
       const hashCode = '';
-      const {err} = await dbpool.getBcEventConn(app).upsert(
+      const {err} = await dbpool.getBcEventConn(app)(
+        'upsert',
         't_blockchain_event',
         [
           ['txhash', event['transactionHash']],