diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java index dd1d9d79..5d88ca31 100644 --- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java +++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/controller/TerminalConnectLogController.java @@ -81,7 +81,7 @@ public class TerminalConnectLogController { } @IgnoreLog(IgnoreLogMode.RET) - @PostMapping("/session") + @PostMapping("/sessions") @Operation(summary = "查询全部终端连接会话") @PreAuthorize("@ss.hasPermission('asset:terminal-connect-session:management:query')") public List getTerminalConnectSessions(@Validated @RequestBody TerminalConnectLogQueryRequest request) { diff --git a/orion-visor-ui/src/api/asset/terminal-connect-log.ts b/orion-visor-ui/src/api/asset/terminal-connect-log.ts index 1fa3da35..562e6684 100644 --- a/orion-visor-ui/src/api/asset/terminal-connect-log.ts +++ b/orion-visor-ui/src/api/asset/terminal-connect-log.ts @@ -12,7 +12,7 @@ export interface TerminalConnectLogQueryRequest extends Pagination { hostId?: number; hostAddress?: string; type?: string; - token?: string; + sessionId?: string; status?: string; startTimeRange?: string[]; } @@ -34,7 +34,7 @@ export interface TerminalConnectLogQueryResponse extends TableData { hostName: string; hostAddress: string; type: string; - token: string; + sessionId: string; status: string; startTime: number; endTime: number; @@ -65,7 +65,7 @@ export function getTerminalConnectLogPage(request: TerminalConnectLogQueryReques * 查询全部终端连接会话 */ export function getTerminalConnectSessions(request: TerminalConnectLogQueryRequest) { - return axios.post>('/asset/terminal-connect-log/session', request); + return axios.post>('/asset/terminal-connect-log/sessions', request); } /** diff --git a/orion-visor-ui/src/api/exec/exec-command-log.ts b/orion-visor-ui/src/api/exec/exec-command-log.ts index 1dcb3245..f50ef515 100644 --- a/orion-visor-ui/src/api/exec/exec-command-log.ts +++ b/orion-visor-ui/src/api/exec/exec-command-log.ts @@ -5,8 +5,7 @@ import type { ExecLogInterruptRequest, ExecLogQueryRequest, ExecLogQueryResponse, - ExecLogStatusResponse, - ExecLogTailRequest + ExecLogStatusResponse } from './exec-log'; import axios from 'axios'; import qs from 'query-string'; @@ -25,6 +24,13 @@ export function getExecCommandLog(id: number) { return axios.get('/asset/exec-command-log/get', { params: { id } }); } +/** + * 查询主机计划任务日志 + */ +export function getExecCommandHostLog(id: number) { + return axios.get('/asset/exec-command-log/get-host', { params: { id } }); +} + /** * 查询主机批量执行日志 */ @@ -98,8 +104,8 @@ export function clearExecCommandLog(request: ExecLogClearRequest) { /** * 查看批量执行日志 */ -export function getExecCommandLogTailToken(request: ExecLogTailRequest) { - return axios.post('/asset/exec-command-log/tail', request); +export function getExecCommandLogTailToken(id: number) { + return axios.get('/asset/exec-command-log/tail', { params: { id } }); } /** diff --git a/orion-visor-ui/src/api/exec/exec-job-log.ts b/orion-visor-ui/src/api/exec/exec-job-log.ts index 75d2d43b..5142e12f 100644 --- a/orion-visor-ui/src/api/exec/exec-job-log.ts +++ b/orion-visor-ui/src/api/exec/exec-job-log.ts @@ -6,7 +6,6 @@ import type { ExecLogQueryRequest, ExecLogQueryResponse, ExecLogStatusResponse, - ExecLogTailRequest } from './exec-log'; import axios from 'axios'; import qs from 'query-string'; @@ -25,6 +24,13 @@ export function getExecJobLog(id: number) { return axios.get('/asset/exec-job-log/get', { params: { id } }); } +/** + * 查询主机计划任务日志 + */ +export function getExecJobHostLog(id: number) { + return axios.get('/asset/exec-job-log/get-host', { params: { id } }); +} + /** * 查询主机计划任务日志 */ @@ -91,8 +97,8 @@ export function clearExecJobLog(request: ExecLogClearRequest) { /** * 查看计划任务日志 */ -export function getExecJobLogTailToken(request: ExecLogTailRequest) { - return axios.post('/asset/exec-job-log/tail', request); +export function getExecJobLogTailToken(id: number) { + return axios.get('/asset/exec-job-log/tail', { params: { id } }); } /** diff --git a/orion-visor-ui/src/api/exec/exec-job.ts b/orion-visor-ui/src/api/exec/exec-job.ts index 23bc1926..3d44abca 100644 --- a/orion-visor-ui/src/api/exec/exec-job.ts +++ b/orion-visor-ui/src/api/exec/exec-job.ts @@ -48,8 +48,8 @@ export interface ExecJobQueryRequest extends Pagination { name?: string; command?: string; status?: number; - execUserId?: number; queryRecentLog?: boolean; + execUserId?: number; } /** diff --git a/orion-visor-ui/src/api/exec/exec-log.ts b/orion-visor-ui/src/api/exec/exec-log.ts index e1feadd3..ffd259d3 100644 --- a/orion-visor-ui/src/api/exec/exec-log.ts +++ b/orion-visor-ui/src/api/exec/exec-log.ts @@ -51,7 +51,7 @@ export interface ExecLogQueryExtraResponse { /** * 主机执行日志查询响应 */ -export interface ExecHostLogQueryResponse extends TableData { +export interface ExecHostLogQueryResponse extends TableData, ExecHostLogQueryResponseExtra { id: number; logId: number; hostId: number; @@ -66,6 +66,13 @@ export interface ExecHostLogQueryResponse extends TableData { finishTime: number; } +/** + * 主机执行日志额外参数 + */ +export interface ExecHostLogQueryResponseExtra { + refreshed: boolean; +} + /** * 执行状态查询响应 */ @@ -74,14 +81,6 @@ export interface ExecLogStatusResponse { hostList: Array; } -/** - * 执行日志 tail 请求 - */ -export interface ExecLogTailRequest { - execId?: number; - hostExecIdList?: Array; -} - /** * 执行中断命令请求 */ diff --git a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue index 38673bbd..7dc26c41 100644 --- a/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue +++ b/orion-visor-ui/src/views/exec/exec-command-log/components/exec-command-host-log-table.vue @@ -47,15 +47,21 @@