增加添加部门接口

server/ldap-admin/internal/handler/createldaporganizationhandler.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"net/http"
+	"reflect"
+
+	"fusenapi/utils/basic"
+
+	"fusenapi/server/ldap-admin/internal/logic"
+	"fusenapi/server/ldap-admin/internal/svc"
+	"fusenapi/server/ldap-admin/internal/types"
+)
+
+func CreateLdapOrganizationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		var req types.CreateLdapOrganizationReq
+		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		if err != nil {
+			return
+		}
+
+		// 创建一个业务逻辑层实例
+		l := logic.NewCreateLdapOrganizationLogic(r.Context(), svcCtx)
+
+		rl := reflect.ValueOf(l)
+		basic.BeforeLogic(w, r, rl)
+
+		resp := l.CreateLdapOrganization(&req, userinfo)
+
+		if !basic.AfterLogic(w, r, rl, resp) {
+			basic.NormalAfterLogic(w, r, resp)
+		}
+	}
+}

server/ldap-admin/internal/handler/deleteldaporganizationhandler.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"net/http"
+	"reflect"
+
+	"fusenapi/utils/basic"
+
+	"fusenapi/server/ldap-admin/internal/logic"
+	"fusenapi/server/ldap-admin/internal/svc"
+	"fusenapi/server/ldap-admin/internal/types"
+)
+
+func DeleteLdapOrganizationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		var req types.DeleteLdapOrganizationReq
+		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		if err != nil {
+			return
+		}
+
+		// 创建一个业务逻辑层实例
+		l := logic.NewDeleteLdapOrganizationLogic(r.Context(), svcCtx)
+
+		rl := reflect.ValueOf(l)
+		basic.BeforeLogic(w, r, rl)
+
+		resp := l.DeleteLdapOrganization(&req, userinfo)
+
+		if !basic.AfterLogic(w, r, rl, resp) {
+			basic.NormalAfterLogic(w, r, resp)
+		}
+	}
+}

server/ldap-admin/internal/handler/routes.go

@@ -12,11 +12,6 @@ import (
 func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 	server.AddRoutes(
 		[]rest.Route{
-			{
-				Method:  http.MethodGet,
-				Path:    "/api/ldap-admin/get_departments",
-				Handler: GetDepartmentsHandler(serverCtx),
-			},
 			{
 				Method:  http.MethodGet,
 				Path:    "/api/ldap-admin/get_apis",
@@ -47,6 +42,26 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
 				Path:    "/api/ldap-admin/get_menus",
 				Handler: GetMenusHandler(serverCtx),
 			},
+			{
+				Method:  http.MethodGet,
+				Path:    "/api/ldap-admin/get_departments",
+				Handler: GetDepartmentsHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/api/ldap-admin/create_ldap_orgination",
+				Handler: CreateLdapOrganizationHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/api/ldap-admin/delete_ldap_orgination",
+				Handler: DeleteLdapOrganizationHandler(serverCtx),
+			},
+			{
+				Method:  http.MethodPost,
+				Path:    "/api/ldap-admin/update_ldap_orgination",
+				Handler: UpdateLdapOrganizationHandler(serverCtx),
+			},
 		},
 	)
 }

server/ldap-admin/internal/handler/updateldaporganizationhandler.go

@@ -0,0 +1,35 @@
+package handler
+
+import (
+	"net/http"
+	"reflect"
+
+	"fusenapi/utils/basic"
+
+	"fusenapi/server/ldap-admin/internal/logic"
+	"fusenapi/server/ldap-admin/internal/svc"
+	"fusenapi/server/ldap-admin/internal/types"
+)
+
+func UpdateLdapOrganizationHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+
+		var req types.UpdateLdapOrganizationReq
+		userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
+		if err != nil {
+			return
+		}
+
+		// 创建一个业务逻辑层实例
+		l := logic.NewUpdateLdapOrganizationLogic(r.Context(), svcCtx)
+
+		rl := reflect.ValueOf(l)
+		basic.BeforeLogic(w, r, rl)
+
+		resp := l.UpdateLdapOrganization(&req, userinfo)
+
+		if !basic.AfterLogic(w, r, rl, resp) {
+			basic.NormalAfterLogic(w, r, resp)
+		}
+	}
+}

server/ldap-admin/internal/logic/createldaporganizationlogic.go

