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

Merge branch 'develop' of https://gitee.com/fusenpack/fusenapi into develop

Browse Source
This commit is contained in:
eson 2023-11-24 13:16:01 +08:00
commit 5005bac4a5
5 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
server/ldap-admin/internal/logic/createldaporganizationlogic.go
View File

@ -55,7 +55,7 @@ func (l *CreateLdapOrganizationLogic) CreateLdapOrganization(req *types.CreateLd
} }
organizationNamePinyin := chinese_to_pinyin.ChineseToPinyin(req.OrganizationName) organizationNamePinyin := chinese_to_pinyin.ChineseToPinyin(req.OrganizationName)
//组装organization dn //组装organization dn
organizationDN := "ou=" + req.OrganizationName + "," + req.ParentOrganizationDN organizationDN := "ou=" + organizationNamePinyin + "," + req.ParentOrganizationDN
err := l.svcCtx.Ldap.Create(organizationDN, map[string][]string{ err := l.svcCtx.Ldap.Create(organizationDN, map[string][]string{
"objectClass": {"top", "groupOfUniqueNames"}, "objectClass": {"top", "groupOfUniqueNames"},
"owner": {req.OwnerDN}, //负责人DN "owner": {req.OwnerDN}, //负责人DN

16
server/ldap-admin/internal/logic/getldaporganizationslogic.go
View File

@ -35,12 +35,12 @@ func NewGetLdapOrganizationsLogic(ctx context.Context, svcCtx *svc.ServiceContex
// } // }
type DNItem struct { type DNItem struct {
MemberCount int `json:"member_count"` MemberCount int `json:"member_count"`
BusinessCategory string `json:"business_category"` OrganizationName string `json:"organization_name"`
OwnerName string `json:"owner_name"` OwnerName string `json:"owner_name"`
OwnerDN string `json:"owner_dn"` OwnerDN string `json:"owner_dn"`
Level int `json:"level"` Level int `json:"level"`
DepartmentDN string `json:"department_dn"` OrganizationDN string `json:"organization_dn"`
DepartmentParentDN string `json:"department_parent_dn"` ParentOrganizationDN string `json:"parent_organization_dn"`
Sort int `json:"sort"` Sort int `json:"sort"`
Child []*DNItem `json:"child"` Child []*DNItem `json:"child"`
} }
@ -73,7 +73,7 @@ func (l *GetLdapOrganizationsLogic) GetLdapOrganizations(req *types.Request, r *
for _, v := range searchResult.Entries { for _, v := range searchResult.Entries {
sortNum++ sortNum++
memberCount := 0 //成员数 memberCount := 0 //成员数
businessCategory := "" //部门名称 departmentName := "" //部门名称
for _, attr := range v.Attributes { for _, attr := range v.Attributes {
switch attr.Name { switch attr.Name {
case "uniqueMember": case "uniqueMember":
@ -87,14 +87,14 @@ func (l *GetLdapOrganizationsLogic) GetLdapOrganizations(req *types.Request, r *
userCn := strings.Split(attr.Values[0], ",")[0] userCn := strings.Split(attr.Values[0], ",")[0]
ownerFilterBuilder.WriteString(fmt.Sprintf("(%s)", userCn)) ownerFilterBuilder.WriteString(fmt.Sprintf("(%s)", userCn))
case "businessCategory": case "businessCategory":
businessCategory = strings.Join(attr.Values, ",") departmentName = strings.Join(attr.Values, ",")
} }
} }
dnSlice := strings.ReplaceAll(v.DN, ","+l.svcCtx.Config.Ldap.BaseDN, "") //把最顶级的组织去掉 dnSlice := strings.ReplaceAll(v.DN, ","+l.svcCtx.Config.Ldap.BaseDN, "") //把最顶级的组织去掉
level := len(strings.Split(dnSlice, ",")) level := len(strings.Split(dnSlice, ","))
data := &DNItem{ data := &DNItem{
DepartmentDN: v.DN, OrganizationDN: v.DN,
BusinessCategory: businessCategory, OrganizationName: departmentName,
Level: level, Level: level,
MemberCount: memberCount, MemberCount: memberCount,
OwnerDN: ownerDN, OwnerDN: ownerDN,
@ -136,7 +136,7 @@ func (l *GetLdapOrganizationsLogic) GetLdapOrganizations(req *types.Request, r *
//有父级 //有父级
parentDN := strings.Join(sl[1:], ",") parentDN := strings.Join(sl[1:], ",")
if parent, ok := mapDN[parentDN]; ok { if parent, ok := mapDN[parentDN]; ok {
v.DepartmentParentDN = parentDN v.ParentOrganizationDN = parentDN
parent.Child = append(parent.Child, v) parent.Child = append(parent.Child, v)
//排序 //排序
sort.Slice(parent.Child, func(i, j int) bool { sort.Slice(parent.Child, func(i, j int) bool {

2
server/ldap-admin/internal/logic/updateldaporganizationlogic.go
View File

@ -44,7 +44,7 @@ func (l *UpdateLdapOrganizationLogic) UpdateLdapOrganization(req *types.UpdateLd
return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误，无效的组织DN") return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误，无效的组织DN")
} }
if err := l.svcCtx.Ldap.Update(req.OrganizationDN, map[string][]string{ if err := l.svcCtx.Ldap.Update(req.OrganizationDN, map[string][]string{
"businessCategory": {req.BusinessCategory}, "businessCategory": {req.OrganizationName},
}); err != nil { }); err != nil {
logx.Error(err) logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "更新ldap组织失败,"+err.Error()) return resp.SetStatusWithMessage(basic.CodeServiceErr, "更新ldap组织失败,"+err.Error())

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

@ -134,8 +134,8 @@ type MenuItem struct {
type CreateLdapOrganizationReq struct { type CreateLdapOrganizationReq struct {
OrganizationName string `json:"organization_name"` //组织名 OrganizationName string `json:"organization_name"` //组织名
ParentOrganizationDN string `json:"parent_organization_dn"` //父级dn ParentOrganizationDN string `json:"parent_organization_dn,optional"` //父级dn
OwnerDN string `json:"owner_dn"` //负责人dn OwnerDN string `json:"owner_dn,optional"` //负责人dn
} }
type DeleteLdapOrganizationReq struct { type DeleteLdapOrganizationReq struct {
@ -144,7 +144,7 @@ type DeleteLdapOrganizationReq struct {
type UpdateLdapOrganizationReq struct { type UpdateLdapOrganizationReq struct {
OrganizationDN string `json:"organization_dn"` //组织dn OrganizationDN string `json:"organization_dn"` //组织dn
BusinessCategory string `json:"business_category"` //组织分类名称 OrganizationName string `json:"organization_name"` //组织分类名称
} }
type CreateLdapUserReq struct { type CreateLdapUserReq struct {

2
server_api/ldap-admin.api
View File

@ -232,7 +232,7 @@ type DeleteLdapOrganizationReq {
//修改ldap组织 //修改ldap组织
type UpdateLdapOrganizationReq { type UpdateLdapOrganizationReq {
OrganizationDN string `json:"organization_dn"` //组织dn OrganizationDN string `json:"organization_dn"` //组织dn
BusinessCategory string `json:"business_category"` //组织分类名称 OrganizationName string `json:"organization_name"` //组织分类名称
} }
//添加ldap用户帐号 //添加ldap用户帐号
type CreateLdapUserReq { type CreateLdapUserReq {