diff --git a/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx b/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx index 76e06bfd..dea284a8 100644 --- a/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx +++ b/frontend/packages/businessEntry/src/components/aoplatform/RenderRoutes.tsx @@ -253,7 +253,7 @@ const PUBLIC_ROUTES:RouteConfig[] = [ key:uuidv4(), }, { - path:'tenantManagement', + path:'consumer', component:, provider:TenantManagementProvider, key:uuidv4(), diff --git a/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx b/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx index 4bba087c..207996b8 100644 --- a/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx +++ b/frontend/packages/common/src/components/aoplatform/BasicLayout.tsx @@ -48,8 +48,8 @@ const themeToken = { const TOTAL_MENU_ITEMS:MenuProps['items'] = useMemo(() => [ getNavItem($t('工作空间'), 'workspace','/guide/page',, [ getNavItem({$t('首页')}, 'guide','/guide/page',,undefined,undefined,'all'), - getNavItem({$t('应用')}, 'tenantManagement','/tenantManagement',,undefined,undefined,'all'), getNavItem({$t('服务')}, 'service','/service',,undefined,undefined,'all'), + getNavItem({$t('消费者')}, 'consumer','/consumer',,undefined,undefined,'all'), getNavItem({$t('团队')}, 'team','/team',,undefined,undefined,'all'), ]), getNavItem($t('API 市场'), 'serviceHub','/serviceHub',,undefined,undefined,'system.workspace.api_market.view'), diff --git a/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx b/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx index 9d08413e..769b33f8 100644 --- a/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx +++ b/frontend/packages/common/src/components/aoplatform/UnUsedWordForTranslate.tsx @@ -17,8 +17,8 @@ export const TranslateWord = ()=>{ {$t('只读成员')} {$t('服务管理员')} {$t('服务开发者')} - {$t('应用开发者')} - {$t('应用管理员')} + {$t('消费者开发者')} + {$t('消费者管理员')} {$t('驱动名称')} {$t('请求失败数')} {$t('转发失败数')} @@ -53,8 +53,8 @@ export const TranslateWord = ()=>{ {$t('上传 OpenAPI 文档 (.json/.yaml)')} {$t('替换 OpenAPI 文档 (.json/.yaml)')} {$t('打开 OpenAPI YAML 编辑器')} - {$t('无需审核：允许任何应用调用该服务')} - {$t('人工审核：仅允许通过人工审核的应用调用该服务')} + {$t('无需审核：允许任何消费者调用该服务')} + {$t('人工审核：仅允许通过人工审核的消费者调用该服务')} {$t('永久')} {$t('否')} {$t('是')} @@ -72,7 +72,7 @@ export const TranslateWord = ()=>{ {$t('版本状态')} {$t('创建人')} {$t('审核时间')} - {$t('申请方-应用')} + {$t('申请方-消费者')} {$t('审核状态')} {$t('申请人')} {$t('审核人')} diff --git a/frontend/packages/common/src/const/approval/const.tsx b/frontend/packages/common/src/const/approval/const.tsx index 6d6c9741..905834d3 100644 --- a/frontend/packages/common/src/const/approval/const.tsx +++ b/frontend/packages/common/src/const/approval/const.tsx @@ -15,7 +15,7 @@ export const SUBSCRIBE_APPROVAL_TABLE_COLUMN : PageProColumns([ - ['workspace',['tenantManagement','service','team','guide']], - ['my',['tenantManagement','service','team']], + ['workspace',['consumer','service','team','guide']], + ['my',['consumer','service','team']], ['mainPage',['dashboard','systemrunning']], ['operationCenter',['member','user','role','common']], ['organization',['member','user','role']], @@ -68,4 +68,9 @@ export const routerKeyMap = new Map([ export const DELETE_TIPS = { default:('该数据删除后将无法找回，请确认是否删除？') - } \ No newline at end of file + } + + export const DATA_SHOW_TYPE_OPTIONS = [ + {label:'列表', value:'list'}, + {label:'块', value:'block'}, + ] \ No newline at end of file diff --git a/frontend/packages/common/src/locales/keyHashMap.json b/frontend/packages/common/src/locales/keyHashMap.json index 31e50cfd..e0f6def1 100644 --- a/frontend/packages/common/src/locales/keyHashMap.json +++ b/frontend/packages/common/src/locales/keyHashMap.json @@ -1,7 +1,7 @@ { "工作空间": "Kc0e5ef9f", "首页": "K4de11e23", - "应用": "Kfe93ef35", + "消费者": "Kfe93ef35", "服务": "Kb58e0c3f", "团队": "Kc9e489f5", "API 市场": "K61c89f5f", @@ -95,8 +95,8 @@ "只读成员": "Ke41d7451", "服务管理员": "Kf99e8b66", "服务开发者": "Kda8db57a", - "应用开发者": "K216a1ac7", - "应用管理员": "K27924db", + "消费者开发者": "K216a1ac7", + "消费者管理员": "K27924db", "驱动名称": "K8dc5c723", "请求失败数": "Kda249fe8", "转发失败数": "Kcf2df651", @@ -131,8 +131,8 @@ "上传 OpenAPI 文档 (.json/.yaml)": "K6206e4ad", "替换 OpenAPI 文档 (.json/.yaml)": "Kfba46e6d", "打开 OpenAPI YAML 编辑器": "Kdac8ce7e", - "无需审核：允许任何应用调用该服务": "Kffd7e274", - "人工审核：仅允许通过人工审核的应用调用该服务": "K8a8b13e4", + "无需审核：允许任何消费者调用该服务": "Kffd7e274", + "人工审核：仅允许通过人工审核的消费者调用该服务": "K8a8b13e4", "永久": "Kbfe02d7f", "否": "K1e9c479e", "是": "Kaddfcb6b", @@ -150,7 +150,7 @@ "版本状态": "Kcbf39b82", "创建人": "K339d15b5", "审核时间": "K7194cea2", - "申请方-应用": "K831aa6c0", + "申请方-消费者": "K831aa6c0", "审核状态": "K7ad449bc", "审核人": "K3b3a98ce", "来源": "K61b62ace", @@ -369,7 +369,7 @@ "创建 AI 服务和 API": "Kc057704a", "创建 AI 类型的服务，并且你可以将 Prompt 提示词设置为一个 API，简化使用 AI 的流程。": "K76bb4a09", "创建调用 Token": "K71b2c70f", - "为了安全地调用 API，你需要创建一个应用以及Token。": "K9bdd8403", + "为了安全地调用 API，你需要创建一个消费者以及Token。": "K9bdd8403", "调用": "Kc5738b6c", "现在你可以通过 Token 来调用这些 API。": "Kd6d7ca1f", "快速接入 REST API": "K86cf95f", @@ -379,13 +379,13 @@ "核心功能": "K2cdbb773", "账号与角色": "K3378c50d", "邀请你的团队成员加入 APIPark，共同管理和调用 API。": "Kda5bb930", - "团队中包含了人员、应用和服务，不同团队之间的应用和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。": "Kc8239422", + "团队中包含了人员、消费者和服务，不同团队之间的消费者和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。": "Kc8239422", "服务内包含一组 API，并且可以发布到 API 市场被其他团队使用。": "Kd5be0cd7", "权限管理": "K62e89ee7", "订阅服务": "K8f7808e6", "如果需要调用某个服务的 API，需要先订阅该服务，并且等待提供服务的团队审核后才可发起 API 请求。": "Kf2410413", "审核订阅申请": "K6c2e44b8", - "提供服务的团队可以审核来自其他团队的订阅申请，审核通过后的应用才可发起 API 请求。": "Ka0a8840a", + "提供服务的团队可以审核来自其他团队的订阅申请，审核通过后的消费者才可发起 API 请求。": "Ka0a8840a", "APIPark 提供详尽的 API 调用日志，帮助企业监控、分析和审计 API 的运行状况。": "K3453272", "Hello！欢迎使用 APIPark": "Kd518ba3e", "你能通过 APIPark 快速在企业内部构建 API 开放门户/市场，享受极致的转发性能、API 可观测、服务治理、多租户管理、订阅审核流程等诸多好处。": "K7e04ea16", @@ -518,7 +518,7 @@ "添加成员": "Kec46a57f", "输入姓名查找": "K48724410", "搜索用户名、邮箱": "Kb9052305", - "设置团队和成员，然后你可以在团队内创建服务和应用、订阅API，成员只能看到所属团队内的服务和应用。": "K5ece3bac", + "设置团队和成员，然后你可以在团队内创建服务和消费者、订阅API，成员只能看到所属团队内的服务和消费者。": "K5ece3bac", "添加团队": "K510cdd27", "输入名称、ID、负责人查找团队": "K9244ae14", "配置团队": "Kc7b24b4b", @@ -538,8 +538,8 @@ "导出": "Ka2c794a2", "退出全屏": "Kaf70c3b", "(0)调用详情": "Kd22841a4", - "应用调用统计": "K1512e983", - "请选择应用": "Kb4d2007f", + "消费者调用统计": "K1512e983", + "请选择消费者": "Kb4d2007f", "调用趋势": "K8c7f2d2e", "(0)-(1)调用趋势": "K657c3452", "调用量统计": "Kc04efb87", @@ -562,7 +562,7 @@ "请选择服务": "Kffcfe375", "调用详情": "Ka65f739c", "API 请求量 Top10": "K89b7ac79", - "应用调用量 Top10": "Kc0915603", + "消费者调用量 Top10": "Kc0915603", "服务被调用量 Top10": "Kf90b54", "暂无请求统计数据": "Kfb26388", "请求统计": "Kc8cbd8f8", @@ -585,9 +585,9 @@ "万": "Ke6a935d", "搜索分类或标签": "Kd59290a2", "暂无API数据": "K6b75bdbc", - "搜索或选择应用": "Kd8a7a689", + "搜索或选择消费者": "Kd8a7a689", "申请理由": "K4b15d6f5", - "应用管理": "Kb7e869a4", + "消费者管理": "Kb7e869a4", "鉴权类型": "Kb71b5a13", "Iss": "K4d1465ee", "签名算法": "K5dcd7ed8", @@ -600,9 +600,9 @@ "SK": "K31418470", "Apikey": "Kbfeb5297", "隐藏鉴权信息": "Ke64e43a", - "应用名称": "K5168eb63", - "应用 ID": "K546e46f", - "删除应用": "K95764d1d", + "消费者名称": "K5168eb63", + "消费者 ID": "K546e46f", + "删除消费者": "K95764d1d", "鉴权详情": "K217cb125", "添加鉴权": "K2bb63eca", "编辑鉴权": "Kd74d69b7", @@ -619,7 +619,7 @@ "请确认是否取消订阅申请？": "K1856c229", "搜索服务": "K66ea2f0", "审核中": "K8adf7f8b", - "添加应用": "K667bbbe7", + "添加消费者": "K667bbbe7", "暂无服务描述": "Ka4b45550", "订阅的服务数量：已通过 (0) 个，申请中 (1) 个": "K3c7b175f", "退出测试": "Kbe3e9335", @@ -630,14 +630,14 @@ "Base URL": "Kc29dabf2", "申请": "K4aa9ed2c", "服务信息": "K6c060779", - "接入应用": "K8723422e", + "接入消费者": "K8723422e", "供应方": "Kb97544cb", "分类": "Kb32f0afe", "版本": "K81634069", "更新时间": "Keefda53d", "无标签": "K96a2f1c8", "API 数量": "K72b0c0b3", - "接入应用数量": "K93d5a66e", + "接入消费者数量": "K93d5a66e", "关联标签": "K96059c69", "更新者": "K8b7c2592", "添加 Open Api": "K32263abd", diff --git a/frontend/packages/common/src/locales/scan/en-US.json b/frontend/packages/common/src/locales/scan/en-US.json index 0df052f5..7d753731 100644 --- a/frontend/packages/common/src/locales/scan/en-US.json +++ b/frontend/packages/common/src/locales/scan/en-US.json @@ -4,7 +4,7 @@ "Kfe93ef35": "Application", "Kb58e0c3f": "Service", "Kc9e489f5": "Team", - "K61c89f5f": "API Marketplace", + "K61c89f5f": "API Portal", "K16d71239": "Analysis", "K714c192d": "Call Statistics", "Kd57dfe97": "Topology", diff --git a/frontend/packages/common/src/locales/scan/ja-JP.json b/frontend/packages/common/src/locales/scan/ja-JP.json index 52b8a03c..3e60bcbf 100644 --- a/frontend/packages/common/src/locales/scan/ja-JP.json +++ b/frontend/packages/common/src/locales/scan/ja-JP.json @@ -4,11 +4,11 @@ "Kfe93ef35": "Application", "Kb58e0c3f": "Service", "Kc9e489f5": "Team", - "K61c89f5f": "API マーケット", + "K61c89f5f": "API Portal", "K16d71239": "解析", "K714c192d": "呼び出し統計", "Kd57dfe97": "トポロジー図", - "K3fe97dcc": "システム設定", + "K3fe97dcc": "設定", "Kecbb0e45": "システム", "Ka358e23d": "一般", "K449058e9": "API ゲートウェイ", diff --git a/frontend/packages/common/src/locales/scan/zh-CN.json b/frontend/packages/common/src/locales/scan/zh-CN.json index 41ee376a..3a90e204 100644 --- a/frontend/packages/common/src/locales/scan/zh-CN.json +++ b/frontend/packages/common/src/locales/scan/zh-CN.json @@ -1,10 +1,10 @@ { "Kc0e5ef9f": "工作空间", "K4de11e23": "首页", - "Kfe93ef35": "应用", + "Kfe93ef35": "消费者", "Kb58e0c3f": "服务", "Kc9e489f5": "团队", - "K61c89f5f": "API 市场", + "K61c89f5f": "API 门户", "K16d71239": "分析报告", "K714c192d": "调用统计", "Kd57dfe97": "拓扑图", @@ -29,7 +29,7 @@ "K1f42de3": "HTTP 状态码", "K4770dff4": "系统状态码", "Kf89e58f1": "描述", - "K9e53c664": "提交", + "K9e53c664": "保存", "Kf8e7294c": "上一步", "Ka0451c97": "取消", "Kb1dedda3": "关闭", @@ -91,8 +91,8 @@ "K6206e4ad": "上传 OpenAPI 文档 (.json/.yaml)", "Kfba46e6d": "替换 OpenAPI 文档 (.json/.yaml)", "Kdac8ce7e": "打开 OpenAPI YAML 编辑器", - "Kffd7e274": "无审核：允许所有应用订阅该服务", - "K8a8b13e4": "人工审核：仅允许审核通过的应用订阅该服务", + "Kffd7e274": "无审核：允许所有消费者订阅该服务", + "K8a8b13e4": "人工审核：仅允许审核通过的消费者订阅该服务", "Kbfe02d7f": "永久", "K1e9c479e": "否", "Kaddfcb6b": "是", @@ -155,7 +155,7 @@ "Ke54a14a3": "格式化", "K43934f6d": "搜索", "K741decac": "替代", - "Kd507abff": "确定", + "Kd507abff": "确认", "Kca2d1624": "(0) 不能为负数.", "K792b255a": "(0) 必须大于或等于 (1).", "Kf0bed26d": "枚举值", @@ -259,7 +259,7 @@ "Kc057704a": "创建 AI 服务和 API", "K76bb4a09": "创建 AI 类型的服务，并且你可以将 Prompt 提示词设置为一个 API，简化使用 AI 的流程。", "K71b2c70f": "创建调用 Token", - "K9bdd8403": "为了安全地调用 API，你需要创建一个应用以及Token。", + "K9bdd8403": "为了安全地调用 API，你需要创建一个消费者以及Token。", "Kc5738b6c": "调用", "Kd6d7ca1f": "现在你可以通过 Token 来调用这些 API。", "K86cf95f": "快速接入 REST API", @@ -269,16 +269,16 @@ "K2cdbb773": "核心功能", "K3378c50d": "账号与角色", "Kda5bb930": "邀请你的团队成员加入 APIPark，共同管理和调用 API。", - "Kc8239422": "团队中包含了人员、应用和服务，不同团队之间的应用和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。", + "Kc8239422": "团队中包含了人员、消费者和服务，不同团队之间的消费者和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。", "Kd5be0cd7": "服务内包含一组 API，并且可以发布到 API 市场被其他团队使用。", "K62e89ee7": "权限管理", "K8f7808e6": "订阅服务", "Kf2410413": "如果需要调用某个服务的 API，需要先订阅该服务，并且等待提供服务的团队审核后才可发起 API 请求。", "K6c2e44b8": "审核订阅", - "Ka0a8840a": "审核其他应用的订阅申请，审核通过后的才可发起 API 请求。", + "Ka0a8840a": "审核其他消费者的订阅申请，审核通过后的才可发起 API 请求。", "K3453272": "APIPark 提供详尽的 API 调用日志，帮助企业监控、分析和审计 API 的运行状况。", "Kd518ba3e": "Hello！欢迎使用 APIPark", - "K7e04ea16": "🦄 APIPark 是开源的一站式 AI 网关和 API 开发者门户，帮助企业和开发者快速接入 100+ AI 模型，将 AI 模型和 Prompt 提示词组合成新的 API，并且统一所有 AI 的请求数据格式，避免切换 AI 模型或调整提示词时影响你的 APP 应用或者微服务。你还可以通过 APIPark 的开发者门户在团队内共享 API，管理调用的应用并保障你的 API 安全，通过清晰的图表来监控你的 AI API 使用情况。", + "K7e04ea16": "🦄 APIPark 是开源的一站式 AI 网关和 API 开发者门户，帮助企业和开发者快速接入 100+ AI 模型，将 AI 模型和 Prompt 提示词组合成新的 API，并且统一所有 AI 的请求数据格式，避免切换 AI 模型或调整提示词时影响你的 APP 消费者或者微服务。你还可以通过 APIPark 的开发者门户在团队内共享 API，管理调用的消费者并保障你的 API 安全，通过清晰的图表来监控你的 AI API 使用情况。", "Kedd41c18": "✨ 如果你喜欢 APIPark，欢迎在 Github 为我们 Star 或提供产品反馈意见。", "Kef02fd87": "快速入门", "K43a3b38d": "我们提供了一些任务来帮你快速了解 APIPark", @@ -306,7 +306,7 @@ "K184d3473": "添加账号", "K1ecb35f2": "编辑成员信息", "Ke6f00b44": "加入部门", - "K501cb1e7": "此操作无法恢复,确定删除成员？", + "K501cb1e7": "此操作无法恢复,确认删除成员？", "Kf20863b5": "成员与部门", "K52c8a730": "启用", "K718c9310": "禁用", @@ -405,7 +405,7 @@ "Kec46a57f": "添加成员", "K48724410": "输入姓名查找", "Kb9052305": "搜索用户名、邮箱", - "K5ece3bac": "设置团队和成员，然后你可以在团队内创建服务和应用、订阅API，成员只能看到所属团队内的服务和应用。", + "K5ece3bac": "设置团队和成员，然后你可以在团队内创建服务和消费者、订阅API，成员只能看到所属团队内的服务和消费者。", "K510cdd27": "添加团队", "K9244ae14": "输入名称、ID、负责人查找团队", "Kc7b24b4b": "设置团队", @@ -425,8 +425,8 @@ "Ka2c794a2": "导出", "Kaf70c3b": "退出全屏", "Kd22841a4": "(0)调用详情", - "K1512e983": "应用调用统计", - "Kb4d2007f": "请选择应用", + "K1512e983": "消费者调用统计", + "Kb4d2007f": "请选择消费者", "K8c7f2d2e": "调用趋势", "K657c3452": "(0)-(1)调用趋势", "Kc04efb87": "调用量统计", @@ -449,7 +449,7 @@ "Kffcfe375": "请选择服务", "Ka65f739c": "调用详情", "K89b7ac79": "API Top10", - "Kc0915603": "应用 Top10", + "Kc0915603": "消费者 Top10", "Kf90b54": "服务 Top10", "Kfb26388": "无请求数据", "Kc8cbd8f8": "请求统计", @@ -472,9 +472,9 @@ "Ke6a935d": "万", "Kd59290a2": "搜索分类或标签", "K6b75bdbc": "无API数据", - "Kd8a7a689": "搜索或选择应用", + "Kd8a7a689": "搜索或选择消费者", "K4b15d6f5": "申请理由", - "Kb7e869a4": "应用管理", + "Kb7e869a4": "消费者管理", "Kb71b5a13": "鉴权类型", "K4d1465ee": "ISS", "K5dcd7ed8": "签名算法", @@ -488,9 +488,9 @@ "Kbfeb5297": "API Key", "K1a78e6f0": "过期时间", "Ke64e43a": "隐藏认证信息", - "K5168eb63": "应用名称", - "K546e46f": "应用 ID", - "K95764d1d": "删除应用", + "K5168eb63": "消费者名称", + "K546e46f": "消费者 ID", + "K95764d1d": "删除消费者", "K217cb125": "鉴权详情", "K2bb63eca": "添加鉴权", "Kd74d69b7": "编辑鉴权", @@ -507,7 +507,7 @@ "K1856c229": "是否取消订阅申请？", "K66ea2f0": "搜索服务", "K8adf7f8b": "审核中", - "K667bbbe7": "添加应用", + "K667bbbe7": "添加消费者", "Ka4b45550": "无服务描述", "K3c7b175f": "订阅服务：已通过 (0) ，审核中 (1)", "Kbe3e9335": "退出测试", @@ -517,14 +517,14 @@ "K59cdbec3": "服务介绍", "K4aa9ed2c": "申请订阅", "K6c060779": "服务信息", - "K8723422e": "接入应用", + "K8723422e": "接入消费者", "Kb97544cb": "供应方", "Kb32f0afe": "分类", "K81634069": "版本", "Keefda53d": "更新时间", "K96a2f1c8": "无标签", "K72b0c0b3": "API 数量", - "K93d5a66e": "接入应用数量", + "K93d5a66e": "接入消费者数量", "K96059c69": "关联标签", "K8b7c2592": "更新者", "K32263abd": "添加 Open Api", @@ -546,8 +546,8 @@ "Ke41d7451": "只读成员", "Kf99e8b66": "服务管理员", "Kda8db57a": "服务开发者", - "K216a1ac7": "应用开发者", - "K27924db": "应用管理员", + "K216a1ac7": "消费者开发者", + "K27924db": "消费者管理员", "K8dc5c723": "驱动名称", "Kda249fe8": "失败", "Kcf2df651": "失败", @@ -589,7 +589,7 @@ "Kcbf39b82": "版本状态", "K339d15b5": "创建人", "K7194cea2": "审核时间", - "K831aa6c0": "申请方-应用", + "K831aa6c0": "申请方-消费者", "K7ad449bc": "审核状态", "K3b3a98ce": "审核人", "K61b62ace": "来源", diff --git a/frontend/packages/common/src/locales/scan/zh-TW.json b/frontend/packages/common/src/locales/scan/zh-TW.json index 0cf359f4..d76510c6 100644 --- a/frontend/packages/common/src/locales/scan/zh-TW.json +++ b/frontend/packages/common/src/locales/scan/zh-TW.json @@ -4,7 +4,7 @@ "Kfe93ef35": "應用程式", "Kb58e0c3f": "服務", "Kc9e489f5": "團隊", - "K61c89f5f": "API 市場", + "K61c89f5f": "API 門戶", "K16d71239": "分析報告", "K714c192d": "調用統計", "Kd57dfe97": "拓撲圖", diff --git a/frontend/packages/common/src/utils/systemRunning.ts b/frontend/packages/common/src/utils/systemRunning.ts index 34e3304c..06d18004 100644 --- a/frontend/packages/common/src/utils/systemRunning.ts +++ b/frontend/packages/common/src/utils/systemRunning.ts @@ -1,6 +1,6 @@ /** - * @description 获取全局应用关系视图（即空间下所有项目组的 api 关联关系) + * @description 获取全局消费者关系视图（即空间下所有项目组的 api 关联关系) * @param request * @returns */ @@ -22,7 +22,7 @@ import { NodeData } from "@core/const/system-running/type" import { TopologyProjectItem, TopologyServiceItem } from "@core/pages/systemRunning/SystemRunning" /** - * @description 获取全局应用关系视图（即空间下所有项目组的 api 关联关系) + * @description 获取全局消费者关系视图（即空间下所有项目组的 api 关联关系) * @param request * @returns */ diff --git a/frontend/packages/core/src/App.css b/frontend/packages/core/src/App.css index eee93cd3..002fa800 100644 --- a/frontend/packages/core/src/App.css +++ b/frontend/packages/core/src/App.css @@ -272,3 +272,16 @@ a{ stroke: rgba(255, 255, 255, 0.1); mask-image: radial-gradient(100% 100% at top right, white, transparent); } + + .login-block{ + background-color: rgba(255, 255, 255, 0.1); + .login-input{ + color:#fff; + background-color: rgba(255, 255, 255, 0.1); + border: 1px solid rgba(255, 255, 255, 0.1); + &:hover, &:focus, &.ant-input-status-error, &.ant-input-status-error:hover, &.ant-input-status-error:focus-within{ + background-color: rgba(255, 255, 255, 0.2); + border: 1px solid rgba(255, 255, 255, 0.2); + } + } + } \ No newline at end of file diff --git a/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx b/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx index 4cf2c011..ad5635b1 100644 --- a/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx +++ b/frontend/packages/core/src/components/aoplatform/RenderRoutes.tsx @@ -366,7 +366,7 @@ const PUBLIC_ROUTES:RouteConfig[] = [ key:uuidv4(), }, { - path:'tenantManagement', + path:'consumer', component:, provider:TenantManagementProvider, key:uuidv4(), diff --git a/frontend/packages/core/src/const/system-running/const.ts b/frontend/packages/core/src/const/system-running/const.ts index 151beda9..92031046 100644 --- a/frontend/packages/core/src/const/system-running/const.ts +++ b/frontend/packages/core/src/const/system-running/const.ts @@ -1,7 +1,7 @@ export const BASE_GROUP_ORDER = JSON.stringify({}) /** - * 应用关系图节点字体大小 + * 消费者关系图节点字体大小 */ export const RELATIVE_PICTURE_NODE_FONTSIZE = 14 diff --git a/frontend/packages/core/src/const/system-running/type.ts b/frontend/packages/core/src/const/system-running/type.ts index 58673fb0..0bc19424 100644 --- a/frontend/packages/core/src/const/system-running/type.ts +++ b/frontend/packages/core/src/const/system-running/type.ts @@ -49,14 +49,14 @@ export interface GetProjectGroupRelativeRequest { } /** - * 获取空间应用(项目组)关联关系请求体 + * 获取空间消费者(项目组)关联关系请求体 */ export interface GetSpaceProjectGroupRelativeRequest { spaceId: string } /** - * 获取空间应用（项目组）关联关系返回体 + * 获取空间消费者（项目组）关联关系返回体 */ export interface GetSpaceProjectGroupRelativeResponse { success: boolean diff --git a/frontend/packages/core/src/const/system/const.tsx b/frontend/packages/core/src/const/system/const.tsx index a1fb3204..19d329a2 100644 --- a/frontend/packages/core/src/const/system/const.tsx +++ b/frontend/packages/core/src/const/system/const.tsx @@ -69,6 +69,11 @@ export const API_PROTOCOL = [ {label:'HTTPS',value:'HTTPS'} ] +export const API_PATH_MATCH_RULES = [ + {label:'前缀匹配',value:'prefix'}, + {label:'全等匹配',value:'full'} +] + export const ALGORITHM_ITEM = [ {label:'HS256',value:'HS256'}, @@ -350,12 +355,12 @@ export const PROXY_HEADER_CONFIG:ConfigField[] = [ export const SERVICE_VISUALIZATION_OPTIONS = [ {label:('内部服务：可通过网关访问，但不展示在服务广场'),value:'inner'}, - {label:('公开服务：可通过网关访问，展示在服务广场，可被其他应用订阅'),value:'public'}]; + {label:('公开服务：可通过网关访问，展示在服务广场，可被其他消费者订阅'),value:'public'}]; export const SERVICE_APPROVAL_OPTIONS = [ - {label:('无需审核：允许任何应用调用该服务'),value:'auto'}, - {label:('人工审核：仅允许通过人工审核的应用调用该服务'),value:'manual'}]; + {label:('无需审核：允许任何消费者调用该服务'),value:'auto'}, + {label:('人工审核：仅允许通过人工审核的消费者调用该服务'),value:'manual'}]; export const SERVICE_KIND_OPTIONS = [ {label:('REST'),value:'rest'}, {label:('AI'),value:'ai'}]; diff --git a/frontend/packages/core/src/main.tsx b/frontend/packages/core/src/main.tsx index 4b3f3e92..7d71bc81 100644 --- a/frontend/packages/core/src/main.tsx +++ b/frontend/packages/core/src/main.tsx @@ -10,7 +10,7 @@ async function initializeApp() { // 初始化行为 // await fetchInitialConfig(); // 示例：获取初始配置 - // 异步操作完成后，渲染React应用 + // 异步操作完成后，渲染React消费者 ReactDOM.createRoot(document.getElementById('root')!).render( diff --git a/frontend/packages/core/src/pages/Login.tsx b/frontend/packages/core/src/pages/Login.tsx index 1a872229..dc59c5d8 100644 --- a/frontend/packages/core/src/pages/Login.tsx +++ b/frontend/packages/core/src/pages/Login.tsx @@ -139,7 +139,7 @@ const Login:FC = ()=> { {/*
*/} -
+
{
-
+
-
-
- {$t('登录')} -
- -
+ { rules={[{ required: true, message: $t('请输入账号') ,whitespace:true }]} > { @@ -209,8 +205,9 @@ const Login:FC = ()=> {
-

{$t('Version (0)-(1)',[state.version,state.updateDate])}

-

{$t(state.powered)}

+

+ {$t('Version (0)-(1)',[state.version,state.updateDate])}, {$t(state.powered)} +

diff --git a/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx b/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx index 69f14b86..0377e05e 100644 --- a/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx +++ b/frontend/packages/core/src/pages/aiService/api/AiServiceInsideRouterCreate.tsx @@ -1,5 +1,5 @@ -import {App, Button, Form, Input, InputNumber, Row, Spin, Tag} from "antd"; -import { MutableRefObject, useEffect, useRef, useState} from "react"; +import {App, Button, Form, Input, InputNumber, Row, Select, Space, Spin, Tag} from "antd"; +import { MutableRefObject, useEffect, useMemo, useRef, useState} from "react"; import {BasicResponse, PLACEHOLDER, RESPONSE_TIPS, STATUS_CODE} from "@common/const/const.tsx"; import {useFetch} from "@common/hooks/http.ts"; import { $t } from "@common/locales/index.ts"; @@ -17,6 +17,9 @@ import { DrawerWithFooter } from "@common/components/aoplatform/DrawerWithFooter import AiServiceRouterModelConfig, { AiServiceRouterModelConfigHandle } from "./AiServiceInsideRouterModelConfig"; import { AiProviderDefaultConfig, AiProviderLlmsItems } from "@core/pages/aiSetting/AiSettingList"; import { EditableFormInstance } from "@ant-design/pro-components"; +import { validateUrlSlash } from "@common/utils/validate"; +import { API_PATH_MATCH_RULES } from "@core/const/system/const"; +import { useGlobalContext } from "@common/contexts/GlobalStateContext"; type AiServiceRouterField = { name:string @@ -59,11 +62,16 @@ const AiServiceInsideRouterCreate = () => { const [defaultLlm, setDefaultLlm] = useState() const [llmList, setLlmList] = useState([]) const [variablesTableRef, setVariablesTableRef] = useState | undefined>>() + const {state} = useGlobalContext() + const onFinish = ()=>{ return variablesTableRef?.current?.validateFields().then(()=>{ return form.validateFields().then((formValue)=>{ - const {name, path, description, variables, prompt, timeout, retry} = formValue - const body = {name, path: prefixForce ? `${apiPrefix}/${path}`:path , description,timeout, retry,aiPrompt:{variables:variables, prompt:prompt},aiModel:{id:defaultLlm?.id, provider:defaultLlm?.provider, config:defaultLlm?.config}} + const {name, path, description, variables, prompt, timeout, retry,pathMatch} = formValue + const body = { + name, + path: `${prefixForce ? apiPrefix + '/' : ''}${path.trim()}${pathMatch === 'prefix' ? '/*' : ''}`, + description,timeout, retry,aiPrompt:{variables:variables, prompt:prompt},aiModel:{id:defaultLlm?.id, provider:defaultLlm?.provider, config:defaultLlm?.config}} return fetchData>('service/ai-router',{method: routeId ? 'PUT' : 'POST',eoBody:(body), eoParams: {service:serviceId,team:teamId, ...(routeId ? {router:routeId}: {})},eoTransformKeys:['aiPrompt','aiModel']}).then(response=>{ const {code,msg} = response if(code === STATUS_CODE.SUCCESS){ @@ -92,7 +100,20 @@ const AiServiceInsideRouterCreate = () => { const {code,data,msg} = response if(code === STATUS_CODE.SUCCESS){ const {path, aiPrompt,aiModel} = data.api - form.setFieldsValue({...data.api,...aiPrompt, path:prefixForce && path?.startsWith(apiPrefix + '/')? path.slice((apiPrefix?.length || 0) + 1) : path }) + let newPath = path + let pathMatch = 'full' + if(prefixForce && path?.startsWith(apiPrefix + '/')){ + newPath = path.slice((apiPrefix?.length || 0) + 1) + } + if(newPath.endsWith('/*')){ + newPath = newPath.slice(0,-2) + pathMatch = 'prefix' + } + form.setFieldsValue({ + ...data.api, + ...aiPrompt, + path:newPath, + pathMatch}) setVariablesTable(aiPrompt.variables as VariableItems[]) setDefaultLlm(prev => ({...prev, provider: aiModel?.provider, id:aiModel?.id, config:aiModel.config}) as (AiProviderDefaultConfig & { config: string; })) getDefaultModelConfig(aiModel?.provider) @@ -141,7 +162,8 @@ const AiServiceInsideRouterCreate = () => { variables:[{key:'Query',value:'',require:true}], prompt:'{{Query}}', retry:0, - timeout:300000 + timeout:300000, + pathMatch:'prefix' }) } return (form.setFieldsValue({})) @@ -185,6 +207,9 @@ const AiServiceInsideRouterCreate = () => { setDrawerType(undefined); }; + const apiPathMatchRulesOptions = useMemo(()=>API_PATH_MATCH_RULES.map( + x=>({label:$t(x.label), value:x.value})),[state.language]) + return ( { - - className="flex-1" - label={$t("请求路径")} - name="path" - rules={[{ required: true,whitespace:true }]} - > - - + + + + + { + if((e.target.value as string).endsWith('/*')){ + form.setFieldValue('path',e.target.value.slice(0,-2)) + form.setFieldValue('pathMatch','prefix') + } + }}/> + + + + diff --git a/frontend/packages/core/src/pages/aiSetting/AiSettingList.tsx b/frontend/packages/core/src/pages/aiSetting/AiSettingList.tsx index 5bcf9bef..a4c8591d 100644 --- a/frontend/packages/core/src/pages/aiSetting/AiSettingList.tsx +++ b/frontend/packages/core/src/pages/aiSetting/AiSettingList.tsx @@ -164,7 +164,10 @@ const AiSettingList = ()=>{ return ( -
+
+ + {provider.name} +
{provider.configured ? $t('已配置') : $t('未配置')} diff --git a/frontend/packages/core/src/pages/guide/Guide.tsx b/frontend/packages/core/src/pages/guide/Guide.tsx index 8e478c84..ef3045ed 100644 --- a/frontend/packages/core/src/pages/guide/Guide.tsx +++ b/frontend/packages/core/src/pages/guide/Guide.tsx @@ -30,7 +30,7 @@ export default function Guide(){ }, { title: $t("创建调用 Token"), - description: $t('为了安全地调用 API，你需要创建一个应用以及Token。'), + description: $t('为了安全地调用 API，你需要创建一个消费者以及Token。'), link: 'https://docs.apipark.com/docs/quick/suberscriber/application' }, { @@ -50,7 +50,7 @@ export default function Guide(){ }, { title: $t("创建调用 Token"), - description: $t('为了安全地调用 API，你需要创建一个应用以及Token。'), + description: $t('为了安全地调用 API，你需要创建一个消费者以及Token。'), link: 'https://docs.apipark.com/docs/quick/suberscriber/subscribe' }, { @@ -82,7 +82,7 @@ export default function Guide(){ }, { title: $t("团队"), - description: $t('团队中包含了人员、应用和服务，不同团队之间的应用和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。'), + description: $t('团队中包含了人员、消费者和服务，不同团队之间的消费者和服务数据是隔离的，可用于管理企业内部不同的部门/项目组/团队。'), link: 'https://docs.apipark.com/docs/quick/provider/service' }, { @@ -102,7 +102,7 @@ export default function Guide(){ }, { title: $t("审核订阅申请"), - description: $t('提供服务的团队可以审核来自其他团队的订阅申请，审核通过后的应用才可发起 API 请求。'), + description: $t('提供服务的团队可以审核来自其他团队的订阅申请，审核通过后的消费者才可发起 API 请求。'), link: 'https://docs.apipark.com/docs/quick/suberscriber/subscribe' } ] diff --git a/frontend/packages/core/src/pages/system/SystemList.tsx b/frontend/packages/core/src/pages/system/SystemList.tsx index 5a4776ef..8f53ae96 100644 --- a/frontend/packages/core/src/pages/system/SystemList.tsx +++ b/frontend/packages/core/src/pages/system/SystemList.tsx @@ -14,7 +14,6 @@ import { DrawerWithFooter } from "@common/components/aoplatform/DrawerWithFooter import SystemConfig from "./SystemConfig.tsx"; import { useGlobalContext } from "@common/contexts/GlobalStateContext.tsx"; import { $t } from "@common/locales/index.ts"; -import Joyride from "react-joyride"; import InsidePage from "@common/components/aoplatform/InsidePage.tsx"; const SystemList:FC = ()=>{ @@ -37,7 +36,7 @@ const SystemList:FC = ()=>{ getGlobalAccessData()?.then?.(()=>{ getSystemList() }) - return + return Promise.resolve({data:[], success:false}) } if(!tableHttpReload){ setTableHttpReload(true) diff --git a/frontend/packages/core/src/pages/system/api/SystemInsideRouterCreate.tsx b/frontend/packages/core/src/pages/system/api/SystemInsideRouterCreate.tsx index 62fd6c99..7721d564 100644 --- a/frontend/packages/core/src/pages/system/api/SystemInsideRouterCreate.tsx +++ b/frontend/packages/core/src/pages/system/api/SystemInsideRouterCreate.tsx @@ -1,10 +1,10 @@ -import {App, Button, Col, Form, Input, Row, Select, Spin, Switch} from "antd"; +import {App, Button, Col, Form, Input, Row, Select, Space, Spin, Switch} from "antd"; import {forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState} from "react"; import EditableTableWithModal from "@common/components/aoplatform/EditableTableWithModal.tsx"; import styles from "./SystemInsideApi.module.css" import {BasicResponse, PLACEHOLDER, RESPONSE_TIPS, STATUS_CODE} from "@common/const/const.tsx"; import {useFetch} from "@common/hooks/http.ts"; -import { API_PROTOCOL, HTTP_METHOD, MATCH_CONFIG, MatchPositionEnum, MatchTypeEnum } from "../../../const/system/const.tsx"; +import { API_PATH_MATCH_RULES, API_PROTOCOL, HTTP_METHOD, MATCH_CONFIG, MatchPositionEnum, MatchTypeEnum } from "../../../const/system/const.tsx"; import { SystemInsideRouterCreateHandle, SystemInsideRouterCreateProps, SystemApiProxyFieldType, SystemInsideApiProxyHandle } from "../../../const/system/type.ts"; import { MatchItem } from "@common/const/type.ts"; import { validateUrlSlash } from "@common/utils/validate.ts"; @@ -31,7 +31,7 @@ const SystemInsideRouterCreate = forwardRef{ return Promise.all([proxyRef.current?.validate?.(), form.validateFields()]).then(([,formValue])=>{ const body = {...formValue, - path: prefixForce? `${apiPrefix}/${formValue.path.trim()}` : formValue.path.trim(), + path: `${prefixForce ? apiPrefix + '/' : ''}${formValue.path.trim()}${formValue.pathMatch === 'prefix' ? '/*' : ''}`, proxy:{...formValue.proxy,path:formValue.proxy.path ? (formValue.proxy.path.startsWith('/')? formValue.proxy.path: '/'+ formValue.proxy.path) : undefined}} return fetchData>('service/router',{ method: routeId ? 'PUT' :'POST' ,eoBody:(body), eoParams: {service:serviceId,team:teamId, router:routeId },eoTransformKeys:['matchType','disable']}).then(response=>{ @@ -77,7 +77,24 @@ const SystemInsideRouterCreate = forwardRefAPI_PATH_MATCH_RULES.map( + x=>({label:$t(x.label), value:x.value})),[state.language]) return ( - - - label={$t("请求路径")} - name="path" - rules={[{ required: true,whitespace:true }, - { - validator: validateUrlSlash, - }]} - className={styles['form-input-group']} - > - + + + + { + if((e.target.value as string).endsWith('/*')){ + form.setFieldValue('path',e.target.value.slice(0,-2)) + form.setFieldValue('pathMatch','prefix') + } + }}/> + + diff --git a/frontend/packages/core/src/pages/team/TeamList.tsx b/frontend/packages/core/src/pages/team/TeamList.tsx index 1fba9241..b7d87645 100644 --- a/frontend/packages/core/src/pages/team/TeamList.tsx +++ b/frontend/packages/core/src/pages/team/TeamList.tsx @@ -165,7 +165,7 @@ const TeamList:FC = ()=>{ return ( diff --git a/frontend/packages/dashboard/src/component/MonitorAppPage.tsx b/frontend/packages/dashboard/src/component/MonitorAppPage.tsx index b76bcfbc..1d3e45aa 100644 --- a/frontend/packages/dashboard/src/component/MonitorAppPage.tsx +++ b/frontend/packages/dashboard/src/component/MonitorAppPage.tsx @@ -99,7 +99,7 @@ export default function MonitorAppPage(props:MonitorAppPageProps){ fetchTableData(data).then((resp) => { const {code,data,msg} = resp if(code === STATUS_CODE.SUCCESS){ - exportExcel($t('应用调用统计'), [query!.start!, query!.end!], $t('应用调用统计'), 'dashboard_application', APPLICATION_TABLE_GLOBAL_COLUMNS_CONFIG, data.statistics) + exportExcel($t('消费者调用统计'), [query!.start!, query!.end!], $t('消费者调用统计'), 'dashboard_application', APPLICATION_TABLE_GLOBAL_COLUMNS_CONFIG, data.statistics) }else{ message.error(msg || $t(RESPONSE_TIPS.dataError)) } @@ -144,13 +144,13 @@ export default function MonitorAppPage(props:MonitorAppPageProps){ onTimeRangeChange={handleTimeRangeChange}/>
- + x.value !== entity.id)}/> +