From e9b7d1266f5a9ae7f9e9c7867146b1d901c3c3ca Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Mon, 13 Nov 2023 14:22:40 +0800 Subject: [PATCH] Fix API typo: /get-global-certs --- controllers/cert.go | 10 +++++----- object/cert.go | 2 +- routers/router.go | 2 +- swagger/swagger.json | 4 ++-- swagger/swagger.yml | 4 ++-- web/src/CertListPage.js | 2 +- web/src/backend/CertBackend.js | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/controllers/cert.go b/controllers/cert.go index d89b8c92..a2681663 100644 --- a/controllers/cert.go +++ b/controllers/cert.go @@ -65,13 +65,13 @@ func (c *ApiController) GetCerts() { } } -// GetGlobleCerts -// @Title GetGlobleCerts +// GetGlobalCerts +// @Title GetGlobalCerts // @Tag Cert API // @Description get globle certs // @Success 200 {array} object.Cert The Response object -// @router /get-globle-certs [get] -func (c *ApiController) GetGlobleCerts() { +// @router /get-global-certs [get] +func (c *ApiController) GetGlobalCerts() { limit := c.Input().Get("pageSize") page := c.Input().Get("p") field := c.Input().Get("field") @@ -80,7 +80,7 @@ func (c *ApiController) GetGlobleCerts() { sortOrder := c.Input().Get("sortOrder") if limit == "" || page == "" { - maskedCerts, err := object.GetMaskedCerts(object.GetGlobleCerts()) + maskedCerts, err := object.GetMaskedCerts(object.GetGlobalCerts()) if err != nil { c.ResponseError(err.Error()) return diff --git a/object/cert.go b/object/cert.go index f2644c50..0ff5062f 100644 --- a/object/cert.go +++ b/object/cert.go @@ -87,7 +87,7 @@ func GetGlobalCertsCount(field, value string) (int64, error) { return session.Count(&Cert{}) } -func GetGlobleCerts() ([]*Cert, error) { +func GetGlobalCerts() ([]*Cert, error) { certs := []*Cert{} err := ormer.Engine.Desc("created_time").Find(&certs) if err != nil { diff --git a/routers/router.go b/routers/router.go index 08733b09..4194213f 100644 --- a/routers/router.go +++ b/routers/router.go @@ -204,7 +204,7 @@ func initAPI() { beego.Router("/api/run-syncer", &controllers.ApiController{}, "GET:RunSyncer") beego.Router("/api/get-certs", &controllers.ApiController{}, "GET:GetCerts") - beego.Router("/api/get-globle-certs", &controllers.ApiController{}, "GET:GetGlobleCerts") + beego.Router("/api/get-global-certs", &controllers.ApiController{}, "GET:GetGlobalCerts") beego.Router("/api/get-cert", &controllers.ApiController{}, "GET:GetCert") beego.Router("/api/update-cert", &controllers.ApiController{}, "POST:UpdateCert") beego.Router("/api/add-cert", &controllers.ApiController{}, "POST:AddCert") diff --git a/swagger/swagger.json b/swagger/swagger.json index d87081aa..df14350c 100644 --- a/swagger/swagger.json +++ b/swagger/swagger.json @@ -2023,13 +2023,13 @@ } } }, - "/api/get-globle-certs": { + "/api/get-global-certs": { "get": { "tags": [ "Cert API" ], "description": "get globle certs", - "operationId": "ApiController.GetGlobleCerts", + "operationId": "ApiController.GetGlobalCerts", "responses": { "200": { "description": "The Response object", diff --git a/swagger/swagger.yml b/swagger/swagger.yml index 4a22816a..628d9920 100644 --- a/swagger/swagger.yml +++ b/swagger/swagger.yml @@ -1311,12 +1311,12 @@ paths: type: array items: $ref: '#/definitions/object.User' - /api/get-globle-certs: + /api/get-global-certs: get: tags: - Cert API description: get globle certs - operationId: ApiController.GetGlobleCerts + operationId: ApiController.GetGlobalCerts responses: "200": description: The Response object diff --git a/web/src/CertListPage.js b/web/src/CertListPage.js index dc202da8..46b72c4a 100644 --- a/web/src/CertListPage.js +++ b/web/src/CertListPage.js @@ -239,7 +239,7 @@ class CertListPage extends BaseListPage { value = params.type; } this.setState({loading: true}); - (Setting.isDefaultOrganizationSelected(this.props.account) ? CertBackend.getGlobleCerts(params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder) + (Setting.isDefaultOrganizationSelected(this.props.account) ? CertBackend.getGlobalCerts(params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder) : CertBackend.getCerts(Setting.getRequestOrganization(this.props.account), params.pagination.current, params.pagination.pageSize, field, value, sortField, sortOrder)) .then((res) => { this.setState({ diff --git a/web/src/backend/CertBackend.js b/web/src/backend/CertBackend.js index 7a4fed95..9c760727 100644 --- a/web/src/backend/CertBackend.js +++ b/web/src/backend/CertBackend.js @@ -24,8 +24,8 @@ export function getCerts(owner, page = "", pageSize = "", field = "", value = "" }).then(res => res.json()); } -export function getGlobleCerts(page = "", pageSize = "", field = "", value = "", sortField = "", sortOrder = "") { - return fetch(`${Setting.ServerUrl}/api/get-globle-certs?&p=${page}&pageSize=${pageSize}&field=${field}&value=${value}&sortField=${sortField}&sortOrder=${sortOrder}`, { +export function getGlobalCerts(page = "", pageSize = "", field = "", value = "", sortField = "", sortOrder = "") { + return fetch(`${Setting.ServerUrl}/api/get-global-certs?&p=${page}&pageSize=${pageSize}&field=${field}&value=${value}&sortField=${sortField}&sortOrder=${sortOrder}`, { method: "GET", credentials: "include", headers: {