hhyykk/RuoYi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户导入初始密码

Browse Source
This commit is contained in:
RuoYi
2019-01-11 10:14:31 +08:00
parent ca5b4bc852
commit 77550e2f11
7 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
View File

@ -22,6 +22,7 @@ import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.framework.util.ShiroUtils;
import com.ruoyi.framework.web.base.BaseController;
import com.ruoyi.system.domain.SysUser;
import com.ruoyi.system.service.ISysConfigService;
import com.ruoyi.system.service.ISysPostService;
import com.ruoyi.system.service.ISysRoleService;
import com.ruoyi.system.service.ISysUserService;
@ -45,6 +46,9 @@ public class SysUserController extends BaseController
@Autowired
private ISysPostService postService;
@Autowired
private ISysConfigService configService;
@Autowired
private SysPasswordService passwordService;
@ -85,7 +89,9 @@ public class SysUserController extends BaseController
{
ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
List<SysUser> userList = util.importExcel(file.getInputStream());
String message = userService.importUser(userList, updateSupport);
String operName = getSysUser().getLoginName();
String password = configService.selectConfigByKey("sys.user.initPassword");
String message = userService.importUser(userList, updateSupport, operName, password);
return AjaxResult.success(message);
}

4
ruoyi-admin/src/main/resources/i18n/messages.properties
View File

@ -6,8 +6,8 @@ user.password.not.match=用户不存在/密码错误
user.password.retry.limit.count=密码输入错误{0}次
user.password.retry.limit.exceed=密码输入错误{0}次，帐户锁定10分钟
user.password.delete=对不起，您的账号已被删除
user.blocked=用户已封禁，原因：{0}
role.blocked=角色已封禁，原因：{0}
user.blocked=用户已封禁，请联系管理员
role.blocked=角色已封禁，请联系管理员
user.logout.success=退出成功
length.not.valid=长度必须在{min}到{max}个字符之间