Helius
2022-08-12 5e0c0bacadab898152518437ceb63bf8b54c6652
finish NFT Active
5 files modified
81 ■■■■■ changed files
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java 60 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java 3 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java 6 ●●●● patch | view | raw | blame | history
src/main/resources/i18n/message_en_US.properties 6 ●●●● patch | view | raw | blame | history
src/main/resources/i18n/message_zh_CN.properties 6 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -11,34 +11,34 @@
    /**
     * 币安 usdt合约
     * 0x46Ac4921e58773ca22826DF1640672B91B1DB2B3
     * 0x55d398326f99059fF775485246999027B3197955
     * 测试链 0x337610d27c682E347C9cD60BD4b3b107C9d34dDd
     */
    BSC_USDT("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
            "efe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
    BSC_USDT("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
            "0x86bd3ad3ffd055b27dd7685d494074982fe96d6cc9dde0e42e85a85036e8abe9",
            "https://bsc-dataseed1.ninicoin.io",
            "0x46ac4921e58773ca22826df1640672b91b1db2b3",
            "0x55d398326f99059fF775485246999027B3197955",
            ""),
    /**
     * 币安链 代币合约
     * 测试链 0xdd92ea2f41d807a60b29004bf7db807d8ac09212
     * 正式 0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68 https://bsc-dataseed1.ninicoin.io
     * 正式 0xb27e44f98543e480dbd071b6605005e3d99b3dd4 https://bsc-dataseed1.ninicoin.io
     *
     */
    BSC_TFC("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
            "efe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
    BSC_TFC("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
            "0x86bd3ad3ffd055b27dd7685d494074982fe96d6cc9dde0e42e85a85036e8abe9",
            "https://bsc-dataseed1.ninicoin.io",
            "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
            "0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
            ""),
    /**
     * 源池币
     */
    BSC_TFC_SOURCE("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
    BSC_TFC_SOURCE("BSC", "0x8cE9d2A8cA6eF9e05493e73C9b6479D100B94847",
            "",
            "https://bsc-dataseed1.ninicoin.io",
            "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
            "0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
            ""),
    /**
@@ -47,7 +47,7 @@
    BSC_USDT_SOURCE("BSC", "0x8cE9d2A8cA6eF9e05493e73C9b6479D100B94847",
            "",
            "https://bsc-dataseed1.ninicoin.io",
            "0x46Ac4921e58773ca22826DF1640672B91B1DB2B3",
            "0x55d398326f99059fF775485246999027B3197955",
            ""),
    /**
@@ -65,7 +65,7 @@
    BSC_TFC_TECH("BSC", "0x8DB4d0E470e6cD206b774f5DAD2b5D0dD43C7688",
            "",
            "https://bsc-dataseed1.ninicoin.io",
            "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
            "0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
            ""),
    /**
@@ -74,40 +74,40 @@
    BSC_TFC_REWARD("BSC", "0x286DDA62A7171a6d6eA6558510834fE8afc0446C",
            "0x3d35db460e2eead11fca7b6ce5a9c5c8a8e0866775008ef5e1721b9f17b57f4f",
            "https://bsc-dataseed1.ninicoin.io",
            "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
            "0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
            ""),
    /**
     * 卡牌
     */
    BSC_NFT_SDC("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
                           "efe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
                           "https://bsc-dataseed1.ninicoin.io",
                           "0x03c7D3f141c5F03971604958170E253362e13BE6",
                           ""),
    BSC_NFT_SDC("BSC", "0x3afD1Bf0994214DBe5ccfA7d8643261B195532c2",
            "0x07ee6de0ca4b289f8e69484f70d09988c6df6697f411dc623179930a3578994f",
            "https://bsc-dataseed1.ninicoin.io",
            "0xb7FDE337f2236F78B2823d9F97eAB03ce893CC3D",
            ""),
    /**
     * 币安 usdt合约
     * 0x46Ac4921e58773ca22826DF1640672B91B1DB2B3
     * 0x55d398326f99059fF775485246999027B3197955
     * 测试链 0x337610d27c682E347C9cD60BD4b3b107C9d34dDd
     */
    BSC_USDT_LISTENER("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
                     "0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
                     "https://bsc-dataseed1.ninicoin.io",
                     "0x46ac4921e58773ca22826df1640672b91b1db2b3",
                     ""),
    BSC_USDT_LISTENER("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
            "0x86bd3ad3ffd055b27dd7685d494074982fe96d6cc9dde0e42e85a85036e8abe9",
            "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
            "0x55d398326f99059fF775485246999027B3197955",
            ""),
    /**
     * 币安链 代币合约
     * 测试链 0xdd92ea2f41d807a60b29004bf7db807d8ac09212
     * 正式 0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68 https://bsc-dataseed1.ninicoin.io
     * 正式 0xb27e44f98543e480dbd071b6605005e3d99b3dd4 https://bsc-dataseed1.ninicoin.io
     *
     */
    BSC_TFC_LISTENER("BSC", "0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25",
                    "0xefe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
                    "https://bsc-dataseed1.ninicoin.io",
                    "0x6c6835e60e7dBaD7a60112a6371271e8eb79ee68",
                    "");
    BSC_TFC_LISTENER("BSC", "0x4f5b6875d0d42f019ab6CdFB3054649b5B7b5472",
            "0x86bd3ad3ffd055b27dd7685d494074982fe96d6cc9dde0e42e85a85036e8abe9",
            "https://bsc-mainnet.blockvision.org/v1/2D3n5NXWVLnIBsdBKZDlDFAC76x",
            "0xb27e44f98543e480dbd071b6605005e3d99b3dd4",
            "");
    private String chain;
src/main/java/cc/mrbird/febs/dapp/controller/ApiDappMemberController.java
@@ -1,6 +1,7 @@
package cc.mrbird.febs.dapp.controller;
import cc.mrbird.febs.common.annotation.EncryptEnable;
import cc.mrbird.febs.common.configure.i18n.MessageSourceUtils;
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.entity.FebsResponse;
import cc.mrbird.febs.common.utils.LoginUserUtil;
@@ -101,7 +102,7 @@
    @PostMapping(value = "/activeNft")
    public FebsResponse activeNft(@RequestBody @Valid ActiveDto activeDto) {
        dappWalletService.activeNft(activeDto);
        return new FebsResponse().success().message("激活成功");
        return new FebsResponse().success().message(MessageSourceUtils.getString("nft_active_002"));
    }
    @ApiResponses({
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -428,15 +428,15 @@
        DappNftActivation nftActive = dappNftActivationDao.selectById(activeDto.getId());
        if (nftActive == null) {
            throw new FebsException("NFT不存在");
            throw new FebsException(MessageSourceUtils.getString("nft_active_003"));
        }
        if (nftActive.getCount() < activeDto.getCount()) {
            throw new FebsException("NFT不足或者正在激活中");
            throw new FebsException(MessageSourceUtils.getString("nft_active_004"));
        }
        if (DateUtil.between(new Date(), nftActive.getExpireTime(), DateUnit.SECOND) < 0) {
            throw new FebsException("NFT已过期");
            throw new FebsException(MessageSourceUtils.getString("nft_active_005"));
        }
        if (nftActive.getStatus() != 1) {
src/main/resources/i18n/message_en_US.properties
@@ -14,4 +14,8 @@
system_regist_error=Please contact the recommender to recommend registration.
nft_active_001=NFT Has Expired
nft_active_001=NFT Has Expired
nft_active_002=Active Success
nft_active_003=NFT Not Exist
nft_active_004=NFT Not Enough Or NFT Activing
nft_active_005=NFT Expired
src/main/resources/i18n/message_zh_CN.properties
@@ -13,4 +13,8 @@
system_regist_error=\u8BF7\u8054\u7CFB\u63A8\u8350\u4EBA\u63A8\u8350\u6CE8\u518C
nft_active_001=NFT\u5DF2\u8FC7\u671F
nft_active_001=NFT\u5DF2\u8FC7\u671F
nft_active_002=\u6FC0\u6D3B\u6210\u529F
nft_active_003=NFT\u4E0D\u5B58\u5728
nft_active_004=NFT\u4E0D\u8DB3\u6216\u8005\u6B63\u5728\u6FC0\u6D3B\u4E2D
nft_active_005=NFT\u5DF2\u8FC7\u671F