From 8255156cedcaea10a707f4b55752ec6b11e24ea2 Mon Sep 17 00:00:00 2001 From: codex Date: Sun, 1 Nov 2026 15:00:19 +0800 Subject: [PATCH] =?UTF-8?q?feat(admin):=20=E4=BC=98=E5=8C=96=E7=BA=BF?= =?UTF-8?q?=E8=B7=AF=E6=B5=81=E9=87=8F=E6=B1=A0=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Cloud/CloudAdminTrafficPoolService.php | 46 +++++++++++-------- web/public/cloud/admin-traffic-pools.js | 30 ++++++------ web/public/theme/venix/css/admin-home.css | 13 ++++++ .../views/venix/admin/cloud/resources.tpl | 30 ++++++------ web/resources/views/venix/layout_assets.tpl | 2 +- .../AdminResourceSchedulingContractTest.php | 2 +- .../CloudAdminTrafficPoolServiceTest.php | 4 +- .../CloudAdminTrafficPoolUiContractTest.php | 12 ++++- 8 files changed, 85 insertions(+), 54 deletions(-) diff --git a/web/app/Services/Cloud/CloudAdminTrafficPoolService.php b/web/app/Services/Cloud/CloudAdminTrafficPoolService.php index 5a7b6796..65464cda 100644 --- a/web/app/Services/Cloud/CloudAdminTrafficPoolService.php +++ b/web/app/Services/Cloud/CloudAdminTrafficPoolService.php @@ -38,7 +38,7 @@ final class CloudAdminTrafficPoolService 'traffic_sample_stale' => '流量采样已过期', 'traffic_scan_failures' => '流量扫描存在失败记录', 'policy_unsettled' => '实例网络策略尚未应用', - 'traffic_restriction_present' => '仍有共享流量池断网限制', + 'traffic_restriction_present' => '仍有线路流量池断网限制', 'network_job_unsettled' => '仍有网络任务未完成', ]; @@ -86,7 +86,7 @@ final class CloudAdminTrafficPoolService $name ): int { if (CloudTrafficPoolGroup::where('code', $code)->exists()) { - throw new CloudError('流量池分组标识已存在', 409); + throw new CloudError('线路流量池标识已存在', 409); } $now = time(); $group = new CloudTrafficPoolGroup(); @@ -101,7 +101,7 @@ final class CloudAdminTrafficPoolService }, 3); } catch (QueryException $error) { if (CloudTrafficPoolGroup::where('code', $code)->exists()) { - throw new CloudError('流量池分组标识已存在', 409); + throw new CloudError('线路流量池标识已存在', 409); } throw $error; } @@ -122,7 +122,7 @@ final class CloudAdminTrafficPoolService $group = CloudTrafficPoolGroup::where('id', $groupId) ->lockForUpdate()->first(); if ($group === null) { - throw new CloudError('流量池分组不存在', 404); + throw new CloudError('线路流量池不存在', 404); } self::assertRevision($group, $expectedRevision); $name = array_key_exists('name', $input) @@ -160,12 +160,12 @@ final class CloudAdminTrafficPoolService $group = CloudTrafficPoolGroup::where('id', $groupId) ->lockForUpdate()->first(); if ($group === null) { - throw new CloudError('流量池分组不存在', 404); + throw new CloudError('线路流量池不存在', 404); } self::assertRevision($group, $expectedRevision); if ((string) $group->mode !== 'disabled') { throw new CloudError( - '只有停用状态的流量池分组可以调整线路映射', + '只有停用状态的线路流量池可以调整覆盖线路', 409 ); } @@ -179,7 +179,7 @@ final class CloudAdminTrafficPoolService } $owner = $byId[$lineId]->traffic_pool_group_id; if ($owner !== null && (int) $owner !== $groupId) { - throw new CloudError('所选线路已属于其他流量池分组', 409); + throw new CloudError('所选线路已属于其他线路流量池', 409); } } $removed = []; @@ -228,7 +228,7 @@ final class CloudAdminTrafficPoolService } if ($current === 'enforced') { throw new CloudError( - '已强制执行的共享流量池禁止回退或停用', + '已强制执行的线路流量池禁止回退或停用', 409 ); } @@ -243,7 +243,7 @@ final class CloudAdminTrafficPoolService if ($current === 'shadow' && $target === 'disabled') { if (self::hasDurableReferences((int) $group->id)) { throw new CloudError( - '流量池已生成冻结周期或账本投影,禁止停用', + '线路流量池已生成冻结周期或账本投影,禁止停用', 409 ); } @@ -602,11 +602,16 @@ final class CloudAdminTrafficPoolService private static function groupDto(CloudTrafficPoolGroup $group): array { - $lineIds = CloudNetworkLine::where( + $lineRows = CloudNetworkLine::where( 'traffic_pool_group_id', (int) $group->id - )->orderBy('id')->pluck('id')->map( + )->orderBy('id')->get(['id', 'region_id']); + $lineIds = $lineRows->pluck('id')->map( static fn ($id): int => (int) $id )->all(); + $regionCount = $lineRows->pluck('region_id')->map( + static fn ($id): int => (int) $id + )->filter(static fn (int $id): bool => $id > 0) + ->unique()->count(); $readiness = self::buildReadiness($group, time()); $nextMode = match ((string) $group->mode) { 'disabled' => 'shadow', @@ -621,6 +626,7 @@ final class CloudAdminTrafficPoolService 'revision' => (int) $group->revision, 'line_ids' => $lineIds, 'line_count' => count($lineIds), + 'region_count' => $regionCount, 'readiness' => $readiness, 'actions' => [ 'can_rename' => true, @@ -685,7 +691,7 @@ final class CloudAdminTrafficPoolService } if (self::hasDurableReferences($groupId)) { throw new CloudError( - '流量池已生成冻结周期或账本投影,禁止移出线路', + '线路流量池已生成冻结周期或账本投影,禁止移出线路', 409 ); } @@ -697,7 +703,7 @@ final class CloudAdminTrafficPoolService 'resource_pool_id', $poolIds )->exists())) { throw new CloudError( - '已有订单或实例冻结了所选线路,禁止移出流量池分组', + '已有订单或实例冻结了所选线路,禁止移出线路流量池', 409 ); } @@ -707,7 +713,7 @@ final class CloudAdminTrafficPoolService { $group = $groupId > 0 ? CloudTrafficPoolGroup::find($groupId) : null; if ($group === null) { - throw new CloudError('流量池分组不存在', 404); + throw new CloudError('线路流量池不存在', 404); } return $group; } @@ -717,18 +723,18 @@ final class CloudAdminTrafficPoolService int $expected ): void { if ((int) $group->revision !== $expected) { - throw new CloudError('流量池分组已被其他管理员修改,请刷新后重试', 409); + throw new CloudError('线路流量池已被其他管理员修改,请刷新后重试', 409); } } private static function code(mixed $value): string { if (!is_string($value)) { - throw new CloudError('流量池分组标识无效'); + throw new CloudError('线路流量池标识无效'); } $value = strtolower(trim($value)); if (preg_match('/^[a-z][a-z0-9_-]{1,63}$/D', $value) !== 1) { - throw new CloudError('流量池分组标识须为 2 至 64 位小写字母、数字、下划线或短横线'); + throw new CloudError('线路流量池标识须为 2 至 64 位小写字母、数字、下划线或短横线'); } return $value; } @@ -737,7 +743,7 @@ final class CloudAdminTrafficPoolService { if (!is_string($value) || ($value = trim($value)) === '' || mb_strlen($value) > 80) { - throw new CloudError('流量池分组名称无效'); + throw new CloudError('线路流量池名称无效'); } return $value; } @@ -745,7 +751,7 @@ final class CloudAdminTrafficPoolService private static function mode(mixed $value): string { if (!is_string($value) || !in_array($value, self::MODES, true)) { - throw new CloudError('流量池分组模式无效'); + throw new CloudError('线路流量池模式无效'); } return $value; } @@ -753,7 +759,7 @@ final class CloudAdminTrafficPoolService private static function revision(mixed $value): int { if (!is_int($value) || $value < 1) { - throw new CloudError('流量池分组版本无效'); + throw new CloudError('线路流量池版本无效'); } return $value; } diff --git a/web/public/cloud/admin-traffic-pools.js b/web/public/cloud/admin-traffic-pools.js index 459df4e0..5a91368d 100644 --- a/web/public/cloud/admin-traffic-pools.js +++ b/web/public/cloud/admin-traffic-pools.js @@ -74,8 +74,8 @@ if (root) { codeField.hidden = Boolean(item); codeInput.disabled = Boolean(item); codeInput.required = !item; - byId('traffic-group-editor-title').textContent = item ? '修改分组名称' : '新建流量池分组'; - byId('traffic-group-editor-eyebrow').textContent = item ? `${item.name} · r${item.revision}` : '共享流量池'; + byId('traffic-group-editor-title').textContent = item ? '修改线路池名称' : '新建线路流量池'; + byId('traffic-group-editor-eyebrow').textContent = item ? `${item.name} · r${item.revision}` : '线路流量池'; notice('traffic-group-editor-notice', '等待提交'); return true; } @@ -86,7 +86,7 @@ if (root) { form.reset(); form.elements.namedItem('group_id').value = item.id; form.elements.namedItem('expected_revision').value = item.revision; - byId('traffic-line-editor-title').textContent = `配置 ${item.name} 的线路`; + byId('traffic-line-editor-title').textContent = `配置 ${item.name} 的覆盖线路`; for (const checkbox of form.querySelectorAll('input[name="line_ids[]"]')) { const owner = Number(checkbox.dataset.lineOwner || 0); checkbox.checked = owner === Number(item.id); @@ -106,14 +106,14 @@ if (root) { const rename = event.target.closest('[data-traffic-rename]'); if (rename) { const item = group(rename.dataset.trafficRename); - if (!item) return pageNotice('找不到流量池分组,请刷新页面。', true); + if (!item) return pageNotice('找不到线路流量池,请刷新页面。', true); if (configureGroupEditor(item)) openDrawer(byId('traffic-group-editor'), rename); return; } const lines = event.target.closest('[data-traffic-lines]'); if (lines) { const item = group(lines.dataset.trafficLines); - if (!item) return pageNotice('找不到流量池分组,请刷新页面。', true); + if (!item) return pageNotice('找不到线路流量池,请刷新页面。', true); if (configureLineEditor(item)) openDrawer(byId('traffic-line-editor'), lines); return; } @@ -122,15 +122,15 @@ if (root) { const item = group(modeButton.dataset.trafficMode); const targetMode = modeButton.dataset.targetMode; if (!item || !['disabled', 'shadow', 'enforced'].includes(targetMode)) { - return pageNotice('流量池状态操作无效,请刷新页面。', true); + return pageNotice('线路流量池状态操作无效,请刷新页面。', true); } const config = targetMode === 'enforced' ? { tone: 'danger', - title: '开始强制执行共享流量池', + title: '开始强制执行线路流量池', message: '启用后会按照共享余额真实限制实例网络,且不能回退、停用或调整线路。请确认就绪检查与业务验收均已完成。', confirmText: '开始强制执行', requiredText: item.name, - requiredLabel: '输入完整分组名称以确认', + requiredLabel: '输入完整线路池名称以确认', } : (targetMode === 'shadow' ? { tone: 'warning', title: '进入影子核算', @@ -144,16 +144,16 @@ if (root) { }); if (!await window.VenixAdminDangerDialog.confirm(config)) return; modeButton.disabled = true; - pageNotice('正在更新流量池模式…'); + pageNotice('正在更新线路流量池模式…'); try { await mutate(`/api/v1/admin/traffic-pool-groups/${item.id}`, { method: 'PATCH', body: { mode: targetMode, expected_revision: Number(item.revision) }, }); - pageNotice('流量池模式已更新,正在刷新…'); + pageNotice('线路流量池模式已更新,正在刷新…'); location.reload(); } catch (error) { - pageNotice(error.message || '流量池模式更新失败,请刷新后核对。', true); + pageNotice(error.message || '线路流量池模式更新失败,请刷新后核对。', true); modeButton.disabled = false; } }); @@ -186,21 +186,21 @@ if (root) { const form = event.currentTarget; const groupId = Number(form.elements.namedItem('group_id').value); const item = group(groupId); - if (!item) return notice('traffic-line-editor-notice', '分组版本已失效,请刷新页面。', 'error'); + if (!item) return notice('traffic-line-editor-notice', '线路流量池版本已失效,请刷新页面。', 'error'); const lineIds = Array.from(form.querySelectorAll('input[name="line_ids[]"]:checked:not(:disabled)'), checkbox => Number(checkbox.value)); const submit = byId('traffic-line-editor-submit'); submit.disabled = true; - notice('traffic-line-editor-notice', '正在保存线路…', 'loading'); + notice('traffic-line-editor-notice', '正在保存覆盖线路…', 'loading'); try { await mutate(`/api/v1/admin/traffic-pool-groups/${groupId}/lines`, { method: 'PUT', body: { line_ids: lineIds, expected_revision: Number(item.revision) }, }); - notice('traffic-line-editor-notice', '线路已保存,正在刷新…', 'success'); + notice('traffic-line-editor-notice', '覆盖线路已保存,正在刷新…', 'success'); location.reload(); } catch (error) { - notice('traffic-line-editor-notice', error.message || '线路保存失败,请刷新后重试。', 'error'); + notice('traffic-line-editor-notice', error.message || '覆盖线路保存失败,请刷新后重试。', 'error'); submit.disabled = false; } }); diff --git a/web/public/theme/venix/css/admin-home.css b/web/public/theme/venix/css/admin-home.css index 52500fcb..23b5b3d9 100644 --- a/web/public/theme/venix/css/admin-home.css +++ b/web/public/theme/venix/css/admin-home.css @@ -3120,6 +3120,19 @@ html.admin-instance-detail-open body { gap: 10px; } +[data-admin-traffic-drawer] .admin-traffic-line-options > h3 { + margin: 10px 0 0; + padding: 0 2px 7px; + border-bottom: 1px solid #e4ebf2; + color: #40566e; + font-size: 13px; + font-weight: 700; +} + +[data-admin-traffic-drawer] .admin-traffic-line-options > h3:first-child { + margin-top: 0; +} + [data-admin-traffic-drawer] .admin-traffic-line-options > label { display: flex; align-items: flex-start; diff --git a/web/resources/views/venix/admin/cloud/resources.tpl b/web/resources/views/venix/admin/cloud/resources.tpl index d5f7ba7f..fbffcb67 100644 --- a/web/resources/views/venix/admin/cloud/resources.tpl +++ b/web/resources/views/venix/admin/cloud/resources.tpl @@ -27,7 +27,7 @@ 资源拓扑 容量与健康 资源预留 - 共享流量池 + 线路流量池 {if $resource_page.view == 'topology'} @@ -129,8 +129,8 @@ {elseif $resource_page.view == 'traffic'} -
-

分组总数

{$resource_page.traffic_pools.summary.groups_total|default:0|escape}

按线路隔离流量账本

+
+

线路池总数

{$resource_page.traffic_pools.summary.groups_total|default:0|escape}

一个线路池可覆盖多个地区

影子核算

{$resource_page.traffic_pools.summary.shadow|default:0|escape}

只核算,不影响网络

可进入强制执行

{$resource_page.traffic_pools.summary.ready_to_enforce|default:0|escape}

全部就绪门禁已通过

强制执行

{$resource_page.traffic_pools.summary.enforced|default:0|escape}

额度耗尽会聚合断网

@@ -139,10 +139,10 @@
-

共享流量池分组

- 每条线路只能属于一个分组;停用 → 影子核算 → 强制执行为单向上线流程。 +

线路流量池

+ 同一商业线路可绑定多个地区的本地线路;地区只表示覆盖范围,不拆分额度。每条物理线路只能属于一个线路池。
- {if $admin_can_manage|default:false}{/if} + {if $admin_can_manage|default:false}{/if}
@@ -157,14 +157,14 @@
-
绑定线路{$group.readiness.line_count|default:0|escape}
+
覆盖地区 / 线路{$group.region_count|default:0|escape} / {$group.line_count|default:0|escape}
账本池{$group.readiness.pool_count|default:0|escape}
服务周期{$group.readiness.period_count|default:0|escape}
活跃实例{$group.readiness.active_instance_count|default:0|escape}
- 线路 + 覆盖线路
{foreach $resource_page.traffic_pools.lines as $line}{if $line.traffic_pool_group_id == $group.id}{$line.region_name|escape} · {$line.name|escape} {$line.code|escape}{/if}{foreachelse}尚无可用线路{/foreach}{if $group.line_count == 0}尚未绑定线路{/if}
@@ -192,7 +192,7 @@ {/if} {foreachelse} -
尚未建立共享流量池分组先创建分组并绑定线路,再进入影子核算进行验收。
+
尚未建立线路流量池先创建线路池并绑定各地区的本地线路,再进入影子核算进行验收。
{/foreach}
@@ -207,7 +207,7 @@ {if $admin_can_manage|default:false && $resource_page.view == 'traffic'} -

共享流量池

新建分组

+

线路流量池

新建线路池

@@ -215,17 +215,17 @@

等待提交

-
分组不提供硬删除;上线状态通过单向流程控制。
+
线路池不提供硬删除;停用 → 影子核算 → 强制执行为单向上线流程。
-

共享流量池

配置线路

+

线路流量池

配置覆盖线路

-

每条线路只能属于一个共享流量池分组。已被其他分组占用的线路不可选择。

-
{foreach $resource_page.traffic_pools.lines as $line}{foreachelse}

尚未建立线路,请先在资源拓扑中创建线路。

{/foreach}
+

选择同一商业线路在各地区对应的本地线路。地区只表示覆盖范围;已被其他线路流量池占用的线路不可选择。

+
{assign var=traffic_line_region_id value=0}{foreach $resource_page.traffic_pools.lines as $line}{if $traffic_line_region_id != $line.region_id}

{$line.region_name|escape}

{assign var=traffic_line_region_id value=$line.region_id}{/if}{foreachelse}

尚未建立线路,请先在资源拓扑中创建线路。

{/foreach}

等待提交

-
只有停用且尚未形成持久账本引用的分组可以调整线路。
+
只有停用且尚未形成持久账本引用的线路池可以调整覆盖线路。
{/if} diff --git a/web/resources/views/venix/layout_assets.tpl b/web/resources/views/venix/layout_assets.tpl index 47aebc10..7b16be0f 100644 --- a/web/resources/views/venix/layout_assets.tpl +++ b/web/resources/views/venix/layout_assets.tpl @@ -1,2 +1,2 @@ {* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *} -{assign var=venix_asset_version value='2026110105' scope='global'} +{assign var=venix_asset_version value='2026110106' scope='global'} diff --git a/web/tests/AdminResourceSchedulingContractTest.php b/web/tests/AdminResourceSchedulingContractTest.php index 144031e5..2f0ac69e 100644 --- a/web/tests/AdminResourceSchedulingContractTest.php +++ b/web/tests/AdminResourceSchedulingContractTest.php @@ -107,7 +107,7 @@ $assert($refund !== '' && $stockPosition < $releasePosition, 'Create refunds must lock offer stock before host resources to match payment placement lock order.'); -foreach (['资源拓扑', '容量与健康', '资源预留', '共享流量池'] as $label) { +foreach (['资源拓扑', '容量与健康', '资源预留', '线路流量池'] as $label) { $assert(str_contains($template, '>' . $label . '<') || str_contains($template, '>' . $label . ''), 'Resource page is missing a persistent tab: ' . $label); } diff --git a/web/tests/CloudAdminTrafficPoolServiceTest.php b/web/tests/CloudAdminTrafficPoolServiceTest.php index a30a6a48..fdaf778f 100644 --- a/web/tests/CloudAdminTrafficPoolServiceTest.php +++ b/web/tests/CloudAdminTrafficPoolServiceTest.php @@ -242,8 +242,10 @@ $mapped = CloudAdminTrafficPoolService::replaceLines($groupId, [ 'expected_revision' => 1, ]); $assert($mapped['item']['line_ids'] === [1, 3] + && $mapped['item']['line_count'] === 2 + && $mapped['item']['region_count'] === 2 && $mapped['item']['revision'] === 2, - 'The cross-region line mapping was not saved atomically.'); + 'The cross-region line mapping or coverage summary was not saved atomically.'); $second = CloudAdminTrafficPoolService::create([ 'code' => 'standard_pool', diff --git a/web/tests/CloudAdminTrafficPoolUiContractTest.php b/web/tests/CloudAdminTrafficPoolUiContractTest.php index f5eff855..ceaf63b2 100644 --- a/web/tests/CloudAdminTrafficPoolUiContractTest.php +++ b/web/tests/CloudAdminTrafficPoolUiContractTest.php @@ -46,8 +46,11 @@ $assert(str_contains($trafficService, 'private const BLOCKER_LABELS = [') $assert(str_contains($trafficService, "use App\\Models\\CloudRegion;") && str_contains($trafficService, "'region_name' =>") + && str_contains($trafficService, "'region_count' => \$regionCount") && str_contains($template, '{$line.region_name|escape} · {$line.name|escape}') + && str_contains($template, + '{$group.region_count|default:0|escape} / {$group.line_count|default:0|escape}') && str_contains($template, '强制执行状态存在'), 'Line choices must disambiguate duplicate regional codes and enforced faults must be described as incidents.'); @@ -56,6 +59,10 @@ $assert(str_contains($template, '{if $admin_can_manage|default:false}线路流量池') + && str_contains($template, '地区只表示覆盖范围,不拆分额度') + && str_contains($template, + '{if $traffic_line_region_id != $line.region_id}

') && !str_contains($template, 'data-traffic-delete'), 'Only authorized administrators may receive traffic-pool mutation controls and no delete control may exist.'); @@ -76,6 +83,7 @@ $assert(str_contains($script, "body: { mode: targetMode, expected_revision: Number(item.revision) }") && str_contains($script, "targetMode === 'enforced'") && str_contains($script, 'requiredText: item.name') + && str_contains($script, "requiredLabel: '输入完整线路池名称以确认'") && str_contains($script, 'window.VenixAdminDangerDialog.confirm(config)') && str_contains($script, '不能回退、停用或调整线路'), 'Enforced rollout must require the shared typed danger confirmation and an exact revision.'); @@ -83,7 +91,7 @@ $assert(str_contains($script, $assert(str_contains($script, 'checkbox.disabled = owner > 0 && owner !== Number(item.id)') && str_contains($template, 'data-line-owner=') - && str_contains($template, '只有停用且尚未形成持久账本引用的分组可以调整线路'), + && str_contains($template, '只有停用且尚未形成持久账本引用的线路池可以调整覆盖线路'), 'Line assignment must visibly reject lines owned by a different group.'); $assert(str_contains($styles, @@ -91,6 +99,8 @@ $assert(str_contains($styles, && str_contains($styles, '.admin-traffic-group-list') && str_contains($styles, '.admin-traffic-metrics') && str_contains($styles, '[data-admin-traffic-drawer]') + && str_contains($styles, + '.admin-traffic-line-options > h3') && str_contains($styles, '@media (max-width: 767.98px)') && preg_match("/venix_asset_version value='20261101[0-9]+'/", $assets) === 1, 'Traffic-pool administration must remain responsive and use a new shared asset version.');