diff --git a/server/dbdata/userauth_ldap.go b/server/dbdata/userauth_ldap.go index 1e6a3f0..1ade05f 100644 --- a/server/dbdata/userauth_ldap.go +++ b/server/dbdata/userauth_ldap.go @@ -39,19 +39,19 @@ func (auth AuthLdap) checkData(authData map[string]interface{}) error { return errors.New("LDAP的服务器地址(含端口)填写有误") } if auth.BindName == "" { - return errors.New("LDAP的用户查询账号不能为空") + return errors.New("LDAP的管理员账号不能为空") } if auth.BindPwd == "" { - return errors.New("LDAP的用户查询密码不能为空") + return errors.New("LDAP的管理员密码不能为空") } if auth.BaseDn == "" || !ValidateDN(auth.BaseDn) { - return errors.New("LDAP的BaseDN填写有误") + return errors.New("LDAP的Base DN填写有误") } if auth.SearchAttr == "" { - return errors.New("LDAP的搜索属性不能为空") + return errors.New("LDAP的用户唯一ID不能为空") } if auth.MemberOf != "" && !ValidateDN(auth.MemberOf) { - return errors.New("LDAP的绑定DN填写有误") + return errors.New("LDAP的受限用户组填写有误") } return nil } @@ -93,7 +93,7 @@ func (auth AuthLdap) checkUser(name, pwd string, g *Group) error { } err = l.Bind(auth.BindName, auth.BindPwd) if err != nil { - return fmt.Errorf("%s LDAP 查询用户的账密有误,请重新检查 %s", name, err.Error()) + return fmt.Errorf("%s LDAP 管理员账号或密码填写有误 %s", name, err.Error()) } filterAttr := "(objectClass=person)" filterAttr += "(" + auth.SearchAttr + "=" + name + ")" diff --git a/web/src/pages/group/List.vue b/web/src/pages/group/List.vue index 1014d6e..72ab1b9 100644 --- a/web/src/pages/group/List.vue +++ b/web/src/pages/group/List.vue @@ -237,34 +237,34 @@ - + - + - + - - + + - - + + - + - - + + - - + + @@ -437,16 +437,16 @@ export default { {required: true, message: '请输入服务器地址(含端口)', trigger: 'blur'} ], "auth.ldap.bind_name": [ - {required: true, message: '请输入查询账号', trigger: 'blur'} + {required: true, message: '请输入管理员账号', trigger: 'blur'} ], "auth.ldap.bind_pwd": [ - {required: true, message: '请输入查询密码', trigger: 'blur'} + {required: true, message: '请输入管理员密码', trigger: 'blur'} ], "auth.ldap.base_dn": [ - {required: true, message: '请输入BaseDN值', trigger: 'blur'} + {required: true, message: '请输入Base DN值', trigger: 'blur'} ], "auth.ldap.search_attr": [ - {required: true, message: '请输入搜索属性', trigger: 'blur'} + {required: true, message: '请输入用户唯一ID', trigger: 'blur'} ], }, }