From 2023de973e6adb490bba962b1d830fd8e4be9418 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 13 一月 2023 23:22:30 +0800
Subject: [PATCH] update 适配 新序列化注解
---
ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java b/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java
index 3c7bae3..b883dae 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java
@@ -1,6 +1,8 @@
package com.ruoyi.system.listener;
+import cn.dev33.satoken.secure.BCrypt;
import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
import com.alibaba.excel.context.AnalysisContext;
import com.alibaba.excel.event.AnalysisEventListener;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -8,8 +10,6 @@
import com.ruoyi.common.excel.ExcelResult;
import com.ruoyi.common.exception.ServiceException;
import com.ruoyi.common.helper.LoginHelper;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.common.utils.ValidatorUtils;
import com.ruoyi.common.utils.spring.SpringUtils;
import com.ruoyi.system.domain.vo.SysUserImportVo;
@@ -43,7 +43,7 @@
public SysUserImportListener(Boolean isUpdateSupport) {
String initPassword = SpringUtils.getBean(ISysConfigService.class).selectConfigByKey("sys.user.initPassword");
this.userService = SpringUtils.getBean(ISysUserService.class);
- this.password = SecurityUtils.encryptPassword(initPassword);
+ this.password = BCrypt.hashpw(initPassword);
this.isUpdateSupport = isUpdateSupport;
this.operName = LoginHelper.getUsername();
}
@@ -53,7 +53,7 @@
SysUser user = this.userService.selectUserByUserName(userVo.getUserName());
try {
// 楠岃瘉鏄惁瀛樺湪杩欎釜鐢ㄦ埛
- if (StringUtils.isNull(user)) {
+ if (ObjectUtil.isNull(user)) {
user = BeanUtil.toBean(userVo, SysUser.class);
ValidatorUtils.validate(user);
user.setPassword(password);
@@ -62,7 +62,12 @@
successNum++;
successMsg.append("<br/>").append(successNum).append("銆佽处鍙� ").append(user.getUserName()).append(" 瀵煎叆鎴愬姛");
} else if (isUpdateSupport) {
+ Long userId = user.getUserId();
+ user = BeanUtil.toBean(userVo, SysUser.class);
+ user.setUserId(userId);
ValidatorUtils.validate(user);
+ userService.checkUserAllowed(user);
+ userService.checkUserDataScope(user.getUserId());
user.setUpdateBy(operName);
userService.updateUser(user);
successNum++;
--
Gitblit v1.9.3