From 6d893f7c4ee007769da997ed22a5c1efc7711914 Mon Sep 17 00:00:00 2001 From: PandaGoAdmin <18610165312@163.com> Date: Thu, 4 Aug 2022 16:57:18 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E6=9B=B4?= =?UTF-8?q?=E6=96=B0swagger=E6=96=87=E6=A1=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/develop/api/table.go | 38 +++++++------- apps/develop/api/vo/tableVo.go | 14 +++++ apps/develop/router/table.go | 13 +++-- apps/job/api/job.go | 11 ++-- apps/job/router/job.go | 10 +++- apps/log/api/log_job.go | 11 ++-- apps/log/api/log_login.go | 11 ++-- apps/log/api/log_oper.go | 11 ++-- apps/log/router/job_log.go | 11 ++-- apps/log/router/login_log.go | 9 +++- apps/log/router/oper_log.go | 10 +++- apps/resource/api/email.go | 11 ++-- apps/resource/api/oss.go | 11 ++-- apps/resource/router/email.go | 15 ++++-- apps/resource/router/oss.go | 13 +++-- apps/system/api/api.go | 13 +++-- apps/system/api/config.go | 11 ++-- apps/system/api/dept.go | 7 +-- apps/system/api/dict.go | 11 ++-- apps/system/api/menu.go | 19 +++---- apps/system/api/notice.go | 11 ++-- apps/system/api/post.go | 11 ++-- apps/system/api/role.go | 11 ++-- apps/system/api/tenant.go | 11 ++-- apps/system/api/user.go | 76 +++++++++++++++------------- apps/system/api/vo/systemVo.go | 63 +++++++++++++++++++++++ apps/system/router/api.go | 12 ++++- apps/system/router/config.go | 18 +++++-- apps/system/router/dept.go | 17 +++++-- apps/system/router/dict.go | 23 +++++++-- apps/system/router/menu.go | 17 ++++--- apps/system/router/notice.go | 13 +++-- apps/system/router/post.go | 18 ++++--- apps/system/router/role.go | 18 +++++-- apps/system/router/tenant.go | 13 +++-- apps/system/router/user.go | 41 ++++++++++----- go.mod | 2 + resource/template/go/api.template | 12 ++--- resource/template/go/router.template | 6 ++- 39 files changed, 439 insertions(+), 214 deletions(-) create mode 100644 apps/develop/api/vo/tableVo.go create mode 100644 apps/system/api/vo/systemVo.go diff --git a/apps/develop/api/table.go b/apps/develop/api/table.go index 5fbdb22..c79f3ec 100644 --- a/apps/develop/api/table.go +++ b/apps/develop/api/table.go @@ -1,8 +1,10 @@ package api import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" + "pandax/apps/develop/api/vo" "pandax/apps/develop/entity" "pandax/apps/develop/gen" "pandax/apps/develop/services" @@ -21,11 +23,11 @@ func (g *GenTableApi) GetDBTableList(rc *restfulx.ReqCtx) { tableName := restfulx.QueryParam(rc, "tableName") list, total := g.GenTableApp.FindDbTablesListPage(pageNum, pageSize, entity.DBTables{TableName: tableName}) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } @@ -37,11 +39,11 @@ func (g *GenTableApi) GetTablePage(rc *restfulx.ReqCtx) { tableComment := restfulx.QueryParam(rc, "tableComment") list, total := g.GenTableApp.FindListPage(pageNum, pageSize, entity.DevGenTable{TableName: tableName, TableComment: tableComment}) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } @@ -49,20 +51,20 @@ func (g *GenTableApi) GetTablePage(rc *restfulx.ReqCtx) { func (g *GenTableApi) GetTableInfo(rc *restfulx.ReqCtx) { tableId := restfulx.PathParamInt(rc, "tableId") result := g.GenTableApp.FindOne(entity.DevGenTable{TableId: int64(tableId)}, true) - mp := make(map[string]any) - mp["list"] = result.Columns - mp["info"] = result - rc.ResData = mp + rc.ResData = vo.TableInfoVo{ + List: result.Columns, + Info: *result, + } } // GetTableInfoByName 获取表信息 func (g *GenTableApi) GetTableInfoByName(rc *restfulx.ReqCtx) { tableName := restfulx.QueryParam(rc, "tableName") result := g.GenTableApp.FindOne(entity.DevGenTable{TableName: tableName}, true) - mp := make(map[string]any) - mp["list"] = result.Columns - mp["info"] = result - rc.ResData = mp + rc.ResData = vo.TableInfoVo{ + List: result.Columns, + Info: *result, + } } // GetTableTree 获取树表信息 diff --git a/apps/develop/api/vo/tableVo.go b/apps/develop/api/vo/tableVo.go new file mode 100644 index 0000000..6fa2c50 --- /dev/null +++ b/apps/develop/api/vo/tableVo.go @@ -0,0 +1,14 @@ +package vo + +import "pandax/apps/develop/entity" + +/** + * @Description + * @Author 熊猫 + * @Date 2022/8/4 15:52 + **/ + +type TableInfoVo struct { + List []entity.DevGenTableColumn `json:"list"` + Info entity.DevGenTable `json:"info"` +} diff --git a/apps/develop/router/table.go b/apps/develop/router/table.go index 577bfcc..d073090 100644 --- a/apps/develop/router/table.go +++ b/apps/develop/router/table.go @@ -1,10 +1,13 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" "pandax/apps/develop/api" + "pandax/apps/develop/api/vo" + "pandax/apps/develop/entity" "pandax/apps/develop/services" ) @@ -23,21 +26,21 @@ func InitGenTableRouter(container *restful.Container) { }). Doc("获取数据库列表"). Metadata(restfulspec.KeyOpenAPITags, tags). - Returns(200, "OK", []map[string]any{})) + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/list").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取表列表").Handle(s.GetTablePage) }). Doc("获取表列表"). Metadata(restfulspec.KeyOpenAPITags, tags). - Returns(200, "OK", []any{})) + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/info/tableName").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取表信息By tableName").Handle(s.GetTableInfoByName) }). Doc("获取表信息By tableName"). Metadata(restfulspec.KeyOpenAPITags, tags). - Returns(200, "OK", []any{})) + Returns(200, "OK", vo.TableInfoVo{})) ws.Route(ws.GET("/info/{tableId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取表信息").Handle(s.GetTableInfo) @@ -45,7 +48,7 @@ func InitGenTableRouter(container *restful.Container) { Doc("获取表信息"). Param(ws.PathParameter("tenantId", "租户Id").DataType("int").DefaultValue("1")). Metadata(restfulspec.KeyOpenAPITags, tags). - Returns(200, "OK", map[string]any{}). + Returns(200, "OK", vo.TableInfoVo{}). Returns(404, "Not Found", nil)) ws.Route(ws.GET("/tableTree").To(func(request *restful.Request, response *restful.Response) { @@ -53,7 +56,7 @@ func InitGenTableRouter(container *restful.Container) { }). Doc("获取表树"). Metadata(restfulspec.KeyOpenAPITags, tags). - Returns(200, "OK", []any{})) + Returns(200, "OK", []entity.DevGenTable{})) ws.Route(ws.POST("").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("新增表").Handle(s.Insert) diff --git a/apps/job/api/job.go b/apps/job/api/job.go index 63c895d..ec2f32e 100644 --- a/apps/job/api/job.go +++ b/apps/job/api/job.go @@ -2,6 +2,7 @@ package api import ( "github.com/XM-GO/PandaKit/biz" + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" "pandax/apps/job/api/from" @@ -30,11 +31,11 @@ func (j *JobApi) GetJobList(rc *restfulx.ReqCtx) { status := restfulx.QueryParam(rc, "status") list, total := j.JobApp.FindListPage(pageNum, pageSize, entity.SysJob{JobName: jobName, JobGroup: jobGroup, Status: status}) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/job/router/job.go b/apps/job/router/job.go index 9e4d5dc..9595f93 100644 --- a/apps/job/router/job.go +++ b/apps/job/router/job.go @@ -1,6 +1,7 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" @@ -23,9 +24,14 @@ func InitJobRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取Job列表").Handle(s.GetJobList) }). Doc("获取Job列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("jobName", "jobName").DataType("string")). + Param(ws.QueryParameter("jobGroup", "jobGroup").DataType("string")). + Param(ws.QueryParameter("status", "status").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.SysJob{}). - Returns(200, "OK", []entity.SysJob{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/{jobId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取Job列表").Handle(s.GetJob) diff --git a/apps/log/api/log_job.go b/apps/log/api/log_job.go index 0dd747f..7c6d957 100644 --- a/apps/log/api/log_job.go +++ b/apps/log/api/log_job.go @@ -1,6 +1,7 @@ package api import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" "pandax/apps/log/entity" @@ -20,11 +21,11 @@ func (l *LogJobApi) GetJobLogList(rc *restfulx.ReqCtx) { status := restfulx.QueryParam(rc, "status") list, total := l.LogJobApp.FindListPage(pageNum, pageSize, entity.LogJob{Name: name, JobGroup: jobGroup, Status: status}) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/log/api/log_login.go b/apps/log/api/log_login.go index 665f4f7..e346178 100644 --- a/apps/log/api/log_login.go +++ b/apps/log/api/log_login.go @@ -1,6 +1,7 @@ package api import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" "pandax/apps/log/entity" @@ -17,11 +18,11 @@ func (l *LogLoginApi) GetLoginLogList(rc *restfulx.ReqCtx) { loginLocation := restfulx.QueryParam(rc, "loginLocation") username := restfulx.QueryParam(rc, "username") list, total := l.LogLoginApp.FindListPage(pageNum, pageSize, entity.LogLogin{LoginLocation: loginLocation, Username: username}) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/log/api/log_oper.go b/apps/log/api/log_oper.go index 7d0b27c..564653b 100644 --- a/apps/log/api/log_oper.go +++ b/apps/log/api/log_oper.go @@ -1,6 +1,7 @@ package api import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" "log" @@ -19,11 +20,11 @@ func (l *LogOperApi) GetOperLogList(rc *restfulx.ReqCtx) { operName := restfulx.QueryParam(rc, "operName") title := restfulx.QueryParam(rc, "title") list, total := l.LogOperApp.FindListPage(pageNum, pageSize, entity.LogOper{BusinessType: businessType, OperName: operName, Title: title}) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/log/router/job_log.go b/apps/log/router/job_log.go index 49c1117..70b2e69 100644 --- a/apps/log/router/job_log.go +++ b/apps/log/router/job_log.go @@ -1,11 +1,11 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" "pandax/apps/log/api" - "pandax/apps/log/entity" "pandax/apps/log/services" ) @@ -23,9 +23,14 @@ func InitJobLogRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取操作日志列表").Handle(s.GetJobLogList) }). Doc("获取操作日志列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("name", "name").DataType("string")). + Param(ws.QueryParameter("jobGroup", "jobGroup").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.LogJob{}). - Returns(200, "OK", []entity.LogJob{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.DELETE("/{logId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("删除操作日志信息").Handle(s.DeleteJobLog) diff --git a/apps/log/router/login_log.go b/apps/log/router/login_log.go index b07fb8d..54dec1b 100644 --- a/apps/log/router/login_log.go +++ b/apps/log/router/login_log.go @@ -1,6 +1,7 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" @@ -23,9 +24,13 @@ func InitLoginLogRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取登录日志列表").Handle(s.GetLoginLogList) }). Doc("获取登录日志列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("loginLocation", "loginLocation").DataType("string")). + Param(ws.QueryParameter("username", "username").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.LogLogin{}). - Returns(200, "OK", []entity.LogLogin{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/{infoId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取登录日志信息").Handle(s.GetLoginLog) diff --git a/apps/log/router/oper_log.go b/apps/log/router/oper_log.go index acd34d1..25f1d9e 100644 --- a/apps/log/router/oper_log.go +++ b/apps/log/router/oper_log.go @@ -1,6 +1,7 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" @@ -23,9 +24,14 @@ func InitOperLogRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取操作日志列表").Handle(s.GetOperLogList) }). Doc("获取操作日志列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("businessType", "businessType").DataType("string")). + Param(ws.QueryParameter("operName", "operName").DataType("string")). + Param(ws.QueryParameter("title", "title").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.LogOper{}). - Returns(200, "OK", []entity.LogOper{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/{operId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取操作日志信息").Handle(s.GetOperLog) diff --git a/apps/resource/api/email.go b/apps/resource/api/email.go index aecdf6c..e2c704f 100644 --- a/apps/resource/api/email.go +++ b/apps/resource/api/email.go @@ -3,6 +3,7 @@ package api import ( "github.com/XM-GO/PandaKit/biz" email "github.com/XM-GO/PandaKit/mail" + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" "pandax/apps/resource/api/from" @@ -36,11 +37,11 @@ func (p *ResEmailsApi) GetResEmailsList(rc *restfulx.ReqCtx) { data.Secret = utils.DdmPassword(data.Secret) li[i] = data } - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/resource/api/oss.go b/apps/resource/api/oss.go index bd5e492..f3fb7f6 100644 --- a/apps/resource/api/oss.go +++ b/apps/resource/api/oss.go @@ -3,6 +3,7 @@ package api import ( "fmt" "github.com/XM-GO/PandaKit/biz" + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/oss" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" @@ -38,11 +39,11 @@ func (p *ResOssesApi) GetResOssesList(rc *restfulx.ReqCtx) { data.SecretKey = utils.DdmKey(data.SecretKey) li[i] = data } - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/resource/router/email.go b/apps/resource/router/email.go index 5b4e301..ca089a2 100644 --- a/apps/resource/router/email.go +++ b/apps/resource/router/email.go @@ -1,10 +1,12 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" "pandax/apps/resource/api" + "pandax/apps/resource/api/from" "pandax/apps/resource/entity" "pandax/apps/resource/services" ) @@ -27,9 +29,13 @@ func InitResEmailsRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取ResEmails分页列表").Handle(s.GetResEmailsList) }). Doc("获取ResEmails分页列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("category", "category").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.ResEmail{}). - Returns(200, "OK", []entity.ResEmail{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/{mailId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取ResEmails信息").Handle(s.GetResEmails) @@ -37,7 +43,7 @@ func InitResEmailsRouter(container *restful.Container) { Doc("获取ResEmails信息"). Param(ws.PathParameter("mailId", "Id").DataType("int")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes(entity.ResEmail{}). // on the response + Writes(entity.ResEmail{}). Returns(200, "OK", entity.ResEmail{}). Returns(404, "Not Found", nil)) @@ -46,7 +52,7 @@ func InitResEmailsRouter(container *restful.Container) { }). Doc("添加ResEmails信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.ResEmail{})) // from the request + Reads(entity.ResEmail{})) ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("修改ResEmails信息").Handle(s.UpdateResEmails) @@ -66,6 +72,7 @@ func InitResEmailsRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("调试").Handle(s.DebugMail) }). Doc("调试"). + Reads(from.SendMail{}). Metadata(restfulspec.KeyOpenAPITags, tags)) ws.Route(ws.PUT("/changeStatus").To(func(request *restful.Request, response *restful.Response) { diff --git a/apps/resource/router/oss.go b/apps/resource/router/oss.go index 5071633..d924f92 100644 --- a/apps/resource/router/oss.go +++ b/apps/resource/router/oss.go @@ -1,6 +1,7 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" @@ -27,9 +28,14 @@ func InitResOssRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取ResOsses分页列表").Handle(s.GetResOssesList) }). Doc("获取ResOsses分页列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("category", "category").DataType("string")). + Param(ws.QueryParameter("ossCode", "ossCode").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.ResOss{}). - Returns(200, "OK", []entity.ResOss{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/{ossId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取ResOsses信息").Handle(s.GetResOsses) @@ -46,7 +52,7 @@ func InitResOssRouter(container *restful.Container) { }). Doc("添加ResOsses信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.ResOss{})) // from the request + Reads(entity.ResOss{})) ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("修改ResOsses信息").Handle(s.UpdateResOsses) @@ -66,6 +72,7 @@ func InitResOssRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("测试文件上传").Handle(s.UplaodResOsses) }). Doc("测试文件上传"). + Param(ws.QueryParameter("ossCode", "ossCode").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags)) ws.Route(ws.PUT("/changeStatus").To(func(request *restful.Request, response *restful.Response) { diff --git a/apps/system/api/api.go b/apps/system/api/api.go index 5eaf5ec..a7faefa 100644 --- a/apps/system/api/api.go +++ b/apps/system/api/api.go @@ -2,9 +2,9 @@ package api import ( "github.com/XM-GO/PandaKit/casbin" + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" - "log" entity "pandax/apps/system/entity" services "pandax/apps/system/services" "strconv" @@ -17,7 +17,6 @@ type SystemApiApi struct { func (s *SystemApiApi) CreateApi(rc *restfulx.ReqCtx) { var api entity.SysApi restfulx.BindQuery(rc, &api) - log.Println(api) s.ApiApp.Insert(api) } @@ -35,11 +34,11 @@ func (s *SystemApiApi) GetApiList(rc *restfulx.ReqCtx) { apiGroup := rc.Request.QueryParameter("apiGroup") api := entity.SysApi{Path: path, Description: description, Method: method, ApiGroup: apiGroup} list, total := s.ApiApp.FindListPage(pageNum, pageSize, api) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/system/api/config.go b/apps/system/api/config.go index 8959bc8..8dc43c5 100644 --- a/apps/system/api/config.go +++ b/apps/system/api/config.go @@ -2,6 +2,7 @@ package api import ( "github.com/XM-GO/PandaKit/biz" + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" entity "pandax/apps/system/entity" @@ -21,11 +22,11 @@ func (p *ConfigApi) GetConfigList(rc *restfulx.ReqCtx) { config := entity.SysConfig{ConfigName: configName, ConfigKey: configKey, ConfigType: configType} list, total := p.ConfigApp.FindListPage(pageNum, pageSize, config) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/system/api/dept.go b/apps/system/api/dept.go index 4820014..b70e7f7 100644 --- a/apps/system/api/dept.go +++ b/apps/system/api/dept.go @@ -6,6 +6,7 @@ import ( "github.com/XM-GO/PandaKit/biz" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" + "pandax/apps/system/api/vo" "pandax/apps/system/entity" "pandax/apps/system/services" "pandax/pkg/global" @@ -29,9 +30,9 @@ func (m *DeptApi) GetDeptTreeRoleSelect(rc *restfulx.ReqCtx) { if roleId != 0 { deptIds = m.RoleApp.GetRoleDeptId(entity.SysRole{RoleId: int64(roleId)}) } - rc.ResData = map[string]any{ - "depts": result, - "checkedKeys": deptIds, + rc.ResData = vo.DeptTreeVo{ + Depts: result, + CheckedKeys: deptIds, } } diff --git a/apps/system/api/dict.go b/apps/system/api/dict.go index 9962848..a40f212 100644 --- a/apps/system/api/dict.go +++ b/apps/system/api/dict.go @@ -3,6 +3,7 @@ package api import ( "fmt" "github.com/XM-GO/PandaKit/biz" + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" entity "pandax/apps/system/entity" @@ -23,11 +24,11 @@ func (p *DictApi) GetDictTypeList(rc *restfulx.ReqCtx) { dictType := restfulx.QueryParam(rc, "dictType") list, total := p.DictType.FindListPage(pageNum, pageSize, entity.SysDictType{Status: status, DictName: dictName, DictType: dictType}) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/system/api/menu.go b/apps/system/api/menu.go index ca27e4e..16babcc 100644 --- a/apps/system/api/menu.go +++ b/apps/system/api/menu.go @@ -4,6 +4,7 @@ import ( "github.com/XM-GO/PandaKit/biz" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" + "pandax/apps/system/api/vo" entity "pandax/apps/system/entity" services "pandax/apps/system/services" ) @@ -35,9 +36,9 @@ func (m *MenuApi) GetMenuTreeRoleSelect(rc *restfulx.ReqCtx) { if roleId != 0 { menuIds = m.RoleApp.GetRoleMeunId(entity.SysRole{RoleId: int64(roleId)}) } - rc.ResData = map[string]any{ - "menus": result, - "checkedKeys": menuIds, + rc.ResData = vo.MenuTreeVo{ + Menus: *result, + CheckedKeys: menuIds, } } @@ -72,9 +73,9 @@ func (m *MenuApi) InsertMenu(rc *restfulx.ReqCtx) { m.MenuApp.Insert(menu) permis := m.RoleMenuApp.GetPermis(rc.LoginAccount.RoleId) menus := m.MenuApp.SelectMenuRole(rc.LoginAccount.RoleKey) - rc.ResData = map[string]any{ - "permissions": permis, - "menus": Build(*menus), + rc.ResData = vo.MenuPermisVo{ + Menus: Build(*menus), + Permissions: permis, } } @@ -85,9 +86,9 @@ func (m *MenuApi) UpdateMenu(rc *restfulx.ReqCtx) { m.MenuApp.Update(menu) permis := m.RoleMenuApp.GetPermis(rc.LoginAccount.RoleId) menus := m.MenuApp.SelectMenuRole(rc.LoginAccount.RoleKey) - rc.ResData = map[string]any{ - "permissions": permis, - "menus": Build(*menus), + rc.ResData = vo.MenuPermisVo{ + Menus: Build(*menus), + Permissions: permis, } } diff --git a/apps/system/api/notice.go b/apps/system/api/notice.go index 5b9c9ba..684a493 100644 --- a/apps/system/api/notice.go +++ b/apps/system/api/notice.go @@ -1,6 +1,7 @@ package api import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" "pandax/apps/system/entity" @@ -28,11 +29,11 @@ func (p *NoticeApi) GetNoticeList(rc *restfulx.ReqCtx) { notice := entity.SysNotice{NoticeType: noticeType, Title: title, DeptIds: ids} list, total := p.NoticeApp.FindListPage(pageNum, pageSize, notice) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/system/api/post.go b/apps/system/api/post.go index b212c43..cf0dbeb 100644 --- a/apps/system/api/post.go +++ b/apps/system/api/post.go @@ -4,6 +4,7 @@ import ( "errors" "fmt" "github.com/XM-GO/PandaKit/biz" + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" "pandax/apps/system/entity" @@ -33,11 +34,11 @@ func (p *PostApi) GetPostList(rc *restfulx.ReqCtx) { list, total := p.PostApp.FindListPage(pageNum, pageSize, post) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/system/api/role.go b/apps/system/api/role.go index b2d6218..44dbfab 100644 --- a/apps/system/api/role.go +++ b/apps/system/api/role.go @@ -5,6 +5,7 @@ import ( "fmt" "github.com/XM-GO/PandaKit/biz" "github.com/XM-GO/PandaKit/casbin" + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" entity "pandax/apps/system/entity" @@ -35,11 +36,11 @@ func (r *RoleApi) GetRoleList(rc *restfulx.ReqCtx) { list, total := r.RoleApp.FindListPage(pageNum, pageSize, role) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/system/api/tenant.go b/apps/system/api/tenant.go index 5073fe7..1f70651 100644 --- a/apps/system/api/tenant.go +++ b/apps/system/api/tenant.go @@ -6,6 +6,7 @@ package api * @Date 2022/7/14 17:55 **/ import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" "github.com/XM-GO/PandaKit/utils" "pandax/apps/system/entity" @@ -23,11 +24,11 @@ func (p *SysTenantsApi) GetSysTenantsList(rc *restfulx.ReqCtx) { list, total := p.SysTenantsApp.FindListPage(pageNum, pageSize, data) - rc.ResData = map[string]interface{}{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } diff --git a/apps/system/api/user.go b/apps/system/api/user.go index cceab6d..f60a2e5 100644 --- a/apps/system/api/user.go +++ b/apps/system/api/user.go @@ -1,6 +1,7 @@ package api import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/token" "github.com/dgrijalva/jwt-go" "github.com/emicklei/go-restful/v3" @@ -39,7 +40,7 @@ type UserApi struct { // GenerateCaptcha 获取验证码 func (u *UserApi) GenerateCaptcha(request *restful.Request, response *restful.Response) { id, image := captcha.Generate() - response.WriteEntity(map[string]any{"base64Captcha": image, "captchaId": id}) + response.WriteEntity(vo.CaptchaVo{Base64Captcha: image, CaptchaId: id}) } // RefreshToken 刷新token @@ -48,7 +49,10 @@ func (u *UserApi) RefreshToken(rc *restfulx.ReqCtx) { j := token.NewJWT("", []byte(global.Conf.Jwt.Key), jwt.SigningMethodHS256) token, err := j.RefreshToken(tokenStr) biz.ErrIsNil(err, "刷新token失败") - rc.ResData = map[string]any{"token": token, "expire": time.Now().Unix() + global.Conf.Jwt.ExpireTime} + rc.ResData = vo.TokenVo{ + Token: token, + Expire: time.Now().Unix() + global.Conf.Jwt.ExpireTime, + } } // Login 用户登录 @@ -77,9 +81,9 @@ func (u *UserApi) Login(rc *restfulx.ReqCtx) { }) biz.ErrIsNil(err, "生成Token失败") - rc.ResData = map[string]any{ - "token": token, - "expire": time.Now().Unix() + global.Conf.Jwt.ExpireTime, + rc.ResData = vo.TokenVo{ + Token: token, + Expire: time.Now().Unix() + global.Conf.Jwt.ExpireTime, } var loginLog logEntity.LogLogin @@ -111,11 +115,11 @@ func (u *UserApi) Auth(rc *restfulx.ReqCtx) { permis := u.RoleMenuApp.GetPermis(role.RoleId) menus := u.MenuApp.SelectMenuRole(role.RoleKey) - rc.ResData = map[string]any{ - "user": userData, - "role": role, - "permissions": permis, - "menus": Build(*menus), + rc.ResData = vo.AuthVo{ + User: *userData, + Role: *role, + Permissions: permis, + Menus: Build(*menus), } } @@ -156,11 +160,11 @@ func (u *UserApi) GetSysUserList(rc *restfulx.ReqCtx) { } list, total := u.UserApp.FindListPage(pageNum, pageSize, user) - rc.ResData = map[string]any{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, } } @@ -184,13 +188,13 @@ func (u *UserApi) GetSysUserProfile(rc *restfulx.ReqCtx) { roleIds := make([]int64, 0) roleIds = append(roleIds, rc.LoginAccount.RoleId) - rc.ResData = map[string]any{ - "data": user, - "postIds": postIds, - "roleIds": roleIds, - "roles": roleList, - "posts": postList, - "dept": deptList, + rc.ResData = vo.UserProfileVo{ + Data: user, + PostIds: postIds, + RoleIds: roleIds, + Roles: *roleList, + Posts: *postList, + Dept: *deptList, } } @@ -244,12 +248,12 @@ func (u *UserApi) GetSysUser(rc *restfulx.ReqCtx) { } posts := u.PostApp.FindList(post) - rc.ResData = map[string]any{ - "data": result, - "postIds": result.PostIds, - "roleIds": result.RoleIds, - "roles": roles, - "posts": posts, + rc.ResData = vo.UserVo{ + Data: result, + PostIds: result.PostIds, + RoleIds: result.RoleIds, + Roles: *roles, + Posts: *posts, } } @@ -266,10 +270,10 @@ func (u *UserApi) GetSysUserInit(rc *restfulx.ReqCtx) { post.TenantId = rc.LoginAccount.TenantId } posts := u.PostApp.FindList(post) - mp := make(map[string]any, 2) - mp["roles"] = roles - mp["posts"] = posts - rc.ResData = mp + rc.ResData = vo.UserRolePost{ + Roles: *roles, + Posts: *posts, + } } // GetUserRolePost 获取添加用户角色和职位 @@ -289,10 +293,10 @@ func (u *UserApi) GetUserRolePost(rc *restfulx.ReqCtx) { po := u.PostApp.FindOne(kgo.KConv.Str2Int64(postId)) posts = append(posts, *po) } - mp := make(map[string]any, 2) - mp["roles"] = roles - mp["posts"] = posts - rc.ResData = mp + rc.ResData = vo.UserRolePost{ + Roles: roles, + Posts: posts, + } } // InsertSysUser 创建用户 diff --git a/apps/system/api/vo/systemVo.go b/apps/system/api/vo/systemVo.go new file mode 100644 index 0000000..59452dc --- /dev/null +++ b/apps/system/api/vo/systemVo.go @@ -0,0 +1,63 @@ +package vo + +import "pandax/apps/system/entity" + +/** + * @Description + * @Author 熊猫 + * @Date 2022/8/4 15:25 + **/ + +type DeptTreeVo struct { + Depts []entity.DeptLable `json:"depts"` + CheckedKeys []int64 `json:"checkedKeys"` +} + +type MenuTreeVo struct { + Menus []entity.MenuLable `json:"menus"` + CheckedKeys []int64 `json:"checkedKeys"` +} + +type MenuPermisVo struct { + Menus []RouterVo `json:"menus"` + Permissions []string `json:"permissions"` +} + +type CaptchaVo struct { + Base64Captcha string `json:"base64Captcha"` + CaptchaId string `json:"captchaId"` +} + +type TokenVo struct { + Token string `json:"token"` + Expire int64 `json:"expire"` +} + +type AuthVo struct { + User entity.SysUserView `json:"user"` + Role entity.SysRole `json:"role"` + Permissions []string `json:"permissions"` + Menus []RouterVo `json:"menus"` +} + +type UserProfileVo struct { + Data any `json:"data"` + PostIds []int64 `json:"postIds"` + RoleIds []int64 `json:"roleIds"` + Roles []entity.SysRole `json:"roles"` + Posts []entity.SysPost `json:"posts"` + Dept []entity.SysDept `json:"dept"` +} + +type UserVo struct { + Data any `json:"data"` + PostIds string `json:"postIds"` + RoleIds string `json:"roleIds"` + Roles []entity.SysRole `json:"roles"` + Posts []entity.SysPost `json:"posts"` +} + +type UserRolePost struct { + Roles []entity.SysRole `json:"roles"` + Posts []entity.SysPost `json:"posts"` +} diff --git a/apps/system/router/api.go b/apps/system/router/api.go index 213b798..3929374 100644 --- a/apps/system/router/api.go +++ b/apps/system/router/api.go @@ -2,6 +2,7 @@ package router import ( "github.com/XM-GO/PandaKit/casbin" + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" @@ -24,8 +25,14 @@ func InitApiRouter(container *restful.Container) { }). Doc("获取api分页列表"). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.SysApi{}). - Returns(200, "OK", []entity.SysApi{})) + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("path", "路径").DataType("string")). + Param(ws.QueryParameter("description", "描述").DataType("string")). + Param(ws.QueryParameter("method", "方法").DataType("string")). + Param(ws.QueryParameter("apiGroup", "API组").DataType("string")). + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/all").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取所有api").Handle(s.GetAllApis) @@ -39,6 +46,7 @@ func InitApiRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取角色拥有的api权限").Handle(s.GetPolicyPathByRoleId) }). Doc("获取角色拥有的api权限"). + Param(ws.QueryParameter("roleKey", "校色key").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). Writes([]casbin.CasbinRule{}). Returns(200, "OK", []casbin.CasbinRule{})) diff --git a/apps/system/router/config.go b/apps/system/router/config.go index 0e81bd3..413e2fb 100644 --- a/apps/system/router/config.go +++ b/apps/system/router/config.go @@ -1,6 +1,7 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" @@ -23,13 +24,20 @@ func InitConfigRouter(container *restful.Container) { }). Doc("获取配置分页列表"). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.SysConfig{}). - Returns(200, "OK", []entity.SysConfig{})) + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("configName", "configName").DataType("string")). + Param(ws.QueryParameter("configKey", "configKey").DataType("string")). + Param(ws.QueryParameter("configType", "configType").DataType("string")). + Metadata(restfulspec.KeyOpenAPITags, tags). + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/configKey").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取配置列表通过ConfigKey").Handle(s.GetConfigListByKey) }). Doc("获取配置列表通过ConfigKey"). + Param(ws.QueryParameter("configKey", "configKey").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). Writes([]entity.SysConfig{}). Returns(200, "OK", []entity.SysConfig{})) @@ -38,9 +46,9 @@ func InitConfigRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取配置信息").Handle(s.GetConfig) }). Doc("获取配置信息"). - Param(ws.PathParameter("configId", "configId").DataType("int").DefaultValue("1")). + Param(ws.PathParameter("configId", "configId").DataType("int")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes(entity.SysConfig{}). // on the response + Writes(entity.SysConfig{}). Returns(200, "OK", entity.SysConfig{}). Returns(404, "Not Found", nil)) @@ -49,7 +57,7 @@ func InitConfigRouter(container *restful.Container) { }). Doc("添加配置信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.SysConfig{})) // from the request + Reads(entity.SysConfig{})) ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("修改配置信息").Handle(s.UpdateConfig) diff --git a/apps/system/router/dept.go b/apps/system/router/dept.go index 278e098..a4e5b0f 100644 --- a/apps/system/router/dept.go +++ b/apps/system/router/dept.go @@ -5,6 +5,7 @@ import ( restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" "pandax/apps/system/api" + "pandax/apps/system/api/vo" "pandax/apps/system/entity" "pandax/apps/system/services" ) @@ -26,21 +27,29 @@ func InitDeptRouter(container *restful.Container) { Doc("获取角色部门树"). Param(ws.PathParameter("roleId", "角色Id").DataType("int").DefaultValue("1")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes(map[string]any{}). // on the response + Writes(vo.DeptTreeVo{}). + Returns(200, "OK", vo.DeptTreeVo{}). Returns(404, "Not Found", nil)) ws.Route(ws.GET("/deptTree").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取所有部门树").Handle(s.GetDeptTree) }). Doc("获取所有部门树"). + Param(ws.QueryParameter("deptName", "deptName").DataType("string")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("deptId", "deptId").DataType("int")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.SysDept{}). // on the response + Writes([]entity.SysDept{}). + Returns(200, "OK", []entity.SysDept{}). Returns(404, "Not Found", nil)) ws.Route(ws.GET("/list").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取部门列表").Handle(s.GetDeptList) }). Doc("获取部门列表"). + Param(ws.QueryParameter("deptName", "deptName").DataType("string")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("deptId", "deptId").DataType("int")). Metadata(restfulspec.KeyOpenAPITags, tags). Writes([]entity.SysDept{}). Returns(200, "OK", []entity.SysDept{})) @@ -60,14 +69,14 @@ func InitDeptRouter(container *restful.Container) { }). Doc("添加部门信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.SysDept{})) // from the request + Reads(entity.SysDept{})) ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("修改部门信息").Handle(s.UpdateDept) }). Doc("修改部门信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.SysDept{})) // from the request + Reads(entity.SysDept{})) ws.Route(ws.DELETE("/{deptId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("删除部门信息").Handle(s.DeleteDept) diff --git a/apps/system/router/dict.go b/apps/system/router/dict.go index eb1f0cc..95c3dc6 100644 --- a/apps/system/router/dict.go +++ b/apps/system/router/dict.go @@ -1,6 +1,7 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" @@ -22,8 +23,14 @@ func InitDictRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取字典类型分页列表").Handle(s.GetDictTypeList) }). Doc("获取字典类型分页列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("dictName", "dictName").DataType("string")). + Param(ws.QueryParameter("dictType", "dictType").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Returns(200, "OK", []entity.SysDictType{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/type/{dictId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取字典类型信息").Handle(s.GetDictType) @@ -31,7 +38,7 @@ func InitDictRouter(container *restful.Container) { Doc("获取字典类型信息"). Param(ws.PathParameter("dictId", "Id").DataType("int").DefaultValue("1")). Metadata(restfulspec.KeyOpenAPITags, tags). - Returns(200, "OK", []entity.SysDictType{})) + Returns(200, "OK", entity.SysDictType{})) ws.Route(ws.POST("/type").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("添加字典类型信息").Handle(s.InsertDictType) @@ -58,12 +65,19 @@ func InitDictRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("导出字典类型信息").Handle(s.ExportDictType) }). Doc("导出字典类型信息"). + Param(ws.QueryParameter("filename", "filename").DataType("string")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("dictName", "dictName").DataType("string")). + Param(ws.QueryParameter("dictType", "dictType").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags)) ws.Route(ws.GET("/data/list").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取字典数据分页列表").Handle(s.GetDictDataList) }). Doc("获取字典数据分页列表"). + Param(ws.QueryParameter("dictLabel", "dictLabel").DataType("string")). + Param(ws.QueryParameter("dictType", "dictType").DataType("string")). + Param(ws.QueryParameter("status", "status").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). Returns(200, "OK", []entity.SysDictData{})) @@ -71,8 +85,9 @@ func InitDictRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取字典数据列表通过字典类型").Handle(s.GetDictDataListByDictType) }). Doc("获取字典数据列表通过字典类型"). + Param(ws.QueryParameter("dictType", "dictType").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Returns(200, "OK", []entity.SysDictType{})) + Returns(200, "OK", []entity.SysDictData{})) ws.Route(ws.GET("/data/{dictCode}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取字典数据信息").Handle(s.GetDictData) @@ -80,7 +95,7 @@ func InitDictRouter(container *restful.Container) { Doc("获取字典数据信息"). Param(ws.PathParameter("dictCode", "dictCode").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Returns(200, "OK", []entity.SysDictType{})) + Returns(200, "OK", entity.SysDictData{})) ws.Route(ws.POST("/data").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("添加字典数据信息").Handle(s.InsertDictData) diff --git a/apps/system/router/menu.go b/apps/system/router/menu.go index cd62196..c38578b 100644 --- a/apps/system/router/menu.go +++ b/apps/system/router/menu.go @@ -5,6 +5,7 @@ import ( restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" "pandax/apps/system/api" + "pandax/apps/system/api/vo" "pandax/apps/system/entity" "pandax/apps/system/services" ) @@ -25,16 +26,17 @@ func InitMenuRouter(container *restful.Container) { }). Doc("获取菜单树"). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.SysMenu{}). - Returns(200, "OK", []entity.SysMenu{})) + Writes([]entity.MenuLable{}). + Returns(200, "OK", []entity.MenuLable{})) ws.Route(ws.GET("/menuRole").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取角色菜单").Handle(s.GetMenuRole) }). Doc("获取角色菜单"). + Param(ws.QueryParameter("roleKey", "roleKey").Required(true).DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.MenuRole{}). - Returns(200, "OK", []entity.MenuRole{})) + Writes([]vo.RouterVo{}). + Returns(200, "OK", []vo.RouterVo{})) ws.Route(ws.GET("/roleMenuTreeSelect/{roleId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取角色菜单树").Handle(s.GetMenuTreeRoleSelect) @@ -42,14 +44,15 @@ func InitMenuRouter(container *restful.Container) { Doc("获取角色菜单树"). Param(ws.PathParameter("roleId", "Id").DataType("int").DefaultValue("1")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes(entity.SysMenu{}). // on the response - Returns(200, "OK", entity.SysMenu{}). + Writes(vo.MenuTreeVo{}). + Returns(200, "OK", vo.MenuTreeVo{}). Returns(404, "Not Found", nil)) ws.Route(ws.GET("/menuPaths").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取角色菜单路径列表").Handle(s.GetMenuPaths) }). Doc("获取角色菜单"). + Param(ws.QueryParameter("roleKey", "roleKey").Required(true).DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). Writes([]entity.MenuPath{}). Returns(200, "OK", []entity.MenuPath{})) @@ -58,6 +61,8 @@ func InitMenuRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取菜单列表").Handle(s.GetMenuList) }). Doc("获取菜单列表"). + Param(ws.QueryParameter("menuName", "menuName").DataType("string")). + Param(ws.QueryParameter("status", "status").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). Writes([]entity.SysMenu{}). Returns(200, "OK", []entity.SysMenu{})) diff --git a/apps/system/router/notice.go b/apps/system/router/notice.go index 90a41c3..7608c62 100644 --- a/apps/system/router/notice.go +++ b/apps/system/router/notice.go @@ -1,6 +1,7 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" @@ -23,22 +24,26 @@ func InitNoticeRouter(container *restful.Container) { }). Doc("获取通知分页列表"). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.SysNotice{}). - Returns(200, "OK", []entity.SysNotice{})) + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("noticeType", "noticeType").DataType("string")). + Param(ws.QueryParameter("title", "title").DataType("string")). + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.POST("").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("添加通知信息").Handle(s.InsertNotice) }). Doc("添加通知信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.SysNotice{})) // from the request + Reads(entity.SysNotice{})) ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("修改通知信息").Handle(s.UpdateNotice) }). Doc("修改通知信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.SysNotice{})) // from the request + Reads(entity.SysNotice{})) ws.Route(ws.DELETE("/{noticeId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("删除通知信息").Handle(s.DeleteNotice) diff --git a/apps/system/router/post.go b/apps/system/router/post.go index 32de1b9..0c7675d 100644 --- a/apps/system/router/post.go +++ b/apps/system/router/post.go @@ -1,6 +1,7 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" @@ -23,17 +24,22 @@ func InitPostRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取岗位分页列表").Handle(s.GetPostList) }). Doc("获取岗位分页列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("postName", "postName").DataType("string")). + Param(ws.QueryParameter("postCode", "postCode").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.SysPost{}). - Returns(200, "OK", []entity.SysPost{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/{postId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取岗位信息").Handle(s.GetPost) }). Doc("获取岗位信息"). - Param(ws.PathParameter("postId", "Id").DataType("int").DefaultValue("1")). + Param(ws.PathParameter("postId", "Id").DataType("int")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes(entity.SysPost{}). // on the response + Writes(entity.SysPost{}). Returns(200, "OK", entity.SysPost{}). Returns(404, "Not Found", nil)) @@ -42,14 +48,14 @@ func InitPostRouter(container *restful.Container) { }). Doc("添加岗位信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.SysPost{})) // from the request + Reads(entity.SysPost{})) ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("修改岗位信息").Handle(s.UpdatePost) }). Doc("修改岗位信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.SysPost{})) // from the request + Reads(entity.SysPost{})) ws.Route(ws.DELETE("/{postId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("删除岗位信息").Handle(s.DeletePost) diff --git a/apps/system/router/role.go b/apps/system/router/role.go index 1e5792a..8a62773 100644 --- a/apps/system/router/role.go +++ b/apps/system/router/role.go @@ -1,6 +1,7 @@ package router import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" @@ -24,9 +25,14 @@ func InitRoleRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取角色分页列表").Handle(s.GetRoleList) }). Doc("获取角色分页列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("roleName", "roleName").DataType("string")). + Param(ws.QueryParameter("roleKey", "roleKey").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.SysRole{}). - Returns(200, "OK", []entity.SysRole{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/{roleId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取角色信息").Handle(s.GetRole) @@ -34,7 +40,7 @@ func InitRoleRouter(container *restful.Container) { Doc("获取角色信息"). Param(ws.PathParameter("roleId", "Id").DataType("int").DefaultValue("1")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes(entity.SysRole{}). // on the response + Writes(entity.SysRole{}). Returns(200, "OK", entity.SysRole{}). Returns(404, "Not Found", nil)) @@ -43,7 +49,7 @@ func InitRoleRouter(container *restful.Container) { }). Doc("添加角色信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.SysRole{})) // from the request + Reads(entity.SysRole{})) ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("修改角色信息").Handle(s.UpdateRole) @@ -77,6 +83,10 @@ func InitRoleRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("导出角色信息").Handle(s.ExportRole) }). Doc("导出角色信息"). + Param(ws.QueryParameter("filename", "filename").DataType("string")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("roleName", "roleName").DataType("string")). + Param(ws.QueryParameter("roleKey", "roleKey").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags)) container.Add(ws) diff --git a/apps/system/router/tenant.go b/apps/system/router/tenant.go index 37986ad..9d84536 100644 --- a/apps/system/router/tenant.go +++ b/apps/system/router/tenant.go @@ -7,6 +7,7 @@ package router **/ import ( + "github.com/XM-GO/PandaKit/model" "github.com/XM-GO/PandaKit/restfulx" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" @@ -27,9 +28,11 @@ func InitSysTenantRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取SysTenant分页列表").Handle(s.GetSysTenantsList) }). Doc("获取SysTenant分页列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.SysTenants{}). - Returns(200, "OK", []entity.SysTenants{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/lists").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取SysTenant列表").Handle(s.GetSysTenantsAll) @@ -45,7 +48,7 @@ func InitSysTenantRouter(container *restful.Container) { Doc("获取SysTenant信息"). Param(ws.PathParameter("tenantId", "租户Id").DataType("int").DefaultValue("1")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes(entity.SysTenants{}). // on the response + Writes(entity.SysTenants{}). Returns(200, "OK", entity.SysTenants{}). Returns(404, "Not Found", nil)) @@ -54,14 +57,14 @@ func InitSysTenantRouter(container *restful.Container) { }). Doc("添加SysTenant信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.SysTenants{})) // from the request + Reads(entity.SysTenants{})) ws.Route(ws.PUT("").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("修改SysTenant信息").Handle(s.UpdateSysTenants) }). Doc("修改SysTenant信息"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.SysTenants{})) // from the request + Reads(entity.SysTenants{})) ws.Route(ws.DELETE("/{tenantId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("删除SysTenant信息").Handle(s.DeleteSysTenants) diff --git a/apps/system/router/user.go b/apps/system/router/user.go index 7539c37..95565f8 100644 --- a/apps/system/router/user.go +++ b/apps/system/router/user.go @@ -1,9 +1,12 @@ package router import ( + "github.com/XM-GO/PandaKit/model" restfulspec "github.com/emicklei/go-restful-openapi/v2" "github.com/emicklei/go-restful/v3" "pandax/apps/system/api" + "pandax/apps/system/api/form" + "pandax/apps/system/api/vo" "pandax/apps/system/entity" "pandax/apps/system/services" @@ -32,7 +35,9 @@ func InitUserRouter(container *restful.Container) { }). Doc("登录"). Metadata(restfulspec.KeyOpenAPITags, tags). - Reads(entity.SysUser{})) // from the request + Reads(form.Login{}). + Writes(vo.TokenVo{}). + Returns(200, "OK", vo.TokenVo{})) ws.Route(ws.POST("/logout").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithNeedToken(false).WithNeedCasbin(false).WithLog("退出登录").Handle(s.LogOut) @@ -44,17 +49,23 @@ func InitUserRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithNeedCasbin(false).WithLog("认证信息").Handle(s.Auth) }). Doc("认证信息"). + Param(ws.QueryParameter("username", "username").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes(entity.SysUser{}). - Returns(200, "OK", entity.SysUser{})) + Writes(vo.AuthVo{}). + Returns(200, "OK", vo.AuthVo{})) ws.Route(ws.GET("/list").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("得到用户分页列表").Handle(s.GetSysUserList) }). Doc("得到用户分页列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("username", "username").DataType("string")). + Param(ws.QueryParameter("phone", "phone").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.SysUser{}). - Returns(200, "OK", []entity.SysUser{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/getById/{userId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取用户信息").Handle(s.GetSysUser) @@ -62,8 +73,8 @@ func InitUserRouter(container *restful.Container) { Doc("获取用户信息"). Param(ws.PathParameter("userId", "Id").DataType("int").DefaultValue("1")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes(entity.SysUser{}). // on the response - Returns(200, "OK", entity.SysUser{}). + Writes(vo.UserVo{}). + Returns(200, "OK", vo.UserVo{}). Returns(404, "Not Found", nil)) ws.Route(ws.GET("/getInit").To(func(request *restful.Request, response *restful.Response) { @@ -71,8 +82,8 @@ func InitUserRouter(container *restful.Container) { }). Doc("获取初始化角色岗位信息(添加用户初始化)"). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes(entity.SysUser{}). // on the response - Returns(200, "OK", entity.SysUser{}). + Writes(vo.UserRolePost{}). // on the response + Returns(200, "OK", vo.UserRolePost{}). Returns(404, "Not Found", nil)) ws.Route(ws.GET("/getRoPo").To(func(request *restful.Request, response *restful.Response) { @@ -80,7 +91,7 @@ func InitUserRouter(container *restful.Container) { }). Doc("获取用户角色岗位信息(添加用户初始化)"). Metadata(restfulspec.KeyOpenAPITags, tags). - Returns(200, "OK", entity.SysUser{}). + Returns(200, "OK", vo.UserRolePost{}). Returns(404, "Not Found", nil)) ws.Route(ws.POST("").To(func(request *restful.Request, response *restful.Response) { @@ -94,13 +105,15 @@ func InitUserRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("修改用户信息").Handle(s.UpdateSysUser) }). Doc("修改用户信息"). - Metadata(restfulspec.KeyOpenAPITags, tags)) // from the request + Metadata(restfulspec.KeyOpenAPITags, tags). + Reads(entity.SysUser{})) ws.Route(ws.PUT("/changeStatus").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("修改用户状态").Handle(s.UpdateSysUserStu) }). Doc("修改用户状态"). - Metadata(restfulspec.KeyOpenAPITags, tags)) // from the request + Metadata(restfulspec.KeyOpenAPITags, tags). + Reads(entity.SysUser{})) ws.Route(ws.DELETE("/{userId}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("删除用户信息").Handle(s.DeleteSysUser) @@ -125,6 +138,10 @@ func InitUserRouter(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("导出用户信息").Handle(s.ExportUser) }). Doc("导出用户信息"). + Param(ws.QueryParameter("filename", "filename").DataType("string")). + Param(ws.QueryParameter("status", "status").DataType("string")). + Param(ws.QueryParameter("username", "username").DataType("string")). + Param(ws.QueryParameter("phone", "phone").DataType("string")). Metadata(restfulspec.KeyOpenAPITags, tags)) container.Add(ws) diff --git a/go.mod b/go.mod index 1aace5c..0b99c97 100644 --- a/go.mod +++ b/go.mod @@ -96,3 +96,5 @@ require ( gorm.io/driver/sqlserver v1.2.1 // indirect gorm.io/plugin/dbresolver v1.1.0 // indirect ) + +replace github.com/XM-GO/PandaKit => D:\workspace\go\project\PandaX\PandaKit \ No newline at end of file diff --git a/resource/template/go/api.template b/resource/template/go/api.template index 811c599..5a4ea25 100644 --- a/resource/template/go/api.template +++ b/resource/template/go/api.template @@ -33,12 +33,12 @@ func (p *{{.ClassName}}Api) Get{{.ClassName}}List(rc *restfulx.ReqCtx) { list, total := p.{{.ClassName}}App.FindListPage(pageNum, pageSize, data) - rc.ResData = map[string]interface{}{ - "data": list, - "total": total, - "pageNum": pageNum, - "pageSize": pageSize, - } + rc.ResData = model.ResultPage{ + Total: total, + PageNum: int64(pageNum), + PageSize: int64(pageNum), + Data: list, + } } // Get{{.ClassName}} 获取{{.FunctionName}} diff --git a/resource/template/go/router.template b/resource/template/go/router.template index 705c933..3a0fe79 100644 --- a/resource/template/go/router.template +++ b/resource/template/go/router.template @@ -28,9 +28,11 @@ func Init{{.ClassName}}Router(container *restful.Container) { restfulx.NewReqCtx(request, response).WithLog("获取{{.FunctionName}}分页列表").Handle(s.Get{{.ClassName}}List) }). Doc("获取{{.FunctionName}}分页列表"). + Param(ws.QueryParameter("pageNum", "页数").Required(true).DataType("int")). + Param(ws.QueryParameter("pageSize", "每页条数").Required(true).DataType("int")). Metadata(restfulspec.KeyOpenAPITags, tags). - Writes([]entity.{{.ClassName}}{}). - Returns(200, "OK", []entity.{{.ClassName}}{})) + Writes(model.ResultPage{}). + Returns(200, "OK", model.ResultPage{})) ws.Route(ws.GET("/{{"{"}}{{.PkJsonField}}{{"}"}}").To(func(request *restful.Request, response *restful.Response) { restfulx.NewReqCtx(request, response).WithLog("获取{{.FunctionName}}信息").Handle(s.Get{{.ClassName}})