diff --git a/api/internal/route.go b/api/internal/route.go index 155303d391..28fc2cd437 100644 --- a/api/internal/route.go +++ b/api/internal/route.go @@ -21,7 +21,7 @@ import ( "github.com/apisix/manager-api/internal/handler/statistic" "path/filepath" - "github.com/gin-contrib/pprof" + // "github.com/gin-contrib/pprof" "github.com/gin-contrib/static" "github.com/gin-gonic/gin" @@ -95,7 +95,7 @@ func SetUpRouter() *gin.Engine { h.ApplyRoute(r) } - pprof.Register(r) + // pprof.Register(r) return r } diff --git a/web/cypress/integration/upstream/create_and_edit_upstream_with_custom_chash_key.spec.js b/web/cypress/integration/upstream/create_and_edit_upstream_with_custom_chash_key.spec.js index 7b02a1459c..7aa3357039 100644 --- a/web/cypress/integration/upstream/create_and_edit_upstream_with_custom_chash_key.spec.js +++ b/web/cypress/integration/upstream/create_and_edit_upstream_with_custom_chash_key.spec.js @@ -83,6 +83,7 @@ context('Create and Delete Upstream With Custom CHash Key', () => { cy.contains('Next').click(); cy.contains('Submit').click(); cy.get(selector.notification).should('contain', data.createUpstreamSuccess); + cy.contains('.ant-table-cell', 'ID').should('be.visible'); cy.url().should('contains', 'upstream/list'); }); diff --git a/web/src/pages/Upstream/List.tsx b/web/src/pages/Upstream/List.tsx index 249abd2827..52be85ed17 100644 --- a/web/src/pages/Upstream/List.tsx +++ b/web/src/pages/Upstream/List.tsx @@ -51,6 +51,11 @@ const Page: React.FC = () => { }, [window.location.search]); const columns: ProColumns[] = [ + { + title: formatMessage({ id: 'page.upstream.list.id' }), + dataIndex: 'id', + hideInSearch: true, + }, { title: formatMessage({ id: 'page.upstream.list.name' }), dataIndex: 'name', diff --git a/web/src/pages/Upstream/locales/en-US.ts b/web/src/pages/Upstream/locales/en-US.ts index 01038ead2f..14e811fd11 100644 --- a/web/src/pages/Upstream/locales/en-US.ts +++ b/web/src/pages/Upstream/locales/en-US.ts @@ -76,6 +76,7 @@ export default { 'page.upstream.create.basic.info': 'Basic Information', 'page.upstream.create.preview': 'Preview', + 'page.upstream.list.id': 'ID', 'page.upstream.list.name': 'Name', 'page.upstream.list.type': 'Type', 'page.upstream.list.description': 'Description', diff --git a/web/src/pages/Upstream/locales/zh-CN.ts b/web/src/pages/Upstream/locales/zh-CN.ts index b2d6778f77..3bd84ebb1d 100644 --- a/web/src/pages/Upstream/locales/zh-CN.ts +++ b/web/src/pages/Upstream/locales/zh-CN.ts @@ -75,6 +75,7 @@ export default { 'page.upstream.create.basic.info': '基础信息', 'page.upstream.create.preview': '预览', + 'page.upstream.list.id': 'ID', 'page.upstream.list.name': '名称', 'page.upstream.list.type': '类型', 'page.upstream.list.description': '描述',