@@ -0,0 +1,69 @@
+package logic
+
+import (
+	"fusenapi/utils/auth"
+	"fusenapi/utils/basic"
+	"fusenapi/utils/ldap_lib"
+	"strings"
+
+	"context"
+
+	"fusenapi/server/ldap-admin/internal/svc"
+	"fusenapi/server/ldap-admin/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type CreateLdapOrganizationLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewCreateLdapOrganizationLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateLdapOrganizationLogic {
+	return &CreateLdapOrganizationLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+// 处理进入前逻辑w,r
+// func (l *CreateLdapOrganizationLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
+// }
+
+func (l *CreateLdapOrganizationLogic) CreateLdapOrganization(req *types.CreateLdapOrganizationReq, userinfo *auth.UserInfo) (resp *basic.Response) {
+	req.OrganizationOu = strings.Trim(req.OrganizationOu, " ")
+	req.ParentOrganizationDN = strings.Trim(req.ParentOrganizationDN, " ")
+	req.BusinessCategory = strings.Trim(req.BusinessCategory, " ")
+	if req.OrganizationOu == "" {
+		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,organization_ou不能为空")
+	}
+	if len(strings.Split(req.OrganizationOu, ",")) != 1 {
+		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,不合法的organization_ou")
+	}
+	if req.ParentOrganizationDN == "" {
+		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,parentOrganization_dn不能为空")
+	}
+	if req.BusinessCategory == "" {
+		return resp.SetStatusWithMessage(basic.CodeRequestParamsErr, "参数错误,business_category不能为空")
+	}
+	//组装organization dn
+	organizationDN := "ou=" + req.OrganizationOu + "," + req.ParentOrganizationDN
+	ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN)
+	err := ldapServer.Create(organizationDN, map[string][]string{
+		"objectClass":      {"top", "organizationalUnit"},
+		"ou":               {req.OrganizationOu},
+		"businessCategory": {req.BusinessCategory},
+	})
+	if err != nil {
+		logx.Error(err)
+		return resp.SetStatusWithMessage(basic.CodeServiceErr, "ldap服务报错,", err.Error())
+	}
+	return resp.SetStatus(basic.CodeOK)
+}
+
+// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
+// func (l *CreateLdapOrganizationLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
+// // httpx.OkJsonCtx(r.Context(), w, resp)
+// }

server/ldap-admin/internal/logic/deleteldaporganizationlogic.go

