ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-09-10 20:57:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 适配 ContiNew Starter 加密模块（安全模块）

Browse Source
This commit is contained in:
Charles7c
2024-02-08 23:19:37 +08:00
parent 2109789116
commit 6435175dc3
10 changed files with 89 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/model/entity/UserDO.java
View File

@@ -16,16 +16,17 @@
package top.charles7c.continew.admin.system.model.entity;
import java.io.Serial;
import java.time.LocalDateTime;
import lombok.Data;
import com.baomidou.mybatisplus.annotation.TableName;
import lombok.Data;
import top.charles7c.continew.admin.common.config.mybatis.BCryptEncryptor;
import top.charles7c.continew.admin.common.enums.DisEnableStatusEnum;
import top.charles7c.continew.admin.common.enums.GenderEnum;
import top.charles7c.continew.starter.extension.crud.model.entity.BaseDO;
import top.charles7c.continew.starter.security.crypto.annotation.FieldEncrypt;
import top.charles7c.continew.starter.security.crypto.enums.Algorithm;
import java.io.Serial;
import java.time.LocalDateTime;
/**
* 用户实体
@@ -53,6 +54,7 @@ public class UserDO extends BaseDO {
/**
* 密码
*/
@FieldEncrypt(encryptor = BCryptEncryptor.class)
private String password;
/**
@@ -63,11 +65,13 @@ public class UserDO extends BaseDO {
/**
* 邮箱
*/
@FieldEncrypt(Algorithm.AES)
private String email;
/**
* 手机号码
*/
@FieldEncrypt(Algorithm.AES)
private String phone;
/**

12
continew-admin-system/src/main/java/top/charles7c/continew/admin/system/service/impl/UserServiceImpl.java
View File

@@ -93,7 +93,6 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
String phone = req.getPhone();
CheckUtils.throwIf(StrUtil.isNotBlank(phone) && this.isPhoneExists(phone, null), errorMsgTemplate, phone);
req.setStatus(DisEnableStatusEnum.ENABLE);
req.setPassword(passwordEncoder.encode(req.getPassword()));
}
@Override
@@ -201,12 +200,9 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
CheckUtils.throwIf(!passwordEncoder.matches(oldPassword, password), "当前密码错误");
}
// 更新密码和密码重置时间
LocalDateTime now = LocalDateTime.now();
baseMapper.lambdaUpdate()
.set(UserDO::getPassword, passwordEncoder.encode(newPassword))
.set(UserDO::getPwdResetTime, now)
.eq(UserDO::getId, id)
.update();
user.setPassword(newPassword);
user.setPwdResetTime(LocalDateTime.now());
baseMapper.updateById(user);
}
@Override
@@ -234,7 +230,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
@Override
public void resetPassword(UserPasswordResetReq req, Long id) {
UserDO user = super.getById(id);
user.setPassword(passwordEncoder.encode(req.getNewPassword()));
user.setPassword(req.getNewPassword());
user.setPwdResetTime(LocalDateTime.now());
baseMapper.updateById(user);
}