From eec742d48a6f824bf59e13796a4535114f9367b8 Mon Sep 17 00:00:00 2001 From: laodaming <11058467+laudamine@user.noreply.gitee.com> Date: Mon, 13 Nov 2023 17:52:20 +0800 Subject: [PATCH] fix --- server/ldap-admin/etc/ldap-admin.yaml | 10 +++ server/ldap-admin/internal/config/config.go | 10 +++ .../internal/handler/getdepartmentshandler.go | 35 ++++++++ server/ldap-admin/internal/handler/routes.go | 22 +++++ .../internal/logic/getdepartmentslogic.go | 41 ++++++++++ .../ldap-admin/internal/svc/servicecontext.go | 26 ++++++ server/ldap-admin/internal/types/types.go | 80 +++++++++++++++++++ server/ldap-admin/ldap-admin.go | 33 ++++++++ server_api/ldap-admin.api | 22 +++++ 9 files changed, 279 insertions(+) create mode 100644 server/ldap-admin/etc/ldap-admin.yaml create mode 100644 server/ldap-admin/internal/config/config.go create mode 100644 server/ldap-admin/internal/handler/getdepartmentshandler.go create mode 100644 server/ldap-admin/internal/handler/routes.go create mode 100644 server/ldap-admin/internal/logic/getdepartmentslogic.go create mode 100644 server/ldap-admin/internal/svc/servicecontext.go create mode 100644 server/ldap-admin/internal/types/types.go create mode 100644 server/ldap-admin/ldap-admin.go create mode 100644 server_api/ldap-admin.api diff --git a/server/ldap-admin/etc/ldap-admin.yaml b/server/ldap-admin/etc/ldap-admin.yaml new file mode 100644 index 00000000..2fe96312 --- /dev/null +++ b/server/ldap-admin/etc/ldap-admin.yaml @@ -0,0 +1,10 @@ +Name: ldap-admin +Host: 0.0.0.0 +Port: 9925 +Timeout: 15000 #服务超时时间(毫秒) +SourceMysql: fsreaderwriter:XErSYmLELKMnf3Dh@tcp(fusen.cdmigcvz3rle.us-east-2.rds.amazonaws.com:3306)/fusen +SourceRabbitMq: "" +Auth: + AccessSecret: fusen2023 + AccessExpire: 2592000 + RefreshAfter: 1592000 diff --git a/server/ldap-admin/internal/config/config.go b/server/ldap-admin/internal/config/config.go new file mode 100644 index 00000000..c8e913a7 --- /dev/null +++ b/server/ldap-admin/internal/config/config.go @@ -0,0 +1,10 @@ +package config + +import "github.com/zeromicro/go-zero/rest" + +type Config struct { + rest.RestConf + SourceMysql string + Auth types.Auth + SourceRabbitMq string +} diff --git a/server/ldap-admin/internal/handler/getdepartmentshandler.go b/server/ldap-admin/internal/handler/getdepartmentshandler.go new file mode 100644 index 00000000..c8741070 --- /dev/null +++ b/server/ldap-admin/internal/handler/getdepartmentshandler.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 GetDepartmentsHandler(svcCtx *svc.ServiceContext) http.HandlerFunc { + return func(w http.ResponseWriter, r *http.Request) { + + var req types.GetDepartmentsReq + userinfo, err := basic.RequestParse(w, r, svcCtx, &req) + if err != nil { + return + } + + // 创建一个业务逻辑层实例 + l := logic.NewGetDepartmentsLogic(r.Context(), svcCtx) + + rl := reflect.ValueOf(l) + basic.BeforeLogic(w, r, rl) + + resp := l.GetDepartments(&req, userinfo) + + if !basic.AfterLogic(w, r, rl, resp) { + basic.NormalAfterLogic(w, r, resp) + } + } +} diff --git a/server/ldap-admin/internal/handler/routes.go b/server/ldap-admin/internal/handler/routes.go new file mode 100644 index 00000000..9f11e45a --- /dev/null +++ b/server/ldap-admin/internal/handler/routes.go @@ -0,0 +1,22 @@ +// Code generated by goctl. DO NOT EDIT. +package handler + +import ( + "net/http" + + "fusenapi/server/ldap-admin/internal/svc" + + "github.com/zeromicro/go-zero/rest" +) + +func RegisterHandlers(server *rest.Server, serverCtx *svc.ServiceContext) { + server.AddRoutes( + []rest.Route{ + { + Method: http.MethodPost, + Path: "/api/ldap-admin/get_departments", + Handler: GetDepartmentsHandler(serverCtx), + }, + }, + ) +} diff --git a/server/ldap-admin/internal/logic/getdepartmentslogic.go b/server/ldap-admin/internal/logic/getdepartmentslogic.go new file mode 100644 index 00000000..a3d5f03a --- /dev/null +++ b/server/ldap-admin/internal/logic/getdepartmentslogic.go @@ -0,0 +1,41 @@ +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 GetDepartmentsLogic struct { + logx.Logger + ctx context.Context + svcCtx *svc.ServiceContext +} + +func NewGetDepartmentsLogic(ctx context.Context, svcCtx *svc.ServiceContext) *GetDepartmentsLogic { + return &GetDepartmentsLogic{ + Logger: logx.WithContext(ctx), + ctx: ctx, + svcCtx: svcCtx, + } +} + +// 处理进入前逻辑w,r +// func (l *GetDepartmentsLogic) BeforeLogic(w http.ResponseWriter, r *http.Request) { +// } + +func (l *GetDepartmentsLogic) GetDepartments(req *types.GetDepartmentsReq, userinfo *auth.UserInfo) (resp *basic.Response) { + + return resp.SetStatus(basic.CodeOK) +} + +// 处理逻辑后 w,r 如:重定向, resp 必须重新处理 +// func (l *GetDepartmentsLogic) AfterLogic(w http.ResponseWriter, r *http.Request, resp *basic.Response) { +// // httpx.OkJsonCtx(r.Context(), w, resp) +// } diff --git a/server/ldap-admin/internal/svc/servicecontext.go b/server/ldap-admin/internal/svc/servicecontext.go new file mode 100644 index 00000000..595bf737 --- /dev/null +++ b/server/ldap-admin/internal/svc/servicecontext.go @@ -0,0 +1,26 @@ +package svc + +import ( + "fusenapi/initalize" + "fusenapi/model/gmodel" + "fusenapi/server/ldap-admin/internal/config" + "gorm.io/gorm" +) + +type ServiceContext struct { + Config config.Config + MysqlConn *gorm.DB + AllModels *gmodel.AllModelsGen + RabbitMq *initalize.RabbitMqHandle +} + +func NewServiceContext(c config.Config) *ServiceContext { + conn := initalize.InitMysql(c.SourceMysql) + + return &ServiceContext{ + Config: c, + MysqlConn: conn, + AllModels: gmodel.NewAllModels(initalize.InitMysql(c.SourceMysql)), + RabbitMq: initalize.InitRabbitMq(c.SourceRabbitMq, nil), + } +} diff --git a/server/ldap-admin/internal/types/types.go b/server/ldap-admin/internal/types/types.go new file mode 100644 index 00000000..f05a40ef --- /dev/null +++ b/server/ldap-admin/internal/types/types.go @@ -0,0 +1,80 @@ +// Code generated by goctl. DO NOT EDIT. +package types + +import ( + "fusenapi/utils/basic" +) + +type GetDepartmentsReq struct { + CurrentPage int `form:"current_page"` + PageSize int `form:"page_size"` +} + +type Request struct { +} + +type Response struct { + Code int `json:"code"` + Message string `json:"msg"` + Data interface{} `json:"data"` +} + +type Auth struct { + AccessSecret string `json:"accessSecret"` + AccessExpire int64 `json:"accessExpire"` + RefreshAfter int64 `json:"refreshAfter"` +} + +type File struct { + Filename string `fsfile:"filename"` + Header map[string][]string `fsfile:"header"` + Size int64 `fsfile:"size"` + Data []byte `fsfile:"data"` +} + +type Meta struct { + TotalCount int64 `json:"total_count"` + PageCount int64 `json:"page_count"` + CurrentPage int `json:"current_page"` + PerPage int `json:"per_page"` +} + +// Set 设置Response的Code和Message值 +func (resp *Response) Set(Code int, Message string) *Response { + return &Response{ + Code: Code, + Message: Message, + } +} + +// Set 设置整个Response +func (resp *Response) SetWithData(Code int, Message string, Data interface{}) *Response { + return &Response{ + Code: Code, + Message: Message, + Data: Data, + } +} + +// SetStatus 设置默认StatusResponse(内部自定义) 默认msg, 可以带data, data只使用一个参数 +func (resp *Response) SetStatus(sr *basic.StatusResponse, data ...interface{}) *Response { + newResp := &Response{ + Code: sr.Code, + } + if len(data) == 1 { + newResp.Data = data[0] + } + return newResp +} + +// SetStatusWithMessage 设置默认StatusResponse(内部自定义) 非默认msg, 可以带data, data只使用一个参数 +func (resp *Response) SetStatusWithMessage(sr *basic.StatusResponse, msg string, data ...interface{}) *Response { + newResp := &Response{ + Code: sr.Code, + Message: msg, + } + if len(data) == 1 { + newResp.Data = data[0] + } + return newResp +} diff --git a/server/ldap-admin/ldap-admin.go b/server/ldap-admin/ldap-admin.go new file mode 100644 index 00000000..a9c78b4d --- /dev/null +++ b/server/ldap-admin/ldap-admin.go @@ -0,0 +1,33 @@ +package main + +import ( + "flag" + "fmt" + "net/http" + + "fusenapi/utils/auth" + "fusenapi/utils/fsconfig" + + "fusenapi/server/ldap-admin/internal/config" + "fusenapi/server/ldap-admin/internal/handler" + "fusenapi/server/ldap-admin/internal/svc" + + "github.com/zeromicro/go-zero/rest" +) + +var configFile = flag.String("f", "etc/ldap-admin.yaml", "the config file") + +func main() { + flag.Parse() + var c config.Config + fsconfig.StartNacosConfig(*configFile, &c, nil) + server := rest.MustNewServer(c.RestConf, rest.WithCustomCors(auth.FsCors, func(w http.ResponseWriter) { + })) + defer server.Stop() + + ctx := svc.NewServiceContext(c) + handler.RegisterHandlers(server, ctx) + + fmt.Printf("Starting server at %s:%d...\n", c.Host, c.Port) + server.Start() +} diff --git a/server_api/ldap-admin.api b/server_api/ldap-admin.api new file mode 100644 index 00000000..3f024bf6 --- /dev/null +++ b/server_api/ldap-admin.api @@ -0,0 +1,22 @@ +syntax = "v1" + +info ( + title: // TODO: add title + desc: // TODO: add description + author: "" + email: "" +) + +import "basic.api" + +service ldap-admin { + //获取部门列表 + @handler GetDepartmentsHandler + post /api/ldap-admin/get_departments(GetDepartmentsReq) returns (response); +} + +//获取部门列表 +type GetDepartmentsReq { + CurrentPage int `form:"current_page"` + PageSize int `form:"page_size"` +} \ No newline at end of file