Helius
2022-07-16 2eb36669bbb1eadba821eb1e6282501e8860e866
fix for prd
4 files modified
46 ■■■■ changed files
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java 10 ●●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java 24 ●●●●● patch | view | raw | blame | history
src/main/resources/application-prod.yml 10 ●●●● patch | view | raw | blame | history
src/main/resources/logback-spring.xml 2 ●●● patch | view | raw | blame | history
src/main/java/cc/mrbird/febs/dapp/chain/ChainEnum.java
@@ -15,20 +15,20 @@
     * 测试链 0x337610d27c682E347C9cD60BD4b3b107C9d34dDd
     */
    BSC_USDT("BSC",
            "0xBae24dAa3aB94cfF8114a16A4267D769b3a651F8",
            "0xFe7648513033782dE07010927686B97340661360",
            "111",
            "https://bsc-dataseed1.ninicoin.io",
            "0x46ac4921e58773ca22826df1640672b91b1db2b3",
            "0x55d398326f99059fF775485246999027B3197955",
            ""),
    /**
     * NFT
     */
    BSC_NFT_SDC("BSC",
            "0x977a9ddfb965a9a3416fa72ca7f91c4949c18f25",
            "efe98e00cd227b6322e892c82fcbd8eadf119c3188b7e574bc624f65405d61bf",
            "0x3afD1Bf0994214DBe5ccfA7d8643261B195532c2",
            "0x07ee6de0ca4b289f8e69484f70d09988c6df6697f411dc623179930a3578994f",
            "https://bsc-dataseed1.ninicoin.io",
            "0x03c7D3f141c5F03971604958170E253362e13BE6",
            "0xb7FDE337f2236F78B2823d9F97eAB03ce893CC3D",
            ""),
    /**
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
@@ -207,21 +207,25 @@
        DappMemberEntity member = LoginUserUtil.getAppUser();
        if (transferDto.getId() == null) {
            if (new BigDecimal(300).compareTo(transferDto.getAmount()) < 0) {
                throw new FebsException("Do Not More Than 300 USDT");
            }
            DappFundFlowEntity fundFlow = new DappFundFlowEntity(member.getId(), transferDto.getAmount(), transferDto.getType(), 1, transferDto.getFee(), transferDto.getTxHash());
            fundFlow.setNewestPrice(transferDto.getPrice());
            dappFundFlowDao.insert(fundFlow);
            return fundFlow.getId();
        }
        if ("success".equals(transferDto.getFlag())) {
            DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
            flow.setFromHash(transferDto.getTxHash());
            dappFundFlowDao.updateById(flow);
        } else {
            DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
            if (flow.getStatus() == 1) {
                dappFundFlowDao.deleteById(transferDto.getId());
            if ("success".equals(transferDto.getFlag())) {
                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
                flow.setFromHash(transferDto.getTxHash());
                dappFundFlowDao.updateById(flow);
            } else {
                DappFundFlowEntity flow = dappFundFlowDao.selectById(transferDto.getId());
                if (flow.getStatus() == 1) {
                    dappFundFlowDao.deleteById(transferDto.getId());
                }
            }
        }
        return null;
src/main/resources/application-prod.yml
@@ -15,20 +15,20 @@
      datasource:
        # 数据源-1,名称为 base
        base:
          username: sys_lab
          password: sys_lab!@#123
          username: db_sdp
          password: sdp!@#123
          driver-class-name: com.mysql.cj.jdbc.Driver
          url: jdbc:mysql://127.0.0.1:3306/sys_lab?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b9
          url: jdbc:mysql://127.0.0.1:3306/db_sdp?useUnicode=true&characterEncoding=UTF-8&useJDBCCompliantTimezoneShift=true&useLegacyDatetimeCode=false&serverTimezone=GMT%2b9
  redis:
    # Redis数据库索引(默认为 0)
    database: 1
    database: 3
    # Redis服务器地址
    host: 127.0.0.1
    # Redis服务器连接端口
    port: 6379
    # Redis 密码
    password: dapp!@#123
    password: ann123!@#
    lettuce:
      pool:
        # 连接池中的最小空闲连接
src/main/resources/logback-spring.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<configuration scan="true" scanPeriod="60 seconds" debug="false">
    <contextName>febs</contextName>
    <property name="log.path" value="tfc/log" />
    <property name="log.path" value="sdp/log" />
    <property name="log.maxHistory" value="15" />
    <property name="log.colorPattern" value="%magenta(%d{yyyy-MM-dd HH:mm:ss}) %highlight(%-5level) %yellow(%thread) %green(%logger) %msg%n"/>
    <property name="log.pattern" value="%d{yyyy-MM-dd HH:mm:ss} %-5level %thread %logger %msg%n"/>