@@ -0,0 +1,43 @@
+package logic
+
+import (
+	"fusenapi/utils/auth"
+	"fusenapi/utils/basic"
+
+	"context"
+
+	"fusenapi/server/ldap-admin/internal/svc"
+	"fusenapi/server/ldap-admin/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type DeleteLdapOrganizationLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewDeleteLdapOrganizationLogic(ctx context.Context, svcCtx *svc.ServiceContext) *DeleteLdapOrganizationLogic {
+	return &DeleteLdapOrganizationLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+// 处理进入前逻辑w,r
+// func (l *DeleteLdapOrganizationLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
+// }
+
+func (l *DeleteLdapOrganizationLogic) DeleteLdapOrganization(req *types.DeleteLdapOrganizationReq, userinfo *auth.UserInfo) (resp *basic.Response) {
+	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
+	// userinfo 传入值时, 一定不为null
+
+	return resp.SetStatus(basic.CodeOK)
+}
+
+// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
+// func (l *DeleteLdapOrganizationLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
+// // httpx.OkJsonCtx(r.Context(), w, resp)
+// }

server/ldap-admin/internal/logic/getdepartmentslogic.go

@@ -45,7 +45,7 @@ func (l *GetDepartmentsLogic) GetDepartments(req *types.Request, userinfo *auth.
 	if len(rootCn) == 0 {
 		return resp.SetStatusWithMessage(basic.CodeServiceErr, "root用户DN未设置")
 	}
-	ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN, l.svcCtx.Config.Ldap.PeopleGroupOu)
+	ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN)
 	filter := "(&(objectClass=*)(!(ou=" + l.svcCtx.Config.Ldap.PeopleGroupOu + "))(!(" + rootCn[0] + ")))" //所有object但是不包括people以及root用户
 	searchResult, err := ldapServer.Search(l.svcCtx.Config.Ldap.BaseDN, filter, nil, nil)
 	if err != nil {

server/ldap-admin/internal/logic/updateldaporganizationlogic.go

@@ -0,0 +1,43 @@
+package logic
+
+import (
+	"fusenapi/utils/auth"
+	"fusenapi/utils/basic"
+
+	"context"
+
+	"fusenapi/server/ldap-admin/internal/svc"
+	"fusenapi/server/ldap-admin/internal/types"
+
+	"github.com/zeromicro/go-zero/core/logx"
+)
+
+type UpdateLdapOrganizationLogic struct {
+	logx.Logger
+	ctx    context.Context
+	svcCtx *svc.ServiceContext
+}
+
+func NewUpdateLdapOrganizationLogic(ctx context.Context, svcCtx *svc.ServiceContext) *UpdateLdapOrganizationLogic {
+	return &UpdateLdapOrganizationLogic{
+		Logger: logx.WithContext(ctx),
+		ctx:    ctx,
+		svcCtx: svcCtx,
+	}
+}
+
+// 处理进入前逻辑w,r
+// func (l *UpdateLdapOrganizationLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
+// }
+
+func (l *UpdateLdapOrganizationLogic) UpdateLdapOrganization(req *types.UpdateLdapOrganizationReq, userinfo *auth.UserInfo) (resp *basic.Response) {
+	// 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data)
+	// userinfo 传入值时, 一定不为null
+
+	return resp.SetStatus(basic.CodeOK)
+}
+
+// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
+// func (l *UpdateLdapOrganizationLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
+// // httpx.OkJsonCtx(r.Context(), w, resp)
+// }

server/ldap-admin/internal/types/types.go

@@ -97,6 +97,21 @@ type MenuItem struct {
 	Status   int64  `json:"status"`
 }
 
+type CreateLdapOrganizationReq struct {
+	OrganizationOu       string `json:"organization_ou"`        //组织ou
+	BusinessCategory     string `json:"business_category"`      //组织分类名称
+	ParentOrganizationDN string `json:"parent_organization_dn"` //父级dn
+}
+
+type DeleteLdapOrganizationReq struct {
+	OrganizationDN string `json:"organization_dn"` //组织dn
+}
+
+type UpdateLdapOrganizationReq struct {
+	OrganizationDN   string `json:"organization_dn"`   //组织dn
+	BusinessCategory string `json:"business_category"` //组织分类名称
+}
+
 type Request struct {
 }
 

server_api/ldap-admin.api

@@ -10,9 +10,6 @@ info (
 import "basic.api"
 
 service ldap-admin {
-	//获取部门列表
-	@handler GetDepartmentsHandler
-	get /api/ldap-admin/get_departments(request) returns (response);
 	//获取API列表
 	@handler GetApisHandler
 	get /api/ldap-admin/get_apis(GetApisReq) returns (response);
@@ -33,6 +30,18 @@ service ldap-admin {
 	//获取菜单列表
 	@handler GetMenusHandler
 	get /api/ldap-admin/get_menus(GetMenusReq) returns (response);
+	//获取ldap组织列表
+	@handler GetDepartmentsHandler
+	get /api/ldap-admin/get_departments(request) returns (response);
+	//增加ldap组织
+	@handler CreateLdapOrganizationHandler
+	post /api/ldap-admin/create_ldap_orgination(CreateLdapOrganizationReq) returns (response);
+	//删除ldap组织
+	@handler DeleteLdapOrganizationHandler
+	post /api/ldap-admin/delete_ldap_orgination(DeleteLdapOrganizationReq) returns (response);
+	//修改组织
+	@handler UpdateLdapOrganizationHandler
+	post /api/ldap-admin/update_ldap_orgination(UpdateLdapOrganizationReq) returns (response);
 }
 
 type GetApisReq {
@@ -122,3 +131,18 @@ type MenuItem {
 	ParentId int64  `json:"parent_id"`
 	Status   int64  `json:"status"`
 }
+//增加ldap组织
+type CreateLdapOrganizationReq {
+	OrganizationOu       string `json:"organization_ou"`        //组织ou
+	BusinessCategory     string `json:"business_category"`      //组织分类名称
+	ParentOrganizationDN string `json:"parent_organization_dn"` //父级dn
+}
+//删除ldap组织
+type DeleteLdapOrganizationReq {
+	OrganizationDN string `json:"organization_dn"` //组织dn
+}
+//修改ldap组织
+type UpdateLdapOrganizationReq {
+	OrganizationDN   string `json:"organization_dn"`   //组织dn
+	BusinessCategory string `json:"business_category"` //组织分类名称
+}

utils/ldap_lib/ldap_group.go

@@ -8,18 +8,16 @@ import (
 )
 
 type Ldap struct {
-	baseDN        string
+	baseDN string
-	rootDN        string
+	rootDN string
-	peopleGroupOu string
+	conn   *ldap.Conn
-	conn          *ldap.Conn
 }
 
-func NewLdap(conn *ldap.Conn, baseDN, rootDN, peopleGroupOu string) *Ldap {
+func NewLdap(conn *ldap.Conn, baseDN, rootDN string) *Ldap {
 	return &Ldap{
-		baseDN:        baseDN,
+		baseDN: baseDN,
-		rootDN:        rootDN,
+		rootDN: rootDN,
-		peopleGroupOu: peopleGroupOu,
+		conn:   conn,
-		conn:          conn,
 	}
 }