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-21 10:13:12 +08:00
parent f4cbb23aa0
commit f946f2926a
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
server/ldap-admin/internal/logic/createldapuserlogic.go
View File

@ -42,6 +42,9 @@ func (l *CreateLdapUserLogic) CreateLdapUser(req *types.CreateLdapUserReq, useri
req.Mobile = strings.Trim(req.Mobile, " ") req.Mobile = strings.Trim(req.Mobile, " ")
req.Email = strings.Trim(req.Email, " ") req.Email = strings.Trim(req.Email, " ")
req.Password = strings.Trim(req.Password, " ") req.Password = strings.Trim(req.Password, " ")
if req.GroupId < 0 {
req.GroupId = 0
}
if req.UserName == "" { if req.UserName == "" {
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误，用户名不能为空") return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误，用户名不能为空")
} }

4
server/ldap-admin/internal/logic/updateldapuserlogic.go
View File

@ -40,7 +40,7 @@ func (l *UpdateLdapUserLogic) UpdateLdapUser(req *types.UpdateLdapUserReq, useri
req.Mobile = strings.Trim(req.Mobile, " ") req.Mobile = strings.Trim(req.Mobile, " ")
req.Avatar = strings.Trim(req.Avatar, " ") req.Avatar = strings.Trim(req.Avatar, " ")
req.UserName = strings.Trim(req.UserName, " ") req.UserName = strings.Trim(req.UserName, " ")
if req.AuthGroupId < 0 { if req.GroupId < 0 {
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误，无效的用户权限组id") return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误，无效的用户权限组id")
} }
if len(req.UserDN) <= 3 || req.UserDN[:3] != "cn=" { if len(req.UserDN) <= 3 || req.UserDN[:3] != "cn=" {
@ -56,7 +56,7 @@ func (l *UpdateLdapUserLogic) UpdateLdapUser(req *types.UpdateLdapUserReq, useri
//更新的属性 //更新的属性
attr := map[string][]string{ attr := map[string][]string{
"homeDirectory": {"/home/users/" + userNamePinyin}, "homeDirectory": {"/home/users/" + userNamePinyin},
"departmentNumber": {fmt.Sprintf("%d", req.AuthGroupId)}, "departmentNumber": {fmt.Sprintf("%d", req.GroupId)},
"sn": {req.UserName}, "sn": {req.UserName},
"uid": {userNamePinyin}, "uid": {userNamePinyin},
"mobile": {req.Mobile}, "mobile": {req.Mobile},

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

@ -137,7 +137,7 @@ type CreateLdapUserReq struct {
Mobile string `json:"mobile"` //手机号 Mobile string `json:"mobile"` //手机号
Avatar string `json:"avatar"` //头像地址 Avatar string `json:"avatar"` //头像地址
EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包 EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包
GroupId int64 `json:"group_id"` //分组id GroupId int64 `json:"group_id,optional"` //分组id
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 Status int64 `json:"status,options=0|1"` //状态 1正常0离职
} }
@ -148,7 +148,7 @@ type UpdateLdapUserReq struct {
Avatar string `json:"avatar,optional"` //头像地址 Avatar string `json:"avatar,optional"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 Status int64 `json:"status,options=0|1"` //状态 1正常0离职
EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包 EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包
AuthGroupId int64 `json:"auth_group_id,optional"` //权限分组id GroupId int64 `json:"group_id,optional"` //权限分组id
} }
type UpdateLdapUserPwdReq struct { type UpdateLdapUserPwdReq struct {

4
server_api/ldap-admin.api
View File

@ -221,7 +221,7 @@ type CreateLdapUserReq {
Mobile string `json:"mobile"` //手机号 Mobile string `json:"mobile"` //手机号
Avatar string `json:"avatar"` //头像地址 Avatar string `json:"avatar"` //头像地址
EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包 EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包
GroupId int64 `json:"group_id"` //分组id GroupId int64 `json:"group_id,optional"` //分组id
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 Status int64 `json:"status,options=0|1"` //状态 1正常0离职
} }
//修改ldap用户信息 //修改ldap用户信息
@ -232,7 +232,7 @@ type UpdateLdapUserReq {
Avatar string `json:"avatar,optional"` //头像地址 Avatar string `json:"avatar,optional"` //头像地址
Status int64 `json:"status,options=0|1"` //状态 1正常0离职 Status int64 `json:"status,options=0|1"` //状态 1正常0离职
EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包 EmployeeType int64 `json:"employee_type,options=1|2|3"` //1正式 2实习 3外包
AuthGroupId int64 `json:"auth_group_id,optional"` //权限分组id GroupId int64 `json:"group_id,optional"` //权限分组id
} }
//修改用户密码 //修改用户密码
type UpdateLdapUserPwdReq { type UpdateLdapUserPwdReq {