From 0505045c812d753aaedbf982548510c5c248c388 Mon Sep 17 00:00:00 2001
From: maggieyyy <61950669+maggieyyy@users.noreply.github.com>
Date: Mon, 21 Oct 2024 17:41:30 +0800
Subject: [PATCH] fix: router config
---
.../components/aoplatform/RenderRoutes.tsx | 82 ++++------
.../businessEntry/src/consts/const.tsx | 142 +++++++++++++++---
.../components/aoplatform/RenderRoutes.tsx | 4 +-
3 files changed, 152 insertions(+), 76 deletions(-)
diff --git a/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx b/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx
index 22fcb660..4dce1229 100644
--- a/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx
+++ b/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx
@@ -139,9 +139,21 @@ const PUBLIC_ROUTES:RouteConfig[] = [
key: 'restServiceInsideApi',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/api/SystemInsideApiDocument.tsx')),
},
+ {
+
+ path:'route/create',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/api/SystemInsideRouterCreate')),
+ },
+ {
+
+ path:'route/:routeId',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/api/SystemInsideRouterCreate')),
+ },
{
path:'route',
- key: 'restServiceInsideRoute',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/api/SystemInsideRouterList')),
},
{
@@ -208,77 +220,47 @@ const PUBLIC_ROUTES:RouteConfig[] = [
key: 'systemConfig',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/SystemConfig.tsx')),
children:[
-
]
},
]
- }
- ]
- }
- ]
- },
-
- {
- path:'aiservice',
- component:,
- key: 'aiService',
- provider: AiServiceProvider,
- children:[
- {
- path:'',
- key:'aiServiceList',
- component:
- },
- {
- path:'list',
- key: 'aiServiceList2',
- lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/AiServiceList.tsx')),
- },
- {
- path:'list/:teamId',
- key: 'aiServiceList3',
- lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/AiServiceList.tsx')),
- },
- {
- path:':teamId',
- component:,
- key: 'aiServiceInside',
- children:[
+ },
{
- path:'inside/:serviceId',
- key: '',
+ path:'aiInside/:serviceId',
+ component:,
+ provider: AiServiceProvider,
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/AiServiceInsidePage.tsx')),
children:[
{
path:'api',
- key: 'aiServiceInsideApi',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/api/AiServiceInsideApiDocument')),
},
{
path:'route/create',
- key: 'aiServiceInsideRoute',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/api/AiServiceInsideRouterCreate')),
},
{
path:'route/:routeId',
- key: 'aiServiceInsideRoute2',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/api/AiServiceInsideRouterCreate')),
},
{
path:'route',
- key: 'aiServiceInsideList',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/api/AiServiceInsideRouterList')),
},
{
path:'document',
- key: 'aiServiceInsideDocument',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/AiServiceInsideDocument.tsx')),
},
{
path:'subscriber',
- key: 'aiServiceInsideSubscriber',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/AiServiceInsideSubscriber.tsx')),
children:[
@@ -286,42 +268,42 @@ const PUBLIC_ROUTES:RouteConfig[] = [
},
{
path:'approval',
- key: 'aiServiceInsideApproval',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/approval/AiServiceInsideApproval')),
children:[
{
path:'',
- key: 'aiServiceInsideApprovalList',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/approval/AiServiceInsideApprovalList')),
},
{
path:'*',
- key: 'aiServiceInsideApprovalList',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/approval/AiServiceInsideApprovalList')),
}
]
},
{
path:'publish',
- key: 'aiServiceInsidePublish',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/publish/AiServiceInsidePublish')),
children:[
{
path:'',
- key: 'aiServiceInsidePublishList',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/publish/AiServiceInsidePublishList')),
},
{
path:'*',
- key: 'aiServiceInsidePublishList2',
+ key: uuidv4(),
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/publish/AiServiceInsidePublishList')),
}
]
},
{
path:'setting',
- key: 'aiServiceSetting',
- lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/AiServiceConfig.tsx')),
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/SystemConfig.tsx')),
children:[
]
diff --git a/frontend/packages/businessEntry/src/consts/const.tsx b/frontend/packages/businessEntry/src/consts/const.tsx
index 85248e36..aa81bded 100644
--- a/frontend/packages/businessEntry/src/consts/const.tsx
+++ b/frontend/packages/businessEntry/src/consts/const.tsx
@@ -57,57 +57,69 @@ import Guide from '@core/pages/guide/Guide';
type: 'module',
path:'service',
component:,
- key: uuidv4(),
+ key: 'restService',
provider: SystemProvider,
children:[
{
path:'',
- key:uuidv4(),
+ key:'restServiceList',
component:
},
{
path:'list',
- key: uuidv4(),
+ key: 'restServiceList2',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/SystemList.tsx')),
},
{
path:'list/:teamId',
- key: uuidv4(),
+ key: 'restServiceList3',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/SystemList.tsx')),
},
{
path:':teamId',
component:,
- key: uuidv4(),
+ key: 'restServiceInside',
children:[
{
path:'inside/:serviceId',
- key: uuidv4(),
+ key: 'restServiceInside2',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/SystemInsidePage.tsx')),
children:[
{
path:'api',
- key: uuidv4(),
+ key: 'restServiceInsideApi',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/api/SystemInsideApiDocument.tsx')),
},
+ {
+
+ path:'route/create',
+ key: 'restServiceInsideRouteCreate',
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/api/SystemInsideRouterCreate')),
+ },
+ {
+
+ path:'route/:routeId',
+ key: 'restServiceInsideRouteEdit',
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/api/SystemInsideRouterCreate')),
+ },
{
path:'router',
- key: uuidv4(),
+ key: 'restServiceInsideRoute',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/api/SystemInsideRouterList')),
},
{
path:'upstream',
- key: uuidv4(),
+ key: 'restServiceInsideUpstream',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/upstream/SystemInsideUpstreamContent.tsx')),
},
{
path:'document',
- key: uuidv4(),
+ key: 'restServiceInsideDocument',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/SystemInsideDocument.tsx')),
},
{
path:'subscriber',
- key: uuidv4(),
+ key: 'restServiceInsideSubscriber',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/SystemInsideSubscriber.tsx')),
children:[
@@ -115,17 +127,17 @@ import Guide from '@core/pages/guide/Guide';
},
{
path:'approval',
- key: uuidv4(),
+ key: 'restServiceInsideApproval',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/approval/SystemInsideApproval.tsx')),
children:[
{
path:'',
- key: uuidv4(),
+ key: 'restServiceInsideApprovalList',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/approval/SystemInsideApprovalList.tsx')),
},
{
path:'*',
- key: uuidv4(),
+ key: 'restServiceInsideApprovalList2',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/approval/SystemInsideApprovalList.tsx')),
}
]
@@ -133,37 +145,123 @@ import Guide from '@core/pages/guide/Guide';
{
path:'topology',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/SystemTopology.tsx')),
- key: uuidv4(),
+ key: 'systemTopology',
children:[
]
},
{
path:'publish',
- key: uuidv4(),
+ key: 'systemPublish',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/publish/SystemInsidePublish.tsx')),
children:[
{
path:'',
- key: uuidv4(),
+ key: 'systemPublishList',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/publish/SystemInsidePublishList.tsx')),
},
{
path:'*',
- key: uuidv4(),
+ key: 'systemPublishList2',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/publish/SystemInsidePublishList.tsx')),
}
]
},
{
path:'setting',
- key: uuidv4(),
+ key: 'systemConfig',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/SystemConfig.tsx')),
children:[
]
},
]
- }
+ },
+ {
+ path:'aiInside/:serviceId',
+ component:,
+ provider: AiServiceProvider,
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/AiServiceInsidePage.tsx')),
+ children:[
+ {
+ path:'api',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/api/AiServiceInsideApiDocument')),
+ },
+ {
+
+ path:'route/create',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/api/AiServiceInsideRouterCreate')),
+ },
+ {
+
+ path:'route/:routeId',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/api/AiServiceInsideRouterCreate')),
+ },
+ {
+ path:'route',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/api/AiServiceInsideRouterList')),
+ },
+ {
+ path:'document',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/AiServiceInsideDocument.tsx')),
+ },
+ {
+ path:'subscriber',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/AiServiceInsideSubscriber.tsx')),
+ children:[
+
+ ]
+ },
+ {
+ path:'approval',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/approval/AiServiceInsideApproval')),
+ children:[
+ {
+ path:'',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/approval/AiServiceInsideApprovalList')),
+ },
+ {
+ path:'*',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/approval/AiServiceInsideApprovalList')),
+ }
+ ]
+ },
+ {
+ path:'publish',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/publish/AiServiceInsidePublish')),
+ children:[
+ {
+ path:'',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/publish/AiServiceInsidePublishList')),
+ },
+ {
+ path:'*',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/aiService/publish/AiServiceInsidePublishList')),
+ }
+ ]
+ },
+ {
+ path:'setting',
+ key: uuidv4(),
+ lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/SystemConfig.tsx')),
+ children:[
+
+ ]
+ },
+ ]
+ }
]
}
]
@@ -200,10 +298,6 @@ import Guide from '@core/pages/guide/Guide';
}]
}],
- ['servicecategories', { type: 'module',
- lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/serviceCategory/ServiceCategory.tsx')),
- }],
-
['tenantManagement', { type: 'module',
component:,
provider:TenantManagementProvider,
diff --git a/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx b/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx
index 0eb5322b..884749c5 100644
--- a/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx
+++ b/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx
@@ -142,13 +142,13 @@ const PUBLIC_ROUTES:RouteConfig[] = [
{
path:'route/create',
- key: uuidv4(),
+ key: 'restServiceInsideRouteCreate',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/api/SystemInsideRouterCreate')),
},
{
path:'route/:routeId',
- key: uuidv4(),
+ key: 'restServiceInsideRouteEdit',
lazy:lazy(() => import(/* webpackChunkName: "[request]" */ '@core/pages/system/api/SystemInsideRouterCreate')),
},
{