20221021

xiaoyong931011

2022-10-21 61b15a65f9ee92cb592efbcc96625c815dfdac73

20221021

 src/main/java/cc/mrbird/febs/common/configure/WebMvcConfigure.java

@@ -29,6 +29,7 @@
        InterceptorRegistration registration = registry.addInterceptor(new LoginInterceptor());

        registration.addPathPatterns("/dapi/**");

        registration.excludePathPatterns("/dapi/common/**");

        registration.excludePathPatterns("/dapi/member/updatePassword");

        registration.excludePathPatterns("/api/news/**");

    }




 src/main/java/cc/mrbird/febs/dapp/dto/ApiUpdatePasswordDto.java

@@ -4,12 +4,17 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import javax.validation.constraints.NotBlank;

@Data
@ApiModel(value = "ApiUpdatePasswordDto", description = "更新密码")
public class ApiUpdatePasswordDto {

    @ApiModelProperty(value = "旧密码",example = "49546512")
    private String oldTransferPassword;
    @ApiModelProperty(value = "用户名",example = "49546512")
    private String username;

    @ApiModelProperty(value = "安全密码",example = "49546512")
    private String transferCode;

    @ApiModelProperty(value = "新密码",example = "49546512")
    private String newTransferPassword;
@@ -17,4 +22,10 @@
    @ApiModelProperty(value = "再次输入新密码",example = "49546512")
    private String newTransferPasswordAgain;

    private String codeToken;

    @ApiModelProperty(value = "验证码", example = "123456")
    @NotBlank(message = "验证码不能为空")
    private String codeValue;

}

 src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java

@@ -36,6 +36,8 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.data.redis.core.ValueOperations;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@@ -63,6 +65,8 @@
    private final DappNftActivationDao dappNftActivationDao;
    private final DappMemberService dappMemberService;
    private final MemberCoinWithdrawDao memberCoinWithdrawDao;

    private final RedisTemplate<String, Object> redisTemplate;

    @Override
    public WalletInfoVo walletInfo() {
@@ -716,9 +720,41 @@

    @Override
    public FebsResponse updatePassword(ApiUpdatePasswordDto apiUpdatePasswordDto) {
        if(ObjectUtil.isEmpty(apiUpdatePasswordDto.getOldTransferPassword())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_007"));
        //验证验证码是否正确
        // 根据前端传回的token在redis中找对应的value
        ValueOperations<String, Object> valueOperations = redisTemplate.opsForValue();
        if(ObjectUtil.isEmpty(apiUpdatePasswordDto.getCodeToken()) || ObjectUtil.isEmpty(apiUpdatePasswordDto.getCodeValue())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("verification_code_err_001"));
        }
        String codeToken = apiUpdatePasswordDto.getCodeToken();
        String codeValue = apiUpdatePasswordDto.getCodeValue();
        if (redisTemplate.hasKey(codeToken)) {
            //验证通过, 删除对应的key
            if (valueOperations.get(codeToken).equals(codeValue)) {
                redisTemplate.delete(codeToken);
            } else {
                return new FebsResponse().fail().message(MessageSourceUtils.getString("verification_code_err_002"));
            }
        } else {
            return new FebsResponse().fail().message(MessageSourceUtils.getString("verification_code_err_003"));
        }
        String username = apiUpdatePasswordDto.getUsername();
        DappMemberEntity memberEntity = dappMemberDao.selectMemberInfoByUsername(username);
        if (ObjectUtil.isEmpty(memberEntity)) {
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
        }

        String inviteIdIn = memberEntity.getInviteId();
        Boolean isMemberIn = dappMemberService.isMember(inviteIdIn);
        if(!isMemberIn){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
        }
        //验证资金密码
        Boolean aBoolean = dappMemberService.validateTransferCode(apiUpdatePasswordDto.getTransferCode(), memberEntity.getId());
        if(!aBoolean){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
        }

        if(ObjectUtil.isEmpty(apiUpdatePasswordDto.getNewTransferPassword())
                || ObjectUtil.isEmpty(apiUpdatePasswordDto.getNewTransferPasswordAgain())){
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
@@ -729,13 +765,10 @@
            return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
        }

        DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
        Long memberId = dappMemberEntity.getId();
        DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
        memberEntity.setPassword(SecureUtil.md5(apiUpdatePasswordDto.getNewTransferPassword()));
        dappMemberDao.updateById(memberEntity);

        String redisKey = AppContants.REDIS_KEY_SIGN + memberId;
        String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
        redisUtils.del(redisKey);

        return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));