Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ RUN sed -i "s/__GW_HOST__/${GW_HOST}/g" /etc/nginx/conf.d/default.conf
# 暴露端口
EXPOSE 80

# 启动 Nginx
CMD ["nginx", "-g", "daemon off;"]
# 直接启动 Nginx,避免官方 entrypoint 的 Alpine 包清单检测阻塞容器启动
ENTRYPOINT ["nginx", "-g", "daemon off;"]
19 changes: 16 additions & 3 deletions src/api/auth/online-user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,26 @@ const ONLINE_USER_BASE_URL = "/auth/online-users";

const OnlineUserAPI = {
list(queryParams?: OnlineUserQueryParams) {
return request<any, OnlineUserItem[]>({
const query = queryParams ?? { pageNum: 1, pageSize: 10 };
return request<
any,
{ records?: OnlineUserItem[]; current?: number; size?: number; total?: number }
>({
url: ONLINE_USER_BASE_URL,
method: "get",
params: {
username: queryParams?.username || undefined,
pageNum: query.pageNum,
pageSize: query.pageSize,
username: query.username || undefined,
},
});
}).then((page) => ({
data: page.records ?? [],
page: {
pageNum: page.current ?? query.pageNum,
pageSize: page.size ?? query.pageSize,
total: page.total ?? 0,
},
}));
},
kickout(sessionId: string) {
return request({
Expand Down
2 changes: 2 additions & 0 deletions src/types/api/online-user.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
*/

export interface OnlineUserQueryParams {
pageNum: number;
pageSize: number;
username?: string;
}

Expand Down
462 changes: 401 additions & 61 deletions src/views/dashboard/index.vue

Large diffs are not rendered by default.

32 changes: 32 additions & 0 deletions src/views/dashboard/presentation.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { matrix } from "@/views/system/gateway/monitoring/history-chart";
import type { MonitoringHistory } from "@/types/api/gateway-api-route";

export interface DashboardTrendPoint {
timestamp: number;
tps: number;
errorTps: number;
}

/** 将网关监控接口返回的多路 Prometheus 矩阵聚合为首页趋势点。 */
export function aggregateDashboardTrend(history?: MonitoringHistory): DashboardTrendPoint[] {
const points = new Map<number, DashboardTrendPoint>();
addSeries(points, matrix(history?.series.tps), "tps");
addSeries(points, matrix(history?.series.errorTps), "errorTps");
return [...points.values()].sort((left, right) => left.timestamp - right.timestamp);
}

function addSeries(
points: Map<number, DashboardTrendPoint>,
series: Array<{ values: Array<[number, string]> }>,
key: "tps" | "errorTps"
) {
for (const item of series) {
for (const [timestamp, rawValue] of item.values) {
const value = Number(rawValue);
if (!Number.isFinite(value)) continue;
const point = points.get(timestamp) || { timestamp, tps: 0, errorTps: 0 };
point[key] += value;
points.set(timestamp, point);
}
}
}
15 changes: 14 additions & 1 deletion src/views/security/online-user/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,13 @@
</el-table-column>
</el-table>
</el-card>
<pagination
v-if="total > 0"
v-model:total="total"
v-model:page="queryParams.pageNum"
v-model:limit="queryParams.pageSize"
@pagination="fetchData"
/>
</div>
</template>

Expand All @@ -103,28 +110,34 @@ defineOptions({
const queryFormRef = ref();
const loading = ref(false);
const onlineUsers = ref<OnlineUserItem[]>([]);
const total = ref(0);

const queryParams = reactive<OnlineUserQueryParams>({
pageNum: 1,
pageSize: 10,
username: "",
});

function fetchData() {
loading.value = true;
OnlineUserAPI.list(queryParams)
.then((data) => {
onlineUsers.value = data ?? [];
onlineUsers.value = data.data ?? [];
total.value = data.page?.total ?? 0;
})
.finally(() => {
loading.value = false;
});
}

function handleQuery() {
queryParams.pageNum = 1;
fetchData();
}

function handleResetQuery() {
queryFormRef.value?.resetFields();
queryParams.pageNum = 1;
fetchData();
}

Expand Down
44 changes: 44 additions & 0 deletions tests/unit/views/dashboard-presentation.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
import { describe, expect, it } from "vitest";

import { aggregateDashboardTrend } from "@/views/dashboard/presentation";

describe("dashboard presentation", () => {
it("aggregates request and error series across routes", () => {
const result = aggregateDashboardTrend({
range: "7d",
start: "2026-09-12T00:00:00Z",
end: "2026-09-19T00:00:00Z",
stepSeconds: 3600,
series: {
tps: JSON.stringify({
data: {
result: [
{
metric: { routeId: "a" },
values: [
[100, "2"],
[200, "3"],
],
},
{
metric: { routeId: "b" },
values: [
[100, "1.5"],
[200, "bad"],
],
},
],
},
}),
errorTps: JSON.stringify({
data: { result: [{ metric: { routeId: "a" }, values: [[100, "0.5"]] }] },
}),
},
});

expect(result).toEqual([
{ timestamp: 100, tps: 3.5, errorTps: 0.5 },
{ timestamp: 200, tps: 3, errorTps: 0 },
]);
});
});
Loading