parent: 130ee4 | patch | commitdiff
gao
2020-07-28 0edef91d1f30a10122cdca358cbe45e044ab87ce
refs
author gao <gaoleox@163>
Tuesday, July 28, 2020 19:16 +0800
committer gao <gaoleox@163>
Tuesday, July 28, 2020 19:16 +0800
commit0edef91d1f30a10122cdca358cbe45e044ab87ce
tree d05a0deb520dc45f61a2fb91309fe0054755afc4 tree | zip | gz
parent 130ee4ec701c05d2930c766935e32e96a6aab753 view | diff
f523bcba09dcb9fbdf2bb0a67e2c1706e77e0519 view | diff 
Merge branch 'master' of
https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git

Conflicts:
	src/test/java/com/xcong/excoin/RedisTest.java
18 files modified
2 files added
892 ■■■■■ changed files
src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/model/EosResult.java 28 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/model/XrpTx.java 69 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/EosService.java 84 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/XrpService.java 436 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/controller/CoinController.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/dao/MemberAccountMoneyChangeDao.java 3 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/BlockCoinService.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/CoinService.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/impl/BlockCoinServiceImpl.java 162 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java 34 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/OrderWebsocketServiceImpl.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/RabbitOrderServiceImpl.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/entity/MemberEntity.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java 5 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java 10 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/member/MemberAccountMoneyChangeDao.xml 17 ●●●●● diff | view | raw | blame | history
src/test/java/com/xcong/excoin/RedisTest.java 5 ●●●●● diff | view | raw | blame | history