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-17 16:02:35 +08:00
parent ceece7c8f6
commit 5b7aa513a2
13 changed files with 103 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
server/ldap-admin/internal/handler/createldapuserbasegrouphandler.go Normal file
View File

@ -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 CreateLdapUserBaseGroupHandler(svcCtx *svc.ServiceContext) http.HandlerFunc {
return func(w http.ResponseWriter, r *http.Request) {
var req types.Request
userinfo, err := basic.RequestParse(w, r, svcCtx, &req)
if err != nil {
return
}
// 创建一个业务逻辑层实例
l := logic.NewCreateLdapUserBaseGroupLogic(r.Context(), svcCtx)
rl := reflect.ValueOf(l)
basic.BeforeLogic(w, r, rl)
resp := l.CreateLdapUserBaseGroup(&req, userinfo)
if !basic.AfterLogic(w, r, rl, resp) {
basic.NormalAfterLogic(w, r, resp)
}
}
}

5
server/ldap-admin/internal/handler/routes.go
View File

@ -127,6 +127,11 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) {
Path: "/api/ldap-admin/get_ldap_organization_members",
Handler: GetLdapOrganizationMembersHandler(serverCtx),
},
{
Method: http.MethodPost,
Path: "/api/ldap-admin/create_ldap_user_base_group",
Handler: CreateLdapUserBaseGroupHandler(serverCtx),
},
},
)
}

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

@ -45,7 +45,7 @@ func (l *AddLdapOrganizationMemberLogic) AddLdapOrganizationMember(req *types.Ad
err := ldapServer.AddUserToOrganization(req.OrganizationDN, req.UserDN)
if err != nil {
logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "添加成员失败，", err.Error())
return resp.SetStatusWithMessage(basic.CodeServiceErr, "添加成员失败，"+err.Error())
}
return resp.SetStatusWithMessage(basic.CodeOK, "添加成功")
}

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

@ -62,7 +62,7 @@ func (l *CreateLdapOrganizationLogic) CreateLdapOrganization(req *types.CreateLd
})
if err != nil {
logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "ldap服务报错,", err.Error())
return resp.SetStatusWithMessage(basic.CodeServiceErr, "创建组织失败,"+err.Error())
}
return resp.SetStatus(basic.CodeOK)
}

51
server/ldap-admin/internal/logic/createldapuserbasegrouplogic.go Normal file
View File

@ -0,0 +1,51 @@
package logic
import (
"fusenapi/utils/auth"
"fusenapi/utils/basic"
"fusenapi/utils/ldap_lib"
"context"
"fusenapi/server/ldap-admin/internal/svc"
"fusenapi/server/ldap-admin/internal/types"
"github.com/zeromicro/go-zero/core/logx"
)
type CreateLdapUserBaseGroupLogic struct {
logx.Logger
ctx context.Context
svcCtx *svc.ServiceContext
}
func NewCreateLdapUserBaseGroupLogic(ctx context.Context, svcCtx *svc.ServiceContext) *CreateLdapUserBaseGroupLogic {
return &CreateLdapUserBaseGroupLogic{
Logger: logx.WithContext(ctx),
ctx: ctx,
svcCtx: svcCtx,
}
}
// 处理进入前逻辑w,r
// func (l *CreateLdapUserBaseGroupLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) {
// }
func (l *CreateLdapUserBaseGroupLogic) CreateLdapUserBaseGroup(req *types.Request, userinfo *auth.UserInfo) (resp *basic.Response) {
ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN)
err := ldapServer.Create(l.svcCtx.Config.Ldap.PeopleGroupDN, map[string][]string{
"objectClass": {"top", "organizationalUnit"},
"ou": {"FusenTeam"},
"businessCategory": {"FUSEN团队"},
})
if err != nil {
logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "创建用户基础分组失败,"+err.Error())
}
return resp.SetStatusWithMessage(basic.CodeServiceErr, "创建用户基础分组成功")
}
// 处理逻辑后 w,r 如:重定向, resp 必须重新处理
// func (l *CreateLdapUserBaseGroupLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) {
// // httpx.OkJsonCtx(r.Context(), w, resp)
// }

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

