From adf7a921b6a0e3007ff15158252a085ff220c795 Mon Sep 17 00:00:00 2001 From: xiaoyong931011 <15274802129@163.com> Date: Wed, 25 Nov 2020 19:29:28 +0800 Subject: [PATCH] 20201125 --- src/main/java/com/xcong/excoin/common/system/dto/WtWalletDto.java | 6 +++--- src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java | 9 ++++----- src/main/java/com/xcong/excoin/common/system/controller/LoginController.java | 2 +- src/main/resources/mapper/member/WtWalletMapper.xml | 1 + src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java b/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java index 9a321db..27bcd67 100644 --- a/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java +++ b/src/main/java/com/xcong/excoin/common/system/controller/LoginController.java @@ -138,7 +138,7 @@ @ApiResponses({ @ApiResponse(code = 200,message = "OK",response = LoginVo.class), }) - public Result recovery(@RequestBody WtWalletDto wtWalletDto) { + public Result loginOutCenter(@RequestBody WtWalletDto wtWalletDto) { return memberservice.recovery(wtWalletDto); } diff --git a/src/main/java/com/xcong/excoin/common/system/dto/WtWalletDto.java b/src/main/java/com/xcong/excoin/common/system/dto/WtWalletDto.java index 50d71a8..8f10bc0 100644 --- a/src/main/java/com/xcong/excoin/common/system/dto/WtWalletDto.java +++ b/src/main/java/com/xcong/excoin/common/system/dto/WtWalletDto.java @@ -25,8 +25,8 @@ @NotBlank(message = "终端ID不能为空") private String terminalId; - @ApiModelProperty(value = "助记词 ", example = "13412341234") - @NotBlank(message = "助记词不能为空") - private List<String> mnemonicWordList; + @ApiModelProperty(value = "助记词 ", example = "handsome,guard,somebody,...") + @NotBlank(message = "助记词不能为空") + private String mnemonicWordList; } diff --git a/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java b/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java index 1c5e6a7..995d83b 100644 --- a/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java +++ b/src/main/java/com/xcong/excoin/configurations/security/WebSecurityConfig.java @@ -38,9 +38,9 @@ .and() .authorizeRequests() .antMatchers(HttpMethod.OPTIONS, "/**").permitAll() + .antMatchers("/loginOutCenter").permitAll() .antMatchers("/login").permitAll() .antMatchers("/registerOutCenter").permitAll() - .antMatchers("/loginOutCenter").permitAll() .antMatchers("/register").permitAll() .antMatchers("/swagger**/**").permitAll() .antMatchers("/webjars/**").permitAll() diff --git a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java index 3386493..7f20577 100644 --- a/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java +++ b/src/main/java/com/xcong/excoin/modules/member/service/impl/MemberServiceImpl.java @@ -1293,12 +1293,11 @@ /** * 判断钱包是否存在 */ - List<String> mnemonicWordList = wtWalletDto.getMnemonicWordList(); - if(CollectionUtils.isEmpty(mnemonicWordList)){ + String mnemonicWordList = wtWalletDto.getMnemonicWordList(); + if(StringUtils.isEmpty(mnemonicWordList)){ return Result.fail(MessageSourceUtils.getString("login_recovery_001")); } - String mnemonicWords = ToolUtil.listToString(mnemonicWordList, ","); - WtWallet wtWallet = wtWalletDao.selectByMnemonicWords(mnemonicWords); + WtWallet wtWallet = wtWalletDao.selectByMnemonicWords(mnemonicWordList); if(wtWallet==null){ return Result.fail(MessageSourceUtils.getString("login_recovery_002")); } @@ -1321,7 +1320,7 @@ loginVo.setAddressMd(strToMD5); Wrapper<MemberEntity> queryWrapperOrepool = new QueryWrapper<>(); ((QueryWrapper<MemberEntity>) queryWrapperOrepool).eq("address", address); - ((QueryWrapper<MemberEntity>) queryWrapperOrepool).eq("tradePassword", passwordToMD5); + ((QueryWrapper<MemberEntity>) queryWrapperOrepool).eq("trade_password", passwordToMD5); MemberEntity memberEntity = memberDao.selectOne(queryWrapperOrepool); if(ObjectUtil.isEmpty(memberEntity)) { log.info("用户初始化"); diff --git a/src/main/resources/mapper/member/WtWalletMapper.xml b/src/main/resources/mapper/member/WtWalletMapper.xml index 1e8a2a2..c59050a 100644 --- a/src/main/resources/mapper/member/WtWalletMapper.xml +++ b/src/main/resources/mapper/member/WtWalletMapper.xml @@ -130,6 +130,7 @@ address, mnemonic_words, wallet_name, + password, terminal_Id from wt_wallet where mnemonic_words=#{mnemonic_words} -- Gitblit v1.9.1