17 Commits
Author SHA1 Message Date
wangdefa 3475ce7ce6 回传日志去高度限制与文案同步,错误 toast 可展开详情
CI / test (push) Successful in 27s
2026-07-17 16:53:03 +08:00
wangdefa c0229b60c1 实例表单:默认 2C12G、去免费文案、配额按 AD 联动 2026-07-17 16:53:03 +08:00
wangdefa fbed8d1ea4 删除未引用的 PageHeader 死组件
CI / test (push) Successful in 26s
2026-07-17 12:19:28 +08:00
wangdefa 1fc5d74d8a 发布 v0.7.2
CI / test (push) Successful in 26s
Release / release (push) Successful in 26s
2026-07-16 21:25:40 +08:00
wangdefa 4606fbfd4f 设置页上游预算项、代理状态列、调用日志 Tokens 列宽
CI / test (push) Successful in 26s
2026-07-16 21:20:14 +08:00
wangdefa 0ff0e22e56 发布 v0.7.1
CI / test (push) Successful in 25s
Release / release (push) Successful in 26s
2026-07-16 16:41:03 +08:00
wangdefa 6ea222e5ab 审计日志搜索框:防抖检索、回溯进度与补批封顶
CI / test (push) Successful in 27s
2026-07-16 16:36:42 +08:00
wangdefa b8c0ddda6d 发布 v0.7.0
CI / test (push) Successful in 26s
Release / release (push) Successful in 26s
2026-07-16 12:58:27 +08:00
wangdefa d987400a5b 设置页新增AI Tab:保险丝/grok工具/模型治理迁入
CI / test (push) Successful in 28s
2026-07-16 12:32:21 +08:00
wangdefa 6a7757ae2f 实例VNIC:附加后自动刷新、IPv6限挂载态与脚注修正 2026-07-16 12:32:20 +08:00
wangdefa 78cc2aab56 渠道模型列表弹窗与模型数量列
CI / test (push) Successful in 28s
Release / release (push) Successful in 26s
2026-07-14 19:33:55 +08:00
wangdefa 08fa529348 登录页加载态、日志动作补齐与绑定按钮禁用态
CI / test (push) Successful in 27s
Release / release (push) Successful in 28s
2026-07-14 11:01:09 +08:00
wangdefa e2cdb99194 接入信息补tts端点,可用模型新增过滤弃用开关
CI / test (push) Successful in 25s
Release / release (push) Successful in 25s
- 接入信息展示 POST /tts(xAI 官方格式)
- 可用模型卡片「过滤弃用」NSwitch:GET/PUT /api/v1/ai-settings,切换即时刷新;修复 request body 双重 stringify
- CHANGELOG 0.5.0(0.4.0 已发版冻结)
2026-07-14 09:50:01 +08:00
wangdefa 7f529bd991 AI网关接入信息补齐新端点,CHANGELOG 0.4.0
CI / test (push) Successful in 26s
Release / release (push) Successful in 26s
2026-07-13 20:14:28 +08:00
wangdefa aea00c2382 关于页运行状态、代理关联租户与步进框修复
CI / test (push) Successful in 25s
Release / release (push) Successful in 25s
2026-07-13 12:21:28 +08:00
wangdefa 2ea5b73de2 移除告警规则界面、恢复 Chat 端点并优化列表
CI / test (push) Successful in 25s
Release / release (push) Successful in 26s
2026-07-13 10:08:08 +08:00
Wang Defa 94fbe62e4c 模型黑名单与密钥模型白名单界面、分组填入、删除弹窗排版
CI / test (push) Successful in 27s
Release / release (push) Successful in 26s
2026-07-12 17:44:46 +08:00
44 changed files with 1654 additions and 571 deletions
+1 -1
View File
@@ -1 +1 @@
0.6.5 0.6.6
@@ -15,7 +15,7 @@ oci-portal-dash/
├── App.vue NConfigProvider 注入 Naive 主题 ├── App.vue NConfigProvider 注入 Naive 主题
├── assets/ main.css:Tailwind @theme 设计 token(浅色)+ html.dark 暗色变量覆盖与全局基础样式 ├── assets/ main.css:Tailwind @theme 设计 token(浅色)+ html.dark 暗色变量覆盖与全局基础样式
├── theme/ tokens.ts(JS 侧 token 唯一来源,含 darkTokens 暗色板)、naive.ts(亮暗两套 themeOverrides 同一工厂生成) ├── theme/ tokens.ts(JS 侧 token 唯一来源,含 darkTokens 暗色板)、naive.ts(亮暗两套 themeOverrides 同一工厂生成)
├── types/ api.ts:与 docs/API接口文档.md 一一对应的 DTO 类型 ├── types/ api.ts:与后端 swagger(oci-portal/docs/)一一对应的 DTO 类型
├── api/ request 封装(JWT 注入、401 跳登录、错误 hint 拼接)+ 按资源分模块;VITE_MOCK=1 时返回 mock.ts 数据 ├── api/ request 封装(JWT 注入、401 跳登录、错误 hint 拼接)+ 按资源分模块;VITE_MOCK=1 时返回 mock.ts 数据
├── stores/ Pinia:auth(令牌持久化)、app(侧栏收缩、暗色主题:默认跟随系统 + localStorage 记忆,驱动 html.dark 与 Naive darkTheme)、scope(全局作用域:租户/区域/区间,localStorage 按租户记忆) ├── stores/ Pinia:auth(令牌持久化)、app(侧栏收缩、暗色主题:默认跟随系统 + localStorage 记忆,驱动 html.dark 与 Naive darkTheme)、scope(全局作用域:租户/区域/区间,localStorage 按租户记忆)
├── router/ 路由与登录守卫 ├── router/ 路由与登录守卫
+1 -1
View File
@@ -27,7 +27,7 @@ Vue 3 + Vite + TypeScript + Naive UI + Tailwind CSS v4 + ECharts + Pinia。Naive
- [ ] 读过 [Directory Structure](./directory-structure.md),文件放对层(views / components / composables / api / stores / types) - [ ] 读过 [Directory Structure](./directory-structure.md),文件放对层(views / components / composables / api / stores / types)
- [ ] 涉及颜色、圆角、间距时先看 [Styling & Design Tokens](./styling-design-tokens.md),禁止硬编码 hex - [ ] 涉及颜色、圆角、间距时先看 [Styling & Design Tokens](./styling-design-tokens.md),禁止硬编码 hex
- [ ] 新增请求走 `api/` 统一封装,DTO 类型进 `types/`(与 `docs/API接口文档.md` 一一对应) - [ ] 新增请求走 `api/` 统一封装,DTO 类型进 `types/`(与后端 swagger `oci-portal/docs/` 一一对应)
- [ ] 出 UI 设计稿前读 `../guides/design-workflow.md` - [ ] 出 UI 设计稿前读 `../guides/design-workflow.md`
## Quality Check ## Quality Check
+1 -1
View File
@@ -4,7 +4,7 @@
- 开启 `strict`;禁止 `any`,未知类型用 `unknown` 后收窄。 - 开启 `strict`;禁止 `any`,未知类型用 `unknown` 后收窄。
- 对象形状优先 `interface`,联合/工具类型用 `type`;类型导入写 `import type` - 对象形状优先 `interface`,联合/工具类型用 `type`;类型导入写 `import type`
- 与后端交互的 DTO 类型集中在 `types/`,字段与 `docs/API接口文档.md` 一一对应,不在组件里手写内联响应类型。 - 与后端交互的 DTO 类型集中在 `types/`,字段与后端 swagger(`oci-portal/docs/`)一一对应,不在组件里手写内联响应类型。
-`const` 对象 + `as const` 代替 `enum` -`const` 对象 + `as const` 代替 `enum`
## Vue 组件 ## Vue 组件
+13 -13
View File
@@ -183,7 +183,7 @@ Complex task: ask the user if you can create a Trellis task and enter the planni
- 1.0 Create task `[required · once]` (only after task-creation consent) - 1.0 Create task `[required · once]` (only after task-creation consent)
- 1.1 Requirement exploration `[required · repeatable]` (`prd.md`; complex tasks also need `design.md` + `implement.md`) - 1.1 Requirement exploration `[required · repeatable]` (`prd.md`; complex tasks also need `design.md` + `implement.md`)
- 1.2 Research `[optional · repeatable]` - 1.2 Research `[optional · repeatable]`
- 1.3 Configure context `[required · once]` — Claude Code, Cursor, OpenCode, Codex, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, ZCode, Reasonix (sub-agent-dispatch platforms only; inline platforms skip) - 1.3 Configure context `[required · once]` — Claude Code, Cursor, OpenCode, Codex, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, Oh My Pi, ZCode, Reasonix (sub-agent-dispatch platforms only; inline platforms skip)
- 1.4 Activate task `[required · once]` (review gate, then `task.py start`; status → in_progress) - 1.4 Activate task `[required · once]` (review gate, then `task.py start`; status → in_progress)
- 1.5 Completion criteria - 1.5 Completion criteria
@@ -272,13 +272,13 @@ Code committed. Run `/trellis:finish-work`; if dirty, return to Phase 3.4 first.
When a user request matches one of these intents inside an active task, route first, then load the detailed phase step if needed. When a user request matches one of these intents inside an active task, route first, then load the detailed phase step if needed.
[Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, ZCode, Reasonix, Trae] [Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, Oh My Pi, ZCode, Reasonix, Trae]
- Planning or unclear requirements -> `trellis-brainstorm`. - Planning or unclear requirements -> `trellis-brainstorm`.
- `in_progress` implementation/check -> dispatch `trellis-implement` / `trellis-check`. - `in_progress` implementation/check -> dispatch `trellis-implement` / `trellis-check`.
- Repeated debugging -> `trellis-break-loop`; spec updates -> `trellis-update-spec`. - Repeated debugging -> `trellis-break-loop`; spec updates -> `trellis-update-spec`.
[/Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, ZCode, Reasonix, Trae] [/Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, Oh My Pi, ZCode, Reasonix, Trae]
[codex-inline, Kilo, Antigravity, Devin] [codex-inline, Kilo, Antigravity, Devin]
@@ -353,7 +353,7 @@ Return to this step whenever requirements change and revise the relevant artifac
Research can happen at any time during requirement exploration. It isn't limited to local code — you can use any available tool (MCP servers, skills, web search, etc.) to look up external information, including third-party library docs, industry practices, API references, etc. Research can happen at any time during requirement exploration. It isn't limited to local code — you can use any available tool (MCP servers, skills, web search, etc.) to look up external information, including third-party library docs, industry practices, API references, etc.
[Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, ZCode, Reasonix, Trae] [Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, Oh My Pi, ZCode, Reasonix, Trae]
Spawn the research sub-agent: Spawn the research sub-agent:
@@ -361,7 +361,7 @@ Spawn the research sub-agent:
- **Task description**: Research <specific question> - **Task description**: Research <specific question>
- **Key requirement**: Research output MUST be persisted to `{TASK_DIR}/research/` - **Key requirement**: Research output MUST be persisted to `{TASK_DIR}/research/`
[/Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, ZCode, Reasonix, Trae] [/Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, Oh My Pi, ZCode, Reasonix, Trae]
[codex-inline, Kilo, Antigravity, Devin] [codex-inline, Kilo, Antigravity, Devin]
@@ -380,7 +380,7 @@ Brainstorm and research can interleave freely — pause to research a technical
#### 1.3 Configure context `[required · once]` #### 1.3 Configure context `[required · once]`
[Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, ZCode, Reasonix, Trae] [Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, Oh My Pi, ZCode, Reasonix, Trae]
Curate `implement.jsonl` and `check.jsonl` so the Phase 2 sub-agents get the right spec/research context. These files were seeded on `task create` with a single self-describing `_example` line; your job here is to fill in real entries. Curate `implement.jsonl` and `check.jsonl` so the Phase 2 sub-agents get the right spec/research context. These files were seeded on `task create` with a single self-describing `_example` line; your job here is to fill in real entries.
@@ -425,7 +425,7 @@ Ready gate: both `implement.jsonl` and `check.jsonl` must contain at least one r
Skip this step only when both files already have real curated entries. Skip this step only when both files already have real curated entries.
[/Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, ZCode, Reasonix, Trae] [/Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, Oh My Pi, ZCode, Reasonix, Trae]
[codex-inline, Kilo, Antigravity, Devin] [codex-inline, Kilo, Antigravity, Devin]
@@ -458,11 +458,11 @@ If `task.py start` errors with a session-identity message (no context key from h
| `design.md` exists (complex tasks) | ✅ | | `design.md` exists (complex tasks) | ✅ |
| `implement.md` exists (complex tasks) | ✅ | | `implement.md` exists (complex tasks) | ✅ |
[Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, ZCode, Reasonix, Trae] [Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, Oh My Pi, ZCode, Reasonix, Trae]
| `implement.jsonl` and `check.jsonl` each contain at least one real curated entry (seed row does not count) | ✅ | | `implement.jsonl` and `check.jsonl` each contain at least one real curated entry (seed row does not count) | ✅ |
[/Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, ZCode, Reasonix, Trae] [/Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, Oh My Pi, ZCode, Reasonix, Trae]
--- ---
@@ -472,7 +472,7 @@ Goal: turn reviewed planning artifacts into code that passes quality checks.
#### 2.1 Implement `[required · repeatable]` #### 2.1 Implement `[required · repeatable]`
[Claude Code, Cursor, OpenCode, CodeBuddy, Droid, Pi] [Claude Code, Cursor, OpenCode, CodeBuddy, Droid, Pi, Oh My Pi]
Spawn the implement sub-agent: Spawn the implement sub-agent:
@@ -484,7 +484,7 @@ The platform hook/plugin auto-handles:
- Reads `implement.jsonl` and injects referenced spec/research files into the agent prompt - Reads `implement.jsonl` and injects referenced spec/research files into the agent prompt
- Injects `prd.md`, `design.md` if present, and `implement.md` if present - Injects `prd.md`, `design.md` if present, and `implement.md` if present
[/Claude Code, Cursor, OpenCode, CodeBuddy, Droid, Pi] [/Claude Code, Cursor, OpenCode, CodeBuddy, Droid, Pi, Oh My Pi]
[codex-sub-agent, Gemini, Qoder, Copilot, ZCode, Reasonix, Trae] [codex-sub-agent, Gemini, Qoder, Copilot, ZCode, Reasonix, Trae]
@@ -526,7 +526,7 @@ The platform prelude auto-handles the context load requirement:
#### 2.2 Quality check `[required · repeatable]` #### 2.2 Quality check `[required · repeatable]`
[Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, ZCode, Reasonix, Trae] [Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, Oh My Pi, ZCode, Reasonix, Trae]
Spawn the check sub-agent: Spawn the check sub-agent:
@@ -540,7 +540,7 @@ The check agent's job:
- Auto-fix issues it finds - Auto-fix issues it finds
- Run lint and typecheck to verify - Run lint and typecheck to verify
[/Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, ZCode, Reasonix, Trae] [/Claude Code, Cursor, OpenCode, codex-sub-agent, Kiro, Gemini, Qoder, CodeBuddy, Copilot, Droid, Pi, Oh My Pi, ZCode, Reasonix, Trae]
[codex-inline, Kilo, Antigravity, Devin] [codex-inline, Kilo, Antigravity, Devin]
+115 -3
View File
@@ -1,8 +1,120 @@
# Changelog # Changelog
格式遵循 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/),版本号遵循语义化版本。 格式参考 [Keep a Changelog](https://keepachangelog.com/zh-CN/1.1.0/)(版本段不记日期),版本号遵循语义化版本。
## [0.1.0] - 2026-07-10 ## [0.7.2]
### Added
- 设置页 AI Tab「Responses 直通」面板新增「上游无响应预算」输入(30..900 秒,失焦 / 回车提交,即时生效),与流式保险丝同面板并网格对齐
- 代理列表新增「状态」列(检测中 / 正常 / 异常):与地区同源于经代理链路的出口探测,探测失败即视为异常,「重测」联动刷新;页脚说明同步
### Changed
- AI 调用日志 Tokens(入/出)列加宽并禁止换行,大用量流式行不再折行;原「流式保险丝」独立面板并入「Responses 直通」
## [0.7.1]
### Added
- 租户详情 · 审计日志新增搜索框(标签式查询框,样式对齐配额页):500ms 防抖,回车 / 清空即时生效且关键字未变不发起重复请求;匹配事件 / 资源 / 操作者等可见字段,不区分大小写、支持 `*` 通配
- 审计分页状态行新增「已回溯至 …」进度提示;搜索命中稀疏时自动补批封顶(2 次)后停驻,由「加载更早」按钮显式继续,不再无人值守回溯整个保留期
### Changed
- 审计页脚说明同步数据源变更:每批约 200 条、搜索匹配可见字段;详情弹窗原始 JSON 来源标注改为「来自 OCI 审计日志」
### Fixed
- 修复审计列表加载中刷新 / 更换关键字时,在途旧响应混入新信息流的竞态(代次校验丢弃过期响应)
## [0.7.0]
### Added
- 设置页新增「AI」Tab,集中承载 AI 网关运行时设置:
- 流式保险丝:开关 + 阈值输入(KB),关闭时输入框禁用;修改即时生效
- grok 服务端搜索工具:`web_search` / `x_search` 默认注入双开关(仅 `xai.` 前缀模型生效,请求已带同名工具不覆盖)
- 模型治理:过滤弃用开关与模型黑名单管理(列表 / 移出 / 添加)
- 黑名单「添加模型」弹窗:聚合全部渠道的可用模型,按能力分组(对话 / 向量 / 重排 / 语音)、关键字过滤、行内拉黑、已拉黑置灰;目录口径随「过滤弃用」开关
### Changed
- 「过滤弃用」开关与模型黑名单管理自 AI 网关页迁入设置 · AI;AI 网关「可用模型」列表移除 ✕ 拉黑入口(添加统一走设置页弹窗),渠道「模型列表」弹窗内的拉黑保留
### Fixed
- 实例详情网卡(VNIC):附加成功后按「期望卡数 +1」限时轮询(≤90s),新卡自动出现无需手动刷新页面;IPv6 添加 / 删除仅在网卡 ATTACHED 状态提供,修复 DETACHED 网卡仍可点「+ IPv6」;脚注移除误导的 dhclient / netplan 说明(OCI DHCPv4 只服务主网卡)
## [0.6.0]
### Added
- AI 网关渠道表格新增「模型数量」列(与模型列表同口径:排除黑名单、随「过滤弃用」开关)
- 渠道「模型列表」弹窗(替代原「同步模型」按钮,同步入口迁入弹窗):模型按能力分组展示(对话 / 向量 / 重排 / 语音),支持关键字过滤;每行可「测试」(通过即标记「验证模型」徽章并置渠道可用,后续探测优先使用)与「拉黑」(全局黑名单);弃用模型降灰标注,非对话模型不提供测试;操作按钮悬停行时着色,保持列表安静
## [0.5.1]
### Changed
- 设置 · 账号安全绑定入口:已绑定的登录方式按钮置禁用态并显示「已绑定」,解绑后自动恢复可点
### Fixed
- 修复禁用密码登录后登录页闪烁:登录方式加载完成前显示加载态,不再先渲染密码表单再切换,同时消除了闪烁窗口内误提交密码触发 403「密码登录已禁用」日志的问题
- 系统日志「动作」列补齐 26 条缺失描述(退出登录、外部身份登录 / 绑定、修改登录凭据、AI 密钥 / 渠道 / 黑名单 / 网关设置、通知渠道 / 模板、代理导入 / 探测 / 关联租户等)
## [0.5.0]
### Added
- AI 网关「接入信息」新增 `POST /tts` 端点展示(文本转语音 · xAI 官方格式)
- AI 网关「可用模型」新增「过滤弃用」开关:开启后已宣布弃用(即使未退役)的模型从模型列表与路由中排除,状态持久化,切换即时刷新列表
## [0.4.0]
### Added
- AI 网关「接入信息」补齐新端点展示:`POST /audio/speech`(文本转语音 · xAI Voice)、`POST /rerank`(文档重排 · Cohere Rerank)、`POST /moderations`(内容审核 · OCI Guardrails
## [0.3.0]
### Added
- AI 网关端点列表恢复展示 OpenAI Chat Completions 接口(`POST /ai/v1/chat/completions`),标明支持流式与非流式调用
- 租户列表分页支持 10 / 20 / 50 / 100 条每页切换
- 设置 · 关于新增「运行状态」面板:运行时长(随查看自增)与 CPU 均值 / 内存(堆)/ 存储占用 / Goroutines 四格指标,明暗主题与窄屏两列自适应;旧版后端缺运行时字段时面板自动隐藏
- 代理列表新增「关联租户」管理:弹窗回显当前关联名单(支持点 ✕ 移除),多选增删保存即设置全集,选中已关联其他代理的租户时提示保存后改挂
### Changed
- 回传日志告警统一改由「通知管理 → 云端事件」分类推送,租户删除提示同步移除已废弃的告警规则清理项
- 总览页租户测活列表改为限高滚动,「查看全部租户」入口固定展示
- 系统日志、OCI 审计日志与配额表格取消固定高度,分页内容随页面完整展开
- 代理列表「认证」列由用户名明文拼接改为「是 / 否」徽标,悬停「是」显示用户名(无用户名提示仅密码认证)
### Removed
- 移除日志页自定义审计告警规则的管理入口、条件表单及相关前端 API
### Fixed
- 修复租户列表分页状态在页面重绘时丢失,以及筛选后停留在越界页码的问题
- 修复「引导卷(GB)」等可清空数字输入框的步进箭头挤出输入框右缘的错位;清空图标改为悬浮在步进竖栏左侧,输入文本自动避让
## [0.2.0]
### Added
- AI 网关页「模型黑名单」管理:模型列表按厂商手风琴分组展示,可一键拉黑(全渠道剔除)、移除后重新同步渠道恢复
- AI 密钥模型白名单编辑:创建 / 编辑密钥时可限定放行的模型列表(空 = 不限)
- 渠道 / 密钥表单「现有分组」chips:点击即填入分组输入框
### Changed
- 租户删除确认弹窗分段排版(标题 / 面板清理范围 / 云端提示),列表与详情页文案一致
## [0.1.0]
### Added ### Added
@@ -24,7 +136,7 @@
- 租户详情「用户」「策略」等 Tab 切换域后内容不刷新 - 租户详情「用户」「策略」等 Tab 切换域后内容不刷新
- 实例详情区块加载中时禁用头部操作按钮,防误点 - 实例详情区块加载中时禁用头部操作按钮,防误点
## [0.0.1] - 2026-07-09 ## [0.0.1]
首个版本:OCI Portal 前端。 首个版本:OCI Portal 前端。
+1 -1
View File
@@ -1,7 +1,7 @@
{ {
"name": "oci-portal-dash", "name": "oci-portal-dash",
"private": true, "private": true,
"version": "0.1.0", "version": "0.2.0",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",
+54 -2
View File
@@ -1,5 +1,15 @@
import { request } from './request' import { request } from './request'
import type { AiCallLog, AiChannel, AiContentLog, AiKey, AiModel, AiModelCacheItem } from '@/types/api' import type {
AiCallLog,
AiCatalogModel,
AiChannel,
AiContentLog,
AiKey,
AiModel,
AiModelBlacklistItem,
AiModelCacheItem,
AiSettings,
} from '@/types/api'
// ---- 网关密钥 ---- // ---- 网关密钥 ----
@@ -11,6 +21,8 @@ export interface CreateAiKeyRequest {
name: string name: string
value?: string value?: string
group?: string group?: string
/** 模型白名单;缺省/空 = 不限 */
models?: string[]
} }
/** 创建密钥;key 为明文,仅本次响应返回 */ /** 创建密钥;key 为明文,仅本次响应返回 */
@@ -20,7 +32,7 @@ export function createAiKey(body: CreateAiKeyRequest): Promise<{ key: string; it
export function updateAiKey( export function updateAiKey(
id: number, id: number,
body: { name?: string; enabled?: boolean; group?: string }, body: { name?: string; enabled?: boolean; group?: string; models?: string[] },
): Promise<void> { ): Promise<void> {
return request(`/ai-keys/${id}`, { method: 'PUT', body }) return request(`/ai-keys/${id}`, { method: 'PUT', body })
} }
@@ -72,12 +84,52 @@ export function syncAiChannelModels(id: number): Promise<AiModelCacheItem[]> {
}).then((r) => r.items) }).then((r) => r.items)
} }
export function listAiChannelModels(id: number): Promise<AiModelCacheItem[]> {
return request<{ items: AiModelCacheItem[] }>(`/ai-channels/${id}/models`).then((r) => r.items)
}
/** 单模型 max_tokens=16 试调;通过即设为该渠道探测验证模型并按需置渠道可用 */
export function testAiChannelModel(id: number, model: string): Promise<AiChannel> {
return request(`/ai-channels/${id}/test-model`, { method: 'POST', body: { model } })
}
// ---- 聚合模型与调用日志 ---- // ---- 聚合模型与调用日志 ----
export function listAiModels(): Promise<AiModel[]> { export function listAiModels(): Promise<AiModel[]> {
return request<{ items: AiModel[] }>('/ai-models').then((r) => r.items) return request<{ items: AiModel[] }>('/ai-models').then((r) => r.items)
} }
/** 聚合模型目录(含能力,启用渠道去重;不受「过滤弃用」影响),黑名单添加弹窗用 */
export function listAiModelCatalog(): Promise<AiCatalogModel[]> {
return request<{ items: AiCatalogModel[] }>('/ai-model-catalog').then((r) => r.items)
}
// ---- 网关全局设置 ----
export function getAiSettings(): Promise<AiSettings> {
return request<AiSettings>('/ai-settings')
}
export function updateAiSettings(body: AiSettings): Promise<AiSettings> {
return request<AiSettings>('/ai-settings', { method: 'PUT', body })
}
// ---- 模型黑名单 ----
export function listAiBlacklist(): Promise<AiModelBlacklistItem[]> {
return request<{ items: AiModelBlacklistItem[] }>('/ai-blacklist').then((r) => r.items)
}
/** 拉黑模型:删除全部渠道缓存中的同名条目,后续同步 / 探测均过滤 */
export function addAiBlacklist(name: string): Promise<void> {
return request('/ai-blacklist', { method: 'POST', body: { name } })
}
/** 移出黑名单:缓存不回填,重新同步 / 探测后恢复入池 */
export function removeAiBlacklist(id: number): Promise<void> {
return request(`/ai-blacklist/${id}`, { method: 'DELETE' })
}
export function listAiCallLogs(params: { export function listAiCallLogs(params: {
page: number page: number
size: number size: number
-23
View File
@@ -1,8 +1,6 @@
import { mockLogEvents, mockLogRelays, mockLogWebhooks } from './mock' import { mockLogEvents, mockLogRelays, mockLogWebhooks } from './mock'
import { mockOn, mocked, request } from './request' import { mockOn, mocked, request } from './request'
import type { import type {
AlertRule,
AlertRuleBody,
LogEventPage, LogEventPage,
LogRelayView, LogRelayView,
LogWebhookInfo, LogWebhookInfo,
@@ -30,27 +28,6 @@ export function listLogEvents(params: LogEventParams): Promise<LogEventPage> {
return request('/log-events', { query: { ...params } }) return request('/log-events', { query: { ...params } })
} }
// ---- 告警规则 ----
export function listAlertRules(): Promise<AlertRule[]> {
if (mockOn) return mocked([])
return request<{ items: AlertRule[] }>('/log-events/alert-rules').then((r) => r.items)
}
export function createAlertRule(body: AlertRuleBody): Promise<AlertRule> {
if (mockOn) return mocked({ ...body, id: 1, createdAt: '', updatedAt: '' }, 300)
return request('/log-events/alert-rules', { method: 'POST', body })
}
export function updateAlertRule(id: number, body: AlertRuleBody): Promise<AlertRule> {
if (mockOn) return mocked({ ...body, id, createdAt: '', updatedAt: '' }, 300)
return request(`/log-events/alert-rules/${id}`, { method: 'PUT', body })
}
export function deleteAlertRule(id: number): Promise<void> {
if (mockOn) return mocked(undefined, 300)
return request(`/log-events/alert-rules/${id}`, { method: 'DELETE' })
}
export function getLogWebhook(cfgId: number): Promise<LogWebhookState> { export function getLogWebhook(cfgId: number): Promise<LogWebhookState> {
if (mockOn) { if (mockOn) {
const info = mockLogWebhooks.get(cfgId) const info = mockLogWebhooks.get(cfgId)
+38 -2
View File
@@ -113,8 +113,9 @@ export const mockConfigs: OciConfig[] = [
promotionStatus: 'EXPIRED', promotionStatus: 'EXPIRED',
multiRegion: true, multiRegion: true,
multiCompartment: true, multiCompartment: true,
proxyId: null, // 与 mockProxies[0].usedBy = 1 呼应:主号经东京 socks5 出站
proxyName: '', proxyId: 1,
proxyName: '东京 socks5',
}), }),
cfg({ cfg({
id: 2, id: 2,
@@ -508,6 +509,7 @@ export const mockRegionSubs: RegionSubscription[] = [
] ]
export const mockLimits: LimitItem[] = [ export const mockLimits: LimitItem[] = [
// A1:三个 AD 均有配额 + 区域总额(镜像真实免费租户形态)
{ {
name: 'standard-a1-core-count', name: 'standard-a1-core-count',
scopeType: 'AD', scopeType: 'AD',
@@ -516,6 +518,19 @@ export const mockLimits: LimitItem[] = [
used: 4, used: 4,
available: 0, available: 0,
}, },
{
name: 'standard-a1-core-count',
scopeType: 'AD',
availabilityDomain: 'RssO:EU-FRANKFURT-1-AD-2',
value: 4,
},
{
name: 'standard-a1-core-count',
scopeType: 'AD',
availabilityDomain: 'RssO:EU-FRANKFURT-1-AD-3',
value: 4,
},
{ name: 'standard-a1-core-regional-count', scopeType: 'REGION', value: 4 },
{ {
name: 'standard-a1-memory-count', name: 'standard-a1-memory-count',
scopeType: 'AD', scopeType: 'AD',
@@ -524,14 +539,27 @@ export const mockLimits: LimitItem[] = [
used: 24, used: 24,
available: 0, available: 0,
}, },
// Micro:仅 AD-2 有配额(AD 受限 shape,驱动创建表单自动落位)
{ {
name: 'standard-e2-micro-core-count', name: 'standard-e2-micro-core-count',
scopeType: 'AD', scopeType: 'AD',
availabilityDomain: 'RssO:EU-FRANKFURT-1-AD-1', availabilityDomain: 'RssO:EU-FRANKFURT-1-AD-1',
value: 0,
},
{
name: 'standard-e2-micro-core-count',
scopeType: 'AD',
availabilityDomain: 'RssO:EU-FRANKFURT-1-AD-2',
value: 2, value: 2,
used: 1, used: 1,
available: 1, available: 1,
}, },
{
name: 'standard-e2-micro-core-count',
scopeType: 'AD',
availabilityDomain: 'RssO:EU-FRANKFURT-1-AD-3',
value: 0,
},
{ {
name: 'standard-e4-core-count', name: 'standard-e4-core-count',
scopeType: 'AD', scopeType: 'AD',
@@ -1373,6 +1401,12 @@ export const mockShapes: ComputeShape[] = [
memoryMinGBs: 1, memoryMinGBs: 1,
memoryMaxGBs: 512, memoryMaxGBs: 512,
processorDescription: '3.0 GHz Ampere® Altra™', processorDescription: '3.0 GHz Ampere® Altra™',
quotaNames: [
'standard-a1-memory-count',
'standard-a1-memory-regional-count',
'standard-a1-core-count',
'standard-a1-core-regional-count',
],
}, },
{ {
name: 'VM.Standard.E2.1.Micro', name: 'VM.Standard.E2.1.Micro',
@@ -1381,6 +1415,7 @@ export const mockShapes: ComputeShape[] = [
ocpus: 1, ocpus: 1,
memoryInGBs: 1, memoryInGBs: 1,
processorDescription: '2.0 GHz AMD EPYC™ 7551', processorDescription: '2.0 GHz AMD EPYC™ 7551',
quotaNames: ['standard-e2-micro-core-count'],
}, },
{ {
name: 'VM.Standard.E4.Flex', name: 'VM.Standard.E4.Flex',
@@ -1391,6 +1426,7 @@ export const mockShapes: ComputeShape[] = [
memoryMinGBs: 1, memoryMinGBs: 1,
memoryMaxGBs: 1024, memoryMaxGBs: 1024,
processorDescription: '2.55 GHz AMD EPYC™ 7J13', processorDescription: '2.55 GHz AMD EPYC™ 7J13',
quotaNames: ['standard-e4-core-count', 'standard-e4-memory-count'],
}, },
{ {
name: 'VM.Standard.E5.Flex', name: 'VM.Standard.E5.Flex',
+17 -1
View File
@@ -1,4 +1,4 @@
import { mockProxies } from './mock' import { mockConfigs, mockProxies } from './mock'
import { mockOn, mocked, request } from './request' import { mockOn, mocked, request } from './request'
import type { ProxyImportResult, ProxyInfo, ProxyInput } from '@/types/api' import type { ProxyImportResult, ProxyInfo, ProxyInput } from '@/types/api'
@@ -78,6 +78,22 @@ export function importProxies(text: string): Promise<ProxyImportResult> {
return request('/proxies/import', { method: 'POST', body: { text } }) return request('/proxies/import', { method: 'POST', body: { text } })
} }
/** 代理侧设置关联租户全集:选中即关联(含从其他代理改挂),未选中即解除 */
export function setProxyTenants(id: number, ociConfigIds: number[]): Promise<{ usedBy: number }> {
if (mockOn) {
const found = mockProxies.find((p) => p.id === id)
if (!found) return Promise.reject(new Error('代理不存在'))
for (const c of mockConfigs) {
if (ociConfigIds.includes(c.id)) Object.assign(c, { proxyId: id, proxyName: found.name })
else if (c.proxyId === id) Object.assign(c, { proxyId: null, proxyName: '' })
}
// 改挂会影响其他代理的引用数,全量重算保持一致
for (const p of mockProxies) p.usedBy = mockConfigs.filter((c) => c.proxyId === p.id).length
return mocked({ usedBy: found.usedBy })
}
return request(`/proxies/${id}/tenants`, { method: 'PUT', body: { ociConfigIds } })
}
/** 手动重测出口地区,同步返回最新视图 */ /** 手动重测出口地区,同步返回最新视图 */
export function probeProxy(id: number): Promise<ProxyInfo> { export function probeProxy(id: number): Promise<ProxyInfo> {
if (mockOn) { if (mockOn) {
+9 -2
View File
@@ -32,8 +32,15 @@ function buildUrl(path: string, query?: RequestOptions['query']): string {
async function parseError(resp: Response): Promise<never> { async function parseError(resp: Response): Promise<never> {
let message = `请求失败(${resp.status}` let message = `请求失败(${resp.status}`
try { try {
const body = (await resp.json()) as { error?: string; hint?: string } const body = (await resp.json()) as { error?: string; hint?: string; errors?: unknown[] }
if (body.error) message = body.hint ? `${body.hint}${body.error}` : body.error if (body.error) {
message = body.hint ? `${body.hint}${body.error}` : body.error
} else {
// 批量接口(如创建实例)全部失败时返回 errors 数组,逐行合并;
// 调用方以「短标题 + detail」经 useToast 展示,多行在详情块中逐行可读
const list = (body.errors ?? []).filter((e): e is string => typeof e === 'string')
if (list.length) message = list.join('\n')
}
} catch { } catch {
/* 非 JSON 响应体,保留默认消息 */ /* 非 JSON 响应体,保留默认消息 */
} }
+11
View File
@@ -181,6 +181,17 @@ export function getAbout(): Promise<AboutInfo> {
buildTime: '2026-07-09T12:00Z', buildTime: '2026-07-09T12:00Z',
goVersion: 'go1.26.4', goVersion: 'go1.26.4',
platform: 'linux/amd64', platform: 'linux/amd64',
startedAt: '2026-07-01T08:23:00+08:00',
uptimeSeconds: 1053360, // 12 天 4 小时 36 分
resources: {
cpuAvgPercent: 1.4,
numCpu: 4,
goroutines: 36,
memHeapBytes: 50537000,
memSysBytes: 101187000,
dbEngine: 'sqlite',
dbBytes: 13212000,
},
}) })
return request('/about') return request('/about')
} }
+15 -8
View File
@@ -182,17 +182,24 @@ export function deleteUserApiKeys(
// ---- 审计日志 ---- // ---- 审计日志 ----
/** 批式懒加载查询审计事件:cursor 空自当前时刻首查, /** 批式懒加载查询审计事件:cursor 空自当前时刻首查,
* 非空从上次响应游标向更早续取一批(~100 条,服务端分窗回溯) */ * 非空从上次响应游标向更早续取一批(~200 条,服务端分窗回溯);
* q 为服务端全文检索关键字,仅首查生效(续查沿用游标内嵌关键字) */
export function listAuditEvents( export function listAuditEvents(
id: number, id: number,
opts: { region?: string; cursor?: string; limit?: number } = {}, opts: { region?: string; cursor?: string; limit?: number; q?: string } = {},
): Promise<AuditEventsResult> { ): Promise<AuditEventsResult> {
// mock:首批带游标,续查一批后到尽头,演示懒加载链路 // mock:首批带游标,续查一批后到尽头,演示懒加载链路;q 演示不区分大小写的包含匹配
if (mockOn) if (mockOn) {
return mocked( const kw = (opts.q ?? '').replace(/\*/g, '').toLowerCase()
{ items: mockAuditEvents, cursor: opts.cursor ? undefined : 'mock-cursor', exhausted: !!opts.cursor }, const items = kw
300, ? mockAuditEvents.filter((e) =>
) [e.eventName, e.resourceName, e.principalName, e.ipAddress, e.source].some((v) =>
(v ?? '').toLowerCase().includes(kw),
),
)
: mockAuditEvents
return mocked({ items, cursor: opts.cursor ? undefined : 'mock-cursor', exhausted: !!opts.cursor }, 300)
}
return request(`/oci-configs/${id}/audit-events`, { query: { ...opts } }) return request(`/oci-configs/${id}/audit-events`, { query: { ...opts } })
} }
+13
View File
@@ -168,6 +168,19 @@ body {
background: var(--color-wash); background: var(--color-wash);
color: var(--color-ink); color: var(--color-ink);
} }
/* clearable 时 naive-ui 在 suffix 首位多渲染 .n-base-clear,会被上面的
2 行网格自动排进隐式第 2 列、把 26px 竖栏撑爆(箭头溢出框外)——
绝对定位使其脱离网格流,悬浮在竖栏左侧;文本区同步加宽避让清空图标 */
.app-input-number .n-input__suffix .n-base-clear {
position: absolute;
right: 100%;
top: 50%;
transform: translateY(-50%);
margin-right: 5px;
}
.app-input-number .n-input:has(.n-base-clear) .n-input-wrapper {
padding-right: 52px;
}
/* useToast 可展开详情:toast 内嵌代码块(标签 + 复制 + 内滚 pre)。 /* useToast 可展开详情:toast 内嵌代码块(标签 + 复制 + 内滚 pre)。
message 经 teleport 渲染于 body,组件 scoped 样式不可达,故置于全局。 */ message 经 teleport 渲染于 body,组件 scoped 样式不可达,故置于全局。 */
-16
View File
@@ -1,16 +0,0 @@
<script setup lang="ts">
defineProps<{ title: string; sub?: string }>()
</script>
<template>
<div class="flex flex-wrap items-baseline justify-between gap-2">
<div class="flex items-baseline gap-3">
<h1 class="page-title">{{ title }}</h1>
<slot name="title-extra" />
</div>
<div class="flex items-center gap-2">
<span v-if="sub" class="text-[13px] text-ink-3">{{ sub }}</span>
<slot name="actions" />
</div>
</div>
</template>
+201
View File
@@ -0,0 +1,201 @@
<script setup lang="ts">
import { NButton, NInput, NModal, useDialog } from 'naive-ui'
import { computed, ref, watch } from 'vue'
import {
addAiBlacklist,
listAiChannelModels,
syncAiChannelModels,
testAiChannelModel,
} from '@/api/aigateway'
import { useToast } from '@/composables/useToast'
import type { AiChannel, AiModelCacheItem } from '@/types/api'
const props = defineProps<{ show: boolean; channel: AiChannel | null }>()
const emit = defineEmits<{ 'update:show': [boolean]; changed: [] }>()
const toast = useToast()
const dialog = useDialog()
const rows = ref<AiModelCacheItem[]>([])
const loading = ref(false)
const syncing = ref(false)
const testing = ref('')
const filter = ref('')
/** 本地镜像验证模型:测试通过即时高亮,不等父级刷新 */
const probeModel = ref('')
const CAP_ORDER = ['CHAT', 'EMBEDDING', 'RERANK', 'TTS']
const CAP_LABEL: Record<string, string> = { CHAT: '对话', EMBEDDING: '向量', RERANK: '重排', TTS: '语音' }
/** 按能力分组 + 关键字过滤;仅对话组提供「测试」入口 */
const groups = computed(() => {
const kw = filter.value.trim().toLowerCase()
const buckets = new Map<string, AiModelCacheItem[]>()
for (const r of rows.value) {
if (kw && !r.name.toLowerCase().includes(kw)) continue
const cap = r.capability || 'CHAT'
buckets.set(cap, [...(buckets.get(cap) ?? []), r])
}
const order = [...CAP_ORDER, ...[...buckets.keys()].filter((c) => !CAP_ORDER.includes(c))]
return order
.filter((cap) => buckets.has(cap))
.map((cap) => ({ cap, label: CAP_LABEL[cap] ?? cap, items: buckets.get(cap)! }))
})
const shownCount = computed(() => groups.value.reduce((n, g) => n + g.items.length, 0))
watch(
() => props.show,
(show) => {
if (show && props.channel) {
probeModel.value = props.channel.probeModel
filter.value = ''
void reload()
}
},
)
async function reload() {
if (!props.channel) return
loading.value = true
try {
rows.value = await listAiChannelModels(props.channel.id)
} catch (e) {
toast.error(e instanceof Error ? e.message : '加载失败')
} finally {
loading.value = false
}
}
async function doSync() {
if (!props.channel) return
syncing.value = true
try {
rows.value = await syncAiChannelModels(props.channel.id)
toast.success(`已同步 ${rows.value.length} 个模型`)
emit('changed')
} catch (e) {
toast.error(e instanceof Error ? e.message : '同步失败')
} finally {
syncing.value = false
}
}
async function doTest(name: string) {
if (!props.channel || testing.value) return
testing.value = name
try {
const ch = await testAiChannelModel(props.channel.id, name)
probeModel.value = ch.probeModel
toast.success('测试通过', '已设为该渠道探测验证模型,后续探测优先使用')
emit('changed')
} catch (e) {
toast.error(e instanceof Error ? e.message : '测试失败')
} finally {
testing.value = ''
}
}
function confirmBlacklist(name: string) {
dialog.warning({
title: '拉黑模型',
content: `${name}」将从全部渠道剔除,同步与探测不再入库;可在模型黑名单中移出后重新同步恢复。`,
positiveText: '拉黑',
negativeText: '取消',
onPositiveClick: async () => {
try {
await addAiBlacklist(name)
toast.success('已拉黑')
void reload()
emit('changed')
} catch (e) {
toast.error(e instanceof Error ? e.message : '拉黑失败')
}
},
})
}
</script>
<template>
<NModal
:show="show"
preset="card"
:style="{ width: '640px', maxWidth: 'calc(100vw - 24px)' }"
@update:show="emit('update:show', $event)"
>
<template #header>
<div>
<div class="text-[15px] leading-tight font-semibold">模型列表</div>
<div class="mono mt-1 text-xs font-normal text-ink-3">{{ channel?.name ?? '' }}</div>
</div>
</template>
<div class="flex items-center gap-2 pb-2">
<NInput v-model:value="filter" size="small" placeholder="过滤模型名…" clearable class="min-w-0 flex-1" />
<span class="flex-none text-xs whitespace-nowrap text-ink-3">
{{ filter ? `${shownCount} / ${rows.length}` : `${rows.length} 个模型` }}
</span>
<NButton size="small" :loading="syncing" @click="doSync">同步模型</NButton>
</div>
<div class="-mx-2 max-h-[58vh] overflow-y-auto">
<div v-if="loading" class="py-10 text-center text-xs text-ink-3">加载中</div>
<template v-else>
<template v-for="g in groups" :key="g.cap">
<div class="px-3 pt-3 pb-1 text-[11.5px] font-semibold tracking-wide text-ink-3">
{{ g.label }} <span class="font-normal">· {{ g.items.length }}</span>
</div>
<div
v-for="r in g.items"
:key="r.name"
class="group flex items-center gap-2 rounded-lg px-3 py-[5px] hover:bg-row-hover"
>
<span
class="mono min-w-0 truncate text-[13px]"
:class="r.deprecatedAt ? 'text-ink-3' : ''"
:title="r.modelOcid"
>
{{ r.name }}
</span>
<span
v-if="r.name === probeModel"
class="flex flex-none items-center gap-1 rounded-[5px] bg-info/15 px-1.5 py-px text-[10.5px] font-medium text-info"
>
<span class="h-[5px] w-[5px] rounded-full bg-info" />验证模型
</span>
<span v-if="r.deprecatedAt" class="flex-none text-[11px] text-warn">弃用</span>
<span class="min-w-0 flex-1" />
<button
v-if="g.cap === 'CHAT'"
type="button"
class="flex-none cursor-pointer rounded-[5px] px-1.5 py-0.5 text-xs hover:bg-accent/10"
:class="testing === r.name ? 'text-accent' : 'text-ink-3/70 group-hover:text-accent'"
:disabled="!!testing"
@click="doTest(r.name)"
>
{{ testing === r.name ? '测试中…' : '测试' }}
</button>
<button
type="button"
class="flex-none cursor-pointer rounded-[5px] px-1.5 py-0.5 text-xs text-ink-3/70 group-hover:text-err hover:bg-err/10"
@click="confirmBlacklist(r.name)"
>
拉黑
</button>
</div>
</template>
<div v-if="!shownCount" class="py-10 text-center text-xs text-ink-3">
{{ rows.length ? '无匹配模型' : '暂无模型缓存,点击右上同步模型拉取' }}
</div>
</template>
</div>
<div class="mt-1 border-t border-line-soft pt-2.5 text-[11.5px] leading-relaxed text-ink-3">
<span class="font-medium text-ink-2">测试</span>: max_tokens=16
试调,通过即设为该渠道探测验证模型(后续探测优先使用)并置渠道可用 ·
<span class="font-medium text-ink-2">拉黑</span>:全局生效,从全部渠道剔除 ·
非对话模型不提供测试
</div>
</NModal>
</template>
+26 -12
View File
@@ -2,8 +2,10 @@
import { NButton, NDataTable, NInput, NSelect, NTooltip, useDialog, type DataTableColumns } from 'naive-ui' import { NButton, NDataTable, NInput, NSelect, NTooltip, useDialog, type DataTableColumns } from 'naive-ui'
import { computed, h, reactive, ref } from 'vue' import { computed, h, reactive, ref } from 'vue'
import { createAiChannel, deleteAiChannel, probeAiChannel, syncAiChannelModels, updateAiChannel } from '@/api/aigateway' import { createAiChannel, deleteAiChannel, probeAiChannel, updateAiChannel } from '@/api/aigateway'
import { listCachedRegions } from '@/api/configs' import { listCachedRegions } from '@/api/configs'
import AiChannelModelsModal from '@/components/ai/AiChannelModelsModal.vue'
import GroupChips from '@/components/ai/GroupChips.vue'
import AppInputNumber from '@/components/AppInputNumber.vue' import AppInputNumber from '@/components/AppInputNumber.vue'
import FormField from '@/components/FormField.vue' import FormField from '@/components/FormField.vue'
import FormModal from '@/components/FormModal.vue' import FormModal from '@/components/FormModal.vue'
@@ -15,9 +17,11 @@ import { useToast } from '@/composables/useToast'
import { useScopeStore } from '@/stores/scope' import { useScopeStore } from '@/stores/scope'
import type { AiChannel, AiProbeStatus } from '@/types/api' import type { AiChannel, AiProbeStatus } from '@/types/api'
defineProps<{ channels: AiChannel[]; loading: boolean }>() const props = defineProps<{ channels: AiChannel[]; loading: boolean }>()
const emit = defineEmits<{ changed: [] }>() const emit = defineEmits<{ changed: [] }>()
const groupHints = computed(() => [...new Set(props.channels.map((c) => c.group).filter(Boolean))])
const toast = useToast() const toast = useToast()
const dialog = useDialog() const dialog = useDialog()
const scope = useScopeStore() const scope = useScopeStore()
@@ -106,14 +110,13 @@ async function doProbe(id: number) {
} }
} }
async function doSync(id: number) { // ---- 模型列表弹窗 ----
try { const showModels = ref(false)
const models = await syncAiChannelModels(id) const modelsChannel = ref<AiChannel | null>(null)
toast.success(`已同步 ${models.length} 个模型`)
emit('changed') function openModels(ch: AiChannel) {
} catch (e) { modelsChannel.value = ch
toast.error(e instanceof Error ? e.message : '同步失败') showModels.value = true
}
} }
async function toggle(ch: AiChannel) { async function toggle(ch: AiChannel) {
@@ -175,12 +178,16 @@ const columns = computed<DataTableColumns<AiChannel>>(() => [
}, },
{ title: '优先级', key: 'priority', width: 76, render: (r) => h('span', { class: 'mono text-[13px]' }, String(r.priority)) }, { title: '优先级', key: 'priority', width: 76, render: (r) => h('span', { class: 'mono text-[13px]' }, String(r.priority)) },
{ title: '权重', key: 'weight', width: 66, render: (r) => h('span', { class: 'mono text-[13px]' }, String(r.weight)) }, { title: '权重', key: 'weight', width: 66, render: (r) => h('span', { class: 'mono text-[13px]' }, String(r.weight)) },
{
title: '模型数量', key: 'modelCount', width: 86,
render: (r) => h('span', { class: r.modelCount ? 'mono text-[13px]' : 'text-xs text-ink-3' }, String(r.modelCount ?? 0)),
},
{ title: '探测状态', key: 'probeStatus', width: 120, render: probeCell }, { title: '探测状态', key: 'probeStatus', width: 120, render: probeCell },
{ {
title: '操作', key: 'actions', width: 250, title: '操作', key: 'actions', width: 250,
render: (r) => h('div', { class: 'flex items-center gap-0.5' }, [ render: (r) => h('div', { class: 'flex items-center gap-0.5' }, [
h(NButton, { size: 'tiny', quaternary: true, type: 'primary', loading: probing.value.has(r.id), onClick: () => doProbe(r.id) }, { default: () => '探测' }), h(NButton, { size: 'tiny', quaternary: true, type: 'primary', loading: probing.value.has(r.id), onClick: () => doProbe(r.id) }, { default: () => '探测' }),
h(NButton, { size: 'tiny', quaternary: true, type: 'primary', onClick: () => doSync(r.id) }, { default: () => '同步模型' }), h(NButton, { size: 'tiny', quaternary: true, type: 'primary', onClick: () => openModels(r) }, { default: () => '模型列表' }),
h(NButton, { size: 'tiny', quaternary: true, onClick: () => toggle(r) }, { default: () => (r.enabled ? '停用' : '启用') }), h(NButton, { size: 'tiny', quaternary: true, onClick: () => toggle(r) }, { default: () => (r.enabled ? '停用' : '启用') }),
h(NButton, { size: 'tiny', quaternary: true, type: 'primary', onClick: () => openEdit(r) }, { default: () => '编辑' }), h(NButton, { size: 'tiny', quaternary: true, type: 'primary', onClick: () => openEdit(r) }, { default: () => '编辑' }),
h(NButton, { size: 'tiny', quaternary: true, type: 'error', onClick: () => confirmRemove(r) }, { default: () => '删除' }), h(NButton, { size: 'tiny', quaternary: true, type: 'error', onClick: () => confirmRemove(r) }, { default: () => '删除' }),
@@ -202,10 +209,16 @@ const columns = computed<DataTableColumns<AiChannel>>(() => [
</div> </div>
<NDataTable :columns="columns" :data="channels" :loading="loading" :bordered="false" size="small" /> <NDataTable :columns="columns" :data="channels" :loading="loading" :bordered="false" size="small" />
<div class="border-t border-line-soft bg-wash px-4.5 py-2.5 text-xs leading-relaxed text-ink-3"> <div class="border-t border-line-soft bg-wash px-4.5 py-2.5 text-xs leading-relaxed text-ink-3">
探测三步:列模型(服务可见性) 同步模型缓存 max_tokens=1 试调(配额)· 探测成功自动复位熔断 · 探测三步:列模型(服务可见性) 同步模型缓存 max_tokens=16 试调(配额)· 探测成功自动复位熔断 ·
有渠道时系统自动维护AI渠道探测后台任务(每天 00:00 逐渠道探测,渠道清空自动暂停) 有渠道时系统自动维护AI渠道探测后台任务(每天 00:00 逐渠道探测,渠道清空自动暂停)
</div> </div>
<AiChannelModelsModal
v-model:show="showModels"
:channel="modelsChannel"
@changed="emit('changed')"
/>
<FormModal <FormModal
v-model:show="showForm" v-model:show="showForm"
:title="editing ? '编辑渠道' : '添加渠道'" :title="editing ? '编辑渠道' : '添加渠道'"
@@ -233,6 +246,7 @@ const columns = computed<DataTableColumns<AiChannel>>(() => [
<div class="grid grid-cols-3 gap-3"> <div class="grid grid-cols-3 gap-3">
<FormField label="分组" hint="分组供密钥定向路由;留空归入默认分组"> <FormField label="分组" hint="分组供密钥定向路由;留空归入默认分组">
<NInput v-model:value="form.group" placeholder="默认" /> <NInput v-model:value="form.group" placeholder="默认" />
<GroupChips :groups="groupHints" @pick="form.group = $event" />
</FormField> </FormField>
<FormField label="优先级" hint="数字小优先"> <FormField label="优先级" hint="数字小优先">
<AppInputNumber v-model:value="form.priority" :min="1" /> <AppInputNumber v-model:value="form.priority" :min="1" />
+46 -20
View File
@@ -1,17 +1,18 @@
<script setup lang="ts"> <script setup lang="ts">
import { NButton, NDataTable, NInput, useDialog, type DataTableColumns } from 'naive-ui' import { NButton, NDataTable, NInput, NSelect, NTooltip, useDialog, type DataTableColumns } from 'naive-ui'
import { computed, h, reactive, ref } from 'vue' import { computed, h, reactive, ref } from 'vue'
import { createAiKey, deleteAiKey, updateAiKey, updateAiKeyContentLog } from '@/api/aigateway' import { createAiKey, deleteAiKey, updateAiKey, updateAiKeyContentLog } from '@/api/aigateway'
import GroupChips from '@/components/ai/GroupChips.vue'
import AppInputNumber from '@/components/AppInputNumber.vue' import AppInputNumber from '@/components/AppInputNumber.vue'
import FormField from '@/components/FormField.vue' import FormField from '@/components/FormField.vue'
import FormModal from '@/components/FormModal.vue' import FormModal from '@/components/FormModal.vue'
import StatusBadge from '@/components/StatusBadge.vue' import StatusBadge from '@/components/StatusBadge.vue'
import { fmtTime } from '@/composables/useFormat' import { fmtTime } from '@/composables/useFormat'
import type { AiKey } from '@/types/api' import type { AiKey, AiModel } from '@/types/api'
import { useToast } from '@/composables/useToast' import { useToast } from '@/composables/useToast'
const props = defineProps<{ keys: AiKey[]; loading: boolean; groups: string[] }>() const props = defineProps<{ keys: AiKey[]; loading: boolean; groups: string[]; models: AiModel[] }>()
const emit = defineEmits<{ changed: [] }>() const emit = defineEmits<{ changed: [] }>()
const message = useToast() const message = useToast()
@@ -21,20 +22,23 @@ const dialog = useDialog()
const showForm = ref(false) const showForm = ref(false)
const editing = ref<AiKey | null>(null) const editing = ref<AiKey | null>(null)
const submitting = ref(false) const submitting = ref(false)
const form = reactive({ name: '', value: '', group: '' }) const form = reactive({ name: '', value: '', group: '', models: [] as string[] })
function openCreate() { function openCreate() {
editing.value = null editing.value = null
Object.assign(form, { name: '', value: '', group: '' }) Object.assign(form, { name: '', value: '', group: '', models: [] })
showForm.value = true showForm.value = true
} }
function openEdit(key: AiKey) { function openEdit(key: AiKey) {
editing.value = key editing.value = key
Object.assign(form, { name: key.name, value: '', group: key.group }) Object.assign(form, { name: key.name, value: '', group: key.group, models: key.models ?? [] })
showForm.value = true showForm.value = true
} }
/** 限制模型下拉选项:聚合模型列表;tag 模式允许手输未同步模型 */
const modelOptions = computed(() => props.models.map((m) => ({ label: m.id, value: m.id })))
// 创建成功后明文只在此弹窗展示一次 // 创建成功后明文只在此弹窗展示一次
const createdKey = ref('') const createdKey = ref('')
const showCreated = ref(false) const showCreated = ref(false)
@@ -43,10 +47,13 @@ async function submit() {
submitting.value = true submitting.value = true
try { try {
if (editing.value) { if (editing.value) {
await updateAiKey(editing.value.id, { name: form.name, group: form.group }) await updateAiKey(editing.value.id, { name: form.name, group: form.group, models: form.models })
message.success('已更新密钥') message.success('已更新密钥')
} else { } else {
const { key } = await createAiKey({ name: form.name, value: form.value || undefined, group: form.group || undefined }) const { key } = await createAiKey({
name: form.name, value: form.value || undefined, group: form.group || undefined,
models: form.models.length ? form.models : undefined,
})
createdKey.value = key createdKey.value = key
showCreated.value = true showCreated.value = true
} }
@@ -118,6 +125,21 @@ function confirmRemove(key: AiKey) {
const groupHints = computed(() => props.groups.filter(Boolean)) const groupHints = computed(() => props.groups.filter(Boolean))
// modelsCell 渲染模型白名单列:空 = 不限;非空显示数量,悬浮列明细
function modelsCell(r: AiKey) {
const list = r.models ?? []
if (!list.length) return h('span', { class: 'text-xs text-ink-3' }, '不限')
return h(
NTooltip,
{ style: { maxWidth: '320px' } },
{
trigger: () =>
h('span', { class: 'cursor-help rounded-[5px] bg-info/15 px-2 py-0.5 text-xs font-medium text-info' }, `${list.length}`),
default: () => h('span', { class: 'text-xs leading-relaxed whitespace-pre-wrap break-all' }, list.join('\n')),
},
)
}
const columns = computed<DataTableColumns<AiKey>>(() => [ const columns = computed<DataTableColumns<AiKey>>(() => [
{ title: '名称', key: 'name', width: 220, ellipsis: { tooltip: true }, render: (r) => h('span', { class: 'text-[13px] font-medium' }, r.name) }, { title: '名称', key: 'name', width: 220, ellipsis: { tooltip: true }, render: (r) => h('span', { class: 'text-[13px] font-medium' }, r.name) },
{ title: '密钥', key: 'tail', width: 120, render: (r) => h('span', { class: 'mono text-[13px] text-ink-2' }, `……${r.tail}`) }, { title: '密钥', key: 'tail', width: 120, render: (r) => h('span', { class: 'mono text-[13px] text-ink-2' }, `……${r.tail}`) },
@@ -127,6 +149,7 @@ const columns = computed<DataTableColumns<AiKey>>(() => [
? h('span', { class: 'rounded-[5px] bg-info/15 px-2 py-0.5 text-xs font-medium text-info' }, r.group) ? h('span', { class: 'rounded-[5px] bg-info/15 px-2 py-0.5 text-xs font-medium text-info' }, r.group)
: h('span', { class: 'text-xs text-ink-3' }, '不限'), : h('span', { class: 'text-xs text-ink-3' }, '不限'),
}, },
{ title: '模型', key: 'models', width: 90, render: modelsCell },
{ {
title: '状态', key: 'enabled', width: 100, title: '状态', key: 'enabled', width: 100,
render: (r) => h(StatusBadge, r.enabled ? { kind: 'run', label: '启用' } : { kind: 'stop', label: '已禁用' }), render: (r) => h(StatusBadge, r.enabled ? { kind: 'run', label: '启用' } : { kind: 'stop', label: '已禁用' }),
@@ -170,18 +193,21 @@ const columns = computed<DataTableColumns<AiKey>>(() => [
</FormField> </FormField>
<FormField label="渠道分组" hint="选择分组后,该密钥的调用只在该分组的渠道内负载均衡;留空不限分组"> <FormField label="渠道分组" hint="选择分组后,该密钥的调用只在该分组的渠道内负载均衡;留空不限分组">
<NInput v-model:value="form.group" placeholder="留空 = 不限(全部渠道)" /> <NInput v-model:value="form.group" placeholder="留空 = 不限(全部渠道)" />
<div v-if="groupHints.length" class="mt-1.5 flex flex-wrap items-center gap-1.5"> <GroupChips :groups="groupHints" @pick="form.group = $event" />
<span class="text-xs text-ink-3">现有分组:</span> </FormField>
<button <FormField
v-for="g in groupHints" label="限制模型"
:key="g" hint="非空时该密钥仅能调用所选模型,/v1/models 同步只返回交集;可手输未同步的模型名;留空不限"
type="button" >
class="cursor-pointer rounded-[5px] border border-line bg-card px-2 py-0.5 text-xs text-ink-2 hover:border-accent hover:text-accent" <NSelect
@click="form.group = g" v-model:value="form.models"
> :options="modelOptions"
{{ g }} multiple
</button> filterable
</div> clearable
tag
placeholder="留空 = 不限(全部模型)"
/>
</FormField> </FormField>
<FormField v-if="!editing" label="自定义密钥值" hint="至少 8 位;仅测试场景建议自定义"> <FormField v-if="!editing" label="自定义密钥值" hint="至少 8 位;仅测试场景建议自定义">
<NInput v-model:value="form.value" placeholder="留空自动生成 sk- 开头随机密钥(推荐)" /> <NInput v-model:value="form.value" placeholder="留空自动生成 sk- 开头随机密钥(推荐)" />
+20
View File
@@ -0,0 +1,20 @@
<script setup lang="ts">
// 现有分组提示行:点击 chip 将分组名填入外部输入框;无分组时整行不渲染
defineProps<{ groups: string[] }>()
defineEmits<{ pick: [group: string] }>()
</script>
<template>
<div v-if="groups.length" class="mt-1.5 flex flex-wrap items-center gap-1.5">
<span class="text-xs text-ink-3">现有分组:</span>
<button
v-for="g in groups"
:key="g"
type="button"
class="cursor-pointer rounded-[5px] border border-line bg-card px-2 py-0.5 text-xs text-ink-2 hover:border-accent hover:text-accent"
@click="$emit('pick', g)"
>
{{ g }}
</button>
</div>
</template>
@@ -56,12 +56,13 @@ async function submit() {
// 后端 errors / instances 为空时序列化为 null,判空防炸 // 后端 errors / instances 为空时序列化为 null,判空防炸
const ok = result.instances?.length ?? 0 const ok = result.instances?.length ?? 0
const failed = result.errors?.length ?? 0 const failed = result.errors?.length ?? 0
if (failed) message.warning(`${ok} 台创建成功,${failed} 台失败${result.errors![0]}`) if (failed) message.warning(`${ok} 台创建成功,${failed} 台失败`, result.errors!.join('\n'))
else message.success(`已创建 ${ok} 台实例`) else message.success(`已创建 ${ok} 台实例`)
emit('update:show', false) emit('update:show', false)
emit('created') emit('created')
} catch (e) { } catch (e) {
message.error(e instanceof Error ? e.message : '创建失败') // 逐台错误(可能多行)收进「展开详情」,标题保持简短
message.error('创建实例失败', e instanceof Error && e.message ? e.message : undefined)
} finally { } finally {
submitting.value = false submitting.value = false
} }
@@ -90,17 +91,18 @@ async function submit() {
<InstanceSpecForm <InstanceSpecForm
ref="specForm" ref="specForm"
sectioned sectioned
auto-pick-ad
:cfg-id="cfgId" :cfg-id="cfgId"
:region="region" :region="region"
:compartment-id="compartmentId" :compartment-id="compartmentId"
/> />
<div <div
class="mt-3 flex flex-wrap items-center justify-between gap-2 rounded-lg border border-line-soft bg-wash px-3 py-2 text-xs leading-relaxed text-ink-3" v-if="specForm?.summary"
class="mt-3 rounded-lg border border-line-soft bg-wash px-3 py-2 text-xs leading-relaxed"
> >
<span v-if="specForm?.summary" class="font-medium text-ink-2"> <span class="font-medium text-ink-2">
预估规格:{{ form.count }} · {{ specForm.summary }} 预估规格:{{ form.count }} · {{ specForm.summary }}
</span> </span>
<span>容量不足Out of host capacity时可改用抢机任务反复尝试</span>
</div> </div>
</FormModal> </FormModal>
</template> </template>
+86 -34
View File
@@ -10,6 +10,7 @@ import FormField from '@/components/FormField.vue'
import FormSection from '@/components/FormSection.vue' import FormSection from '@/components/FormSection.vue'
import { shortAd } from '@/composables/useFormat' import { shortAd } from '@/composables/useFormat'
import { useAsync } from '@/composables/useAsync' import { useAsync } from '@/composables/useAsync'
import type { ComputeShape, LimitItem } from '@/types/api'
/** 实例规格表单(创建实例弹窗与抢机任务共用): /** 实例规格表单(创建实例弹窗与抢机任务共用):
* Shape / 可用域 / 规格 / 镜像 / VCN 子网 / 引导卷 / 登录方式 / IP 分配。 * Shape / 可用域 / 规格 / 镜像 / VCN 子网 / 引导卷 / 登录方式 / IP 分配。
@@ -22,6 +23,9 @@ const props = defineProps<{
sectioned?: boolean sectioned?: boolean
/** 可用域字段说明;抢机任务留空为轮询语义,与手动创建(固定 AD-1)不同 */ /** 可用域字段说明;抢机任务留空为轮询语义,与手动创建(固定 AD-1)不同 */
adHint?: string adHint?: string
/** 创建场景:AD 留空(默认 AD-1)而所选 shape 在 AD-1 无配额时,自动落位首个有配额 AD;
* 抢机表单留空 = 轮询语义,勿开 */
autoPickAd?: boolean
}>() }>()
/** VCN 选择的「自动创建」哨兵:提交时不传 subnetId,由后端建 VCN 与子网 */ /** VCN 选择的「自动创建」哨兵:提交时不传 subnetId,由后端建 VCN 与子网 */
@@ -30,8 +34,8 @@ const AUTO_VCN = '__auto__'
const blank = { const blank = {
availabilityDomain: null as string | null, availabilityDomain: null as string | null,
shape: 'VM.Standard.A1.Flex', shape: 'VM.Standard.A1.Flex',
ocpus: 4, ocpus: 2,
memoryInGBs: 24, memoryInGBs: 12,
imageId: null as string | null, imageId: null as string | null,
vcnId: AUTO_VCN, vcnId: AUTO_VCN,
subnetId: null as string | null, subnetId: null as string | null,
@@ -194,51 +198,82 @@ watch(
}, },
) )
/** shape → OCI compute 配额名(官方 Limits by Service 命名);已知映射用于配额标注, /** 免费类计费类型:仅用于排序置顶,不在选项文案中标注 */
* 清单外的 shape 不判定配额。AD 维度多行求和 > 0 才认为有配额。 */ const FREE_BILLING = new Set(['ALWAYS_FREE', 'LIMITED_FREE'])
const SHAPE_QUOTAS: Record<string, string> = {
'VM.Standard.A1.Flex': 'standard-a1-core-count', /** shape 的核数配额名:quotaNames 排除 memory / reserved / reservable 变体,
'VM.Standard.A2.Flex': 'standard-a2-core-count', * 剩余为核数(或实例数)限额名,与 compute limits 的 name 同名 */
'VM.Standard.A4.Flex': 'standard-a4-core-count', function coreQuotaNames(s: ComputeShape): string[] {
'VM.Standard.E2.1.Micro': 'standard-e2-micro-core-count', return (s.quotaNames ?? []).filter(
'VM.Standard.E3.Flex': 'standard-e3-core-ad-count', (n) => !n.includes('memory') && !n.includes('reserved') && !n.includes('reservable'),
'VM.Standard.E4.Flex': 'standard-e4-core-count', )
'VM.Standard.E5.Flex': 'standard-e5-core-count',
'VM.Standard.E6.Flex': 'standard-e6-core-count',
'VM.Standard3.Flex': 'standard3-core-count',
} }
const BILLING_LABEL: Record<string, string> = { /** 单个 shape 的配额汇总:AD 行按 AD 求和,REGION 行累计为区域总额;无匹配行返回 null */
ALWAYS_FREE: '永久免费', function shapeQuotaEntry(names: Set<string>, rows: LimitItem[]): ShapeQuota | null {
LIMITED_FREE: '免费额度', const byAd = new Map<string, number>()
let regional: number | null = null
let matched = false
for (const r of rows) {
if (!names.has(r.name)) continue
matched = true
if (r.scopeType === 'AD' && r.availabilityDomain) {
byAd.set(r.availabilityDomain, (byAd.get(r.availabilityDomain) ?? 0) + Math.max(r.value, 0))
} else if (r.scopeType === 'REGION') {
regional = (regional ?? 0) + Math.max(r.value, 0)
}
}
return matched ? { byAd, regional } : null
} }
/** 已知映射 shape 的核数配额合计;未知映射或配额未加载返回 null(不判定) */ interface ShapeQuota {
function quotaOf(shape: string): number | null { byAd: Map<string, number> // AD 全名 → 核数配额
const quota = SHAPE_QUOTAS[shape] regional: number | null // 区域级总额,null = 无区域行
const items = limits.data.value ?? [] }
if (!quota || !items.length) return null
return items.filter((l) => l.name === quota).reduce((sum, l) => sum + (l.value > 0 ? l.value : 0), 0) /** 全部 shape 的配额汇总;quotaNames 缺失或 limits 无匹配行的 shape 无条目(不判定) */
const quotaByShape = computed(() => {
const rows = limits.data.value ?? []
const out = new Map<string, ShapeQuota>()
if (!rows.length) return out
for (const s of shapes.data.value ?? []) {
const names = new Set(coreQuotaNames(s))
if (!names.size) continue
const entry = shapeQuotaEntry(names, rows)
if (entry) out.set(s.name, entry)
}
return out
})
/** shape 在指定 AD(null = 任一 AD)是否有配额;null = 数据不足不判定 */
function quotaInAd(name: string, ad: string | null): boolean | null {
const q = quotaByShape.value.get(name)
if (!q) return null
if (q.regional !== null && q.regional <= 0) return false
if (!q.byAd.size) return true // 仅区域级限额且 > 0
if (ad === null) return [...q.byAd.values()].some((v) => v > 0)
return (q.byAd.get(ad) ?? 0) > 0
} }
/** 排序:免费 shape 优先 → VM.Standard 系列 → 其他 VM → 裸金属等 */ /** 排序:免费 shape 优先 → VM.Standard 系列 → 其他 VM → 裸金属等 */
function shapeRank(s: { billingType: string; name: string }): number { function shapeRank(s: { billingType: string; name: string }): number {
if (BILLING_LABEL[s.billingType]) return 0 if (FREE_BILLING.has(s.billingType)) return 0
if (s.name.startsWith('VM.Standard')) return 1 if (s.name.startsWith('VM.Standard')) return 1
if (s.name.startsWith('VM.')) return 2 if (s.name.startsWith('VM.')) return 2
return 3 return 3
} }
const shapeOptions = computed(() => { const shapeOptions = computed(() => {
// 清单全部来自 shapes 接口,不做本地预设;接口不可用时仍可手输(tag 模式) // 清单全部来自 shapes 接口,不做本地预设;接口不可用时仍可手输(tag 模式);
// 选定 AD 时按该 AD 判定配额,未选时看任一 AD
const list = shapes.data.value ?? [] const list = shapes.data.value ?? []
const ad = form.availabilityDomain
return [...list] return [...list]
.sort((a, b) => shapeRank(a) - shapeRank(b) || a.name.localeCompare(b.name)) .sort((a, b) => shapeRank(a) - shapeRank(b) || a.name.localeCompare(b.name))
.map((s) => { .map((s) => {
const free = BILLING_LABEL[s.billingType] const ok = quotaInAd(s.name, ad)
const quota = quotaOf(s.name) const suffix = ok === false ? (ad ? ' · 该 AD 无配额' : ' · 无配额') : ''
const suffix = (free ? `${free}` : '') + (quota === 0 ? ' · 无配额' : '') return { label: s.name + suffix, value: s.name, disabled: ok === false }
return { label: s.name + suffix, value: s.name, disabled: quota === 0 }
}) })
}) })
@@ -288,10 +323,29 @@ const imageOptions = computed(() => {
.map((i) => ({ label: i.displayName, value: i.id })) .map((i) => ({ label: i.displayName, value: i.id }))
}) })
/** AD 选项按当前 shape 的配额标注并禁用无配额项;数据不足时不标注 */
const adOptions = computed( const adOptions = computed(
() => ads.data.value?.map((ad) => ({ label: shortAd(ad), value: ad })) ?? [], () =>
ads.data.value?.map((ad) => {
const ok = quotaInAd(form.shape, ad)
return {
label: shortAd(ad) + (ok === false ? '(无配额)' : ''),
value: ad,
disabled: ok === false,
}
}) ?? [],
) )
// 创建场景(autoPickAd):AD 留空将由后端取 AD-1;所选 shape 在 AD-1 无配额
// 而其他 AD 有配额时,自动落位首个有配额 AD(字段可见,用户可改)
watch([() => form.shape, quotaByShape, () => ads.data.value], () => {
if (!props.autoPickAd || form.availabilityDomain !== null) return
const list = ads.data.value ?? []
if (!list.length || quotaInAd(form.shape, list[0]) !== false) return
const target = list.find((ad) => quotaInAd(form.shape, ad) === true)
if (target) form.availabilityDomain = target
})
const vcnOptions = computed(() => [ const vcnOptions = computed(() => [
{ label: '自动创建(oci-portal-auto-vcn', value: AUTO_VCN }, { label: '自动创建(oci-portal-auto-vcn', value: AUTO_VCN },
...(vcns.data.value ?? []).map((v) => ({ label: v.displayName, value: v.id })), ...(vcns.data.value ?? []).map((v) => ({ label: v.displayName, value: v.id })),
@@ -325,12 +379,10 @@ const valid = computed(() => {
return !isFlex.value || form.ocpus > 0 return !isFlex.value || form.ocpus > 0
}) })
/** 规格摘要(父表单底部预估条用):shape 短名 + 弹性核内存 + 免费标注 */ /** 规格摘要(父表单底部预估条用):shape 短名 + 弹性核内存 */
const summary = computed(() => { const summary = computed(() => {
const parts = [form.shape.replace(/^VM\.Standard\.?/, '') || form.shape] const parts = [form.shape.replace(/^VM\.Standard\.?/, '') || form.shape]
if (isFlex.value) parts.push(`${form.ocpus} OCPU · ${form.memoryInGBs} GB`) if (isFlex.value) parts.push(`${form.ocpus} OCPU · ${form.memoryInGBs} GB`)
const free = selectedShape.value && BILLING_LABEL[selectedShape.value.billingType]
if (free) parts.push(free)
return parts.join(' · ') return parts.join(' · ')
}) })
@@ -366,7 +418,7 @@ defineExpose({ valid, buildSpec, reset, applySpec, summary })
<FormField <FormField
label="Shape" label="Shape"
required required
hint="清单来自租户当前区域实际提供的 shape(免费与无配额已标注),可手输其他" hint="清单来自租户当前区域实际提供的 shape(无配额已标注),可手输其他"
> >
<NSelect <NSelect
v-model:value="form.shape" v-model:value="form.shape"
+2 -10
View File
@@ -37,18 +37,10 @@ watch(
}, },
) )
const BILLING_LABEL: Record<string, string> = {
ALWAYS_FREE: '永久免费',
LIMITED_FREE: '免费额度',
}
const shapeOptions = computed(() => { const shapeOptions = computed(() => {
const list = shapes.data.value ?? [] const list = shapes.data.value ?? []
if (!list.length) return [{ label: form.shape, value: form.shape }] if (!list.length) return [{ label: form.shape, value: form.shape }]
return list.map((s) => { return list.map((s) => ({ label: s.name, value: s.name }))
const free = BILLING_LABEL[s.billingType]
return { label: s.name + (free ? `${free}` : ''), value: s.name }
})
}) })
const selectedShape = computed( const selectedShape = computed(
@@ -141,7 +133,7 @@ async function submit() {
</div> </div>
<div class="text-xs leading-relaxed text-ink-3"> <div class="text-xs leading-relaxed text-ink-3">
运行中实例 OCI 会自动重启完成变更更换 shape 要求镜像与目标 shape 架构兼容 aarch64 运行中实例 OCI 会自动重启完成变更更换 shape 要求镜像与目标 shape 架构兼容 aarch64
镜像不能换到 x86 shapeA1 免费额度上限 4 OCPU / 24 GB 镜像不能换到 x86 shape
</div> </div>
</FormModal> </FormModal>
</template> </template>
+19 -5
View File
@@ -27,9 +27,15 @@ const emit = defineEmits<{ changed: [] }>()
const message = useToast() const message = useToast()
const vnics = useAsync(() => listVnics(props.cfgId, props.instanceId, props.region)) const vnics = useAsync(() => listVnics(props.cfgId, props.instanceId, props.region))
/** 附加已受理但 OCI 挂载列表有可见性延迟:限时轮询等新卡入列,入列后交由过渡态轮询接管 */
const expectAtLeast = ref(0)
let expectUntil = 0
useTransientPoll( useTransientPoll(
() => vnics.data.value, () => vnics.data.value,
(list) => !!list?.some((v) => ATTACHMENT_TRANSIENT_STATES.includes(v.lifecycleState)), (list) =>
!!list?.some((v) => ATTACHMENT_TRANSIENT_STATES.includes(v.lifecycleState)) ||
((list?.length ?? 0) < expectAtLeast.value && Date.now() < expectUntil),
() => void vnics.run({ silent: true }), () => void vnics.run({ silent: true }),
) )
@@ -44,6 +50,12 @@ function refresh() {
emit('changed') emit('changed')
} }
function onAttached() {
expectAtLeast.value = (vnics.data.value ?? []).length + 1
expectUntil = Date.now() + 90_000
refresh()
}
async function doDetach(attachmentId: string) { async function doDetach(attachmentId: string) {
detaching.value = attachmentId detaching.value = attachmentId
try { try {
@@ -174,7 +186,7 @@ defineExpose({ refresh: () => vnics.run() })
<td colspan="6" class="px-4.5 pt-0 pb-2.5"> <td colspan="6" class="px-4.5 pt-0 pb-2.5">
<div class="flex flex-wrap items-center gap-1.5"> <div class="flex flex-wrap items-center gap-1.5">
<span class="text-[10.5px] font-medium tracking-wider text-ink-3">IPV6</span> <span class="text-[10.5px] font-medium tracking-wider text-ink-3">IPV6</span>
<template v-if="v.vnicId"> <template v-if="v.vnicId && v.lifecycleState === 'ATTACHED'">
<span <span
v-for="addr in v.ipv6Addresses ?? []" v-for="addr in v.ipv6Addresses ?? []"
:key="addr" :key="addr"
@@ -204,7 +216,9 @@ defineExpose({ refresh: () => vnics.run() })
+ IPv6 + IPv6
</NButton> </NButton>
</template> </template>
<span v-else class="text-xs text-ink-3"> · 附加完成后可添加</span> <span v-else class="text-xs text-ink-3">
{{ v.vnicId ? '网卡未在挂载状态,不可操作 IPv6' : '无 · 附加完成后可添加' }}
</span>
</div> </div>
</td> </td>
</tr> </tr>
@@ -221,7 +235,7 @@ defineExpose({ refresh: () => vnics.run() })
<FootNote> <FootNote>
附加须实例运行中且 shape 有空余 VNIC 配额 · 主网卡不可分离 · 每卡 IPv6 附加须实例运行中且 shape 有空余 VNIC 配额 · 主网卡不可分离 · 每卡 IPv6
可多个要求所在子网已启用 IPv6· 次要网卡在 OS 内需自行配置 IPdhclient / netplan 可多个要求所在子网已启用 IPv6
</FootNote> </FootNote>
<AttachVnicModal <AttachVnicModal
@@ -230,7 +244,7 @@ defineExpose({ refresh: () => vnics.run() })
:instance-id="instanceId" :instance-id="instanceId"
:region="region" :region="region"
:attached-count="(vnics.data.value ?? []).length" :attached-count="(vnics.data.value ?? []).length"
@attached="refresh" @attached="onAttached"
/> />
</div> </div>
</template> </template>
+2 -2
View File
@@ -69,7 +69,7 @@ function statusCell(row: AiCallLog) {
function tokensCell(row: AiCallLog) { function tokensCell(row: AiCallLog) {
if (row.errMsg && !row.totalTokens) return h('span', { class: 'text-[13px] text-ink-3' }, '—') if (row.errMsg && !row.totalTokens) return h('span', { class: 'text-[13px] text-ink-3' }, '—')
const flow = row.stream ? ' · 流' : '' const flow = row.stream ? ' · 流' : ''
return h('span', { class: 'mono text-[13px]' }, `${row.promptTokens} / ${row.completionTokens}${flow}`) return h('span', { class: 'mono text-[13px] whitespace-nowrap' }, `${row.promptTokens} / ${row.completionTokens}${flow}`)
} }
const columns: DataTableColumns<AiCallLog> = [ const columns: DataTableColumns<AiCallLog> = [
@@ -79,7 +79,7 @@ const columns: DataTableColumns<AiCallLog> = [
{ title: '模型', key: 'model', minWidth: 220, ellipsis: { tooltip: true }, render: (r) => h('span', { class: 'mono text-xs' }, r.model) }, { title: '模型', key: 'model', minWidth: 220, ellipsis: { tooltip: true }, render: (r) => h('span', { class: 'mono text-xs' }, r.model) },
{ title: '渠道', key: 'channelName', minWidth: 180, ellipsis: { tooltip: true }, render: (r) => h('span', { class: 'text-[13px]' }, r.channelName || '—') }, { title: '渠道', key: 'channelName', minWidth: 180, ellipsis: { tooltip: true }, render: (r) => h('span', { class: 'text-[13px]' }, r.channelName || '—') },
{ title: '状态', key: 'status', width: 80, render: statusCell }, { title: '状态', key: 'status', width: 80, render: statusCell },
{ title: 'Tokens(入/出)', key: 'tokens', width: 150, render: tokensCell }, { title: 'Tokens(入/出)', key: 'tokens', width: 190, render: tokensCell },
{ title: '耗时', key: 'latencyMs', width: 80, render: (r) => h('span', { class: 'mono text-[13px]' }, fmtLatency(r.latencyMs)) }, { title: '耗时', key: 'latencyMs', width: 80, render: (r) => h('span', { class: 'mono text-[13px]' }, fmtLatency(r.latencyMs)) },
{ title: '重试', key: 'retries', width: 60, render: (r) => h('span', { class: 'mono text-[13px]' }, String(r.retries)) }, { title: '重试', key: 'retries', width: 60, render: (r) => h('span', { class: 'mono text-[13px]' }, String(r.retries)) },
] ]
-313
View File
@@ -1,313 +0,0 @@
<script setup lang="ts">
import {
NButton,
NInput,
NModal,
NPopconfirm,
NSelect,
NSwitch,
type SelectOption,
} from 'naive-ui'
import { computed, reactive, ref, watch } from 'vue'
import {
createAlertRule,
deleteAlertRule,
listAlertRules,
updateAlertRule,
} from '@/api/logevents'
import { listNotifyTemplates } from '@/api/settings'
import AppInputNumber from '@/components/AppInputNumber.vue'
import FormField from '@/components/FormField.vue'
import NotifyTemplateModal from '@/components/settings/NotifyTemplateModal.vue'
import TenantPicker from '@/components/TenantPicker.vue'
import { eventLabel } from '@/composables/useEventLabel'
import { useAsync } from '@/composables/useAsync'
import { useScopeStore } from '@/stores/scope'
import type { AlertRule, AlertRuleBody, NotifyTemplateItem } from '@/types/api'
import { useToast } from '@/composables/useToast'
const show = defineModel<boolean>('show', { required: true })
const message = useToast()
const scope = useScopeStore()
/** 可选事件短名 = 回传链路的关键事件清单(Connector 侧 filter 一致) */
const RELAY_EVENTS = [
'LaunchInstance', 'TerminateInstance', 'InstanceAction',
'CreateUser', 'DeleteUser', 'UpdateUser',
'CreateApiKey', 'DeleteApiKey', 'UpdateUserCapabilities',
'CreateRegionSubscription', 'CreatePolicy', 'UpdatePolicy', 'DeletePolicy',
'InteractiveLogin',
]
const eventOptions: SelectOption[] = RELAY_EVENTS.map((e) => ({
value: e,
label: eventLabel(e) ? `${eventLabel(e)}(${e})` : e,
}))
const rules = useAsync(listAlertRules, false)
watch(show, (v) => {
if (v) void rules.run()
})
// ---- 编辑表单:editing 非 null 时进入表单视图,id=0 表示新建 ----
const editing = ref<AlertRule | null>(null)
const saving = ref(false)
const form = reactive({
name: '',
enabled: true,
cfgId: null as number | null,
eventTypes: [] as string[],
sourceIps: '',
sourceIpMode: 'in' as 'in' | 'notin',
resourceMatch: '',
threshold: 1 as number | null,
windowMinutes: 5 as number | null,
})
function openCreate() {
editing.value = {
id: 0, name: '', enabled: true, ociConfigId: 0, eventTypes: '', sourceIps: '',
sourceIpMode: 'in', resourceMatch: '', threshold: 1, windowMinutes: 5,
createdAt: '', updatedAt: '',
}
}
function openEdit(rule: AlertRule) {
editing.value = rule
}
// 进入表单时由所编辑规则回填
watch(editing, (r) => {
if (!r) return
form.name = r.name
form.enabled = r.enabled
form.cfgId = r.ociConfigId || null
form.eventTypes = r.eventTypes ? r.eventTypes.split(',') : []
form.sourceIps = r.sourceIps
form.sourceIpMode = r.sourceIpMode || 'in'
form.resourceMatch = r.resourceMatch
form.threshold = r.threshold || 1
form.windowMinutes = r.windowMinutes || 5
})
function buildBody(): AlertRuleBody {
return {
name: form.name.trim(),
enabled: form.enabled,
ociConfigId: form.cfgId ?? 0,
eventTypes: form.eventTypes.join(','),
sourceIps: form.sourceIps.trim(),
sourceIpMode: form.sourceIpMode,
resourceMatch: form.resourceMatch.trim(),
threshold: form.threshold ?? 1,
windowMinutes: form.windowMinutes ?? 5,
}
}
async function save() {
if (!editing.value) return
saving.value = true
try {
const body = buildBody()
if (editing.value.id) await updateAlertRule(editing.value.id, body)
else await createAlertRule(body)
message.success(editing.value.id ? '规则已更新' : '规则已创建')
editing.value = null
void rules.run()
} catch (e) {
message.error(e instanceof Error ? e.message : '保存失败')
} finally {
saving.value = false
}
}
/** 列表行的启停开关:就地整体覆盖保存 */
async function toggleRule(rule: AlertRule, enabled: boolean) {
try {
await updateAlertRule(rule.id, { ...rule, enabled })
rule.enabled = enabled
} catch (e) {
message.error(e instanceof Error ? e.message : '操作失败')
}
}
async function removeRule(rule: AlertRule) {
try {
await deleteAlertRule(rule.id)
message.success(`已删除「${rule.name}`)
void rules.run()
} catch (e) {
message.error(e instanceof Error ? e.message : '删除失败')
}
}
/** 条件摘要:留空条件不出现 */
function ruleSummary(r: AlertRule): string {
const parts: string[] = []
const alias = scope.cfgOptions.find((o) => Number(o.value) === r.ociConfigId)?.label
parts.push(r.ociConfigId ? `租户 ${alias ?? `#${r.ociConfigId}`}` : '全部租户')
parts.push(r.eventTypes ? `${r.eventTypes.split(',').length} 种事件` : '全部事件')
if (r.sourceIps) parts.push(`IP ${r.sourceIpMode === 'notin' ? '不在' : '命中'} ${r.sourceIps}`)
if (r.resourceMatch) parts.push(`资源含「${r.resourceMatch}`)
parts.push(r.threshold > 1 ? `${r.windowMinutes} 分钟内 ${r.threshold}` : '即时触发')
return parts.join(' · ')
}
// ---- 通知模板入口:复用设置页模板编辑弹窗(kind=audit_alert) ----
const templates = useAsync(listNotifyTemplates, false)
const tplShow = ref(false)
const tplItem = ref<NotifyTemplateItem | null>(null)
async function openTemplate() {
if (!templates.data.value) await templates.run()
const item = (templates.data.value ?? []).find((t) => t.kind === 'audit_alert')
if (!item) {
message.error('模板加载失败,请稍后再试')
return
}
tplItem.value = item
tplShow.value = true
}
const canSave = computed(() => !!form.name.trim())
</script>
<template>
<NModal
v-model:show="show"
preset="card"
closable
title="审计告警规则"
:style="{ width: '680px', maxWidth: 'calc(100vw - 24px)' }"
>
<!-- 表单视图 -->
<div v-if="editing" class="flex flex-col">
<FormField label="规则名称" required>
<NInput v-model:value="form.name" placeholder="如:非白名单终止实例" />
</FormField>
<div class="grid grid-cols-2 gap-3 max-md:grid-cols-1">
<FormField label="租户范围" hint="留空对全部租户生效">
<TenantPicker
v-model:value="form.cfgId"
clearable
placeholder="全部租户"
:configs="scope.configs.data ?? []"
:loading="scope.configs.loading"
/>
</FormField>
<FormField label="事件类型" hint="留空匹配全部回传事件">
<NSelect
v-model:value="form.eventTypes"
multiple
clearable
:options="eventOptions"
placeholder="全部事件"
:max-tag-count="2"
/>
</FormField>
</div>
<FormField
label="来源 IP 条件"
hint="逗号分隔 IP 或 CIDR;「不在列表才告警」适合白名单场景(非我发起的操作)"
>
<div class="mb-1.5 flex gap-1.5">
<button
v-for="m in [
{ v: 'in', t: '命中列表告警' },
{ v: 'notin', t: '不在列表才告警' },
]"
:key="m.v"
type="button"
class="cursor-pointer rounded-md border px-3 py-1 text-xs"
:class="
form.sourceIpMode === m.v
? 'border-accent bg-accent/10 font-semibold text-accent'
: 'border-line bg-white text-ink-2 hover:border-ink-3'
"
@click="form.sourceIpMode = m.v as 'in' | 'notin'"
>
{{ m.t }}
</button>
</div>
<NInput v-model:value="form.sourceIps" class="mono" placeholder="203.0.113.8, 10.0.0.0/8(留空=任意)" />
</FormField>
<div class="grid grid-cols-3 gap-3 max-md:grid-cols-1">
<FormField label="资源名包含" hint="子串匹配,留空=任意">
<NInput v-model:value="form.resourceMatch" placeholder="web-" />
</FormField>
<FormField label="触发阈值(次)" hint="1=每次命中即告警">
<AppInputNumber v-model:value="form.threshold" :min="1" :max="100" class="!w-full" />
</FormField>
<FormField label="聚合窗口(分钟)" hint="阈值>1 时生效,告警后同窗冷却">
<AppInputNumber
v-model:value="form.windowMinutes"
:min="1"
:max="1440"
:disabled="(form.threshold ?? 1) <= 1"
class="!w-full"
/>
</FormField>
</div>
<div class="flex items-center justify-between rounded-lg bg-wash px-3 py-2">
<span class="text-[12.5px]">启用该规则</span>
<NSwitch v-model:value="form.enabled" size="small" />
</div>
<div class="mt-3 flex items-center gap-2">
<NButton size="small" type="primary" :loading="saving" :disabled="!canSave" @click="save">
保存
</NButton>
<NButton size="small" @click="editing = null">返回列表</NButton>
</div>
</div>
<!-- 列表视图 -->
<div v-else class="flex flex-col">
<div class="mb-2 flex items-center justify-between gap-2">
<div class="text-xs text-ink-3">
命中规则的回传事件经「通知方式」的启用渠道推送;仅已建回传链路的租户产生事件
</div>
<div class="flex flex-none items-center gap-2">
<NButton size="tiny" quaternary type="primary" @click="openTemplate">通知模板</NButton>
<NButton size="small" type="primary" @click="openCreate">新建规则</NButton>
</div>
</div>
<div
v-for="rule in rules.data.value ?? []"
:key="rule.id"
class="flex items-center gap-3 border-b border-line-soft py-2.5 last:border-b-0"
>
<div class="min-w-0 flex-1">
<div class="text-[13px] font-medium">{{ rule.name }}</div>
<div class="mt-0.5 truncate text-xs text-ink-3" :title="ruleSummary(rule)">
{{ ruleSummary(rule) }}
</div>
</div>
<NSwitch
size="small"
:value="rule.enabled"
@update:value="(v: boolean) => toggleRule(rule, v)"
/>
<NButton size="tiny" quaternary type="primary" @click="openEdit(rule)">编辑</NButton>
<NPopconfirm @positive-click="removeRule(rule)">
<template #trigger>
<NButton size="tiny" quaternary type="error">删除</NButton>
</template>
删除规则「{{ rule.name }}」?
</NPopconfirm>
</div>
<div
v-if="!rules.loading.value && !(rules.data.value ?? []).length"
class="py-8 text-center text-[13px] text-ink-3"
>
暂无规则,点击「新建规则」创建第一条
</div>
</div>
<NotifyTemplateModal
v-model:show="tplShow"
:item="tplItem"
hint="命中告警规则时推送;变量:rule / tenant / event / resource / ip / count"
/>
</NModal>
</template>
+6 -12
View File
@@ -1,11 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
import { NButton, NDataTable, NModal, NPopover, type DataTableColumns } from 'naive-ui' import { NDataTable, NModal, NPopover, type DataTableColumns } from 'naive-ui'
import { computed, h, reactive, ref } from 'vue' import { computed, h, reactive, ref } from 'vue'
import { useRouter } from 'vue-router' import { useRouter } from 'vue-router'
import { listConfigs } from '@/api/configs' import { listConfigs } from '@/api/configs'
import { listLogEvents } from '@/api/logevents' import { listLogEvents } from '@/api/logevents'
import AlertRuleModal from '@/components/logs/AlertRuleModal.vue'
import DetailFieldList, { type DetailRow } from '@/components/DetailFieldList.vue' import DetailFieldList, { type DetailRow } from '@/components/DetailFieldList.vue'
import DetailHero, { type HeroChip } from '@/components/DetailHero.vue' import DetailHero, { type HeroChip } from '@/components/DetailHero.vue'
import FootNote from '@/components/FootNote.vue' import FootNote from '@/components/FootNote.vue'
@@ -41,7 +40,6 @@ const cfgById = computed(() => {
const detail = ref<LogEvent | null>(null) const detail = ref<LogEvent | null>(null)
const showDetail = ref(false) const showDetail = ref(false)
const showRules = ref(false)
/** 受控远程分页:字面量对象会在重渲染时被重建导致状态丢失 */ /** 受控远程分页:字面量对象会在重渲染时被重建导致状态丢失 */
const pagination = reactive({ const pagination = reactive({
@@ -223,7 +221,6 @@ useAutoRefresh(() => load(true))
</div> </div>
</div> </div>
<div class="flex flex-wrap items-center gap-2"> <div class="flex flex-wrap items-center gap-2">
<NButton size="small" @click="showRules = true">告警规则</NButton>
<TenantPicker <TenantPicker
v-model:value="cfgFilter" v-model:value="cfgFilter"
size="small" size="small"
@@ -243,20 +240,17 @@ useAutoRefresh(() => load(true))
:loading="loading" :loading="loading"
:pagination="pagination" :pagination="pagination"
:scroll-x="880" :scroll-x="880"
:max-height="480"
:row-key="(r: LogEvent) => r.id" :row-key="(r: LogEvent) => r.id"
:row-props="rowProps" :row-props="rowProps"
/> />
<FootNote> <FootNote>
在租户详情「其他」tab 一键创建链路后,实例生命周期(Launch/Terminate/InstanceAction)、 在租户详情「其他」tab 一键创建链路后,实例终止与电源操作(Terminate/InstanceAction;
用户与凭据(Create/Delete/UpdateUser、Create/DeleteApiKey、UpdateUserCapabilities)、 创建不回传,避免面板抢机与批量创建刷屏)、用户与凭据(Create/Delete/UpdateUser、
区域订阅与策略变更等关键审计事件将自动回传;消息按 MessageId 幂等去重,保留 90 Create/DeleteApiKey、UpdateUserCapabilities)、区域订阅与策略变更等关键审计事件将自动回传;
天、总量超 2 万条时删除最旧,关键事件另经「通知管理 → 云端事件」推送告警; 消息按 MessageId 幂等去重,保留 90 天、总量超 2 万条时删除最旧,关键事件另经
更细粒度的条件告警(事件/来源 IP/资源/频率)在「告警规则」中配置 「通知管理 → 云端事件」推送告警
</FootNote> </FootNote>
<AlertRuleModal v-model:show="showRules" />
<NModal v-model:show="showDetail" preset="card" closable :style="{ width: '720px', maxWidth: 'calc(100vw - 24px)' }"> <NModal v-model:show="showDetail" preset="card" closable :style="{ width: '720px', maxWidth: 'calc(100vw - 24px)' }">
<template #header> <template #header>
<DetailHero <DetailHero
-1
View File
@@ -185,7 +185,6 @@ useAutoRefresh(() => load(true))
:loading="loading" :loading="loading"
:pagination="pagination" :pagination="pagination"
:scroll-x="880" :scroll-x="880"
:max-height="480"
:row-key="(r: SystemLog) => r.id" :row-key="(r: SystemLog) => r.id"
:row-props="rowProps" :row-props="rowProps"
/> />
+37 -9
View File
@@ -22,6 +22,8 @@ import {
import AppInputNumber from '@/components/AppInputNumber.vue' import AppInputNumber from '@/components/AppInputNumber.vue'
import FootNote from '@/components/FootNote.vue' import FootNote from '@/components/FootNote.vue'
import FormField from '@/components/FormField.vue' import FormField from '@/components/FormField.vue'
import ProxyTenantsModal from '@/components/proxy/ProxyTenantsModal.vue'
import StatusBadge from '@/components/StatusBadge.vue'
import { useAsync } from '@/composables/useAsync' import { useAsync } from '@/composables/useAsync'
import type { ProxyImportResult, ProxyInfo } from '@/types/api' import type { ProxyImportResult, ProxyInfo } from '@/types/api'
import { useToast } from '@/composables/useToast' import { useToast } from '@/composables/useToast'
@@ -120,6 +122,15 @@ async function remove(row: ProxyInfo) {
} }
} }
// ---- 关联租户管理 ----
const showTenants = ref(false)
const tenantsFor = ref<ProxyInfo | null>(null)
function openTenants(row: ProxyInfo) {
tenantsFor.value = row
showTenants.value = true
}
// ---- 手动重测出口地区 ---- // ---- 手动重测出口地区 ----
const probingIds = ref(new Set<number>()) const probingIds = ref(new Set<number>())
@@ -179,6 +190,13 @@ function renderGeo(row: ProxyInfo) {
return h('span', { class: 'text-[13px]' }, row.city ? `${row.country}·${row.city}` : row.country) return h('span', { class: 'text-[13px]' }, row.city ? `${row.country}·${row.city}` : row.country)
} }
/** 状态单元格:与地区探测同源 —— 探测经该代理链路发起,失败即代理不可用 */
function renderStatus(row: ProxyInfo) {
if (!row.geoAt) return h(StatusBadge, { kind: 'check', label: '检测中' })
const ok = !!row.country
return h(StatusBadge, { kind: ok ? 'run' : 'term', label: ok ? '正常' : '异常' })
}
// 新增 / 批量导入入口由页面标题行触发(ProxyListView),这里暴露打开方法 // 新增 / 批量导入入口由页面标题行触发(ProxyListView),这里暴露打开方法
defineExpose({ openCreate, openImport }) defineExpose({ openCreate, openImport })
@@ -204,16 +222,19 @@ const columns: DataTableColumns<ProxyInfo> = [
render: (row) => h('span', { class: 'mono text-[12.5px] text-ink-2' }, `${row.host}:${row.port}`), render: (row) => h('span', { class: 'mono text-[12.5px] text-ink-2' }, `${row.host}:${row.port}`),
}, },
{ title: '地区', key: 'geo', minWidth: 120, render: renderGeo }, { title: '地区', key: 'geo', minWidth: 120, render: renderGeo },
{ title: '状态', key: 'status', width: 88, render: renderStatus },
{ {
title: '认证', title: '认证',
key: 'username', key: 'username',
width: 110, width: 76,
render: (row) => render: (row) => {
h( const has = !!row.username || row.passwordSet
'span', // 悬停「是」可见用户名(无用户名则提示仅密码)
{ class: 'text-[12.5px] text-ink-2' }, const title = has ? (row.username ? `用户名 ${row.username}` : '仅密码认证') : undefined
row.username ? `${row.username}${row.passwordSet ? ' / ●●●' : ''}` : row.passwordSet ? '●●●' : '无', return h('span', { title }, [
), h(StatusBadge, { kind: has ? 'run' : 'check', label: has ? '是' : '否', dot: false }),
])
},
}, },
{ {
title: '关联租户', title: '关联租户',
@@ -225,7 +246,7 @@ const columns: DataTableColumns<ProxyInfo> = [
{ {
title: '操作', title: '操作',
key: 'actions', key: 'actions',
width: 168, width: 236,
render: (row) => render: (row) =>
h('div', { class: 'flex items-center gap-1' }, [ h('div', { class: 'flex items-center gap-1' }, [
h( h(
@@ -233,6 +254,7 @@ const columns: DataTableColumns<ProxyInfo> = [
{ size: 'tiny', quaternary: true, loading: probingIds.value.has(row.id), onClick: () => probe(row) }, { size: 'tiny', quaternary: true, loading: probingIds.value.has(row.id), onClick: () => probe(row) },
() => '重测', () => '重测',
), ),
h(NButton, { size: 'tiny', quaternary: true, onClick: () => openTenants(row) }, () => '关联租户'),
h(NButton, { size: 'tiny', quaternary: true, onClick: () => openEdit(row) }, () => '编辑'), h(NButton, { size: 'tiny', quaternary: true, onClick: () => openEdit(row) }, () => '编辑'),
h( h(
NPopconfirm, NPopconfirm,
@@ -258,9 +280,15 @@ const columns: DataTableColumns<ProxyInfo> = [
:row-key="(r: ProxyInfo) => r.id" :row-key="(r: ProxyInfo) => r.id"
/> />
<FootNote> <FootNote>
支持 SOCKS5 / HTTP / HTTPS;密码 AES 加密存储、不回显明文;地区为经代理实测的出口位置(ip-api.com),创建后自动检测;被租户关联的代理不可删除,请先解除关联 支持 SOCKS5 / HTTP / HTTPS;密码 AES 加密存储、不回显明文;地区与状态为经代理实测的出口探测结果(ip-api.com),创建后自动检测,探测失败即视为异常,可点「重测」复查;被租户关联的代理不可删除,请先解除关联
</FootNote> </FootNote>
<ProxyTenantsModal
v-model:show="showTenants"
:proxy="tenantsFor"
@saved="void proxies.run({ silent: true })"
/>
<NModal <NModal
v-model:show="showForm" v-model:show="showForm"
preset="card" preset="card"
+130
View File
@@ -0,0 +1,130 @@
<script setup lang="ts">
import { NButton, NModal } from 'naive-ui'
import { computed, ref, watch } from 'vue'
import { listConfigs } from '@/api/configs'
import { setProxyTenants } from '@/api/proxies'
import FormField from '@/components/FormField.vue'
import TenantPicker from '@/components/TenantPicker.vue'
import { useAsync } from '@/composables/useAsync'
import type { ProxyInfo } from '@/types/api'
import { useToast } from '@/composables/useToast'
/** 代理侧关联租户管理:打开时回显当前关联名单,多选增删,保存即设置全集
* (选中即关联,含从其他代理改挂;取消选中即解除)。 */
const props = defineProps<{ show: boolean; proxy: ProxyInfo | null }>()
const emit = defineEmits<{ 'update:show': [boolean]; saved: [] }>()
const message = useToast()
const configs = useAsync(listConfigs, false)
const selected = ref<number[]>([])
const saving = ref(false)
watch(
() => props.show,
async (v) => {
if (!v || !props.proxy) return
selected.value = []
await configs.run()
const pid = props.proxy.id
selected.value = (configs.data.value ?? []).filter((c) => c.proxyId === pid).map((c) => c.id)
},
)
const all = computed(() => configs.data.value ?? [])
/** 当前选中名单(打开时即已关联名单),chips 展示并支持点 × 移除 */
const picked = computed(() => all.value.filter((c) => selected.value.includes(c.id)))
/** 选中但已挂其他代理的租户:保存即改挂,给出警示 */
const rebinding = computed(() =>
picked.value.filter((c) => c.proxyId !== null && c.proxyId !== props.proxy?.id),
)
function removeOne(id: number) {
selected.value = selected.value.filter((v) => v !== id)
}
async function save() {
if (!props.proxy) return
saving.value = true
try {
const res = await setProxyTenants(props.proxy.id, selected.value)
message.success(`已更新关联,当前 ${res.usedBy} 个租户经此代理出站`)
emit('update:show', false)
emit('saved')
} catch (e) {
message.error(e instanceof Error ? e.message : '保存失败')
} finally {
saving.value = false
}
}
</script>
<template>
<NModal
:show="show"
preset="card"
:title="`关联租户 · ${proxy?.name ?? ''}`"
:style="{ width: '480px', maxWidth: 'calc(100vw - 24px)' }"
@update:show="emit('update:show', $event)"
>
<FormField label="关联租户" hint="选中即关联,取消选中即解除;关联后租户全部 SDK 请求经此代理出站">
<TenantPicker
v-model:values="selected"
multiple
:configs="all"
:loading="configs.loading.value"
placeholder="选择要关联的租户"
/>
</FormField>
<div v-if="picked.length" class="mb-3 flex flex-wrap gap-1.5">
<span
v-for="c in picked"
:key="c.id"
class="inline-flex items-center gap-1 rounded-full border border-line bg-wash px-2.5 py-0.5 text-[11.5px] font-medium text-ink-2"
>
{{ c.alias }}
<button
type="button"
class="cursor-pointer text-ink-3 hover:text-err"
:aria-label="`移除 ${c.alias}`"
@click="removeOne(c.id)"
>
</button>
</span>
</div>
<div v-else class="mb-3 text-xs text-ink-3">暂无租户关联此代理</div>
<div
v-if="rebinding.length"
class="mb-3 flex items-start gap-2 rounded-lg border border-warn/30 bg-warn/10 px-3 py-2.5 text-xs leading-relaxed"
>
<svg
class="mt-0.5 h-[14px] w-[14px] flex-none text-warn"
viewBox="0 0 24 24"
fill="none"
stroke="currentColor"
stroke-width="2"
>
<path d="M10.3 3.9 1.8 18a2 2 0 0 0 1.7 3h17a2 2 0 0 0 1.7-3L13.7 3.9a2 2 0 0 0-3.4 0z" />
<path d="M12 9v4M12 17h.01" />
</svg>
<span>
<template v-for="(c, i) in rebinding" :key="c.id">
<template v-if="i > 0"></template>
<b>{{ c.alias }}</b>
<span v-if="c.proxyName" class="text-ink-3">现挂 {{ c.proxyName }}</span>
</template>
已关联其他代理,保存后将改挂到本代理
</span>
</div>
<div class="mt-1 flex items-center gap-2">
<NButton size="small" type="primary" :loading="saving" @click="save">保存</NButton>
<NButton size="small" quaternary @click="emit('update:show', false)">取消</NButton>
</div>
</NModal>
</template>
+106 -1
View File
@@ -1,9 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
import { NButton, NSpin } from 'naive-ui' import { NButton, NSpin } from 'naive-ui'
import { onMounted, ref } from 'vue' import { computed, onMounted, onUnmounted, ref } from 'vue'
import { getAbout } from '@/api/settings' import { getAbout } from '@/api/settings'
import AppLogo from '@/components/AppLogo.vue' import AppLogo from '@/components/AppLogo.vue'
import { fmtBytes, fmtTime } from '@/composables/useFormat'
import { useParticles } from '@/composables/useParticles' import { useParticles } from '@/composables/useParticles'
import { useAppStore } from '@/stores/app' import { useAppStore } from '@/stores/app'
import type { AboutInfo } from '@/types/api' import type { AboutInfo } from '@/types/api'
@@ -20,15 +21,56 @@ const loading = ref(true)
const pcanvas = ref<HTMLCanvasElement | null>(null) const pcanvas = ref<HTMLCanvasElement | null>(null)
useParticles(pcanvas, { count: 26 }) useParticles(pcanvas, { count: 26 })
// 运行时长随查看自增:记录拉取时刻,30s 粒度刷新本地流逝时间
const loadedAt = ref(0)
const nowTick = ref(0)
let upTimer: ReturnType<typeof setInterval> | null = null
onMounted(async () => { onMounted(async () => {
try { try {
info.value = await getAbout() info.value = await getAbout()
loadedAt.value = nowTick.value = Date.now()
upTimer = setInterval(() => (nowTick.value = Date.now()), 30_000)
} catch { } catch {
/* 构建信息加载失败不阻塞页面,chips 显示占位 */ /* 构建信息加载失败不阻塞页面,chips 显示占位 */
} finally { } finally {
loading.value = false loading.value = false
} }
}) })
onUnmounted(() => {
if (upTimer) clearInterval(upTimer)
})
/** 运行时长分段:天(为 0 时省略)/ 小时 / 分 */
const uptimeParts = computed(() => {
const base = info.value?.uptimeSeconds
if (base === undefined) return []
const sec = base + Math.max(0, (nowTick.value - loadedAt.value) / 1000)
const d = Math.floor(sec / 86400)
const h = Math.floor((sec % 86400) / 3600)
const parts: { v: number; u: string }[] = []
if (d > 0) parts.push({ v: d, u: '天' })
if (d > 0 || h > 0) parts.push({ v: h, u: '小时' })
parts.push({ v: Math.floor((sec % 3600) / 60), u: '分' })
return parts
})
const DB_LABEL: Record<string, string> = { sqlite: 'SQLite', mysql: 'MySQL', postgres: 'PostgreSQL' }
/** 四格资源指标:值与单位拆开渲染,sub 为口径说明 */
const statCells = computed(() => {
const r = info.value?.resources
if (!r) return []
const heap = fmtBytes(r.memHeapBytes).split(' ')
const store = r.dbBytes >= 0 ? fmtBytes(r.dbBytes).split(' ') : ['—', '']
const db = DB_LABEL[r.dbEngine] ?? r.dbEngine
return [
{ label: 'CPU 均值', value: String(r.cpuAvgPercent), unit: '%', sub: `${r.numCpu} 核 · 占单核百分比` },
{ label: '内存(堆)', value: heap[0], unit: heap[1], sub: `向系统申请 ${fmtBytes(r.memSysBytes)}` },
{ label: '存储占用', value: store[0], unit: store[1], sub: r.dbBytes >= 0 ? `${db} 含 WAL 日志` : `${db} 外部数据库,不可度量` },
{ label: 'Goroutines', value: String(r.goroutines), unit: '', sub: '运行时并发任务数' },
]
})
function fmtBuild(t: string) { function fmtBuild(t: string) {
return t ? t.replace('T', ' ').replace('Z', ' UTC') : '—' return t ? t.replace('T', ' ').replace('Z', ' UTC') : '—'
@@ -69,6 +111,40 @@ function openRepo() {
</div> </div>
</div> </div>
<!-- 运行状态:运行时长随查看自增,资源指标为进程自启动累计口径 -->
<div v-if="info?.resources" class="panel">
<div
class="flex items-center justify-between gap-3 border-b border-line-soft px-5 py-3.5 max-md:flex-col max-md:items-start max-md:gap-1"
>
<div class="flex items-center gap-2">
<span class="live-dot"></span>
<span class="text-[13px] font-semibold">运行状态</span>
</div>
<span class="text-xs text-ink-3">
{{ fmtTime(info.startedAt) }} 启动 · 指标为进程自启动累计口径
</span>
</div>
<div class="px-5 pt-[22px] pb-5">
<div class="text-xs font-medium text-ink-2">运行时间</div>
<div class="mt-1.5 text-[38px] leading-[1.1] font-semibold tracking-[-0.6px]">
<template v-for="p in uptimeParts" :key="p.u"
>{{ p.v }}<span class="uptime-unit">{{ p.u }}</span></template
>
</div>
</div>
<div class="mx-5 h-px bg-line-soft"></div>
<div class="grid grid-cols-4 max-md:grid-cols-2">
<div v-for="c in statCells" :key="c.label" class="statcell flex flex-col gap-[5px] px-5 pt-4 pb-[18px]">
<div class="text-xs font-medium text-ink-2">{{ c.label }}</div>
<div class="text-[26px] leading-[1.15] font-semibold tracking-[-0.3px]">
<span>{{ c.value }}</span
><span v-if="c.unit" class="ml-0.5 text-sm font-medium text-ink-2">{{ c.unit }}</span>
</div>
<div class="text-[11.5px] text-ink-3">{{ c.sub }}</div>
</div>
</div>
</div>
<!-- GitHub 仓库 --> <!-- GitHub 仓库 -->
<div class="panel flex items-center gap-3.5 px-5 py-4"> <div class="panel flex items-center gap-3.5 px-5 py-4">
<span class="flex h-10 w-10 flex-none items-center justify-center rounded-[9px] bg-wash"> <span class="flex h-10 w-10 flex-none items-center justify-center rounded-[9px] bg-wash">
@@ -88,6 +164,35 @@ function openRepo() {
</template> </template>
<style scoped> <style scoped>
.live-dot {
width: 7px;
height: 7px;
border-radius: 50%;
background: var(--color-ok);
box-shadow: 0 0 0 3px color-mix(in srgb, var(--color-ok) 18%, transparent);
}
.uptime-unit {
margin: 0 8px 0 3px;
font-size: 16px;
font-weight: 500;
letter-spacing: 0;
color: var(--color-ink-2);
}
.uptime-unit:last-of-type {
margin-right: 0;
}
/* 四格分栏:桌面竖线分隔;窄屏 2 列换行时第二行改上边框接续 */
.statcell + .statcell {
border-left: 1px solid var(--color-line-soft);
}
@media (width < 768px) {
.statcell:nth-child(3) {
border-left: none;
}
.statcell:nth-child(n + 3) {
border-top: 1px solid var(--color-line-soft);
}
}
.chip { .chip {
display: inline-flex; display: inline-flex;
align-items: center; align-items: center;
@@ -204,6 +204,11 @@ const bindableProviders = computed(() => {
return out return out
}) })
/** 已绑定的 provider 集合;绑定入口按钮据此禁用,解绑后自动恢复 */
const boundProviders = computed(
() => new Set((identities.data.value?.items ?? []).map((it) => it.provider)),
)
async function bindProvider(provider: string) { async function bindProvider(provider: string) {
binding.value = provider binding.value = provider
try { try {
@@ -507,9 +512,10 @@ async function deleteProvider(p: ProviderType) {
:key="p" :key="p"
size="small" size="small"
:loading="binding === p" :loading="binding === p"
:disabled="boundProviders.has(p)"
@click="bindProvider(p)" @click="bindProvider(p)"
> >
绑定 {{ displayNameOf(p) }} {{ boundProviders.has(p) ? '已绑定' : '绑定' }} {{ displayNameOf(p) }}
</NButton> </NButton>
<span class="text-xs text-ink-3">将跳转到对应平台授权</span> <span class="text-xs text-ink-3">将跳转到对应平台授权</span>
</div> </div>
+264
View File
@@ -0,0 +1,264 @@
<script setup lang="ts">
import { NButton, NInputNumber, NSpin, NSwitch } from 'naive-ui'
import { reactive, ref, watch } from 'vue'
import { getAiSettings, listAiBlacklist, removeAiBlacklist, updateAiSettings } from '@/api/aigateway'
import BlacklistAddModal from '@/components/settings/BlacklistAddModal.vue'
import { useAsync } from '@/composables/useAsync'
import { fmtTime } from '@/composables/useFormat'
import { useToast } from '@/composables/useToast'
import type { AiSettings } from '@/types/api'
const toast = useToast()
const settings = useAsync(getAiSettings)
const blacklist = useAsync(listAiBlacklist)
/** 本地表单镜像:开关即时提交,数字输入失焦/回车提交 */
const form = reactive<AiSettings>({
filterDeprecated: false,
streamGuardEnabled: true,
streamGuardKB: 60,
grokWebSearch: true,
grokXSearch: true,
upstreamWaitSeconds: 300,
})
watch(
() => settings.data.value,
(v) => {
if (v) Object.assign(form, v)
},
{ immediate: true },
)
const saving = ref(false)
/** 全量 PUT;失败回滚到服务端最新值 */
async function save() {
saving.value = true
try {
Object.assign(form, await updateAiSettings({ ...form }))
toast.success('已保存,即时生效')
} catch (e) {
toast.error(e instanceof Error ? e.message : '保存失败')
void settings.run({ silent: true })
} finally {
saving.value = false
}
}
function setField<K extends keyof AiSettings>(key: K, value: AiSettings[K]) {
form[key] = value
void save()
}
/** 阈值失焦/回车提交;NInputNumber 已按 min/max 收敛 */
function commitGuardKB(v: number | null) {
if (v == null || v === form.streamGuardKB) return
setField('streamGuardKB', v)
}
/** 上游无响应预算失焦/回车提交 */
function commitUpstreamWait(v: number | null) {
if (v == null || v === form.upstreamWaitSeconds) return
setField('upstreamWaitSeconds', v)
}
const removing = ref(0)
async function doRemove(id: number, name: string) {
removing.value = id
try {
await removeAiBlacklist(id)
toast.success(`已移出黑名单:${name},重新同步渠道后恢复`)
void blacklist.run({ silent: true })
} catch (e) {
toast.error(e instanceof Error ? e.message : '移出失败')
} finally {
removing.value = 0
}
}
const showAdd = ref(false)
function onBlacklistChanged() {
void blacklist.run({ silent: true })
}
</script>
<template>
<div v-if="settings.loading.value && !settings.data.value" class="panel flex max-w-[880px] items-center justify-center py-20">
<NSpin size="small" />
</div>
<div v-else class="flex max-w-[880px] flex-col gap-4">
<!-- Responses 直通防护 -->
<div class="panel">
<div class="border-b border-line-soft px-4.5 py-3.5">
<div class="text-sm font-semibold">Responses 直通</div>
</div>
<div class="px-4.5">
<div class="flex items-center justify-between gap-3 border-b border-line-soft py-3.5">
<div class="min-w-0">
<div class="text-[13px] font-medium">流式保险丝:instructions + tools 阈值</div>
<div class="mt-0.5 text-xs text-ink-3">
系统提示与工具定义合计超过阈值的流式请求,预防性改走非流式上游并合成
SSE:丢增量输出,保会话不中断
</div>
</div>
<div class="flex flex-none items-center gap-3">
<NInputNumber
:value="form.streamGuardKB"
:min="1"
:max="1024"
:show-button="false"
:disabled="!form.streamGuardEnabled"
size="small"
class="w-24"
:update-value-on-input="false"
@update:value="commitGuardKB"
>
<template #suffix><span class="text-xs text-ink-3">KB</span></template>
</NInputNumber>
<NSwitch
:value="form.streamGuardEnabled"
size="small"
:loading="saving"
@update:value="(v: boolean) => setField('streamGuardEnabled', v)"
/>
</div>
</div>
<div class="flex items-center justify-between gap-3 py-3.5">
<div class="min-w-0">
<div class="text-[13px] font-medium">上游无响应预算</div>
<div class="mt-0.5 text-xs text-ink-3">
非流式为单次尝试总超时,流式为等待响应头上限,响应头到达后不限制流时长;
multi-agent / 搜索类模型单次调用可达 3 分钟,建议 300
</div>
</div>
<div class="flex flex-none items-center gap-3">
<NInputNumber
:value="form.upstreamWaitSeconds"
:min="30"
:max="900"
:show-button="false"
size="small"
class="w-24"
:update-value-on-input="false"
@update:value="commitUpstreamWait"
>
<template #suffix><span class="text-xs text-ink-3"></span></template>
</NInputNumber>
<!-- 隐形开关与上一行等宽占位,保证两行输入框网格对齐 -->
<NSwitch class="invisible" size="small" aria-hidden="true" />
</div>
</div>
</div>
<div class="border-t border-line-soft bg-wash px-4.5 py-2.5 text-xs leading-relaxed text-ink-3">
修改即时生效,无需重启 · 仅作用于 Responses 直通面;Chat / Messages 已有断流自动重做兜底
</div>
</div>
<!-- grok 服务端搜索工具 -->
<div class="panel">
<div class="border-b border-line-soft px-4.5 py-3.5">
<div class="text-sm font-semibold">grok 服务端搜索工具</div>
<div class="mt-0.5 text-xs text-ink-3">
仅对 <span class="mono">xai.</span> 前缀模型的对话请求生效;请求 tools
已包含同名工具时保持原样,不覆盖参数
</div>
</div>
<div class="px-4.5">
<div class="flex items-center justify-between gap-3 border-b border-line-soft py-3">
<div class="text-[13px] font-medium">默认开启 web_search</div>
<NSwitch
:value="form.grokWebSearch"
size="small"
:loading="saving"
@update:value="(v: boolean) => setField('grokWebSearch', v)"
/>
</div>
<div class="flex items-center justify-between gap-3 py-3">
<div class="text-[13px] font-medium">默认开启 x_search</div>
<NSwitch
:value="form.grokXSearch"
size="small"
:loading="saving"
@update:value="(v: boolean) => setField('grokXSearch', v)"
/>
</div>
</div>
</div>
<!-- 模型治理( AI 网关页迁入) -->
<div class="panel">
<div class="border-b border-line-soft px-4.5 py-3.5">
<div class="text-sm font-semibold">模型治理</div>
</div>
<div class="px-4.5 pb-4">
<div class="flex items-center justify-between gap-3 border-b border-line-soft py-3.5">
<div class="min-w-0">
<div class="text-[13px] font-medium">过滤弃用模型</div>
<div class="mt-0.5 text-xs text-ink-3">
开启后,已宣布弃用(即使未退役)的模型从模型列表与路由中排除;关闭恢复展示
</div>
</div>
<NSwitch
:value="form.filterDeprecated"
size="small"
:loading="saving"
@update:value="(v: boolean) => setField('filterDeprecated', v)"
/>
</div>
<div class="flex items-center justify-between gap-3 pt-3.5 pb-1">
<div class="min-w-0">
<div class="text-[13px] font-medium">模型黑名单</div>
<div class="mt-0.5 text-xs text-ink-3">
命中的模型从模型列表与路由排除,重新同步渠道后移出才恢复
</div>
</div>
<NButton size="tiny" quaternary type="primary" @click="showAdd = true"> 添加模型</NButton>
</div>
<table class="mt-1.5 w-full border-collapse">
<thead>
<tr class="border-y border-line-soft text-left text-xs font-medium text-ink-3">
<th class="w-[52%] px-3 py-2">模型</th>
<th class="px-3 py-2">加入时间</th>
<th class="w-22 px-3 py-2">操作</th>
</tr>
</thead>
<tbody>
<tr
v-for="b in blacklist.data.value ?? []"
:key="b.id"
class="border-b border-line-soft last:border-b-0"
>
<td class="px-3 py-2"><span class="mono text-[13px]">{{ b.name }}</span></td>
<td class="px-3 py-2 text-xs text-ink-3">{{ fmtTime(b.createdAt) }}</td>
<td class="px-3 py-2">
<NButton
size="tiny"
quaternary
type="error"
:loading="removing === b.id"
@click="doRemove(b.id, b.name)"
>
移出
</NButton>
</td>
</tr>
<tr v-if="!(blacklist.data.value ?? []).length">
<td colspan="3" class="px-3 py-6 text-center text-xs text-ink-3">
黑名单为空;点右上 添加模型从聚合模型目录选择
</td>
</tr>
</tbody>
</table>
</div>
</div>
<BlacklistAddModal
v-model:show="showAdd"
:blacklisted="(blacklist.data.value ?? []).map((b) => b.name)"
@changed="onBlacklistChanged"
/>
</div>
</template>
@@ -0,0 +1,137 @@
<script setup lang="ts">
import { NInput, NModal } from 'naive-ui'
import { computed, ref, watch } from 'vue'
import { addAiBlacklist, listAiModelCatalog } from '@/api/aigateway'
import { useToast } from '@/composables/useToast'
import type { AiCatalogModel } from '@/types/api'
const props = defineProps<{ show: boolean; blacklisted: string[] }>()
const emit = defineEmits<{ 'update:show': [boolean]; changed: [] }>()
const toast = useToast()
const rows = ref<AiCatalogModel[]>([])
const loading = ref(false)
const adding = ref('')
const filter = ref('')
const CAP_ORDER = ['CHAT', 'EMBEDDING', 'RERANK', 'TTS']
const CAP_LABEL: Record<string, string> = { CHAT: '对话', EMBEDDING: '向量', RERANK: '重排', TTS: '语音' }
const bannedSet = computed(() => new Set(props.blacklisted))
/** 按能力分组 + 关键字过滤,与渠道「模型列表」弹窗同构 */
const groups = computed(() => {
const kw = filter.value.trim().toLowerCase()
const buckets = new Map<string, AiCatalogModel[]>()
for (const r of rows.value) {
if (kw && !r.name.toLowerCase().includes(kw)) continue
buckets.set(r.capability, [...(buckets.get(r.capability) ?? []), r])
}
const order = [...CAP_ORDER, ...[...buckets.keys()].filter((c) => !CAP_ORDER.includes(c))]
return order
.filter((cap) => buckets.has(cap))
.map((cap) => ({ cap, label: CAP_LABEL[cap] ?? cap, items: buckets.get(cap)! }))
})
const shownCount = computed(() => groups.value.reduce((n, g) => n + g.items.length, 0))
watch(
() => props.show,
(show) => {
if (show) {
filter.value = ''
void reload()
}
},
)
async function reload() {
loading.value = true
try {
rows.value = await listAiModelCatalog()
} catch (e) {
toast.error(e instanceof Error ? e.message : '加载失败')
} finally {
loading.value = false
}
}
/** 弹窗即添加场景,意图明确不做二次确认;可在黑名单中移出恢复 */
async function doBan(name: string) {
if (adding.value) return
adding.value = name
try {
await addAiBlacklist(name)
toast.success(`已拉黑:${name}`)
emit('changed')
} catch (e) {
toast.error(e instanceof Error ? e.message : '拉黑失败')
} finally {
adding.value = ''
}
}
</script>
<template>
<NModal
:show="show"
preset="card"
:style="{ width: '640px', maxWidth: 'calc(100vw - 24px)' }"
@update:show="emit('update:show', $event)"
>
<template #header>
<div>
<div class="text-[15px] leading-tight font-semibold">添加到模型黑名单</div>
<div class="mt-1 text-xs font-normal text-ink-3">聚合全部渠道的可用模型</div>
</div>
</template>
<div class="flex items-center gap-2 pb-2">
<NInput v-model:value="filter" size="small" placeholder="过滤模型名…" clearable class="min-w-0 flex-1" />
<span class="flex-none text-xs whitespace-nowrap text-ink-3">
{{ filter ? `${shownCount} / ${rows.length}` : `${rows.length} 个模型` }}
</span>
</div>
<div class="-mx-2 max-h-[58vh] overflow-y-auto">
<div v-if="loading" class="py-10 text-center text-xs text-ink-3">加载中</div>
<template v-else>
<template v-for="g in groups" :key="g.cap">
<div class="px-3 pt-3 pb-1 text-[11.5px] font-semibold tracking-wide text-ink-3">
{{ g.label }} <span class="font-normal">· {{ g.items.length }}</span>
</div>
<div
v-for="r in g.items"
:key="r.name"
class="group flex items-center gap-2 rounded-lg px-3 py-[5px] hover:bg-row-hover"
>
<span class="mono min-w-0 truncate text-[13px]" :class="bannedSet.has(r.name) ? 'text-ink-3/60' : ''">
{{ r.name }}
</span>
<span class="min-w-0 flex-1" />
<span v-if="bannedSet.has(r.name)" class="flex-none px-1.5 text-xs text-ink-3/50">已拉黑</span>
<button
v-else
type="button"
class="flex-none cursor-pointer rounded-[5px] px-1.5 py-0.5 text-xs text-ink-3/70 group-hover:text-err hover:bg-err/10"
:disabled="!!adding"
@click="doBan(r.name)"
>
{{ adding === r.name ? '拉黑中…' : '拉黑' }}
</button>
</div>
</template>
<div v-if="!shownCount" class="py-10 text-center text-xs text-ink-3">
{{ rows.length ? '无匹配模型' : '暂无模型缓存,先在 AI 网关同步渠道模型' }}
</div>
</template>
</div>
<div class="mt-1 border-t border-line-soft pt-2.5 text-[11.5px] leading-relaxed text-ink-3">
<span class="font-medium text-ink-2">拉黑</span>:全局生效,从全部渠道剔除 ·
移出后重新同步渠道恢复 · 已拉黑的模型置灰
</div>
</NModal>
</template>
+94 -18
View File
@@ -1,6 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { NButton, NDataTable, NModal, type DataTableColumns } from 'naive-ui' import { NButton, NDataTable, NInput, NInputGroup, NInputGroupLabel, NModal, type DataTableColumns } from 'naive-ui'
import { computed, h, onMounted, reactive, ref } from 'vue' import { computed, h, onMounted, reactive, ref, watch } from 'vue'
import { getAuditEventDetail, listAuditEvents } from '@/api/tenant' import { getAuditEventDetail, listAuditEvents } from '@/api/tenant'
import DetailFieldList, { type DetailRow } from '@/components/DetailFieldList.vue' import DetailFieldList, { type DetailRow } from '@/components/DetailFieldList.vue'
@@ -23,23 +23,74 @@ const rows = ref<AuditEvent[]>([])
// : exhausted 365 // : exhausted 365
const cursor = ref('') const cursor = ref('')
const exhausted = ref(false) const exhausted = ref(false)
// ;
const q = ref('')
// (),
const scannedThrough = ref('')
// :/,
let gen = 0
let qTimer: ReturnType<typeof setTimeout> | undefined
// ;/,
let loadedQ: string | null = null
// :,
let autoFills = 0
const maxAutoFills = 2
// : 500ms ;/
watch(q, () => {
clearTimeout(qTimer)
if (q.value.trim() === loadedQ) return
qTimer = setTimeout(() => void load(), 500)
})
/** 回车/清空的即时提交:关键字未变则不发起重复搜索 */
function submitSearch() {
clearTimeout(qTimer)
if (q.value.trim() !== loadedQ) void load()
}
const pageCount = computed(() => Math.max(1, Math.ceil(rows.value.length / pagination.pageSize))) const pageCount = computed(() => Math.max(1, Math.ceil(rows.value.length / pagination.pageSize)))
const hasMore = computed(() => cursor.value !== '' && !exhausted.value) const hasMore = computed(() => cursor.value !== '' && !exhausted.value)
/** = min(, ):,
* 直接展示会显示成当前时刻;两者取更早才反映真实扫描位置 */
const scanProgress = computed(() => {
const oldest = rows.value.length ? (rows.value[rows.value.length - 1].eventTime ?? '') : ''
if (!scannedThrough.value || !oldest) return scannedThrough.value || oldest
return scannedThrough.value < oldest ? scannedThrough.value : oldest
})
/** 受控分页:字面量对象会在重渲染时被重建导致页大小切换失效 */ /** 受控分页:字面量对象会在重渲染时被重建导致页大小切换失效 */
const pagination = reactive({ const pagination = reactive({
page: 1, page: 1,
pageSize: 20, pageSize: 20,
showSizePicker: true, showSizePicker: true,
pageSizes: [20, 50, 100], pageSizes: [20, 50, 100],
prefix: () => /** :/;,
`已加载 ${rows.value.length} 条 · ` + * 自动补批封顶后由用户显式接力,不会无人值守扫完整个保留期 */
(loadingMore.value ? '正在加载更早…' : exhausted.value ? '已到 365 天保留期尽头' : '翻到末页自动加载更早'), prefix: () => {
const parts = [`已加载 ${rows.value.length}`]
if (scanProgress.value && !exhausted.value) parts.push(`已回溯至 ${fmtTime(scanProgress.value)}`)
if (exhausted.value) parts.push('已到 365 天保留期尽头')
const text = parts.join(' · ')
if (loadingMore.value) return `${text} · 正在加载更早…`
if (!hasMore.value) return text
return h('span', { class: 'inline-flex items-center gap-1.5' }, [
`${text} ·`,
h(
NButton,
{ size: 'tiny', quaternary: true, type: 'primary', onClick: () => { autoFills = 0; void fetchBatch() } },
{ default: () => '加载更早' },
),
])
},
onUpdatePage: (p: number) => { onUpdatePage: (p: number) => {
pagination.page = p pagination.page = p
// : // :(,)
if (p >= pageCount.value) void fetchBatch() if (p >= pageCount.value) {
autoFills = 0
void fetchBatch()
}
}, },
onUpdatePageSize: (ps: number) => { onUpdatePageSize: (ps: number) => {
pagination.pageSize = ps pagination.pageSize = ps
@@ -47,35 +98,45 @@ const pagination = reactive({
}, },
}) })
/** 重置信息流:回到最新一批 */ /** 重置信息流:回到最新一批(刷新按钮与关键字变化共用) */
async function load() { async function load() {
clearTimeout(qTimer)
const g = ++gen
loadedQ = q.value.trim()
autoFills = 0
loading.value = true loading.value = true
error.value = '' error.value = ''
rows.value = [] rows.value = []
cursor.value = '' cursor.value = ''
exhausted.value = false exhausted.value = false
scannedThrough.value = ''
pagination.page = 1 pagination.page = 1
try { try {
await fetchBatch(true) await fetchBatch(true)
} finally { } finally {
loading.value = false if (g === gen) loading.value = false
} }
} }
/** (~100 ):; /** (~200 ):;
* 末页不满且还有更早数据时自动补一批,避免首屏残页 */ * 末页不满且还有更早数据时自动补一批,避免首屏残页;
* 代次不符的在途响应直接丢弃,防止旧关键字结果混入新信息流 */
async function fetchBatch(first = false) { async function fetchBatch(first = false) {
if (loadingMore.value || (!first && !hasMore.value)) return if (!first && (loadingMore.value || !hasMore.value)) return
const g = gen
loadingMore.value = true loadingMore.value = true
try { try {
const r = await listAuditEvents(props.cfgId, { cursor: cursor.value || undefined }) const r = await listAuditEvents(props.cfgId, { cursor: cursor.value || undefined, q: q.value.trim() || undefined })
if (g !== gen) return
const seen = new Set(rows.value.map((e) => e.eventId)) const seen = new Set(rows.value.map((e) => e.eventId))
rows.value = [...rows.value, ...r.items.filter((e) => !seen.has(e.eventId))].sort((a, b) => rows.value = [...rows.value, ...r.items.filter((e) => !seen.has(e.eventId))].sort((a, b) =>
(b.eventTime ?? '').localeCompare(a.eventTime ?? ''), (b.eventTime ?? '').localeCompare(a.eventTime ?? ''),
) )
cursor.value = r.cursor ?? '' cursor.value = r.cursor ?? ''
exhausted.value = r.exhausted exhausted.value = r.exhausted
scannedThrough.value = r.scannedThrough ?? ''
} catch (e) { } catch (e) {
if (g !== gen) return
if (first) { if (first) {
error.value = e instanceof Error ? e.message : '查询失败' error.value = e instanceof Error ? e.message : '查询失败'
} else { } else {
@@ -83,9 +144,13 @@ async function fetchBatch(first = false) {
message.error(e instanceof Error ? e.message : '继续加载失败,请刷新重新查询') message.error(e instanceof Error ? e.message : '继续加载失败,请刷新重新查询')
} }
} finally { } finally {
loadingMore.value = false if (g === gen) loadingMore.value = false
}
// : maxAutoFills ,
if (g === gen && hasMore.value && rows.value.length < pagination.pageSize && autoFills < maxAutoFills) {
autoFills++
void fetchBatch()
} }
if (hasMore.value && rows.value.length < pagination.pageSize) void fetchBatch()
} }
onMounted(() => void load()) onMounted(() => void load())
@@ -206,6 +271,17 @@ const columns: DataTableColumns<AuditEvent> = [
<div class="text-sm font-semibold">审计日志</div> <div class="text-sm font-semibold">审计日志</div>
<StatusBadge v-if="exhausted" kind="run" label="已加载全部保留期数据" :dot="false" /> <StatusBadge v-if="exhausted" kind="run" label="已加载全部保留期数据" :dot="false" />
<div class="flex-1" /> <div class="flex-1" />
<NInputGroup class="!w-76 max-lg:!w-full">
<NInputGroupLabel size="small">搜索</NInputGroupLabel>
<NInput
v-model:value="q"
size="small"
clearable
placeholder="事件 / 资源 / 操作者,支持 *"
@keydown.enter="submitSearch()"
@clear="submitSearch()"
/>
</NInputGroup>
<NButton size="small" :loading="loading" @click="load()">刷新</NButton> <NButton size="small" :loading="loading" @click="load()">刷新</NButton>
</div> </div>
@@ -222,14 +298,14 @@ const columns: DataTableColumns<AuditEvent> = [
:loading="loading" :loading="loading"
:pagination="pagination" :pagination="pagination"
:scroll-x="820" :scroll-x="820"
:max-height="480"
:row-props="rowProps" :row-props="rowProps"
/> />
<FootNote> <FootNote>
OCI Audit 免费且默认开启事件保留 365 无需在云端做任何配置 · OCI Audit 免费且默认开启事件保留 365 无需在云端做任何配置 ·
实时查询不入库事件通常延迟数分钟可见 · 实时查询不入库事件通常延迟数分钟可见 ·
已默认过滤遥测噪声SummarizeMetricsData与内网地址发起的服务互调 · 已默认过滤遥测噪声SummarizeMetricsData与内网地址发起的服务互调 ·
从最新事件起每批约 100 翻到末页自动向更早加载空档期自动扩窗回溯 · 点击行查看完整详情 从最新事件起每批约 200 翻到末页自动向更早加载空档期自动扩窗回溯 ·
搜索匹配事件 / 资源 / 操作者等可见字段不区分大小写支持 * 通配命中较少时自动补两批后停驻加载更早继续回溯 · 点击行查看完整详情
</FootNote> </FootNote>
<NModal v-model:show="showDetail" preset="card" closable :style="{ width: '720px', maxWidth: 'calc(100vw - 24px)' }"> <NModal v-model:show="showDetail" preset="card" closable :style="{ width: '720px', maxWidth: 'calc(100vw - 24px)' }">
@@ -255,7 +331,7 @@ const columns: DataTableColumns<AuditEvent> = [
v-if="detailRaw" v-if="detailRaw"
:value="detailRaw" :value="detailRaw"
title="原始 JSON" title="原始 JSON"
meta="来自 Audit SDK" meta="来自 OCI 审计日志"
max-height="36vh" max-height="36vh"
wide wide
/> />
-1
View File
@@ -222,7 +222,6 @@ const columns = computed(() => (withAvail.value ? [...baseColumns, ...availColum
:loading="limits.loading.value" :loading="limits.loading.value"
:pagination="pagination" :pagination="pagination"
:scroll-x="withAvail ? 660 : 380" :scroll-x="withAvail ? 660 : 380"
:max-height="440"
:row-key="(r: LimitItem) => r.name + (r.availabilityDomain ?? '')" :row-key="(r: LimitItem) => r.name + (r.availabilityDomain ?? '')"
/> />
<FootNote> <FootNote>
+25
View File
@@ -4,6 +4,11 @@
*/ */
const exact: Record<string, string> = { const exact: Record<string, string> = {
'POST /api/v1/auth/login': '登录面板', 'POST /api/v1/auth/login': '登录面板',
'POST /api/v1/auth/logout': '退出登录',
'GET /api/v1/auth/oauth/:provider/callback': '外部身份登录 / 绑定',
'PUT /api/v1/auth/credentials': '修改登录凭据',
'PUT /api/v1/auth/password-login': '切换密码登录开关',
'POST /api/v1/auth/revoke-sessions': '撤销全部会话',
'POST /api/v1/auth/totp/setup': '发起两步验证绑定', 'POST /api/v1/auth/totp/setup': '发起两步验证绑定',
'POST /api/v1/auth/totp/activate': '启用两步验证', 'POST /api/v1/auth/totp/activate': '启用两步验证',
'POST /api/v1/auth/totp/disable': '停用两步验证', 'POST /api/v1/auth/totp/disable': '停用两步验证',
@@ -42,6 +47,26 @@ const exact: Record<string, string> = {
'DELETE /api/v1/tasks/:id': '删除后台任务', 'DELETE /api/v1/tasks/:id': '删除后台任务',
'POST /api/v1/tasks/:id/run': '手动执行任务', 'POST /api/v1/tasks/:id/run': '手动执行任务',
'POST /api/v1/webhooks/oci-logs/:secret': '回传消息投递', 'POST /api/v1/webhooks/oci-logs/:secret': '回传消息投递',
'POST /api/v1/ai-keys': '创建网关密钥',
'PUT /api/v1/ai-keys/:id': '修改网关密钥',
'DELETE /api/v1/ai-keys/:id': '删除网关密钥',
'PUT /api/v1/ai-keys/:id/content-log': '设置密钥内容留痕',
'POST /api/v1/ai-channels': '创建网关渠道',
'PUT /api/v1/ai-channels/:id': '修改网关渠道',
'DELETE /api/v1/ai-channels/:id': '删除网关渠道',
'POST /api/v1/ai-channels/:id/probe': '探测网关渠道',
'POST /api/v1/ai-channels/:id/sync-models': '同步渠道模型',
'POST /api/v1/ai-channels/:id/test-model': '测试渠道模型',
'POST /api/v1/ai-blacklist': '拉黑模型',
'DELETE /api/v1/ai-blacklist/:id': '移出模型黑名单',
'PUT /api/v1/ai-settings': '保存网关设置',
'PUT /api/v1/settings/notify-channels/:type': '保存通知渠道配置',
'POST /api/v1/settings/notify-channels/:type/test': '发送通知测试消息',
'PUT /api/v1/settings/notify-templates/:kind': '保存通知模板',
'POST /api/v1/settings/notify-templates/:kind/test': '发送模板测试消息',
'POST /api/v1/proxies/import': '批量导入代理',
'POST /api/v1/proxies/:id/probe': '探测代理',
'PUT /api/v1/proxies/:id/tenants': '设置代理关联租户',
} }
/** 资源段兜底词典:精确表未命中时以「动词 + 资源」组合 */ /** 资源段兜底词典:精确表未命中时以「动词 + 资源」组合 */
+59 -28
View File
@@ -489,6 +489,8 @@ export interface ComputeShape {
memoryMaxGBs?: number memoryMaxGBs?: number
gpus?: number gpus?: number
processorDescription?: string processorDescription?: string
/** 该 shape 对应的配额名(与 compute limits 的 name 同名),用于配额与 AD 可用性判定 */
quotaNames?: string[]
} }
// ---- 引导卷 ---- // ---- 引导卷 ----
@@ -594,11 +596,13 @@ export interface AuditEvent {
} }
// 批式懒加载响应:cursor 供下一批续查原样带回; // 批式懒加载响应:cursor 供下一批续查原样带回;
// cursor 为空且 exhausted 为 true 表示已回溯到 365 天保留期尽头 // cursor 为空且 exhausted 为 true 表示已回溯到 365 天保留期尽头;
// scannedThrough 为已完整回溯到的时刻(比它更新的时段已扫完),用于进度提示
export interface AuditEventsResult { export interface AuditEventsResult {
items: AuditEvent[] items: AuditEvent[]
cursor?: string cursor?: string
exhausted: boolean exhausted: boolean
scannedThrough?: string
} }
// ---- 域通知与密码策略 ---- // ---- 域通知与密码策略 ----
@@ -878,32 +882,6 @@ export interface LogEventPage {
total: number total: number
} }
/** 回传事件告警规则;条件间 AND,空条件视为任意 */
export interface AlertRule {
id: number
name: string
enabled: boolean
/** 0=全部租户 */
ociConfigId: number
/** 逗号分隔事件短名(如 TerminateInstance),空=全部 */
eventTypes: string
/** 逗号分隔 IP/CIDR,空=任意 */
sourceIps: string
/** in:命中列表告警;notin:不在列表才告警(白名单) */
sourceIpMode: 'in' | 'notin'
/** 资源名子串,空=任意 */
resourceMatch: string
/** 触发阈值,默认 1(即时) */
threshold: number
/** 聚合窗口分钟,threshold>1 时必填 */
windowMinutes: number
createdAt: string
updatedAt: string
}
/** 创建/更新告警规则请求体 */
export type AlertRuleBody = Omit<AlertRule, 'id' | 'createdAt' | 'updatedAt'>
/** 每租户回传回调地址;path 需以面板公网域名拼接完整 URL */ /** 每租户回传回调地址;path 需以面板公网域名拼接完整 URL */
export interface LogWebhookInfo { export interface LogWebhookInfo {
path: string path: string
@@ -946,6 +924,8 @@ export interface AiKey {
name: string name: string
tail: string tail: string
group: string group: string
/** 模型白名单;null/空 = 不限,非空时网关仅放行列表内模型 */
models: string[] | null
enabled: boolean enabled: boolean
lastUsedAt: string | null lastUsedAt: string | null
/** 内容日志开启截止时间;null = 永关(默认,红线),开启必须限时到期自动停写 */ /** 内容日志开启截止时间;null = 永关(默认,红线),开启必须限时到期自动停写 */
@@ -970,8 +950,12 @@ export interface AiChannel {
lastProbeAt: string | null lastProbeAt: string | null
probeStatus: AiProbeStatus probeStatus: AiProbeStatus
probeError: string probeError: string
/** 用户测试通过后固定的探测验证模型;探测时置于候选首位 */
probeModel: string
createdAt: string createdAt: string
updatedAt: string updatedAt: string
/** 渠道模型缓存计数(列表查询回填) */
modelCount: number
} }
/** 聚合可用模型(OpenAI /models 形态) */ /** 聚合可用模型(OpenAI /models 形态) */
@@ -988,7 +972,36 @@ export interface AiModelCacheItem {
modelOcid: string modelOcid: string
name: string name: string
vendor: string vendor: string
capability: string
syncedAt: string syncedAt: string
deprecatedAt: string | null
retiredAt: string | null
}
/** 模型黑名单条目:拉黑即全渠道剔除,同步 / 探测不再入库 */
/** AI 网关全局设置 */
export interface AiSettings {
filterDeprecated: boolean
/** Responses 流式保险丝:instructions+tools 合计超阈值改非流式上游并合成 SSE */
streamGuardEnabled: boolean
streamGuardKB: number
/** grok(xai. 前缀)服务端搜索工具默认注入;请求已带同名工具时不覆盖 */
grokWebSearch: boolean
grokXSearch: boolean
/** 上游无响应预算(秒):非流式为单次尝试总超时,流式为等待响应头上限;限 30..900 */
upstreamWaitSeconds: number
}
/** 聚合模型目录条目(黑名单添加弹窗):能力为 CHAT / EMBEDDING / RERANK / TTS */
export interface AiCatalogModel {
name: string
capability: string
}
export interface AiModelBlacklistItem {
id: number
name: string
createdAt: string
} }
/** 调用日志:仅元数据与 token 用量 */ /** 调用日志:仅元数据与 token 用量 */
@@ -1032,10 +1045,28 @@ export interface AiContentLog {
} }
// ---- 关于 ---- // ---- 关于 ----
/** GET /about:构建与运行环境信息 */ /** 进程资源占用快照,指标为自启动累计口径 */
export interface AboutResources {
/** CPU 自启动均值,占单核百分比(多核并行可超 100) */
cpuAvgPercent: number
numCpu: number
goroutines: number
/** Go 堆在用字节数 */
memHeapBytes: number
/** 向系统申请的总字节数 */
memSysBytes: number
dbEngine: string
/** 数据库磁盘占用;-1 表示外部数据库不可度量 */
dbBytes: number
}
/** GET /about:构建与运行环境信息;运行时字段旧版后端可能缺失 */
export interface AboutInfo { export interface AboutInfo {
version: string version: string
buildTime: string buildTime: string
goVersion: string goVersion: string
platform: string platform: string
startedAt?: string
uptimeSeconds?: number
resources?: AboutResources
} }
+21 -9
View File
@@ -1,8 +1,11 @@
<script setup lang="ts"> <script setup lang="ts">
import { NButton } from 'naive-ui'
import { computed, ref } from 'vue' import { computed, ref } from 'vue'
import { listAiChannels, listAiKeys, listAiModels } from '@/api/aigateway' import {
listAiChannels,
listAiKeys,
listAiModels,
} from '@/api/aigateway'
import AiChannelPanel from '@/components/ai/AiChannelPanel.vue' import AiChannelPanel from '@/components/ai/AiChannelPanel.vue'
import AiKeyPanel from '@/components/ai/AiKeyPanel.vue' import AiKeyPanel from '@/components/ai/AiKeyPanel.vue'
import { useAsync } from '@/composables/useAsync' import { useAsync } from '@/composables/useAsync'
@@ -21,6 +24,10 @@ const endpoints = [
{ method: 'POST', path: '/responses', note: 'OpenAI Responses · 无状态子集' }, { method: 'POST', path: '/responses', note: 'OpenAI Responses · 无状态子集' },
{ method: 'POST', path: '/messages', note: 'Claude · 流式/非流式' }, { method: 'POST', path: '/messages', note: 'Claude · 流式/非流式' },
{ method: 'POST', path: '/embeddings', note: 'OpenAI Embeddings · 向量化' }, { method: 'POST', path: '/embeddings', note: 'OpenAI Embeddings · 向量化' },
{ method: 'POST', path: '/audio/speech', note: '文本转语音 · xAI Voice' },
{ method: 'POST', path: '/tts', note: '文本转语音 · xAI 官方格式' },
{ method: 'POST', path: '/rerank', note: '文档重排 · Cohere Rerank' },
{ method: 'POST', path: '/moderations', note: '内容审核 · OCI Guardrails' },
{ method: 'GET', path: '/models', note: '模型列表(按密钥分组过滤)' }, { method: 'GET', path: '/models', note: '模型列表(按密钥分组过滤)' },
] ]
@@ -144,16 +151,20 @@ function refreshChannels() {
v-if="expandedVendor === g.vendor" v-if="expandedVendor === g.vendor"
class="flex max-h-36 flex-wrap content-start gap-1.5 overflow-y-auto pb-2 pl-5" class="flex max-h-36 flex-wrap content-start gap-1.5 overflow-y-auto pb-2 pl-5"
> >
<button <span
v-for="id in g.ids" v-for="id in g.ids"
:key="id" :key="id"
type="button" class="mono inline-flex items-center overflow-hidden rounded-[5px] border border-line bg-card text-[11.5px]"
class="mono cursor-pointer rounded-[5px] border border-line bg-card px-2 py-0.5 text-[11.5px] hover:border-accent hover:text-accent"
:title="`复制 ${id}`"
@click="copyModel(id)"
> >
{{ id }} <button
</button> type="button"
class="cursor-pointer py-0.5 pr-1 pl-2 hover:text-accent"
:title="`复制 ${id}`"
@click="copyModel(id)"
>
{{ id }}
</button>
</span>
</div> </div>
</div> </div>
<div v-if="models.data.value && !models.data.value.length" class="py-2 text-xs text-ink-3"> <div v-if="models.data.value && !models.data.value.length" class="py-2 text-xs text-ink-3">
@@ -170,6 +181,7 @@ function refreshChannels() {
:keys="keys.data.value ?? []" :keys="keys.data.value ?? []"
:loading="keys.loading.value" :loading="keys.loading.value"
:groups="groups" :groups="groups"
:models="models.data.value ?? []"
@changed="keys.run({ silent: true })" @changed="keys.run({ silent: true })"
/> />
+11 -1
View File
@@ -1,5 +1,5 @@
<script setup lang="ts"> <script setup lang="ts">
import { NButton, NInput } from 'naive-ui' import { NButton, NInput, NSpin } from 'naive-ui'
import { onMounted, ref } from 'vue' import { onMounted, ref } from 'vue'
import { useRoute, useRouter } from 'vue-router' import { useRoute, useRouter } from 'vue-router'
@@ -30,6 +30,8 @@ const errorMsg = ref('')
const providers = ref<OauthProviderInfo[]>([]) const providers = ref<OauthProviderInfo[]>([])
// (): // ():
const passwordLoginDisabled = ref(false) const passwordLoginDisabled = ref(false)
// :providers ,
const bootLoading = ref(true)
// ://() // ://()
const featureChips = [ const featureChips = [
@@ -47,6 +49,8 @@ onMounted(async () => {
passwordLoginDisabled.value = r.passwordLoginDisabled && r.providers.length > 0 passwordLoginDisabled.value = r.passwordLoginDisabled && r.providers.length > 0
} catch { } catch {
/* 登录页容忍 provider 列表加载失败 */ /* 登录页容忍 provider 列表加载失败 */
} finally {
bootLoading.value = false
} }
}) })
@@ -155,6 +159,11 @@ async function oauthLogin(provider: string) {
<div class="rounded-[14px] border border-line bg-card px-[30px] pt-[30px] pb-7 shadow-[0_18px_50px_rgba(20,20,19,.10),0_2px_8px_rgba(20,20,19,.05)]"> <div class="rounded-[14px] border border-line bg-card px-[30px] pt-[30px] pb-7 shadow-[0_18px_50px_rgba(20,20,19,.10),0_2px_8px_rgba(20,20,19,.05)]">
<div class="font-serif text-[19px] font-semibold">欢迎回来</div> <div class="font-serif text-[19px] font-semibold">欢迎回来</div>
<div v-if="bootLoading" class="flex items-center justify-center py-14">
<NSpin size="small" />
</div>
<template v-else>
<div <div
v-if="errorMsg" v-if="errorMsg"
class="mt-4 flex items-start gap-2 rounded-md border border-err/30 bg-err/10 px-3 py-2 text-[12.5px] text-err" class="mt-4 flex items-start gap-2 rounded-md border border-err/30 bg-err/10 px-3 py-2 text-[12.5px] text-err"
@@ -227,6 +236,7 @@ async function oauthLogin(provider: string) {
由管理员在 设置 · 账号安全 中管理 由管理员在 设置 · 账号安全 中管理
</div> </div>
</template> </template>
</template>
</div> </div>
</div> </div>
</div> </div>
+9 -8
View File
@@ -163,7 +163,8 @@ const currencySymbol = computed(() => {
{{ ov?.tenants.alive ?? 0 }}/{{ ov?.tenants.total ?? 0 }} 存活 {{ ov?.tenants.alive ?? 0 }}/{{ ov?.tenants.total ?? 0 }} 存活
</div> </div>
</div> </div>
<div class="px-4.5 py-1.5"> <!-- 限高内部滚动:租户多时不撑高整行,底部露半行暗示可滚 -->
<div class="max-h-90 overflow-y-auto px-4.5 py-1.5">
<div <div
v-for="c in configs.data.value ?? []" v-for="c in configs.data.value ?? []"
:key="c.id" :key="c.id"
@@ -188,13 +189,13 @@ const currencySymbol = computed(() => {
</div> </div>
<div class="w-18 flex-none text-right text-xs text-ink-3">{{ fmtRelative(c.lastVerifiedAt) }}</div> <div class="w-18 flex-none text-right text-xs text-ink-3">{{ fmtRelative(c.lastVerifiedAt) }}</div>
</div> </div>
<div class="py-2.5 text-center"> </div>
<RouterLink <div class="border-t border-line-soft py-2.5 text-center">
class="text-[13px] font-medium text-accent hover:text-accent-hover" <RouterLink
:to="{ name: 'tenants' }" class="text-[13px] font-medium text-accent hover:text-accent-hover"
>查看全部租户</RouterLink :to="{ name: 'tenants' }"
> >查看全部租户</RouterLink
</div> >
</div> </div>
</div> </div>
</div> </div>
+6 -1
View File
@@ -20,6 +20,7 @@ import AppInputNumber from '@/components/AppInputNumber.vue'
import FootNote from '@/components/FootNote.vue' import FootNote from '@/components/FootNote.vue'
import FormField from '@/components/FormField.vue' import FormField from '@/components/FormField.vue'
import AboutTab from '@/components/settings/AboutTab.vue' import AboutTab from '@/components/settings/AboutTab.vue'
import AiSettingsTab from '@/components/settings/AiSettingsTab.vue'
import AccountSecurityCard from '@/components/settings/AccountSecurityCard.vue' import AccountSecurityCard from '@/components/settings/AccountSecurityCard.vue'
import NotifyChannelCard from '@/components/settings/NotifyChannelCard.vue' import NotifyChannelCard from '@/components/settings/NotifyChannelCard.vue'
import NotifyTemplateModal from '@/components/settings/NotifyTemplateModal.vue' import NotifyTemplateModal from '@/components/settings/NotifyTemplateModal.vue'
@@ -88,7 +89,7 @@ const eventRows: { key: keyof NotifyEventsSetting; label: string; hint: string }
{ key: 'taskStop', label: '任务停止', hint: '抢机连续鉴权失败熔断停止时推送' }, { key: 'taskStop', label: '任务停止', hint: '抢机连续鉴权失败熔断停止时推送' },
{ key: 'loginLock', label: '登录锁定', hint: '同一 IP+用户名连续失败达阈值时推送' }, { key: 'loginLock', label: '登录锁定', hint: '同一 IP+用户名连续失败达阈值时推送' },
{ key: 'modelDeprecated', label: '模型弃用预警', hint: 'AI 网关在池模型 30 天内被 OCI 弃用时随每日探测推送' }, { key: 'modelDeprecated', label: '模型弃用预警', hint: 'AI 网关在池模型 30 天内被 OCI 弃用时随每日探测推送' },
{ key: 'logEventInstance', label: '实例生命周期', hint: '创建 / 终止 / 电源操作(Launch、Terminate、InstanceAction)' }, { key: 'logEventInstance', label: '实例生命周期', hint: '终止 / 电源操作(Terminate、InstanceAction);创建不回传,避免抢机噪声' },
{ key: 'logEventIdentity', label: '用户与凭据', hint: '用户增删改、API Key 增删、能力变更' }, { key: 'logEventIdentity', label: '用户与凭据', hint: '用户增删改、API Key 增删、能力变更' },
{ key: 'logEventPolicy', label: '策略变更', hint: 'IAM Policy 创建 / 修改 / 删除' }, { key: 'logEventPolicy', label: '策略变更', hint: 'IAM Policy 创建 / 修改 / 删除' },
{ key: 'logEventRegion', label: '区域订阅', hint: '订阅新区域(CreateRegionSubscription)' }, { key: 'logEventRegion', label: '区域订阅', hint: '订阅新区域(CreateRegionSubscription)' },
@@ -339,6 +340,7 @@ async function sendTest() {
<NTabPane name="notify" tab="通知" /> <NTabPane name="notify" tab="通知" />
<NTabPane name="task" tab="任务" /> <NTabPane name="task" tab="任务" />
<NTabPane name="security" tab="安全" /> <NTabPane name="security" tab="安全" />
<NTabPane name="ai" tab="AI" />
<NTabPane name="about" tab="关于" /> <NTabPane name="about" tab="关于" />
</NTabs> </NTabs>
@@ -658,6 +660,9 @@ async function sendTest() {
</div> </div>
</div> </div>
<!-- AI:网关运行时设置(保险丝 / grok 工具默认 / 模型治理) -->
<AiSettingsTab v-else-if="tab === 'ai'" />
<!-- 关于:构建信息与项目主页(v-else-if 挂载时才启动粒子动画) --> <!-- 关于:构建信息与项目主页(v-else-if 挂载时才启动粒子动画) -->
<AboutTab v-else-if="tab === 'about'" /> <AboutTab v-else-if="tab === 'about'" />
+9 -2
View File
@@ -140,8 +140,15 @@ async function remove() {
<template #trigger> <template #trigger>
<NButton size="small" type="error" ghost>删除租户</NButton> <NButton size="small" type="error" ghost>删除租户</NButton>
</template> </template>
删除{{ config.data.value.alias }}将清理本面板中的关联任务快照回传事件与 Webhook <div class="max-w-80 text-[13px] leading-relaxed">
密钥告警及 AI 渠道数据OCI 云端资源不会被删除云端日志回传链路请先在其他页销毁 <div class="font-medium">删除{{ config.data.value.alias }}</div>
<div class="mt-1 text-xs text-ink-3">
将清理面板内关联数据后台任务测活 / 成本快照回传事件Webhook 密钥与 AI 渠道
</div>
<div class="mt-0.5 text-xs text-ink-3">
OCI 云端资源不受影响云端日志回传链路请先在其他页销毁
</div>
</div>
</NPopconfirm> </NPopconfirm>
</div> </div>
+34 -3
View File
@@ -1,6 +1,6 @@
<script setup lang="ts"> <script setup lang="ts">
import { NButton, NDataTable, NInput, NInputGroup, NInputGroupLabel, NPopconfirm, NPopover, NSelect, NTooltip, type DataTableColumns } from 'naive-ui' import { NButton, NDataTable, NInput, NInputGroup, NInputGroupLabel, NPopconfirm, NPopover, NSelect, NTooltip, type DataTableColumns } from 'naive-ui'
import { computed, h, ref, type VNodeChild } from 'vue' import { computed, h, reactive, ref, watch, type VNodeChild } from 'vue'
import { RouterLink, useRouter } from 'vue-router' import { RouterLink, useRouter } from 'vue-router'
import { listAiChannels } from '@/api/aigateway' import { listAiChannels } from '@/api/aigateway'
@@ -63,6 +63,25 @@ const filtered = computed(() => {
) )
}) })
/** 客户端分页:字面量对象会在重渲染时被重建导致状态丢失,须用 reactive 受控 */
const pagination = reactive({
page: 1,
pageSize: 10,
showSizePicker: true,
pageSizes: [10, 20, 50, 100],
onUpdatePage: (p: number) => {
pagination.page = p
},
onUpdatePageSize: (ps: number) => {
pagination.pageSize = ps
pagination.page = 1
},
})
/** 搜索或分组过滤变化后回第 1 页,避免停留在越界页码 */
watch([keyword, groupFilter], () => {
pagination.page = 1
})
/** :;AI (); /** :;AI ();
* 测活 / 成本看范围( = 全部租户) */ * 测活 / 成本看范围( = 全部租户) */
function taskTouchesCfg(task: Task, cfgId: number): boolean { function taskTouchesCfg(task: Task, cfgId: number): boolean {
@@ -222,7 +241,19 @@ function renderActions(row: OciConfigSummary): VNodeChild {
trigger: () => trigger: () =>
h(NButton, { size: 'tiny', quaternary: true, type: 'error' }, { default: () => '删除' }), h(NButton, { size: 'tiny', quaternary: true, type: 'error' }, { default: () => '删除' }),
default: () => default: () =>
`删除「${row.alias}」?将清理本面板中的关联任务、快照、回传事件与 Webhook 密钥、告警及 AI 渠道数据;OCI 云端资源不会被删除(云端日志回传链路请先在“其他”页销毁)。`, h('div', { class: 'max-w-80 text-[13px] leading-relaxed' }, [
h('div', { class: 'font-medium' }, `删除「${row.alias}」?`),
h(
'div',
{ class: 'mt-1 text-xs text-ink-3' },
'将清理面板内关联数据:后台任务、测活 / 成本快照、回传事件、Webhook 密钥与 AI 渠道。',
),
h(
'div',
{ class: 'mt-0.5 text-xs text-ink-3' },
'OCI 云端资源不受影响;云端日志回传链路请先在「其他」页销毁。',
),
]),
}, },
), ),
]) ])
@@ -320,7 +351,7 @@ const columns = computed<DataTableColumns<OciConfigSummary>>(() => [
:columns="columns" :columns="columns"
:data="filtered" :data="filtered"
:loading="configs.loading.value" :loading="configs.loading.value"
:pagination="{ pageSize: 10 }" :pagination="pagination"
:scroll-x="1200" :scroll-x="1200"
:row-key="(r: OciConfigSummary) => r.id" :row-key="(r: OciConfigSummary) => r.id"
/> />