@ -81,7 +81,7 @@ func (l *CreateLdapUserLogic) CreateLdapUser(req *types.CreateLdapUserReq, useri
"userPassword": {req.Password},
}); err != nil {
logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "添加用户失败,", err.Error())
return resp.SetStatusWithMessage(basic.CodeServiceErr, "添加用户失败,"+err.Error())
}
return resp.SetStatusWithMessage(basic.CodeOK, "添加用户成功")
}

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

@ -40,7 +40,7 @@ func (l *DeleteLdapOrganizationLogic) DeleteLdapOrganization(req *types.DeleteLd
ldapServer := ldap_lib.NewLdap(l.svcCtx.Ldap, l.svcCtx.Config.Ldap.BaseDN, l.svcCtx.Config.Ldap.RootDN)
if err := ldapServer.Delete(req.OrganizationDN); err != nil {
logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "删除ldap组织失败,", err.Error())
return resp.SetStatusWithMessage(basic.CodeServiceErr, "删除ldap组织失败,"+err.Error())
}
return resp.SetStatusWithMessage(basic.CodeOK, "删除成功")
}

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

@ -43,7 +43,7 @@ func (l *DeleteLdapUserLogic) DeleteLdapUser(req *types.DeleteLdapUserReq, useri
})
if err != nil {
logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "删除用户失败,", err.Error())
return resp.SetStatusWithMessage(basic.CodeServiceErr, "删除用户失败,"+err.Error())
}
return resp.SetStatusWithMessage(basic.CodeOK, "删除用户成功")
}

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

@ -114,7 +114,7 @@ func (l *GetLdapOrganizationsLogic) GetLdapOrganizations(req *types.Request, use
list = append(list, v)
}
}
return resp.SetStatusWithMessage(basic.CodeOK, "", list)
return resp.SetStatusWithMessage(basic.CodeOK, "success", list)
}
// 处理逻辑后 w,r 如:重定向, resp 必须重新处理

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

@ -45,7 +45,7 @@ func (l *RemoveLdapOrganizationMemberLogic) RemoveLdapOrganizationMember(req *ty
err := ldapServer.RemoveUserFromOrganization(req.OrganizationDN, req.UserDN)
if err != nil {
logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "移除成员失败，", err.Error())
return resp.SetStatusWithMessage(basic.CodeServiceErr, "移除成员失败，"+err.Error())
}
return resp.SetStatusWithMessage(basic.CodeOK, "移除成员成功")
}

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

@ -46,7 +46,7 @@ func (l *UpdateLdapOrganizationLogic) UpdateLdapOrganization(req *types.UpdateLd
"businessCategory": {req.BusinessCategory},
}); err != nil {
logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "更新ldap组织失败,", err.Error())
return resp.SetStatusWithMessage(basic.CodeServiceErr, "更新ldap组织失败,"+err.Error())
}
return resp.SetStatusWithMessage(basic.CodeOK, "更新成功")
}

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

@ -64,7 +64,7 @@ func (l *UpdateLdapUserLogic) UpdateLdapUser(req *types.UpdateLdapUserReq, useri
})
if err != nil {
logx.Error(err)
return resp.SetStatusWithMessage(basic.CodeServiceErr, "更新用户失败,", err.Error())
return resp.SetStatusWithMessage(basic.CodeServiceErr, "更新用户失败,"+err.Error())
}
return resp.SetStatusWithMessage(basic.CodeOK, "更新用户成功")
}

3
server_api/ldap-admin.api
View File

@ -79,6 +79,9 @@ service ldap-admin {
//获取ldap组织成员列表
@handler GetLdapOrganizationMembersHandler
get /api/ldap-admin/get_ldap_organization_members(GetLdapOrganizationMembersReq) returns (response);
//创建用户基础组
@handler CreateLdapUserBaseGroupHandler
post /api/ldap-admin/create_ldap_user_base_group(request) returns (response);
}
type (