|
|
@ -15,7 +15,9 @@ import com.ruoyi.common.core.domain.entity.SysUser; |
|
|
import com.ruoyi.common.core.domain.model.LoginBody; |
|
|
import com.ruoyi.common.core.domain.model.LoginBody; |
|
|
import com.ruoyi.common.core.domain.model.LoginUser; |
|
|
import com.ruoyi.common.core.domain.model.LoginUser; |
|
|
import com.ruoyi.common.core.text.Convert; |
|
|
import com.ruoyi.common.core.text.Convert; |
|
|
|
|
|
import com.ruoyi.common.utils.DateUtils; |
|
|
import com.ruoyi.common.utils.SecurityUtils; |
|
|
import com.ruoyi.common.utils.SecurityUtils; |
|
|
|
|
|
import com.ruoyi.common.utils.StringUtils; |
|
|
import com.ruoyi.framework.web.service.SysLoginService; |
|
|
import com.ruoyi.framework.web.service.SysLoginService; |
|
|
import com.ruoyi.framework.web.service.SysPermissionService; |
|
|
import com.ruoyi.framework.web.service.SysPermissionService; |
|
|
import com.ruoyi.framework.web.service.TokenService; |
|
|
import com.ruoyi.framework.web.service.TokenService; |
|
|
@ -86,6 +88,7 @@ public class SysLoginController |
|
|
ajax.put("roles", roles); |
|
|
ajax.put("roles", roles); |
|
|
ajax.put("permissions", permissions); |
|
|
ajax.put("permissions", permissions); |
|
|
ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate())); |
|
|
ajax.put("isDefaultModifyPwd", initPasswordIsModify(user.getPwdUpdateDate())); |
|
|
|
|
|
ajax.put("isPasswordExpired", passwordIsExpiration(user.getPwdUpdateDate())); |
|
|
return ajax; |
|
|
return ajax; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
@ -108,4 +111,21 @@ public class SysLoginController |
|
|
Integer initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify")); |
|
|
Integer initPasswordModify = Convert.toInt(configService.selectConfigByKey("sys.account.initPasswordModify")); |
|
|
return initPasswordModify != null && initPasswordModify == 1 && pwdUpdateDate == null; |
|
|
return initPasswordModify != null && initPasswordModify == 1 && pwdUpdateDate == null; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
// 检查密码是否过期
|
|
|
|
|
|
public boolean passwordIsExpiration(Date pwdUpdateDate) |
|
|
|
|
|
{ |
|
|
|
|
|
Integer passwordValidateDays = Convert.toInt(configService.selectConfigByKey("sys.account.passwordValidateDays")); |
|
|
|
|
|
if (passwordValidateDays != null && passwordValidateDays > 0) |
|
|
|
|
|
{ |
|
|
|
|
|
if (StringUtils.isNull(pwdUpdateDate)) |
|
|
|
|
|
{ |
|
|
|
|
|
// 如果从未修改过初始密码,直接提醒过期
|
|
|
|
|
|
return true; |
|
|
|
|
|
} |
|
|
|
|
|
Date nowDate = DateUtils.getNowDate(); |
|
|
|
|
|
return DateUtils.differentDaysByMillisecond(nowDate, pwdUpdateDate) > passwordValidateDays; |
|
|
|
|
|
} |
|
|
|
|
|
return false; |
|
|
|
|
|
} |
|
|
} |
|
|
} |
|
|
|