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

初始密码支持自定义修改策略

Browse Source
This commit is contained in:
RuoYi
2020-10-15 13:27:46 +08:00
parent aa0c930682
commit e0523d1c2d
8 changed files with 74 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysIndexController.java
View File

@ -46,8 +46,10 @@ public class SysIndexController extends BaseController
mmap.put("sideTheme", configService.selectConfigByKey("sys.index.sideTheme"));
mmap.put("skinName", configService.selectConfigByKey("sys.index.skinName"));
mmap.put("ignoreFooter", configService.selectConfigByKey("sys.index.ignoreFooter"));
mmap.put("initPasswordModify", configService.selectConfigByKey("sys.account.initPasswordModify"));
mmap.put("copyrightYear", Global.getCopyrightYear());
mmap.put("demoEnabled", Global.isDemoEnabled());
mmap.put("isDefaultPwd", user.getPwdUpdateDate() == null);
// 菜单导航显示风格
String menuStyle = configService.selectConfigByKey("sys.index.menuStyle");

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysProfileController.java
View File

@ -16,6 +16,7 @@ import com.ruoyi.common.config.Global;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.common.utils.file.FileUploadUtils;
import com.ruoyi.framework.shiro.service.SysPasswordService;
import com.ruoyi.framework.util.ShiroUtils;
@ -79,7 +80,6 @@ public class SysProfileController extends BaseController
@ResponseBody
public AjaxResult resetPwd(String oldPassword, String newPassword)
{
SysUser user = ShiroUtils.getSysUser();
if (!passwordService.matches(user, oldPassword))
{
@ -91,14 +91,13 @@ public class SysProfileController extends BaseController
}
user.setSalt(ShiroUtils.randomSalt());
user.setPassword(passwordService.encryptPassword(user.getLoginName(), newPassword, user.getSalt()));
user.setPwdUpdateDate(DateUtils.getNowDate());
if (userService.resetUserPwd(user) > 0)
{
ShiroUtils.setSysUser(userService.selectUserById(user.getUserId()));
return success();
}
return error("修改密码异常，请联系管理员");
}
/**

13
ruoyi-admin/src/main/resources/templates/index-topnav.html
View File

@ -391,6 +391,19 @@ $(function() {
$(".navbar-toolbar li a").eq(0).click();
}
}
/* 初始密码提示 */
if([[${initPasswordModify}]] == 1 && [[${isDefaultPwd}]] == true) {
layer.confirm("您的密码还是初始密码，请修改密码！", {
icon: 0,
title: "安全提示",
btn: ['确认' , '取消'],
offset: ['30%']
}, function (index) {
resetPwd();
layer.close(index);
});
}
});
</script>
</body>

13
ruoyi-admin/src/main/resources/templates/index.html
View File

@ -331,6 +331,19 @@ $(function() {
}
}
}
/* 初始密码提示 */
if([[${initPasswordModify}]] == 1 && [[${isDefaultPwd}]] == true) {
layer.confirm("您的密码还是初始密码，请修改密码！", {
icon: 0,
title: "安全提示",
btn: ['确认' , '取消'],
offset: ['30%']
}, function (index) {
resetPwd();
layer.close(index);
});
}
});
</script>
</body>