Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善密码修改

Browse Source
This commit is contained in:
wanggeng888 2021-03-01 15:49:03 +08:00
parent 920874a82d
commit c191deb51e
4 changed files with 34 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
login-base/src/main/resources/templates/config/update.html
View File

@ -114,6 +114,23 @@
</div>
</div>
</div>
<div class="layui-card">
<div class="layui-card-header">
<span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
<a href="javascript:void(0);"><cite>用户首次登录修改密码（该功能需设置密码有效期）</cite></a>
</span>
</div>
<div class="layui-card-body" style="padding: 15px;">
<div class="layui-form-item">
<div>
<input type="radio" name="firstLoginChangePassword" value="close" title="关闭" checked>
</div>
<div>
<input type="radio" name="firstLoginChangePassword" value="open" title="开通">
</div>
</div>
</div>
</div>
<div class="layui-card">
<div class="layui-card-header">
<span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
@ -149,23 +166,6 @@
</div>
</div>
</div>
<div class="layui-card">
<div class="layui-card-header">
<span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
<a href="javascript:void(0);"><cite>用户首次登录修改密码</cite></a>
</span>
</div>
<div class="layui-card-body" style="padding: 15px;">
<div class="layui-form-item">
<div>
<input type="radio" name="firstLoginChangePassword" value="close" title="关闭" checked>
</div>
<div>
<input type="radio" name="firstLoginChangePassword" value="open" title="开通">
</div>
</div>
</div>
</div>
<div class="layui-card">
<div class="layui-card-header">
<span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">

11
service-user/src/main/java/ink/wgink/service/user/pojo/pos/UserPO.java
View File

@ -35,6 +35,7 @@ public class UserPO implements Serializable {
private String userLatitude;
private Integer loginType;
private String gmtPasswordModified;
private String gmtCreate;
public String getUserId() {
return userId == null ? "" : userId;
@ -172,6 +173,14 @@ public class UserPO implements Serializable {
this.gmtPasswordModified = gmtPasswordModified;
}
public String getGmtCreate() {
return gmtCreate == null ? "" : gmtCreate;
}
public void setGmtCreate(String gmtCreate) {
this.gmtCreate = gmtCreate;
}
@Override
public String toString() {
final StringBuilder sb = new StringBuilder("{");
@ -209,6 +218,8 @@ public class UserPO implements Serializable {
.append(loginType);
sb.append(",\"gmtPasswordModified\":\"")
.append(gmtPasswordModified).append('\"');
sb.append(",\"gmtCreate\":\"")
.append(gmtCreate).append('\"');
sb.append('}');
return sb.toString();
}

7
service-user/src/main/java/ink/wgink/service/user/service/impl/UserServiceImpl.java
View File

@ -382,8 +382,11 @@ public class UserServiceImpl extends DefaultBaseService implements IUserService
if (config.get(FIRST_LOGIN_CHANGE_PASSWORD) != null && !StringUtils.isBlank(config.get(FIRST_LOGIN_CHANGE_PASSWORD).toString())) {
firstLoginChangePassword = config.get(FIRST_LOGIN_CHANGE_PASSWORD).toString();
}
String gmtPasswordModified = userDao.getGmtPasswordModified(securityComponent.getCurrentUser().getUserId());
if (StringUtils.equals(FIRST_LOGIN_CHANGE_PASSWORD_OPEN, firstLoginChangePassword) && StringUtils.isBlank(gmtPasswordModified)) {
UserPO userPO = getPO(securityComponent.getCurrentUser().getUserId());
String gmtCreate = userPO.getGmtCreate();
String gmtPasswordModified = userPO.getGmtPasswordModified();
if (StringUtils.equals(FIRST_LOGIN_CHANGE_PASSWORD_OPEN, firstLoginChangePassword) &&
(StringUtils.isBlank(gmtPasswordModified) || StringUtils.equals(gmtCreate.substring(0, 10), gmtPasswordModified.substring(0, 10)))) {
return new SuccessResultData<>(PASSWORD_CHANGE);
}
DateTime gmtPasswordModifiedDateTime = null;

1
service-user/src/main/resources/mybatis/mapper/user-mapper.xml
View File

@ -22,6 +22,7 @@
<result property="userLatitude" column="user_latitude"/>
<result property="loginType" column="login_type"/>
<result property="gmtPasswordModified" column="gmt_password_modified"/>
<result property="gmtCreate" column="gmt_create"/>
</resultMap>
<resultMap id="userDTO" type="ink.wgink.pojo.dtos.user.UserDTO">