parent: 572cd5 | patch | commitdiff
zainali5120
2020-10-12 43385a77303aa2295d902b5a2be9e28723d08cef
refs
author zainali5120 <512061637@qq.com>
Monday, October 12, 2020 16:00 +0800
committer zainali5120 <512061637@qq.com>
Monday, October 12, 2020 16:00 +0800
commit43385a77303aa2295d902b5a2be9e28723d08cef
tree f6a6681ed0c52ebcf93e0661a286a344da092094 tree | zip | gz
parent 572cd528259f5affdf91b1da6f6d5ab973056655 view | diff
dcac20ece30dddba0fd21ca0d7a965de5914189d view | diff 
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
29 files modified
7 files added
843 ■■■■■ changed files
src/main/java/com/xcong/excoin/configurations/RabbitMqConfig.java 93 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/model/EthUsdtChargeDto.java 25 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/EthService.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/EthUsdtContract.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtErc20UpdateService.java 60 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtEthService.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java 7 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinDealDao.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinsDao.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/BlockCoinService.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java 76 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java 67 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/dao/MemberCoinAddressDao.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/symbols/service/SymbolsService.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/processor/DefaultCoinProcessor.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/processor/MarketService.java 23 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java 14 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/quartz/job/KLineGeneratorJob.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/quartz/job/NotionalPoolingJob.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/quartz/job/UsdtErc20InitJob.java 31 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/rabbit/consumer/ExchangeConsumer.java 26 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/rabbit/consumer/OperateOrderPriceConsumer.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/rabbit/consumer/OrderSubmitConsumer.java 48 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/rabbit/consumer/RocBlockUpdateConsumer.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/rabbit/consumer/UsdtUpdateConsumer.java 44 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/rabbit/consumer/WebsocketPriceConsumer.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/rabbit/init/OrderProducerInit.java 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/rabbit/producer/OrderSubmitProducer.java 47 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/rabbit/producer/UsdtUpdateProducer.java 47 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/websocket/TradePlateSendWebSocket.java 16 ●●●●● diff | view | raw | blame | history
src/main/resources/application-prodapp.yml 114 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/member/MemberCoinAddressDao.xml 7 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml 21 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/walletCoinOrder/OrderCoinsDao.xml 13 ●●●●● diff | view | raw | blame | history