From ee766faa731a7b3e92042dbcc52a8dad6590c3f5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 22 Oct 2022 15:39:29 +0800
Subject: [PATCH] 20221021
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 73 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 9 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java b/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
index 50bd8fd..da7826f 100644
--- a/src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java
+++ b/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() {
@@ -695,6 +699,20 @@
@Override
public FebsResponse transferPassword(ApiTransferPasswordDto apiTransferPasswordDto) {
+ DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
+ Long memberId = dappMemberEntity.getId();
+
+ if(ObjectUtil.isEmpty(apiTransferPasswordDto.getRealname())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013"));
+ }
+ if(ObjectUtil.isEmpty(apiTransferPasswordDto.getPhone())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013"));
+ }
+ if(ObjectUtil.isEmpty(apiTransferPasswordDto.getEmail())
+ && ObjectUtil.isEmpty(apiTransferPasswordDto.getWahtsApp())
+ && ObjectUtil.isEmpty(apiTransferPasswordDto.getTelegram())){
+ return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0013"));
+ }
if(ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPassword())
|| ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPasswordAgain())){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
@@ -704,11 +722,19 @@
if(!newTransferPassword.equals(newTransferPasswordAgain)){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
}
-
- DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
- Long memberId = dappMemberEntity.getId();
DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
+
+ String realname = apiTransferPasswordDto.getRealname();
+ String phone = apiTransferPasswordDto.getPhone();
+ String email = apiTransferPasswordDto.getEmail();
+ String wahtsApp = apiTransferPasswordDto.getWahtsApp();
+ String telegram = apiTransferPasswordDto.getTelegram();
memberEntity.setTransferCode(SecureUtil.md5(apiTransferPasswordDto.getNewTransferPassword()));
+ memberEntity.setRealname(realname);
+ memberEntity.setPhone(phone);
+ memberEntity.setEmail(email);
+ memberEntity.setWahtsApp(wahtsApp);
+ memberEntity.setTelegram(telegram);
dappMemberDao.updateById(memberEntity);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
@@ -716,9 +742,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 +787,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"));
--
Gitblit v1.9.1