modify

Helius

2021-06-11 20333d03d0d1008d8e16f2f444ef8fdab8c53c94

modify

 src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java

@@ -42,8 +42,8 @@
    })

    @GetMapping(value = "/findBlockAddress")

    @SubmitRepeat

    public Result findBlockAddress(String symbol) {

        return blockSerive.findBlockAddress(symbol);

    public Result findBlockAddress(String symbol, String lable) {

        return blockSerive.findBlockAddress(symbol, lable);

    }



}


 src/main/java/com/xcong/excoin/modules/blackchain/service/BlockSerive.java

@@ -4,6 +4,6 @@


public interface BlockSerive {



    Result findBlockAddress(String symbol);

    Result findBlockAddress(String symbol, String lable);



}


 src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java

@@ -8,6 +8,7 @@
import com.xcong.excoin.modules.blackchain.service.*;

import com.xcong.excoin.rabbit.producer.UsdtUpdateProducer;

import lombok.extern.slf4j.Slf4j;

import org.apache.commons.lang.StringUtils;

import org.springframework.stereotype.Service;



import com.alibaba.fastjson.JSONObject;

@@ -35,14 +36,17 @@
    private UsdtUpdateProducer usdtUpdateProducer;



    @Override

    public Result findBlockAddress(String symbol) {

    public Result findBlockAddress(String symbol, String lable) {

        //获取用户ID

        String mId = LoginUserUtils.getAppLoginUser().getId().toString();

        MemberEntity member = memberDao.selectById(mId);

        if (member == null) {

            return Result.fail(MessageSourceUtils.getString("member_service_0003"));

        }

        String lable = "ERC20";

        if(StringUtils.isBlank(lable)){

            //lable = "ERC20";

            lable = "TRC20";

        }

        Result result = new Result();

        try {

            Map<String, String> map = new HashMap<String, String>();

@@ -161,7 +165,7 @@
                                memberMapper.insert(coinAddress);

                            }



                        } else {

                        } else if ("ERC20".equals(lable)) {

                            MemberCoinAddressEntity ethAddress2 = memberMapper.selectBlockAddress(Long.parseLong(mId), "ETH");

                            if (ethAddress2 != null) {

                                address = ethAddress2.getAddress();

@@ -182,8 +186,15 @@
                                coinAddress.setLabel(uuid);

                                memberMapper.insert(coinAddress);

                            }

                           // 发送新增的地址到监听集合

                            usdtUpdateProducer.sendAddressMsg(address);

                            // 发送新增的地址到监听集合

                            usdtUpdateProducer.sendAddressMsg(address+","+"ERC20");

                        } else if ("TRC20".equals(lable)) {

                            Map<String, String> usdtMap = Trc20Service.createAddress();

                            address = usdtMap.get("address");

                            key = usdtMap.get("privateKey");

                            map.put("address", address);

                            // 发送新增的地址到监听集合

                            usdtUpdateProducer.sendAddressMsg(address+","+"TRC20");

                        }

                        break;

                    case "ROC":


 src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java

@@ -22,7 +22,7 @@
                return "EOS/USDT";
            case "etcusdt":
                return "ETC/USDT";
            case "BZZusdt":
            case "bzzusdt":
                return "BZZ/USDT";
            default:
                return null;
@@ -34,7 +34,7 @@
            case "BTC/USDT":
                return "btcusdt";
            case "BZZ/USDT":
                return "BZZusdt";
                return "bzzusdt";
            default:
                return null;
        }