src/main/java/com/xcong/excoin/common/system/controller/LoginController.java
@@ -17,6 +17,7 @@ import com.xcong.excoin.common.system.dto.LoginDto; import com.xcong.excoin.common.system.dto.OutCenterRegisterDto; import com.xcong.excoin.common.system.dto.RegisterDto; import com.xcong.excoin.common.system.dto.WtWalletDto; import com.xcong.excoin.common.system.entity.WtWallet; import com.xcong.excoin.common.system.vo.LoginVo; import com.xcong.excoin.configurations.properties.ApplicationProperties; @@ -138,8 +139,8 @@ @ApiResponses({ @ApiResponse(code = 200,message = "OK",response = LoginVo.class), }) public Result recovery(@RequestBody WtWallet wallet) { return memberservice.recovery(wallet); public Result recovery(@RequestBody WtWalletDto wtWalletDto) { return memberservice.recovery(wtWalletDto); } } src/main/java/com/xcong/excoin/common/system/dto/WtWalletDto.java
New file @@ -0,0 +1,32 @@ package com.xcong.excoin.common.system.dto; import java.util.List; import javax.validation.constraints.NotBlank; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @Data @ApiModel(value = "WtWalletDto", description = "导入类") public class WtWalletDto { /** * 密码：通过助记词导入后重置 */ @ApiModelProperty(value = "密码：通过助记词导入后重置", example = "a12345678") @NotBlank(message = "密码不能为空") private String password; /** * 终端ID */ @ApiModelProperty(value = "终端ID", example = "sdsadsadsa") @NotBlank(message = "终端ID不能为空") private String terminalId; @ApiModelProperty(value = "助记词 ", example = "13412341234") @NotBlank(message = "助记词不能为空") private List<String> mnemonicWordList; } src/main/java/com/xcong/excoin/configurations/security/TokenFilter.java
@@ -48,7 +48,7 @@ public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException { HttpServletRequest request = (HttpServletRequest) servletRequest; HttpServletResponse response = (HttpServletResponse) servletResponse; String token = resolveToken(request); String token = resolveTokenOutCenter(request); if (!AppContants.TIME_OUT.equals(token)) { if (StrUtil.isNotBlank(token)) { @@ -81,7 +81,7 @@ } /** * 解析前端传来的token，md5加密后的地址_/api_设备iD * 解析前端传来的token，md5加密后的地址_设备iD_/api * * @param request * @return @@ -98,7 +98,7 @@ RSA rsa = new RSA(securityProperties.getPrivateKey(), null); String[] tokens = StrUtil.split(rsa.decryptStr(rsaToken, KeyType.PrivateKey), "_"); if (StrUtil.isNotEmpty(requestURL) && requestURL.toString().contains(tokens[1])) { if (StrUtil.isNotEmpty(requestURL) && requestURL.toString().contains(tokens[2])) { return tokens[0]; } else { // log.info("前面token为{}", tokens[0]); src/main/java/com/xcong/excoin/modules/member/service/MemberService.java
@@ -6,6 +6,7 @@ import com.xcong.excoin.common.response.Result; import com.xcong.excoin.common.system.dto.OutCenterRegisterDto; import com.xcong.excoin.common.system.dto.RegisterDto; import com.xcong.excoin.common.system.dto.WtWalletDto; import com.xcong.excoin.common.system.entity.WtWallet; import com.xcong.excoin.modules.member.entity.MemberEntity; import com.xcong.excoin.modules.member.parameter.dto.MemberAddCoinAddressDto; @@ -94,7 +95,7 @@ public Result registerOutCenter(OutCenterRegisterDto outCenterRegisterDto); public Result recovery(WtWallet wallet); public Result recovery(WtWalletDto wtWalletDto);
@@ -21,6 +21,7 @@ import com.xcong.excoin.common.system.dao.WtWordDao; import com.xcong.excoin.common.system.dto.OutCenterRegisterDto; import com.xcong.excoin.common.system.dto.RegisterDto; import com.xcong.excoin.common.system.dto.WtWalletDto; import com.xcong.excoin.common.system.entity.WtToken; import com.xcong.excoin.common.system.entity.WtWallet; import com.xcong.excoin.common.system.entity.WtWalletDetail; @@ -1266,14 +1267,14 @@ @Transactional @Override public Result recovery(WtWallet wallet) { public Result recovery(WtWalletDto wtWalletDto) { LoginVo loginVo = new LoginVo(); /** * 判断钱包是否存在 */ List<String> mnemonicWordList = wallet.getMnemonicWordList(); List<String> mnemonicWordList = wtWalletDto.getMnemonicWordList(); if(CollectionUtils.isEmpty(mnemonicWordList)){ return Result.fail(MessageSourceUtils.getString("login_recovery_001")); } @@ -1300,8 +1301,8 @@ */ MemberEntity member = new MemberEntity(); member.setAddress(address); member.setPassword(MD5Util.strToMD5(wallet.getPassword())); member.setTradePassword(MD5Util.strToMD5(wallet.getPassword())); member.setPassword(MD5Util.strToMD5(wtWalletDto.getPassword())); member.setTradePassword(MD5Util.strToMD5(wtWalletDto.getPassword())); member.setAccountStatus(MemberEntity.ACCOUNT_STATUS_ENABLE); member.setAccountType(MemberEntity.ACCOUNT_TYPE_NORMAL); member.setAgentLevel(MemberEntity.ACCOUNT_AGENT_LEVEL);
