Revert "feat: 显示实例累计总流量"

This reverts commit 3d52c11de8.
go
codex 2 weeks ago
parent 3d52c11de8
commit a1dcb60f3e

@ -317,7 +317,6 @@ final class CloudTrafficPoolReadModel
'id', 'user_id', 'current_period_id', 'name', 'status',
'service_status', 'network_status', 'expires_at',
'traffic_download_bytes', 'traffic_upload_bytes',
'lifetime_download_bytes', 'lifetime_upload_bytes',
]);
$result = [];
foreach ($instances as $instance) {
@ -329,10 +328,6 @@ final class CloudTrafficPoolReadModel
}
$download = max(0, (int) $instance->traffic_download_bytes);
$upload = max(0, (int) $instance->traffic_upload_bytes);
$lifetimeDownload = max(0,
(int) $instance->lifetime_download_bytes);
$lifetimeUpload = max(0,
(int) $instance->lifetime_upload_bytes);
$groupId = (int) $period->traffic_pool_group_id;
$result[$groupId][] = [
'id' => (string) $instance->id,
@ -340,8 +335,6 @@ final class CloudTrafficPoolReadModel
'traffic_download_bytes' => $download,
'traffic_upload_bytes' => $upload,
'traffic_used_bytes' => $download + $upload,
'lifetime_traffic_bytes' =>
$lifetimeDownload + $lifetimeUpload,
'service_expires_at' => $instance->expires_at === null
? null : (int) $instance->expires_at,
'network_status' => (string) $instance->network_status,

@ -124,9 +124,6 @@ final class CloudUserPageView
'upload_display' => self::bytes(
$instance['traffic_upload_bytes'] ?? null
),
'lifetime_display' => self::bytes(
$instance['lifetime_traffic_bytes'] ?? null
),
'expires_display' => self::date(
$instance['service_expires_at'] ?? null
),

@ -327,18 +327,16 @@ body.vu-body .ssh-key-picker-manage:hover {
.cloud-traffic-instance>div{display:grid;gap:4px;min-width:0}
.cloud-traffic-instance strong{color:#344f62;font-size:12px;overflow-wrap:anywhere}
.cloud-traffic-instance small{color:#8798a6;font-size:9px}
.cloud-traffic-instance dl{display:grid;grid-template-columns:repeat(auto-fit,minmax(140px,1fr));gap:10px;margin:0}
.cloud-traffic-instance dl{display:grid;grid-template-columns:repeat(3,minmax(0,1fr));gap:10px;margin:0}
.cloud-traffic-instance dl>div{display:grid;gap:3px;min-width:0}
.cloud-traffic-instance dt{color:#8a9aa7;font-size:9px}
.cloud-traffic-instance dd{margin:0;color:#50697a;font-size:10px;font-weight:700;overflow-wrap:anywhere}
.cloud-traffic-instance .state-pill{max-width:100%;white-space:normal;line-height:1.35}
.cloud-traffic-instance-empty,.cloud-traffic-empty{margin:0;color:#8395a3;text-align:center}
.cloud-traffic-instance-empty{padding:18px;border:1px dashed #d9e3e7;border-radius:9px;font-size:10px;line-height:1.65}
.cloud-traffic-empty{display:grid;justify-items:center;gap:7px;padding:50px 18px}
.cloud-traffic-empty strong{color:#52697b;font-size:14px}
.cloud-traffic-empty>span:last-child{font-size:10px;line-height:1.6}
@media(max-width:1100px){.cloud-traffic-instance{grid-template-columns:1fr}.cloud-traffic-instance dl{grid-template-columns:repeat(2,minmax(0,1fr))}}
@media(max-width:820px){.cloud-traffic-facts{grid-template-columns:repeat(2,minmax(0,1fr))}}
@media(max-width:820px){.cloud-traffic-facts{grid-template-columns:repeat(2,minmax(0,1fr))}.cloud-traffic-instance{grid-template-columns:1fr}.cloud-traffic-instance dl{grid-template-columns:repeat(3,minmax(0,1fr))}}
@media(max-width:510px){.cloud-traffic-panel>.panel-heading,.cloud-traffic-list{padding-inline:16px}.cloud-traffic-card{padding:15px}.cloud-traffic-card-heading{align-items:flex-start;flex-direction:column}.cloud-traffic-state-group{justify-content:flex-start}.cloud-traffic-facts{grid-template-columns:1fr 1fr}.cloud-traffic-instance{padding:12px}.cloud-traffic-instance dl{grid-template-columns:1fr}.cloud-traffic-instance dl>div{display:flex;align-items:center;justify-content:space-between;gap:10px}.cloud-traffic-instance dd{text-align:right}}
/* VPC list, creation and member views share the existing user shell. */

@ -96,7 +96,6 @@ function renderInstances(pool, section) {
element('small', '', `到期 ${formatDate(instance.service_expires_at, '时间未记录')}`));
const facts = document.createElement('dl');
facts.append(fact('本实例已用', formatBytes(instance.traffic_used_bytes)),
fact('累计总流量', formatBytes(instance.lifetime_traffic_bytes)),
fact('RX / TX', `${formatBytes(instance.traffic_download_bytes)} / ${formatBytes(instance.traffic_upload_bytes)}`));
const [networkLabel, networkClass] = instanceNetwork(instance.network_status);
const network = document.createElement('div');

@ -5,14 +5,14 @@
</div>
<div class="vm-settings-notice cloud-traffic-notice"><strong>额度按服务周期到期</strong><span>同一线路内的实例共享有效额度,并按最早到期优先消耗;实例到期时只作废该周期尚未使用的额度。</span></div>
<section class="inventory-panel cloud-traffic-panel" aria-labelledby="cloud-traffic-list-title">
<div class="panel-heading"><div><h2 id="cloud-traffic-list-title">当前共享流量池</h2><p>只显示已经进入强制执行的线路分组;“本实例已用”和 RX / TX 为当前周期采样,“累计总流量”为实例生命周期累计值,均不代表独占额度。</p></div><span id="cloud-traffic-count" class="state-pill other">{$cloud_traffic_view.count|default:0|escape:'html'} 个</span></div>
<div class="panel-heading"><div><h2 id="cloud-traffic-list-title">当前共享流量池</h2><p>只显示已经进入强制执行的线路分组;实例流量是本实例当前周期采样,不代表独占额度。</p></div><span id="cloud-traffic-count" class="state-pill other">{$cloud_traffic_view.count|default:0|escape:'html'} 个</span></div>
<p id="cloud-traffic-status" class="vm-settings-status" role="status" aria-live="polite" hidden></p>
<div id="cloud-traffic-list" class="cloud-traffic-list" aria-live="polite">
{foreach $cloud_traffic_view.items|default:[] as $pool}
<article class="cloud-traffic-card">
<header class="cloud-traffic-card-heading"><div><span class="cloud-traffic-icon"><i class="mdi mdi-chart-donut-variant" aria-hidden="true"></i></span><div><h3>{$pool.name|escape:'html'}</h3><p>共享额度按最早到期批次优先消耗</p></div></div><div class="cloud-traffic-state-group"><span class="state-pill {$pool.state_class|escape:'html'}">{$pool.state_label|escape:'html'}</span><span class="state-pill {$pool.network_class|escape:'html'}">{$pool.network_label|escape:'html'}</span></div></header>
<dl class="cloud-traffic-facts"><div><dt>当前有效额度</dt><dd>{$pool.entitlement_display|escape:'html'}</dd></div><div><dt>有效额度已消耗</dt><dd>{$pool.consumed_display|escape:'html'}</dd></div><div><dt>当前可用余额</dt><dd>{$pool.available_display|escape:'html'}</dd></div><div><dt>采样超额债务</dt><dd>{$pool.overage_display|escape:'html'}</dd></div><div><dt>下一批额度到期</dt><dd>{$pool.next_expiry_display|escape:'html'}<small>{$pool.next_expiry_note|escape:'html'}</small></dd></div><div><dt>最近可信采样</dt><dd>{$pool.last_observed_display|escape:'html'}</dd></div></dl>
<section class="cloud-traffic-instances" aria-label="{$pool.name|escape:'html'} 中的当前实例"><div class="cloud-traffic-instances-heading"><h4>当前实例采样</h4><span>{$pool.instances|@count|escape:'html'} 台</span></div><div class="cloud-traffic-instance-list">{foreach $pool.instances as $instance}<a class="cloud-traffic-instance" href="/user/cloud/instances/{$instance.id|escape:'url'}"><div><strong>{$instance.name|escape:'html'}</strong><small>到期 {$instance.expires_display|escape:'html'}</small></div><dl><div><dt>本实例已用</dt><dd>{$instance.used_display|escape:'html'}</dd></div><div><dt>累计总流量</dt><dd>{$instance.lifetime_display|escape:'html'}</dd></div><div><dt>RX / TX</dt><dd>{$instance.download_display|escape:'html'} / {$instance.upload_display|escape:'html'}</dd></div><div><dt>网络</dt><dd><span class="state-pill {$instance.network_class|escape:'html'}">{$instance.network_label|escape:'html'}</span></dd></div></dl></a>{foreachelse}<p class="cloud-traffic-instance-empty">当前没有正在使用该共享池的有效实例;未到期额度仍按原服务周期保留。</p>{/foreach}</div></section>
<section class="cloud-traffic-instances" aria-label="{$pool.name|escape:'html'} 中的当前实例"><div class="cloud-traffic-instances-heading"><h4>当前实例采样</h4><span>{$pool.instances|@count|escape:'html'} 台</span></div><div class="cloud-traffic-instance-list">{foreach $pool.instances as $instance}<a class="cloud-traffic-instance" href="/user/cloud/instances/{$instance.id|escape:'url'}"><div><strong>{$instance.name|escape:'html'}</strong><small>到期 {$instance.expires_display|escape:'html'}</small></div><dl><div><dt>本实例已用</dt><dd>{$instance.used_display|escape:'html'}</dd></div><div><dt>RX / TX</dt><dd>{$instance.download_display|escape:'html'} / {$instance.upload_display|escape:'html'}</dd></div><div><dt>网络</dt><dd><span class="state-pill {$instance.network_class|escape:'html'}">{$instance.network_label|escape:'html'}</span></dd></div></dl></a>{foreachelse}<p class="cloud-traffic-instance-empty">当前没有正在使用该共享池的有效实例;未到期额度仍按原服务周期保留。</p>{/foreach}</div></section>
</article>
{foreachelse}<div class="cloud-traffic-empty"><span class="cloud-traffic-icon"><i class="mdi mdi-chart-donut-variant" aria-hidden="true"></i></span><strong>当前没有已启用的共享流量池</strong><span>管理员完成影子核算验收并启用后,将在这里显示共享额度。</span></div>{/foreach}
</div>

@ -1,2 +1,2 @@
{* Shared Venix CSS/JS cache key. Increment whenever a shared browser asset changes. *}
{assign var=venix_asset_version value='2026110103' scope='global'}
{assign var=venix_asset_version value='2026110102' scope='global'}

@ -71,8 +71,6 @@ $schema->create('cloud_instances', static function (Blueprint $table): void {
$table->integer('expires_at')->nullable();
$table->integer('traffic_download_bytes')->default(0);
$table->integer('traffic_upload_bytes')->default(0);
$table->integer('lifetime_download_bytes')->default(0);
$table->integer('lifetime_upload_bytes')->default(0);
});
$schema->create('cloud_service_periods', static function (Blueprint $table): void {
$table->increments('id');
@ -205,10 +203,6 @@ foreach ($instances as [$id, $userId, $periodId, $name, $status,
'traffic_upload_bytes' => $upload,
]);
}
Capsule::table('cloud_instances')->where('id', 1)->update([
'lifetime_download_bytes' => 1000,
'lifetime_upload_bytes' => 500,
]);
$periods = [
[101, 1, 1, 1, 'finite', 1000],
[102, 2, 1, 2, 'finite', 200],
@ -301,7 +295,6 @@ $assert($lineA['active_entitlement_bytes'] === 1500
$assert(count($lineA['instances']) === 1
&& $lineA['instances'][0]['id'] === '1'
&& $lineA['instances'][0]['traffic_used_bytes'] === 150
&& $lineA['instances'][0]['lifetime_traffic_bytes'] === 1500
&& $lineA['network_restriction_state'] === 'clear',
'Current-instance observations crossed user, group, deletion or unlimited boundaries.');
$assert($payload['items'][1]['network_restriction_state'] === 'restricted',

@ -86,10 +86,6 @@ $assert(str_contains($sidebar, 'href="/user/cloud/traffic"')
&& str_contains($template, 'id="cloud-traffic-list"')
&& str_contains($template, '下一批额度到期')
&& str_contains($template, '本实例已用')
&& str_contains($template, '累计总流量')
&& str_contains($template, '{$instance.lifetime_display|escape:')
&& str_contains($template, '“本实例已用”和 RX / TX 为当前周期采样')
&& str_contains($template, '“累计总流量”为实例生命周期累计值')
&& str_contains($template, '只显示已经进入强制执行的线路分组'),
'The user traffic-pool page lacks SSR first paint, navigation or clear shared-vs-instance copy.');
@ -104,28 +100,16 @@ $assert(str_contains($script,
&& str_contains($script, 'pool.active_consumed_bytes')
&& str_contains($script, 'pool.available_bytes')
&& str_contains($script, 'pool.projection_ready === true')
&& str_contains($script,
"fact('累计总流量', formatBytes(instance.lifetime_traffic_bytes))")
&& str_contains($script, "preparing: ['额度准备中', 'warning']"),
'Browser code must only refresh the server projection and must not mutate, sum or inject traffic data.');
$assert(str_contains($view, 'function trafficPools(')
&& str_contains($view, "'network_restriction_state'")
&& str_contains($view, "'lifetime_display'")
&& str_contains($readModel, "'lifetime_traffic_bytes'")
&& str_contains($readModel, "'lifetime_download_bytes'")
&& str_contains($readModel, "'lifetime_upload_bytes'")
&& str_contains($detail, 'id="vm-detail-traffic-pool-link"')
&& str_contains($detail, '本实例本期下载(RX)')
&& str_contains($detail, '本实例本期上传(TX)')
&& str_contains($styles, '.cloud-traffic-facts')
&& str_contains($styles, '.cloud-traffic-instance')
&& str_contains($styles,
'.cloud-traffic-instance dl{display:grid;grid-template-columns:repeat(auto-fit,minmax(140px,1fr))')
&& str_contains($styles,
'.cloud-traffic-instance .state-pill{max-width:100%;white-space:normal')
&& str_contains($styles,
'@media(max-width:1100px){.cloud-traffic-instance{grid-template-columns:1fr}.cloud-traffic-instance dl{grid-template-columns:repeat(2,minmax(0,1fr))')
&& str_contains($styles, '@media(max-width:510px)')
&& preg_match(
"/venix_asset_version value='20261101[0-9]+'/",

Loading…
Cancel
Save