From 43b45a5461ab7432b78ee2d0cb5003d1d7b52d17 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Fri, 24 Nov 2023 15:02:11 +0800 Subject: [PATCH] fix --- model/gmodel/ldap_user_gen.go | 9 ++- server/ldap-admin/internal/handler/routes.go | 5 -- .../handler/setldapgroupuserhandler.go | 35 ----------- .../internal/logic/setldapgroupuserlogic.go | 61 ------------------- server/ldap-admin/internal/types/types.go | 5 -- server_api/ldap-admin.api | 9 --- 6 files changed, 4 insertions(+), 120 deletions(-) delete mode 100644 server/ldap-admin/internal/handler/setldapgroupuserhandler.go delete mode 100644 server/ldap-admin/internal/logic/setldapgroupuserlogic.go diff --git a/model/gmodel/ldap_user_gen.go b/model/gmodel/ldap_user_gen.go index 3717eeba..016fe8d1 100644 --- a/model/gmodel/ldap_user_gen.go +++ b/model/gmodel/ldap_user_gen.go @@ -7,11 +7,10 @@ import ( // ldap_user ldap_用户id递增表 type LdapUser struct { - Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // - GroupId *int64 `gorm:"default:0;" json:"group_id"` // 权限组 - UserDn *string `gorm:"index;default:'';" json:"user_dn"` // - Ctime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"ctime"` // - Utime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"utime"` // + Id int64 `gorm:"primary_key;default:0;auto_increment;" json:"id"` // + UserDn *string `gorm:"index;default:'';" json:"user_dn"` // + Ctime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"ctime"` // + Utime *time.Time `gorm:"default:'0000-00-00 00:00:00';" json:"utime"` // } type LdapUserModel struct { db *gorm.DB diff --git a/server/ldap-admin/internal/handler/routes.go b/server/ldap-admin/internal/handler/routes.go index 3a4d4898..a563f1d9 100644 --- a/server/ldap-admin/internal/handler/routes.go +++ b/server/ldap-admin/internal/handler/routes.go @@ -37,11 +37,6 @@ func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { Path: "/api/ldap-admin/set_ldap_group_auth", Handler: SetLdapGroupAuthHandler(serverCtx), }, - { - Method: http.MethodPost, - Path: "/api/ldap-admin/set_ldap_group_user", - Handler: SetLdapGroupUserHandler(serverCtx), - }, { Method: http.MethodGet, Path: "/api/ldap-admin/get_apis", diff --git a/server/ldap-admin/internal/handler/setldapgroupuserhandler.go b/server/ldap-admin/internal/handler/setldapgroupuserhandler.go deleted file mode 100644 index 0f70e5a3..00000000 --- a/server/ldap-admin/internal/handler/setldapgroupuserhandler.go +++ /dev/null @@ -1,35 +0,0 @@ -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 SetLdapGroupUserHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { - return func(w http.ResponseWriter, r *http.Request) { - - var req types.SetLdapGroupUserReq - userinfo, err := basic.RequestParse(w, r, svcCtx, &req) - if err != nil { - return - } - - // 创建一个业务逻辑层实例 - l := logic.NewSetLdapGroupUserLogic(r.Context(), svcCtx) - - rl := reflect.ValueOf(l) - basic.BeforeLogic(w, r, rl) - - resp := l.SetLdapGroupUser(&req, userinfo) - - if !basic.AfterLogic(w, r, rl, resp) { - basic.NormalAfterLogic(w, r, resp) - } - } -} diff --git a/server/ldap-admin/internal/logic/setldapgroupuserlogic.go b/server/ldap-admin/internal/logic/setldapgroupuserlogic.go deleted file mode 100644 index dc66c08f..00000000 --- a/server/ldap-admin/internal/logic/setldapgroupuserlogic.go +++ /dev/null @@ -1,61 +0,0 @@ -package logic - -import ( - "errors" - "fusenapi/model/gmodel" - "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" - "gorm.io/gorm" -) - -type SetLdapGroupUserLogic struct { - logx.Logger - ctx context.Context - svcCtx *svc.ServiceContext -} - -func NewSetLdapGroupUserLogic(ctx context.Context, svcCtx *svc.ServiceContext) *SetLdapGroupUserLogic { - return &SetLdapGroupUserLogic{ - Logger: logx.WithContext(ctx), - ctx: ctx, - svcCtx: svcCtx, - } -} - -// 处理进入前逻辑w,r -// func (l *SetLdapGroupUserLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) { -// } - -func (l *SetLdapGroupUserLogic) SetLdapGroupUser(req *types.SetLdapGroupUserReq, userinfo *auth.UserInfo) (resp *basic.Response) { - // 返回值必须调用Set重新返回, resp可以空指针调用 resp.SetStatus(basic.CodeOK, data) - // userinfo 传入值时, 一定不为null - _, err := l.svcCtx.AllModels.LdapGroup.FindOneById(l.ctx, req.GroupId) - if err != nil { - if errors.Is(err, gorm.ErrRecordNotFound) { - basic.CodeServiceErr.Message = "权限组记录不存在" - } else { - basic.CodeServiceErr.Message = "系统出错" - } - return resp.SetStatus(basic.CodeServiceErr) - } - err = l.svcCtx.AllModels.LdapUser.UpdateById(l.ctx, req.UserId, &gmodel.LdapUser{ - GroupId: &req.GroupId, - }) - if err != nil { - basic.CodeServiceErr.Message = "系统出错" - return resp.SetStatus(basic.CodeServiceErr) - } - return resp.SetStatus(basic.CodeOK) -} - -// 处理逻辑后 w,r 如:重定向, resp 必须重新处理 -// func (l *SetLdapGroupUserLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) { -// // httpx.OkJsonCtx(r.Context(), w, resp) -// } diff --git a/server/ldap-admin/internal/types/types.go b/server/ldap-admin/internal/types/types.go index ccc7cc3d..55c589df 100644 --- a/server/ldap-admin/internal/types/types.go +++ b/server/ldap-admin/internal/types/types.go @@ -59,11 +59,6 @@ type SetLdapCasbinRuleReq struct { ApIds []int64 `json:"api_ids"` } -type SetLdapGroupUserReq struct { - GroupId int64 `json:"group_id"` - UserId int64 `json:"user_id"` -} - type GetApisReq struct { Sort string `form:"sort,optional"` CurrentPage int `form:"current_page,optional,default=1"` diff --git a/server_api/ldap-admin.api b/server_api/ldap-admin.api index b8f8be75..93be5c6e 100644 --- a/server_api/ldap-admin.api +++ b/server_api/ldap-admin.api @@ -26,10 +26,6 @@ service ldap-admin { //权限组授权 @handler SetLdapGroupAuthHandler post /api/ldap-admin/set_ldap_group_auth(SetLdapGroupAuthReq) returns (response); - - //权限组授权用户 - @handler SetLdapGroupUserHandler - post /api/ldap-admin/set_ldap_group_user(SetLdapGroupUserReq) returns (response); //获取API列表 @handler GetApisHandler get /api/ldap-admin/get_apis(GetApisReq) returns (response); @@ -147,11 +143,6 @@ type ( GroupId int64 `json:"group_id"` ApIds []int64 `json:"api_ids"` } - - SetLdapGroupUserReq { - GroupId int64 `json:"group_id"` - UserId int64 `json:"user_id"` - } ) type GetApisReq {