fusen/fusenapi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
laodaming 2023-11-20 12:08:04 +08:00
parent 833f0ffcf5
commit e7eeb9114c
4 changed files with 41 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
server/ldap-admin/internal/logic/getldapuserinfologic.go
View File

@ -46,13 +46,14 @@ func (l *GetLdapUserInfoLogic) GetLdapUserInfo(req *types.GetLdapUserInfoReq, us
return resp.SetStatusWithMessage(basic.CodeServiceErr, err.Error()) return resp.SetStatusWithMessage(basic.CodeServiceErr, err.Error())
} }
return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetLdapUserInfoRsp{ return resp.SetStatusWithMessage(basic.CodeOK, "success", types.GetLdapUserInfoRsp{
UserId: user.UserId, UserId: user.UserId,
UserDN: user.UserDN, UserDN: user.UserDN,
UserName: user.UserName, UserName: user.UserName,
Email: user.Email, Email: user.Email,
Mobile: user.Mobile, Mobile: user.Mobile,
Avatar: user.Avatar, Avatar: user.Avatar,
Status: user.Status, Status: user.Status,
EmployeeTpye: user.EmployeeType,
}) })
} }

15
server/ldap-admin/internal/types/types.go
View File

@ -163,13 +163,14 @@ type GetLdapUserInfoReq struct {
} }
type GetLdapUserInfoRsp struct { type GetLdapUserInfoRsp struct {
UserId int64 `json:"userId"` UserId int64 `json:"userId"`
UserDN string `json:"user_dn"` UserDN string `json:"user_dn"`
UserName string `json:"user_name"` //用户名 UserName string `json:"user_name"` //用户名
Email string `json:"email"` //邮箱 Email string `json:"email"` //邮箱
Mobile string `json:"mobile"` //手机号 Mobile string `json:"mobile"` //手机号
Avatar string `json:"avatar"` //头像地址 Avatar string `json:"avatar"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 EmployeeTpye int64 `json:"employee_tpye"` //雇佣类型 1正式 2实习 3外包
Status int64 `json:"status,options=0|1"` //状态 1正常0离职
} }
type AddLdapOrganizationMemberReq struct { type AddLdapOrganizationMemberReq struct {

15
server_api/ldap-admin.api
View File

@ -243,13 +243,14 @@ type GetLdapUserInfoReq {
UserDN string `form:"user_dn"` //用户dn UserDN string `form:"user_dn"` //用户dn
} }
type GetLdapUserInfoRsp { type GetLdapUserInfoRsp {
UserId int64 `json:"userId"` UserId int64 `json:"userId"`
UserDN string `json:"user_dn"` UserDN string `json:"user_dn"`
UserName string `json:"user_name"` //用户名 UserName string `json:"user_name"` //用户名
Email string `json:"email"` //邮箱 Email string `json:"email"` //邮箱
Mobile string `json:"mobile"` //手机号 Mobile string `json:"mobile"` //手机号
Avatar string `json:"avatar"` //头像地址 Avatar string `json:"avatar"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 EmployeeTpye int64 `json:"employee_tpye"` //雇佣类型 1正式 2实习 3外包
Status int64 `json:"status,options=0|1"` //状态 1正常0离职
} }
//ldap组织添加成员 //ldap组织添加成员
type AddLdapOrganizationMemberReq { type AddLdapOrganizationMemberReq {

25
utils/ldap_lib/ldap_user.go
View File

@ -9,14 +9,15 @@ import (
) )
type GetLdapUserInfoRsp struct { type GetLdapUserInfoRsp struct {
UserId int64 `json:"userId"` UserId int64 `json:"userId"`
UserDN string `json:"user_dn"` UserDN string `json:"user_dn"`
UserName string `json:"user_name"` //用户名 UserName string `json:"user_name"` //用户名
Password string `json:"password"` //密码 Password string `json:"password"` //密码
Email string `json:"email"` //邮箱 Email string `json:"email"` //邮箱
Mobile string `json:"mobile"` //手机号 Mobile string `json:"mobile"` //手机号
Avatar string `json:"avatar"` //头像地址 Avatar string `json:"avatar"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 EmployeeType int64 `json:"employee_type"` //1正式 2实习 3外包
Status int64 `json:"status,options=0|1"` //状态 1正常0离职
} }
func (l *Ldap) GetLdapUserInfo(userDN string) (*GetLdapUserInfoRsp, error) { func (l *Ldap) GetLdapUserInfo(userDN string) (*GetLdapUserInfoRsp, error) {
@ -54,6 +55,14 @@ func (l *Ldap) GetLdapUserInfo(userDN string) (*GetLdapUserInfoRsp, error) {
user.Avatar = strings.Join(attr.Values, "") user.Avatar = strings.Join(attr.Values, "")
case "userPassword": //密码 case "userPassword": //密码
user.Password = strings.Join(attr.Values, ",") user.Password = strings.Join(attr.Values, ",")
case "employeeType": //员工类型
if len(attr.Values) == 0 {
continue
}
user.EmployeeType, err = strconv.ParseInt(attr.Values[0], 10, 64)
if err != nil {
return nil, errors.New("用户类型转数字失败")
}
case "postalCode": //状态 case "postalCode": //状态
if len(attr.Values) == 0 { if len(attr.Values) == 0 {
continue continue