From 914b789d830d887ebdce2e87e9d29c409f3618a9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Fri, 12 Aug 2022 14:30:52 +0800
Subject: [PATCH] ifx
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 3 ++-
src/main/resources/application-dev.yml | 2 +-
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java | 50 +++++++++++++++++++++++++-------------------------
3 files changed, 28 insertions(+), 27 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
index b18ee9d..7b59e42 100644
--- a/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
+++ b/src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -11,25 +11,25 @@
/**
* 币安 usdt合约
- * 0x55d398326f99059fF775485246999027B3197955
+ * 0x46Ac4921e58773ca22826DF1640672B91B1DB2B3
* 测试链 0x337610d27c682E347C9cD60BD4b3b107C9d34dDd
*/
- BSC_USDT("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
- "0x86bd3ad3ffd055b27dd7685d494074982fe96d6cc9dde0e42e85a85036e8abe9",
+ BSC_USDT("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
+ "efe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
"https://bsc-dataseed1.ninicoin.io",
- "0x55d398326f99059fF775485246999027B3197955",
+ "0x46Ac4921e58773ca22826DF1640672B91B1DB2B3",
""),
/**
* 币安链 代币合约
* 测试链 0xdd92ea2f41d807a60b29004bf7db807d8ac09212
- * 正式 0xb27e44f98543e480dbd071b6605005e3d99b3dd4 https://bsc-dataseed1.ninicoin.io
+ * 正式 0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68 https://bsc-dataseed1.ninicoin.io
*
*/
- BSC_TFC("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
- "0x86bd3ad3ffd055b27dd7685d494074982fe96d6cc9dde0e42e85a85036e8abe9",
+ BSC_TFC("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
+ "efe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
"https://bsc-dataseed1.ninicoin.io",
- "0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
+ "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
""),
/**
@@ -38,7 +38,7 @@
BSC_TFC_SOURCE("BSC", "0x8cE9d2A8cA6eF9e05493e73C9b6479D100B94847",
"",
"https://bsc-dataseed1.ninicoin.io",
- "0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
+ "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
""),
/**
@@ -47,7 +47,7 @@
BSC_USDT_SOURCE("BSC", "0x8cE9d2A8cA6eF9e05493e73C9b6479D100B94847",
"",
"https://bsc-dataseed1.ninicoin.io",
- "0x55d398326f99059fF775485246999027B3197955",
+ "0x46Ac4921e58773ca22826DF1640672B91B1DB2B3",
""),
/**
@@ -65,7 +65,7 @@
BSC_TFC_TECH("BSC", "0x8DB4d0E470e6cD206b774f5DAD2b5D0dD43C7688",
"",
"https://bsc-dataseed1.ninicoin.io",
- "0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
+ "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
""),
/**
@@ -74,39 +74,39 @@
BSC_TFC_REWARD("BSC", "0x286DDA62A7171a6d6eA6558510834fE8afc0446C",
"0x3d35db460e2eead11fca7b6ce5a9c5c8a8e0866775008ef5e1721b9f17b57f4f",
"https://bsc-dataseed1.ninicoin.io",
- "0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
+ "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
""),
/**
* 卡牌
*/
- BSC_NFT_SDC("BSC", "0x3afD1Bf0994214DBe5ccfA7d8643261B195532c2",
- "0x07ee6de0ca4b289f8e69484f70d09988c6df6697f411dc623179930a3578994f",
+ BSC_NFT_SDC("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
+ "efe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
"https://bsc-dataseed1.ninicoin.io",
- "0xb7FDE337f2236F78B2823d9F97eAB03ce893CC3D",
+ "0x03c7D3f141c5F03971604958170E253362e13BE6",
""),
/**
* 币安 usdt合约
- * 0x55d398326f99059fF775485246999027B3197955
+ * 0x46Ac4921e58773ca22826DF1640672B91B1DB2B3
* 测试链 0x337610d27c682E347C9cD60BD4b3b107C9d34dDd
*/
- BSC_USDT_LISTENER("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
- "0x86bd3ad3ffd055b27dd7685d494074982fe96d6cc9dde0e42e85a85036e8abe9",
- "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
- "0x55d398326f99059fF775485246999027B3197955",
+ BSC_USDT_LISTENER("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
+ "efe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
+ "https://bsc-dataseed1.ninicoin.io",
+ "0x46Ac4921e58773ca22826DF1640672B91B1DB2B3",
""),
/**
* 币安链 代币合约
* 测试链 0xdd92ea2f41d807a60b29004bf7db807d8ac09212
- * 正式 0xb27e44f98543e480dbd071b6605005e3d99b3dd4 https://bsc-dataseed1.ninicoin.io
+ * 正式 0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68 https://bsc-dataseed1.ninicoin.io
*
*/
- BSC_TFC_LISTENER("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
- "0x86bd3ad3ffd055b27dd7685d494074982fe96d6cc9dde0e42e85a85036e8abe9",
- "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
- "0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
+ BSC_TFC_LISTENER("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
+ "efe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
+ "https://bsc-dataseed1.ninicoin.io",
+ "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
"");
private String chain;
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index eb78c03..40ad5d9 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -411,6 +411,7 @@
nftActivation.setCount(box.getIndex());
nftActivation.setOpenTime(time);
nftActivation.setExpireTime(expire);
+ nftActivation.setStatus(1);
dappNftActivationDao.insert(nftActivation);
ActiveNftListVo nft = new ActiveNftListVo();
@@ -470,7 +471,7 @@
nftActivations.forEach(nft -> {
ActiveNftListVo nftVo = new ActiveNftListVo();
nftVo.setId(nft.getId());
- nftVo.setRemain(DateUtil.between(nft.getOpenTime(), now, DateUnit.SECOND, false));
+ nftVo.setRemain(DateUtil.between(now, nft.getExpireTime(), DateUnit.SECOND, false));
list.add(nftVo);
});
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index bb39e1e..d5dbf1b 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -64,6 +64,6 @@
publisher-confirm-type: correlated
system:
- online-transfer: false
+ online-transfer: true
chain-listener: true
trade-job: false
\ No newline at end of file
--
Gitblit v1.9.1