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

fix(系统设置): LDAP用户首次登录系统失败 

--bug=1018387 --user=李玉号 【系统设置】LDAP用户首次登录系统失败，再次登录成，但是页面显示需要优化
https://www.tapd.cn/55049933/s/1267896
This commit is contained in:
shiziyuan9527 2022-10-19 17:15:00 +08:00 committed by lyh
parent 6c2a01d419
commit 111505f77d
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
framework/gateway/src/main/java/io/metersphere/gateway/service/LdapService.java
View File

@ -98,7 +98,7 @@ public class LdapService {
} }
user.setSource(UserSource.LDAP.name()); user.setSource(UserSource.LDAP.name());
userLoginService.addLdapUser(user); u = userLoginService.addLdapUser(user);
} else { } else {
// 更新 // 更新
u.setName(name); u.setName(name);

3
framework/gateway/src/main/java/io/metersphere/gateway/service/UserLoginService.java
View File

@ -332,12 +332,13 @@ public class UserLoginService {
userMapper.insertSelective(user); userMapper.insertSelective(user);
} }
public void addLdapUser(User user) { public User addLdapUser(User user) {
user.setCreateTime(System.currentTimeMillis()); user.setCreateTime(System.currentTimeMillis());
user.setUpdateTime(System.currentTimeMillis()); user.setUpdateTime(System.currentTimeMillis());
user.setStatus(UserStatus.NORMAL); user.setStatus(UserStatus.NORMAL);
checkEmailIsExist(user.getEmail()); checkEmailIsExist(user.getEmail());
userMapper.insertSelective(user); userMapper.insertSelective(user);
return user;
} }
private void checkEmailIsExist(String email) { private void checkEmailIsExist(String email) {