From 325d2fbc3d907dcf3f574d8e1f30d0269ddc1937 Mon Sep 17 00:00:00 2001
From: houzhongjian <houzhongyi@126.com>
Date: 星期三, 24 七月 2024 08:28:47 +0800
Subject: [PATCH] 1、请求租户不存在时，记录访问日志、操作日志异常的问题 2、LoginUser 新增过期时间，方便判断 token 过期 3、增加 ConfigApi，支持参数配置的读取
---
iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/user/AdminUserServiceImpl.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/user/AdminUserServiceImpl.java b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/user/AdminUserServiceImpl.java
index f954f50..0d1afc3 100644
--- a/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/user/AdminUserServiceImpl.java
+++ b/iailab-module-system/iailab-module-system-biz/src/main/java/com/iailab/module/system/service/user/AdminUserServiceImpl.java
@@ -10,6 +10,7 @@
import com.iailab.framework.common.util.collection.CollectionUtils;
import com.iailab.framework.common.util.object.BeanUtils;
import com.iailab.framework.datapermission.core.util.DataPermissionUtils;
+import com.iailab.module.infra.api.config.ConfigApi;
import com.iailab.module.infra.api.file.FileApi;
import com.iailab.module.system.controller.admin.user.vo.profile.UserProfileUpdatePasswordReqVO;
import com.iailab.module.system.controller.admin.user.vo.profile.UserProfileUpdateReqVO;
@@ -57,8 +58,7 @@
@Slf4j
public class AdminUserServiceImpl implements AdminUserService {
- @Value("${sys.user.init-password:iailabyuanma}")
- private String userInitPassword;
+ static final String USER_INIT_PASSWORD_KEY = "system.user.init-password";
@Resource
private AdminUserMapper userMapper;
@@ -80,6 +80,9 @@
@Resource
private FileApi fileApi;
+
+ @Resource
+ private ConfigApi configApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -428,9 +431,17 @@
@Override
@Transactional(rollbackFor = Exception.class) // 添加事务，异常则回滚所有导入
public UserImportRespVO importUserList(List<UserImportExcelVO> importUsers, boolean isUpdateSupport) {
+ // 1.1 参数校验
if (CollUtil.isEmpty(importUsers)) {
throw exception(USER_IMPORT_LIST_IS_EMPTY);
}
+ // 1.2 初始化密码不能为空
+ String initPassword = configApi.getConfigValueByKey(USER_INIT_PASSWORD_KEY).getCheckedData();
+ if (StrUtil.isEmpty(initPassword)) {
+ throw exception(USER_IMPORT_INIT_PASSWORD);
+ }
+
+ // 2. 遍历，逐个创建 or 更新
UserImportRespVO respVO = UserImportRespVO.builder().createUsernames(new ArrayList<>())
.updateUsernames(new ArrayList<>()).failureUsernames(new LinkedHashMap<>()).build();
importUsers.forEach(importUser -> {
--
Gitblit v1.9.3