From b6847d6b207ac823ed63aa1ca8d62aeb6580cb4f Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwei@kingsome.cn>
Date: Wed, 17 Jul 2024 17:33:01 +0800
Subject: [PATCH] 1

---
 server/common/bchelper.js                | 1 +
 server/web3service/controllers/jwt.js    | 6 +++++-
 server/web3sign/controllers/minthero.js  | 5 +++--
 server/web3sign/controllers/nftunlock.js | 2 +-
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/server/common/bchelper.js b/server/common/bchelper.js
index c0cd444..3271848 100644
--- a/server/common/bchelper.js
+++ b/server/common/bchelper.js
@@ -49,6 +49,7 @@ function getItemMetaNftType(itemMeta) {
 function getNftTableName(tokenType) {
   switch (Number(tokenType)) {
   case bcconst.BC_NFT_HERO:
+  case bcconst.BC_NFT_NORMAL_HERO:
     {
       return 't_hero';
     }
diff --git a/server/web3service/controllers/jwt.js b/server/web3service/controllers/jwt.js
index 66d536c..11818da 100644
--- a/server/web3service/controllers/jwt.js
+++ b/server/web3service/controllers/jwt.js
@@ -114,7 +114,11 @@ async function verify(session) {
   console.log('fffff', err, decoded);
   if (err != null) {
     //console.log(postData);
-    session.rspErr(500, err);
+    if (err instanceof jwt.TokenExpiredError) {
+      session.rspErr(501, 'jwt expired');
+    } else {
+      session.rspErr(500, err);
+    }
     return;
   }
   session.rspData({
diff --git a/server/web3sign/controllers/minthero.js b/server/web3sign/controllers/minthero.js
index d8068fa..66acaa5 100644
--- a/server/web3sign/controllers/minthero.js
+++ b/server/web3sign/controllers/minthero.js
@@ -46,7 +46,8 @@ async function mintHero(session) {
         session.rspErr(101, 'nft_address param error2');
         return;
       }
-      if (!(toAddress == heroAddress || toAddress == normalHeroAddress)) {
+      console.log(toAddress, heroAddress, normalHeroAddress);
+      if (!(nftAddress == heroAddress || nftAddress == normalHeroAddress)) {
         session.rspErr(500, 'nft_address is not hero or normalhero address');
         return;
       }
@@ -76,7 +77,7 @@ async function mintHero(session) {
       ]);
     const nonce = transId;
     const nftList = [];
-    tokenids.forEach(ele => {
+    tokenIds.forEach(ele => {
       nftList.push([
         ele,
         toAddress,
diff --git a/server/web3sign/controllers/nftunlock.js b/server/web3sign/controllers/nftunlock.js
index 9ba3b43..5cdf5f6 100644
--- a/server/web3sign/controllers/nftunlock.js
+++ b/server/web3sign/controllers/nftunlock.js
@@ -76,7 +76,7 @@ async function nftUnlock(session) {
       ]);
     const nonce = transId;
     const nftList = [];
-    tokenids.forEach(ele => {
+    tokenIds.forEach(ele => {
       nftList.push([
         ele,
         toAddress,