Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/n...

zainali5120

2020-10-13 17fb78903b310564aaeea6e4fd50824f45d4677a

Merge branches 'cpv' and 'feature/撮合交易' of https://gitee.com/chonggaoxiao/new_excoin into cpv

# Conflicts:
#	src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java
#	src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java
#	src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java
#	src/main/java/com/xcong/excoin/processor/DefaultCoinProcessor.java
#	src/main/java/com/xcong/excoin/quartz/job/KLineGeneratorJob.java
#	src/main/java/com/xcong/excoin/quartz/job/NotionalPoolingJob.java
#	src/main/resources/application-prod.yml
#	src/main/resources/mapper/member/MemberAuthenticationDao.xml

 src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java

@@ -38,27 +38,32 @@

    @PostConstruct
    public void initNewestPrice() {
        log.info("#=======价格更新开启=======#");
        SubscriptionOptions subscriptionOptions = new SubscriptionOptions();
        subscriptionOptions.setConnectionDelayOnFailure(5);
        subscriptionOptions.setUri("wss://api.hadax.com/ws");
        SubscriptionClient subscriptionClient = SubscriptionClient.create("", "", subscriptionOptions);
        subscriptionClient.subscribeTradeEvent("btcusdt,ethusdt,xrpusdt,ltcusdt,bchusdt,eosusdt,etcusdt", tradeEvent -> {
            String symbol = tradeEvent.getSymbol();
            // 根据symbol判断做什么操作
            symbol = CoinTypeConvert.convert(symbol);
            if (null != symbol) {
                String price = tradeEvent.getTradeList().get(0).getPrice().toPlainString();
                // TODO 测试环境关闭这个插入redis
                redisUtils.set(CoinTypeConvert.convertToKey(symbol), price);
                // 比较
                //websocketPriceService.comparePriceAsc(symbol, price);
                //websocketPriceService.comparePriceDesc(symbol, price);
                //System.out.println("比较完毕:"+symbol+"-"+price);
        try{
            log.info("#=======价格更新开启=======#");
            SubscriptionOptions subscriptionOptions = new SubscriptionOptions();
            subscriptionOptions.setConnectionDelayOnFailure(5);
            subscriptionOptions.setUri("wss://api.hadax.com/ws");
            SubscriptionClient subscriptionClient = SubscriptionClient.create("", "", subscriptionOptions);
            subscriptionClient.subscribeTradeEvent("btcusdt,ethusdt,xrpusdt,ltcusdt,bchusdt,eosusdt,etcusdt", tradeEvent -> {
                String symbol = tradeEvent.getSymbol();
                // 根据symbol判断做什么操作
                symbol = CoinTypeConvert.convert(symbol);
                if (null != symbol) {
                    String price = tradeEvent.getTradeList().get(0).getPrice().toPlainString();
                    // TODO 测试环境关闭这个插入redis
                    redisUtils.set(CoinTypeConvert.convertToKey(symbol), price);
                    // 比较
                    //websocketPriceService.comparePriceAsc(symbol, price);
                    //websocketPriceService.comparePriceDesc(symbol, price);
                    //System.out.println("比较完毕:"+symbol+"-"+price);

            }
                }

        });
            });
        }catch (Exception e){

        }

//        subscriptionClient.subscribeCandlestickEvent("btcusdt,ethusdt,eosusdt,etcusdt,ltcusdt,bchusdt,xrpusdt", CandlestickInterval.DAY1, (candlestickEvent) -> {
//            Candlestick data = candlestickEvent.getData();
//            redisUtils.set(CoinTypeConvert.convert(candlestickEvent.getSymbol()), data);