From d64adc42c078a82f58aa58743ae3871b203e3bbe Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 15 Nov 2022 15:13:58 +0800
Subject: [PATCH] 20221115,密码RSA加密
---
src/main/java/cc/mrbird/febs/dapp/service/impl/DappWalletServiceImpl.java | 48 +++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 41 insertions(+), 7 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 c602b75..f0876bf 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
@@ -29,6 +29,8 @@
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.crypto.SecureUtil;
+import cn.hutool.crypto.asymmetric.KeyType;
+import cn.hutool.crypto.asymmetric.RSA;
import cn.hutool.json.JSONUtil;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -570,7 +572,12 @@
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
}
//验证资金密码
- Boolean aBoolean = dappMemberService.validateTransferCode(apiTransferInsideDto.getTransferCode(), dappMemberEntityOut.getId());
+
+ //RSA解密
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
+ String transferPassword = apiTransferInsideDto.getTransferCode();
+ transferPassword = rsa.decryptStr(transferPassword, KeyType.PrivateKey);
+ Boolean aBoolean = dappMemberService.validateTransferCode(transferPassword, dappMemberEntityOut.getId());
if(!aBoolean){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
@@ -690,8 +697,13 @@
|| ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPasswordAgain())){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
}
+
+ //RSA解密
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
String newTransferPassword = apiTransferPasswordDto.getNewTransferPassword();
+ newTransferPassword = rsa.decryptStr(newTransferPassword, KeyType.PrivateKey);
String newTransferPasswordAgain = apiTransferPasswordDto.getNewTransferPasswordAgain();
+ newTransferPasswordAgain = rsa.decryptStr(newTransferPasswordAgain, KeyType.PrivateKey);
if(!newTransferPassword.equals(newTransferPasswordAgain)){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
}
@@ -699,7 +711,7 @@
DappMemberEntity dappMemberEntity = LoginUserUtil.getAppUser();
Long memberId = dappMemberEntity.getId();
DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
- memberEntity.setTransferCode(SecureUtil.md5(apiTransferPasswordDto.getNewTransferPassword()));
+ memberEntity.setTransferCode(SecureUtil.md5(newTransferPassword));
dappMemberDao.updateById(memberEntity);
return new FebsResponse().success().message(MessageSourceUtils.getString("Operation_001"));
@@ -743,7 +755,11 @@
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_0017"));
}
//验证资金密码
- Boolean aBoolean = dappMemberService.validateTransferCode(apiTransferOutsideDto.getTransferCode(), memberId);
+ //RSA解密
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
+ String transferPassword = apiTransferOutsideDto.getTransferCode();
+ transferPassword = rsa.decryptStr(transferPassword, KeyType.PrivateKey);
+ Boolean aBoolean = dappMemberService.validateTransferCode(transferPassword, memberId);
if(!aBoolean){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
@@ -824,8 +840,13 @@
|| ObjectUtil.isEmpty(apiTransferPasswordDto.getNewTransferPasswordAgain())){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
}
+
+ //RSA解密
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
String newTransferPassword = apiTransferPasswordDto.getNewTransferPassword();
+ newTransferPassword = rsa.decryptStr(newTransferPassword, KeyType.PrivateKey);
String newTransferPasswordAgain = apiTransferPasswordDto.getNewTransferPasswordAgain();
+ newTransferPasswordAgain = rsa.decryptStr(newTransferPasswordAgain, KeyType.PrivateKey);
if(!newTransferPassword.equals(newTransferPasswordAgain)){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
}
@@ -836,7 +857,7 @@
String email = apiTransferPasswordDto.getEmail();
String wahtsApp = apiTransferPasswordDto.getWahtsApp();
String telegram = apiTransferPasswordDto.getTelegram();
- memberEntity.setTransferCode(SecureUtil.md5(apiTransferPasswordDto.getNewTransferPassword()));
+ memberEntity.setTransferCode(SecureUtil.md5(newTransferPassword));
memberEntity.setRealname(realname);
memberEntity.setPhone(phone);
memberEntity.setEmail(email);
@@ -879,7 +900,12 @@
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_003"));
}
//验证资金密码
- Boolean aBoolean = dappMemberService.validateTransferCode(apiUpdatePasswordDto.getTransferCode(), memberEntity.getId());
+
+ //RSA解密
+ String transferCode = apiUpdatePasswordDto.getTransferCode();
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
+ transferCode = rsa.decryptStr(transferCode, KeyType.PrivateKey);
+ Boolean aBoolean = dappMemberService.validateTransferCode(transferCode, memberEntity.getId());
if(!aBoolean){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_006"));
}
@@ -888,13 +914,16 @@
|| ObjectUtil.isEmpty(apiUpdatePasswordDto.getNewTransferPasswordAgain())){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
}
+
String newTransferPassword = apiUpdatePasswordDto.getNewTransferPassword();
+ newTransferPassword = rsa.decryptStr(newTransferPassword, KeyType.PrivateKey);
String newTransferPasswordAgain = apiUpdatePasswordDto.getNewTransferPasswordAgain();
+ newTransferPasswordAgain = rsa.decryptStr(newTransferPasswordAgain, KeyType.PrivateKey);
if(!newTransferPassword.equals(newTransferPasswordAgain)){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
}
- memberEntity.setPassword(SecureUtil.md5(apiUpdatePasswordDto.getNewTransferPassword()));
+ memberEntity.setPassword(SecureUtil.md5(newTransferPassword));
dappMemberDao.updateById(memberEntity);
String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
@@ -917,13 +946,18 @@
|| ObjectUtil.isEmpty(apiResetPasswordDto.getNewPasswordAgain())){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_008"));
}
+
+ //RSA解密
+ RSA rsa = new RSA(AppContants.PRIVATE_KEY, null);
String newPassword = apiResetPasswordDto.getNewPassword();
+ newPassword = rsa.decryptStr(newPassword, KeyType.PrivateKey);
String newPasswordAgain = apiResetPasswordDto.getNewPasswordAgain();
+ newPasswordAgain = rsa.decryptStr(newPasswordAgain, KeyType.PrivateKey);
if(!newPassword.equals(newPasswordAgain)){
return new FebsResponse().fail().message(MessageSourceUtils.getString("member_err_009"));
}
DappMemberEntity memberEntity = dappMemberDao.selectById(memberId);
- memberEntity.setPassword(SecureUtil.md5(apiResetPasswordDto.getNewPassword()));
+ memberEntity.setPassword(SecureUtil.md5(newPassword));
dappMemberDao.updateById(memberEntity);
String redisKey = AppContants.REDIS_KEY_SIGN + memberEntity.getId();
--
Gitblit v1.9.1