parent: 801f50 | patch | commitdiff
zainali5120
2020-05-31 9031180e72e881827c30e757237a63ce9304c149
refs
author zainali5120 <512061637@qq.com>
Sunday, May 31, 2020 22:44 +0800
committer zainali5120 <512061637@qq.com>
Sunday, May 31, 2020 22:44 +0800
commit9031180e72e881827c30e757237a63ce9304c149
tree 0d84f781b0376b35781c2f86e4eedf8424ad8a4b tree | zip | gz
parent 801f5056d26137600a3fd99ed45c72af3b5ec204 view | diff
603eef80308d1fd802f4cdb0a2aba83884d43805 view | diff 
Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
#	src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java
8 files modified
26 files added
4083 ■■■■■ changed files
lib/ripple-core-0.0.1-SNAPSHOT.jar diff | view | raw | blame | history
pom.xml 20 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/controller/BlockController.java 47 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/model/XrpTransResult.java 49 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/model/XrpTransactions.java 36 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/model/XrpTx.java 63 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/BchService.java 138 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/BigDecimalUtil.java 190 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/BlockSerive.java 9 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/BtcService.java 138 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/DateUtil.java 1369 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/EthService.java 283 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/HttpUtil.java 281 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/Impl/BlockSeriveImpl.java 219 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/LtcService.java 125 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/UsdtService.java 167 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/blackchain/service/XrpService.java 487 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java 92 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/dao/AgentReturnDao.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/dao/MemberCoinAddressDao.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberPaymethodDto.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAuthenticationInfoVo.java 26 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberAvivableCoinInfoVo.java 19 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinInfoListVo.java 16 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberCoinInfoVo.java 14 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPersonCenterInfoVo.java 32 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/service/MemberService.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java 110 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/platform/dao/PlatformFeeSettingDao.java 14 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/platform/entity/PlatformCnyUsdtExchangeEntity.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/platform/entity/PlatformFeeSettingEntity.java 53 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/member/AgentReturnDao.xml 5 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/member/MemberCoinAddressDao.xml 19 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/platform/PlatformFeeSettingDao.xml 24 ●●●●● diff | view | raw | blame | history