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

build: continew-starter 2.13.2-SNAPSHOT => 2.13.2

Browse Source 
1.使用 EncryptHelper 重构用户导入相关加密查询场景
2.BCryptEncryptor 适配最新加密体系
3.使用 Jackson JSONUtils 优化 ServletUtils.writeJSON（Hutool JSONUtil 序列化无法识别 Jackson 注解）
4.DefaultDataPermissionUserDataProvider 包调整、UserData、RoleData 字段类型调整
5.其他隐形升级（租户拦截器优先级、依赖升级等）
This commit is contained in:
Charles7c
2025-07-21 22:12:01 +08:00
parent 84b2c39a30
commit bc44de4bdd
15 changed files with 65 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
continew-system/src/main/java/top/continew/admin/system/model/resp/DeptResp.java
View File

@@ -83,4 +83,10 @@ public class DeptResp extends BaseDetailResp {
@Schema(description = "描述", example = "测试部描述信息")
@ExcelProperty(value = "描述", order = 8)
private String description;
// TODO 临时修复，等待 ContiNew Starter 2.13.3 发布移除
@Override
public Long getId() {
return super.getId();
}
}

6
continew-system/src/main/java/top/continew/admin/system/model/resp/MenuResp.java
View File

@@ -122,4 +122,10 @@ public class MenuResp extends BaseResp {
*/
@Schema(description = "状态", example = "1")
private DisEnableStatusEnum status;
// TODO 临时修复，等待 ContiNew Starter 2.13.3 发布移除
@Override
public Long getId() {
return super.getId();
}
}

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

@@ -63,7 +63,6 @@ import top.continew.admin.common.context.UserContextHolder;
import top.continew.admin.common.enums.DisEnableStatusEnum;
import top.continew.admin.common.enums.GenderEnum;
import top.continew.admin.common.service.CommonUserService;
import top.continew.admin.common.util.SecureUtils;
import top.continew.admin.system.enums.OptionCategoryEnum;
import top.continew.admin.system.mapper.user.UserMapper;
import top.continew.admin.system.model.entity.DeptDO;
@@ -86,6 +85,7 @@ import top.continew.starter.core.util.validation.CheckUtils;
import top.continew.starter.extension.crud.model.query.PageQuery;
import top.continew.starter.extension.crud.model.query.SortQuery;
import top.continew.starter.extension.crud.model.resp.PageResp;
import top.continew.starter.security.crypto.utils.EncryptHelper;
import java.io.IOException;
import java.time.Duration;
@@ -285,13 +285,13 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
// 查询重复用户
userImportResp
.setDuplicateUserRows(countExistByField(validRowList, UserImportRowReq::getUsername, UserDO::getUsername, false));
.setDuplicateUserRows(countExistByField(validRowList, UserImportRowReq::getUsername, UserDO::getUsername));
// 查询重复邮箱
userImportResp
.setDuplicateEmailRows(countExistByField(validRowList, UserImportRowReq::getEmail, UserDO::getEmail, true));
userImportResp.setDuplicateEmailRows(countExistByField(validRowList, row -> EncryptHelper.encrypt(row
.getEmail()), UserDO::getEmail));
// 查询重复手机
userImportResp
.setDuplicatePhoneRows(countExistByField(validRowList, UserImportRowReq::getPhone, UserDO::getPhone, true));
userImportResp.setDuplicatePhoneRows(countExistByField(validRowList, row -> EncryptHelper.encrypt(row
.getPhone()), UserDO::getPhone));
// 设置导入会话并缓存数据，有效期10分钟
String importKey = UUID.fastUUID().toString(true);
@@ -315,8 +315,10 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
throw new BusinessException("导入已过期，请重新上传");
}
// 已存在数据查询
List<String> existEmails = listExistByField(importUserList, UserImportRowReq::getEmail, UserDO::getEmail);
List<String> existPhones = listExistByField(importUserList, UserImportRowReq::getPhone, UserDO::getPhone);
List<String> existEmails = listExistByField(importUserList, row -> EncryptHelper.encrypt(row
.getEmail()), UserDO::getEmail);
List<String> existPhones = listExistByField(importUserList, row -> EncryptHelper.encrypt(row
.getPhone()), UserDO::getPhone);
List<UserDO> existUserList = listByUsernames(CollUtils
.mapToList(importUserList, UserImportRowReq::getUsername));
List<String> existUsernames = CollUtils.mapToList(existUserList, UserDO::getUsername);
@@ -597,14 +599,12 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
*/
private int countExistByField(List<UserImportRowReq> userRowList,
Function<UserImportRowReq, String> rowField,
SFunction<UserDO, ?> dbField,
boolean fieldEncrypt) {
SFunction<UserDO, ?> dbField) {
List<String> fieldValues = CollUtils.mapToList(userRowList, rowField);
if (fieldValues.isEmpty()) {
return 0;
}
return (int)this.count(Wrappers.<UserDO>lambdaQuery()
.in(dbField, fieldEncrypt ? SecureUtils.encryptFieldByAes(fieldValues) : fieldValues));
return Math.toIntExact(baseMapper.lambdaQuery().in(dbField, fieldValues).count());
}
/**
@@ -622,9 +622,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserMapper, UserDO, UserRes
if (fieldValues.isEmpty()) {
return Collections.emptyList();
}
List<UserDO> userList = baseMapper.selectList(Wrappers.<UserDO>lambdaQuery()
.in(dbField, SecureUtils.encryptFieldByAes(fieldValues))
.select(dbField));
List<UserDO> userList = baseMapper.lambdaQuery().select(dbField).in(dbField, fieldValues).list();
return CollUtils.mapToList(userList, dbField);
}