From 453bb7a946a35af96efddb334f6eef0a1b4a0757 Mon Sep 17 00:00:00 2001
From: whycxzp <perryhsu@163.com>
Date: 星期一, 07 三月 2022 16:45:02 +0800
Subject: [PATCH] 更新密码逻辑
---
src/main/java/com/whyc/service/PasswordResetService.java | 29 +++++++++--------------------
1 files changed, 9 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/whyc/service/PasswordResetService.java b/src/main/java/com/whyc/service/PasswordResetService.java
index 912781e..7a6ada9 100644
--- a/src/main/java/com/whyc/service/PasswordResetService.java
+++ b/src/main/java/com/whyc/service/PasswordResetService.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.github.pagehelper.util.StringUtil;
import com.whyc.dto.Response;
import com.whyc.mapper.UserInfMapper;
import com.whyc.pojo.UserInf;
@@ -28,9 +29,7 @@
@Resource
private UserInfMapper userInfMapper;
- private String encryptType = null;
-
- public Response<String> preCheck(String name) {
+ /*public Response<String> preCheck(String name) {
Response<String> response = new Response<>();
QueryWrapper<UserInf> queryWrapper = Wrappers.query();
queryWrapper.select("uSnId as SNId").eq("uName",name).last(" limit 1");
@@ -40,7 +39,7 @@
response.setData(password);
response.setMsg(encryptType);
return response;
- }
+ }*/
@Transactional
public void passwordReset(){
@@ -49,18 +48,11 @@
queryWrapper.select("uId as id","uSnId as SNId");
List<UserInf> userInfList = userInfMapper.selectList(queryWrapper);
userInfList.stream().forEach(userInf->{
- if(userInf.getId() == 0){
+ /*if(userInf.getId() == 0){
return;
- }
+ }*/
//鏄庢枃,闇�瑕佸垽鏂幏鍙�
- String password = null;
- String snId = userInf.getSNId();
- switch (encryptType){
- case "AES": password = AESUtil.desEncrypt(snId); break;
- case "Common": password = snId;break;
- case "RSA": password = RSAUtil.decrypt(snId,RSAUtil.getPrivateKey());break;
- default:break;
- }
+ String password = parsePassword(userInf.getSNId());
password = password.trim();
//灏嗘槑鏂嘡SA鍔犲瘑鍥炲啓鍒皍SnId鍜寀password
String passwordRSA = RSAUtil.encrypt(password, RSAUtil.getPublicKey());
@@ -68,20 +60,17 @@
userInf.setPassword(passwordRSA);
//userInfMapper.updateById(userInf);
});
- userInfMapper.updateBatch(userInfList);
+ //userInfMapper.updateBatch(userInfList);
}
private String parsePassword(String passwordData){
//鏄庢枃,闇�瑕佸垽鏂幏鍙�
String password;
password = AESUtil.desEncrypt(passwordData);
- encryptType = "AES";
- if(password == null || !verifyPassword(password.trim())){
+ if(StringUtil.isEmpty(password) || !verifyPassword(password.trim())){
password = RSAUtil.decrypt(passwordData, RSAUtil.getPrivateKey());
- encryptType = "RSA";
- if(password == null || !verifyPassword(password.trim())){
+ if(StringUtil.isEmpty(password) || !verifyPassword(password.trim())){
password = passwordData;
- encryptType = "Common";
}
}
return password.trim();
--
Gitblit v1.9.1