From 0a3573bfb78db35540b4f8c5610a431fd12e1aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Sun, 5 Nov 2023 23:03:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E5=88=86=E9=A1=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/http/controllers/cert_controller.go | 18 +++++++++--------- app/http/requests/cert/cert_add.go | 5 ----- app/http/requests/common/paginate.go | 3 --- go.mod | 2 +- go.sum | 2 ++ 5 files changed, 12 insertions(+), 18 deletions(-) diff --git a/app/http/controllers/cert_controller.go b/app/http/controllers/cert_controller.go index cf542c50..0f815c25 100644 --- a/app/http/controllers/cert_controller.go +++ b/app/http/controllers/cert_controller.go @@ -125,15 +125,15 @@ func (r *CertController) Algorithms(ctx http.Context) http.Response { // @Failure 500 {object} ErrorResponse "系统内部错误" // @Router /panel/cert/users [get] func (r *CertController) UserList(ctx http.Context) http.Response { - var updateProfileRequest commonrequests.Paginate - sanitize := Sanitize(ctx, &updateProfileRequest) + var paginateRequest commonrequests.Paginate + sanitize := Sanitize(ctx, &paginateRequest) if sanitize != nil { return sanitize } var users []models.CertUser var total int64 - err := facades.Orm().Query().Paginate(updateProfileRequest.Page, updateProfileRequest.Limit, &users, &total) + err := facades.Orm().Query().Paginate(paginateRequest.Page, paginateRequest.Limit, &users, &total) if err != nil { facades.Log().Request(ctx.Request()).Tags("面板", "证书管理").With(map[string]any{ "error": err.Error(), @@ -215,15 +215,15 @@ func (r *CertController) UserDelete(ctx http.Context) http.Response { // @Failure 500 {object} ErrorResponse "系统内部错误" // @Router /panel/cert/dns [get] func (r *CertController) DNSList(ctx http.Context) http.Response { - var updateProfileRequest commonrequests.Paginate - sanitize := Sanitize(ctx, &updateProfileRequest) + var paginateRequest commonrequests.Paginate + sanitize := Sanitize(ctx, &paginateRequest) if sanitize != nil { return sanitize } var dns []models.CertDNS var total int64 - err := facades.Orm().Query().Paginate(updateProfileRequest.Page, updateProfileRequest.Limit, &dns, &total) + err := facades.Orm().Query().Paginate(paginateRequest.Page, paginateRequest.Limit, &dns, &total) if err != nil { facades.Log().Request(ctx.Request()).Tags("面板", "证书管理").With(map[string]any{ "error": err.Error(), @@ -305,15 +305,15 @@ func (r *CertController) DNSDelete(ctx http.Context) http.Response { // @Failure 500 {object} ErrorResponse "系统内部错误" // @Router /panel/cert/certs [get] func (r *CertController) CertList(ctx http.Context) http.Response { - var updateProfileRequest commonrequests.Paginate - sanitize := Sanitize(ctx, &updateProfileRequest) + var paginateRequest commonrequests.Paginate + sanitize := Sanitize(ctx, &paginateRequest) if sanitize != nil { return sanitize } var certs []models.Cert var total int64 - err := facades.Orm().Query().Paginate(updateProfileRequest.Page, updateProfileRequest.Limit, &certs, &total) + err := facades.Orm().Query().Paginate(paginateRequest.Page, paginateRequest.Limit, &certs, &total) if err != nil { facades.Log().Request(ctx.Request()).Tags("面板", "证书管理").With(map[string]any{ "error": err.Error(), diff --git a/app/http/requests/cert/cert_add.go b/app/http/requests/cert/cert_add.go index 598e8169..ac822e66 100644 --- a/app/http/requests/cert/cert_add.go +++ b/app/http/requests/cert/cert_add.go @@ -44,10 +44,5 @@ func (r *CertAdd) Attributes(ctx http.Context) map[string]string { } func (r *CertAdd) PrepareForValidation(ctx http.Context, data validation.Data) error { - err := data.Set("user_id", uint(ctx.Request().InputInt("user_id"))) - if err != nil { - return err - } - return nil } diff --git a/app/http/requests/common/paginate.go b/app/http/requests/common/paginate.go index 2375b90f..72061a45 100644 --- a/app/http/requests/common/paginate.go +++ b/app/http/requests/common/paginate.go @@ -37,8 +37,5 @@ func (r *Paginate) Attributes(ctx http.Context) map[string]string { } func (r *Paginate) PrepareForValidation(ctx http.Context, data validation.Data) error { - _ = data.Set("page", ctx.Request().QueryInt("page")) - _ = data.Set("limit", ctx.Request().QueryInt("limit")) - return nil } diff --git a/go.mod b/go.mod index 8bc426d0..89b1f019 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,7 @@ require ( github.com/go-acme/lego/v4 v4.14.2 github.com/gookit/color v1.5.4 github.com/goravel/fiber v1.1.10 - github.com/goravel/framework v1.13.1-0.20231104153423-7bfd9573b12d + github.com/goravel/framework v1.13.1-0.20231105145249-62c723ac8fd1 github.com/iancoleman/strcase v0.3.0 github.com/imroc/req/v3 v3.42.1 github.com/mojocn/base64Captcha v1.3.5 diff --git a/go.sum b/go.sum index c72ce007..bae59a31 100644 --- a/go.sum +++ b/go.sum @@ -387,6 +387,8 @@ github.com/goravel/file-rotatelogs/v2 v2.4.1 h1:ogkeIFcTHSBRUBpZYiyJbpul8hkVXxHP github.com/goravel/file-rotatelogs/v2 v2.4.1/go.mod h1:euk9qr52WrzM8ICs1hecFcR4CZ/ZZOPdacHfvHgbOf0= github.com/goravel/framework v1.13.1-0.20231104153423-7bfd9573b12d h1:20bsAUUZWGcB8LvCP3nbO+fxGPuwYITiUJGnyx2xUgQ= github.com/goravel/framework v1.13.1-0.20231104153423-7bfd9573b12d/go.mod h1:5jKFbJzfqhaQTP3HCgbyrpnrCyoJjxN5JWSXO96H0iQ= +github.com/goravel/framework v1.13.1-0.20231105145249-62c723ac8fd1 h1:Bi86UTQtrQIo74ler6NbbXTy0dOGGZaNwtRcBOuZom8= +github.com/goravel/framework v1.13.1-0.20231105145249-62c723ac8fd1/go.mod h1:5jKFbJzfqhaQTP3HCgbyrpnrCyoJjxN5JWSXO96H0iQ= github.com/gorilla/securecookie v1.1.1/go.mod h1:ra0sb63/xPlUeL+yeDciTfxMRAA+MP+HVt/4epWDjd4= github.com/gorilla/sessions v1.2.1/go.mod h1:dk2InVEVJ0sfLlnXv9EAgkf6ecYs/i80K/zI+bUmuGM= github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 h1:UH//fgunKIs4JdUbpDl1VZCDaL56wXCB/5+wF6uHfaI=