test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'v1.3' of https://github.com/metersphere/metersphere into v1.3

This commit is contained in:
fit2-zhao 2020-09-30 17:10:35 +08:00
parent c64f5847f8 c7a3ed933e
commit fd09d77563
1 changed files with 13 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
backend/src/main/java/io/metersphere/service/UserService.java
View File

@ -487,20 +487,18 @@ public class UserService {
/*修改当前用户用户密码*/ /*修改当前用户用户密码*/
private User updateCurrentUserPwd(EditPassWordRequest request) { private User updateCurrentUserPwd(EditPassWordRequest request) {
if (SessionUtils.getUser() != null) { String oldPassword = CodingUtil.md5(request.getPassword(), "utf-8");
User user = userMapper.selectByPrimaryKey(SessionUtils.getUser().getId()); String newPassword = request.getNewpassword();
String pwd = user.getPassword(); UserExample userExample = new UserExample();
String prepwd = CodingUtil.md5(request.getPassword(), "utf-8"); userExample.createCriteria().andIdEqualTo(SessionUtils.getUser().getId()).andPasswordEqualTo(oldPassword);
String newped = request.getNewpassword(); List<User> users = userMapper.selectByExample(userExample);
if (StringUtils.isNotBlank(prepwd)) { if (!CollectionUtils.isEmpty(users)) {
if (prepwd.trim().equals(pwd.trim())) { User user = users.get(0);
user.setPassword(CodingUtil.md5(newped)); user.setPassword(CodingUtil.md5(newPassword));
user.setUpdateTime(System.currentTimeMillis()); user.setUpdateTime(System.currentTimeMillis());
return user; return user;
}
}
MSException.throwException(Translator.get("password_modification_failed"));
} }
MSException.throwException(Translator.get("password_modification_failed"));
return null; return null;
} }
@ -512,8 +510,8 @@ public class UserService {
/*管理员修改用户密码*/ /*管理员修改用户密码*/
private User updateUserPwd(EditPassWordRequest request) { private User updateUserPwd(EditPassWordRequest request) {
User user = userMapper.selectByPrimaryKey(request.getId()); User user = userMapper.selectByPrimaryKey(request.getId());
String newped = request.getNewpassword(); String newPassword = request.getNewpassword();
user.setPassword(CodingUtil.md5(newped)); user.setPassword(CodingUtil.md5(newPassword));
user.setUpdateTime(System.currentTimeMillis()); user.setUpdateTime(System.currentTimeMillis());
return user; return user;
} }