From a2843b599dca4edc4bb72a34ff268c2e1df6c62d Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期六, 16 七月 2022 15:44:26 +0800 Subject: [PATCH] !205 StreamUtils优化分组方法返回由HashMap无序转为LinkedHashMap有序 Merge pull request !205 from 抓蛙师/auto-7465549-dev-1657957318499 --- ruoyi-system/src/main/java/com/ruoyi/system/listener/SysUserImportListener.java | 4 ++-- 1 files changed, 2 insertions(+), 2 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 20cb14d..58f2f31 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,5 +1,6 @@ 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; @@ -9,7 +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.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(); } -- Gitblit v1.9.3