diff --git a/server/common/req.go b/server/common/req.go index 811c4b8c..29c0c983 100644 --- a/server/common/req.go +++ b/server/common/req.go @@ -1,8 +1,8 @@ package common type PageReq struct { - PageIndex int `json:"page_index" form:"page_index"` - PageSize int `json:"page_size" form:"page_size"` + Page int `json:"page_index" form:"page"` + PerPage int `json:"page_size" form:"per_page"` } const MaxUint = ^uint(0) @@ -11,10 +11,10 @@ const MaxInt = int(MaxUint >> 1) const MinInt = -MaxInt - 1 func (p *PageReq) Validate() { - if p.PageIndex < 1 { - p.PageIndex = 1 + if p.Page < 1 { + p.Page = 1 } - if p.PageSize < 1 { - p.PageSize = MaxInt + if p.PerPage < 1 { + p.PerPage = MaxInt } } diff --git a/server/handles/fsmanage.go b/server/handles/fsmanage.go index 2649a82a..5a66894e 100644 --- a/server/handles/fsmanage.go +++ b/server/handles/fsmanage.go @@ -230,9 +230,9 @@ func FsPut(c *gin.Context) { common.SuccessResp(c) } -// Link return real link, just for proxy program, it may contain cookie +// Link return real link, just for proxy program, it may contain cookie, so just allowed for admin func Link(c *gin.Context) { - var req FsGetOrLinkReq + var req MkdirOrLinkReq if err := c.ShouldBind(&req); err != nil { common.ErrorResp(c, err, 400) return diff --git a/server/handles/fsread.go b/server/handles/fsread.go index c8a10999..3f20f426 100644 --- a/server/handles/fsread.go +++ b/server/handles/fsread.go @@ -153,7 +153,7 @@ func canAccess(user *model.User, meta *model.Meta, path string, password string) } func pagination(objs []model.Obj, req *common.PageReq) (int, []model.Obj) { - pageIndex, pageSize := req.PageIndex, req.PageSize + pageIndex, pageSize := req.Page, req.PerPage total := len(objs) start := (pageIndex - 1) * pageSize if start > total { @@ -190,7 +190,7 @@ func toObjResp(objs []model.Obj) []ObjResp { return resp } -type FsGetOrLinkReq struct { +type FsGetReq struct { Path string `json:"path" form:"path"` Password string `json:"password" form:"password"` } @@ -204,7 +204,7 @@ type FsGetResp struct { } func FsGet(c *gin.Context) { - var req FsGetOrLinkReq + var req FsGetReq if err := c.ShouldBind(&req); err != nil { common.ErrorResp(c, err, 400) return diff --git a/server/handles/meta.go b/server/handles/meta.go index 0ae1e528..07498374 100644 --- a/server/handles/meta.go +++ b/server/handles/meta.go @@ -22,7 +22,7 @@ func ListMetas(c *gin.Context) { } req.Validate() log.Debugf("%+v", req) - metas, total, err := db.GetMetas(req.PageIndex, req.PageSize) + metas, total, err := db.GetMetas(req.Page, req.PerPage) if err != nil { common.ErrorResp(c, err, 500, true) return diff --git a/server/handles/storage.go b/server/handles/storage.go index 68c77a90..e8833b47 100644 --- a/server/handles/storage.go +++ b/server/handles/storage.go @@ -19,7 +19,7 @@ func ListStorages(c *gin.Context) { } req.Validate() log.Debugf("%+v", req) - storages, total, err := db.GetStorages(req.PageIndex, req.PageSize) + storages, total, err := db.GetStorages(req.Page, req.PerPage) if err != nil { common.ErrorResp(c, err, 500) return diff --git a/server/handles/user.go b/server/handles/user.go index 2902d682..18175750 100644 --- a/server/handles/user.go +++ b/server/handles/user.go @@ -18,7 +18,7 @@ func ListUsers(c *gin.Context) { } req.Validate() log.Debugf("%+v", req) - users, total, err := db.GetUsers(req.PageIndex, req.PageSize) + users, total, err := db.GetUsers(req.Page, req.PerPage) if err != nil { common.ErrorResp(c, err, 500, true) return