admin/wisdomisite-java
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

是否开启用户密码超期重置功能

Browse Source
This commit is contained in:
guoshengxiong 2024-08-09 16:09:21 +08:00
parent 8775bbda96
commit fcc31f2e6e
2 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/zhgd/xmgl/modules/basicdata/entity/SystemLogoConfig.java
View File

@ -104,6 +104,8 @@ public class SystemLogoConfig implements Serializable {
private java.lang.Integer certificateExpireWarnAheadDay;
@ApiModelProperty(value = "是否显示资料中心0不显示1显示")
private java.lang.Integer showFileCenter;
@ApiModelProperty(value = "是否开启用户密码超期重置")
private java.lang.Integer enablePasswordReset;
@TableField(exist = false)
private java.lang.String fileStorageType;
}

35
src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
View File

@ -382,6 +382,18 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
result.put("sn", toCompanyProject.getSn());
SystemLogoConfig config = getSystemLogoConfig(toCompanyProject.getHeadquartersSn());
result.put("systemLogoConfig", config);
if (Objects.equals(config.getEnablePasswordReset(),1)) {
//密码过期就返回userId，提示修改密码
if (PwUtil.checkPwExpire(systemUser.getPwUpdateTime())) {
HashMap<String, Object> m = new HashMap<>(16);
m.put("expire", true);
m.put("userId", systemUser.getUserId());
m.put("account", systemUser.getAccount());
m.put("msg", "需要修改密码");
m.put("token", jwtTokenProvider.createToken(systemUser.getAccount(), 3600));
return m;
}
}
}
return result;
} else {
@ -439,6 +451,18 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
companyConfig.setEffectiveTime(60 * 60 * 24 * 30 * 12);
}
SystemLogoConfig slc = this.getSystemLogoConfig(companyConfig.getHeadquartersSn());
if (Objects.equals(slc.getEnablePasswordReset(),1)) {
//密码过期就返回userId，提示修改密码
if (PwUtil.checkPwExpire(systemUser.getPwUpdateTime())) {
HashMap<String, Object> m = new HashMap<>(16);
m.put("expire", true);
m.put("userId", systemUser.getUserId());
m.put("account", systemUser.getAccount());
m.put("msg", "需要修改密码");
m.put("token", jwtTokenProvider.createToken(systemUser.getAccount(), 3600));
return m;
}
}
String token = jwtTokenProvider.createToken(account, companyConfig.getEffectiveTime(), slc != null ? slc.getLoginTimeOut() : null);
UserEnterprise userEnterprise = userEnterpriseService.selectUserEnterpriseByUserId(systemUser.getUserId());
if (userEnterprise != null) {
@ -1546,17 +1570,6 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
}
}
//密码过期就返回userId，提示修改密码
if (PwUtil.checkPwExpire(systemUser.getPwUpdateTime())) {
HashMap<String, Object> m = new HashMap<>(16);
m.put("expire", true);
m.put("userId", systemUser.getUserId());
m.put("account", systemUser.getAccount());
m.put("msg", "需要修改密码");
m.put("token", jwtTokenProvider.createToken(systemUser.getAccount(), 3600));
return m;
}
authenticationManager.authenticate(new UsernamePasswordAuthenticationToken(account, systemUser.getShowPassword()));
return doLogin(map, systemUser);