fix

Helius

2022-05-23 a6c755cdfbeec45b735a350e0caa93ea714426fa

fix

 src/main/java/cc/mrbird/febs/dapp/chain/ChainService.java

@@ -26,7 +26,7 @@
    private final static String ETH_PRIVATE = "77f650768ff50a4243c008fbae1be9ffe74c52908ee9081e2e15f3d3411690bb";
    private final static String ETH_CONTRACT_ADDRESS = "0xdac17f958d2ee523a2206206994597c13d831ec7";

    private final static String BSC_URL = "https://bsc-dataseed.binance.org";
    private final static String BSC_URL = "https://dataseed4.ninicoin.io";
    private final static String BSC_ADDRESS = "0x971c09aA9735EB98459B17EC8b48932D24CbB931";
    private final static String BSC_PRIVATE = "0x5f38d0e63157f535fc21f89ea13ec3cd245691c20795c1d2cb60233b3ba7bb47";
    private final static String BSC_CONTRACT_ADDRESS = "0x55d398326f99059fF775485246999027B3197955";
@@ -59,7 +59,7 @@

    public static void main(String[] args) {
        // 0x391040eE5F241711E763D0AC55E775B9b4bD0024 0x977A9dDFb965a9A3416Fa72cA7F91c4949c18f25
        System.out.println(getInstance("BSC").balanceOf("0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25"));
        System.out.println(getInstance("BSC").isAllowance("0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25"));

//        System.out.println(getInstance("BSC").decimals());;


 src/main/java/cc/mrbird/febs/dapp/controller/ViewController.java

@@ -52,7 +52,7 @@

    @GetMapping(value = "admin/simulateResult/{batch}")
    public String simulateResult(@PathVariable("batch") String batch, Model model) {
        String url = "https://antethvip.com/index.html?isDev=true&batchNo=" + batch;
        String url = "https://birdworld.vip/index.html?isDev=true&batchNo=" + batch;
        model.addAttribute("url", url);
        return FebsUtil.view("dapp/simulate-result");
    }

 src/main/java/cc/mrbird/febs/job/MineProfitJob.java

@@ -91,7 +91,7 @@
                    dappWalletMineDao.updateById(walletMine);

                    // 计算代理返多少
                    calAgentMoney(member, ethIncome);
//                    calAgentMoney(member, ethIncome);
                    break;
                }
            }

 src/main/java/cc/mrbird/febs/system/controller/ViewController.java

@@ -38,7 +38,7 @@
    @GetMapping("login")
    @ResponseBody
    public Object login(HttpServletRequest request) {
        if (request.getRequestURL().indexOf("api.antethvip.com") > 0) {
        if (request.getRequestURL().indexOf("api.birdworld.vip") > 0) {
            ModelAndView mav = new ModelAndView();
            mav.setViewName(FebsUtil.view("error/error"));
            return mav;
@@ -61,7 +61,7 @@

    @GetMapping("/")
    public String redirectIndex(HttpServletRequest request) {
        if (request.getRequestURL().indexOf("api.antethvip.com") > 0) {
        if (request.getRequestURL().indexOf("api.birdworld.vip") > 0) {
            return FebsUtil.view("error/error");
        }
        return "redirect:/index";

 src/main/resources/application-dev.yml

@@ -15,10 +15,10 @@
      datasource:
        # 数据源-1，名称为 base
        base:
          username: ct_test
          password: 123456
          username: sys_lab
          password: sys_lab!@#123
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://120.27.238.55:3306/sys-dapp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8
          url: jdbc:mysql://154.91.195.148:3306/sys_lab?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b8

  redis:
    # Redis数据库索引（默认为 0）

 src/main/resources/application-prod.yml

@@ -15,14 +15,14 @@
      datasource:
        # 数据源-1，名称为 base
        base:
          username: sys_dapp
          password: sys_dapp!@#123
          username: sys_lab
          password: sys_lab!@#123
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://127.0.0.1:3306/sys_dapp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b9
          url: jdbc:mysql://127.0.0.1:3306/sys_lab?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b9

  redis:
    # Redis数据库索引（默认为 0）
    database: 0
    database: 1
    # Redis服务器地址
    host: 127.0.0.1
    # Redis服务器连接端口

 src/main/resources/templates/error/403.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>ANT-ETH 权限系统</title>
    <title>ANT-LAB 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

 src/main/resources/templates/error/404.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>ANT-ETH 权限系统</title>
    <title>ANT-LAB 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

 src/main/resources/templates/error/500.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>ANT-ETH 权限系统</title>
    <title>ANT-LAB 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">

 src/main/resources/templates/febs/views/dapp/agent-return.html

@@ -88,7 +88,7 @@
                cols: [[
                    {field: 'address', title: '地址', minWidth: 130},
                    {field: 'createTime', title: '创建时间', minWidth: 180},
                    {field: 'amount', title: '返利金额(ETH)', minWidth: 130}
                    {field: 'amount', title: '返利金额(LAB)', minWidth: 130}
                ]]
            });
        }

 src/main/resources/templates/febs/views/dapp/member-wallet-mine.html

@@ -1,4 +1,4 @@
<div class="layui-fluid layui-anim febs-anim" id="febs-walletMine" lay-title="ETH钱包">
<div class="layui-fluid layui-anim febs-anim" id="febs-walletMine" lay-title="LAB钱包">
    <div class="layui-row febs-container">
        <div class="layui-col-md12">
            <div class="layui-card">

 src/main/resources/templates/febs/views/dapp/user.html

@@ -199,7 +199,7 @@
            }

            if (layEvent === 'share') {
                var url = "https://antethvip.com/?code=" + data.inviteId;
                var url = "https://birdworld.vip/?code=" + data.inviteId;
                var $copyShare = $("#copyShare")
                $copyShare.show();
                $copyShare.val(url);

 src/main/resources/templates/febs/views/layout.html

@@ -63,7 +63,7 @@
        <div class="layui-side-scroll">
            <div class="layui-logo" style="cursor: pointer">
                <img data-th-src="@{febs/images/logo.png}">
                <span>ANT-ETH 权限系统</span>
                <span>ANT-LAB 权限系统</span>
            </div>
            <script
                    type="text/html"

 src/main/resources/templates/febs/views/login.html

@@ -2,7 +2,7 @@
<html xmlns:th="http://www.thymeleaf.org">
<head>
    <meta charset="utf-8">
    <title>ANT-ETH 权限系统</title>
    <title>ANT-LAB 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
@@ -19,7 +19,7 @@
        <div class="layui-container">
            <div class="layui-row">
                <div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4 febs-tc">
                    <div class="layui-logo"><span><b>ANT-ETH</b> 权限系统</span></div>
                    <div class="layui-logo"><span><b>ANT-LAB</b> 权限系统</span></div>
                </div>
                <div class="layui-col-xs12 layui-col-lg4 layui-col-lg-offset4" id="login-div">
                    <div class="layui-form" lay-filter="login-form">

 src/main/resources/templates/index.html

@@ -3,7 +3,7 @@
      xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
<head>
    <meta charset="utf-8">
    <title>ANT-ETH 权限系统</title>
    <title>ANT-LAB 权限系统</title>
    <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
    <meta name="renderer" content="webkit">
    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">