parent: 8a9641 | patch | commitdiff
gao
2020-05-28 cc9d558c8cda42d53be7b4545d2f33db26edf777
refs
author gao <gaoleox@163>
Thursday, May 28, 2020 16:46 +0800
committer gao <gaoleox@163>
Thursday, May 28, 2020 16:46 +0800
commitcc9d558c8cda42d53be7b4545d2f33db26edf777
tree 1c264d6b63fd0a85e601ad7a140faeecc3a0ca52 tree | zip | gz
parent 8a9641217be954f000ba71951838369796005715 view | diff
9419faa169d5e4826f59e33d436a88ab8ad7dfea view | diff 
Merge branch 'master' of https://chonggaoxiao:xcg523511090712@gitee.com/chonggaoxiao/new_excoin.git
1 files deleted
17 files modified
39 files added
4 files renamed
2158 ■■■■■ changed files
pom.xml 1 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/common/enumerates/SymbolEnum.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/controller/OrderCoinController.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/dao/OrderCoinsDao.java 4 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/dao/platform/TradeSettingDao.java 22 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinListVo.java 16 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/parameter/vo/OrderWalletCoinVo.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/impl/CoinServiceImpl.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/coin/service/impl/OrderCoinServiceImpl.java 21 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/controller/ContractEntrustOrderController.java 49 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/controller/ContractHoldOrderController.java 17 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/controller/ContractOrderController.java 17 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/dao/ContractEntrustOrderDao.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/dao/ContractHoldOrderDao.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/dao/ContractOrderDao.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/entity/ContractEntrustOrderEntity.java 76 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/entity/ContractHoldOrderEntity.java 110 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/entity/ContractOrderEntity.java 147 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/parameter/dto/SubmitEntrustDto.java 42 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/ContractEntrustOrderService.java 14 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/ContractHoldOrderService.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/ContractOrderService.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractEntrustOrderServiceImpl.java 87 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractHoldOrderServiceImpl.java 13 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/contract/service/impl/ContractOrderServiceImpl.java 13 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/controller/MemberController.java 217 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/dao/MemberAuthenticationDao.java 10 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/dao/MemberDao.java 31 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/dao/MemberPaymentMethodDao.java 8 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/entity/MemberAuthenticationEntity.java 121 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/entity/MemberPaymentMethodEntity.java 56 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberAuthenticationDto.java 45 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberDelPaymethodDto.java 17 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberForgetPwdDto.java 31 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberPaymethodDto.java 52 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberTradersPwdDto.java 31 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberUpdatePwdDto.java 31 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/dto/MemberUpdateTradePwdDto.java 31 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberInfoVo.java 23 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPaymethodDetailListVo.java 16 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/parameter/vo/MemberPaymethodDetailVo.java 46 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/service/MemberService.java 62 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java 369 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/platform/dao/CnyUsdtExchangeDao.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/platform/dao/TradeSettingDao.java 22 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/platform/entity/PlatformLeverageSettingEntity.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/platform/entity/PlatformSymbolsSkuEntity.java 6 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/modules/platform/entity/PlatformTradeSettingEntity.java 2 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/utils/CacheSettingUtils.java 82 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/utils/CoinTypeConvert.java 50 ●●●●● diff | view | raw | blame | history
src/main/java/com/xcong/excoin/utils/TypeJudgeUtils.java 28 ●●●●● diff | view | raw | blame | history
src/main/resources/logback-spring.xml 2 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/contract/ContractEntrustOrderDao.xml 5 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/contract/ContractHoldOrderDao.xml 5 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/contract/ContractOrderDao.xml 5 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/member/MemberAuthenticationDao.xml 9 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/member/MemberDao.xml 1 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/member/MemberPaymentMethodDao.xml 6 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/platform/TradeSettingDao.xml 10 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/walletCoinOrder/OrderCoinDealDao.xml 2 ●●●●● diff | view | raw | blame | history
src/main/resources/mapper/walletCoinOrder/OrderCoinsDao.xml 1 ●●●●● diff | view | raw | blame | history