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,6 +38,7 @@

    @PostConstruct
    public void initNewestPrice() {
        try{
        log.info("#=======价格更新开启=======#");
        SubscriptionOptions subscriptionOptions = new SubscriptionOptions();
        subscriptionOptions.setConnectionDelayOnFailure(5);
@@ -59,6 +60,10 @@
            }

        });
        }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);