表数据查看增加选择展示列功能,域账号登录优化

This commit is contained in:
暮光:城中城
2021-09-25 21:28:37 +08:00
parent 27c0d8e50a
commit b82f6ae2e0
9 changed files with 106 additions and 67 deletions

View File

@@ -46,8 +46,8 @@ public class LoginController {
// TODO 域账号登录,待测试
@Value("${spring.ldap.domainName:}")
private String ldapDomainName;
@Value("${spring.ldap.urls:}")
private String ldapUrls;
@Value("${spring.ldap.enable:}")
private boolean ldapLoginEnable;
/**
* 用户登录
@@ -59,7 +59,7 @@ public class LoginController {
queryWrapper.eq("del_flag", 0);
UserInfo userInfo = userInfoService.getOne(queryWrapper);
// 如果使用域账号登录
if (this.isUseLdapServer()) {
if (ldapLoginEnable) {
LdapPerson ldapPerson = this.getUserFromLdap(username, password);
if (null == ldapPerson) {
return DocResponseJson.warn("用户名或密码错误");
@@ -117,13 +117,6 @@ public class LoginController {
return userInfo;
}
/**
* 是否使用域账号登录
*/
public boolean isUseLdapServer() {
return StringUtils.isNotEmpty(ldapUrls);
}
/**
* 鉴别域账号中是否有该用户
*/