diff --git a/orion-ops-ui/src/api/exec/exec-log.ts b/orion-ops-ui/src/api/exec/exec-log.ts deleted file mode 100644 index 30c0dbf2..00000000 --- a/orion-ops-ui/src/api/exec/exec-log.ts +++ /dev/null @@ -1,74 +0,0 @@ -import type { TableData } from '@arco-design/web-vue/es/table/interface'; -import axios from 'axios'; -import qs from 'query-string'; - -/** - * 执行记录查询响应 - */ -export interface ExecLogQueryResponse extends TableData, ExecLogQueryExtraResponse { - id: number; - userId: number; - username: string; - description: string; - command: string; - parameterSchema: string; - timeout: number; - status: string; - startTime: number; - finishTime: number; - hostIdList: Array; - hosts: Array; -} - -/** - * 执行记录查询响应 拓展 - */ -export interface ExecLogQueryExtraResponse { - hosts: Array; -} - -/** - * 主机执行记录查询响应 - */ -export interface ExecHostLogQueryResponse extends TableData { - id: number; - logId: number; - hostId: number; - hostName: string; - hostAddress: string; - status: string; - command: string; - parameter: string; - exitStatus: number; - errorMessage: string; - startTime: number; - finishTime: number; -} - -/** - * 执行状态查询响应 - */ -export interface ExecStatusResponse { - logList: Array; - hostList: Array; -} - -/** - * 查询执行记录 - */ -export function getExecLog(id: number) { - return axios.get('/asset/exec-log/get', { params: { id } }); -} - - -/** - * 查询命令执行状态 - */ -export function getExecLogStatus(idList: Array) { - return axios.get('/asset/exec-log/status', { - params: { idList }, - paramsSerializer: params => { - return qs.stringify(params, { arrayFormat: 'comma' }); - } - }); -} diff --git a/orion-ops-ui/src/api/exec/exec.ts b/orion-ops-ui/src/api/exec/exec.ts deleted file mode 100644 index e4e5bc69..00000000 --- a/orion-ops-ui/src/api/exec/exec.ts +++ /dev/null @@ -1,23 +0,0 @@ -import axios from 'axios'; - -/** - * 中断命令请求 - */ -export interface ExecTailRequest { - execId?: number; - hostExecIdList?: Array; -} - -/** - * 查看执行日志 - */ -export function getExecLogTailToken(request: ExecTailRequest) { - return axios.post('/asset/exec/tail-log', request); -} - -/** - * 下载执行日志文件 - */ -export function downloadExecLogFile(id: number) { - return axios.get('/asset/exec/download-log', { unwrap: true, params: { id } }); -} diff --git a/orion-ops-ui/src/components/exec/log/panel-modal/index.vue b/orion-ops-ui/src/components/exec/log/panel-modal/index.vue index 2a3de79b..39c41077 100644 --- a/orion-ops-ui/src/components/exec/log/panel-modal/index.vue +++ b/orion-ops-ui/src/components/exec/log/panel-modal/index.vue @@ -32,7 +32,7 @@ import useVisible from '@/hooks/visible'; import useLoading from '@/hooks/loading'; import { nextTick, ref } from 'vue'; - import { getExecLog } from '@/api/exec/exec-log'; + import { getExecCommandLog } from '@/api/exec/exec-command-log'; import ExecLogPanel from '../panel/index.vue'; const { visible, setVisible } = useVisible(); @@ -46,7 +46,7 @@ setLoading(true); try { // 获取执行日志 - const { data } = await getExecLog(id); + const { data } = await getExecCommandLog(id); // 打开日志 await nextTick(() => { setTimeout(() => { diff --git a/orion-ops-ui/src/components/exec/log/panel/exec-host.vue b/orion-ops-ui/src/components/exec/log/panel/exec-host.vue index 210ba3df..d5adfa7c 100644 --- a/orion-ops-ui/src/components/exec/log/panel/exec-host.vue +++ b/orion-ops-ui/src/components/exec/log/panel/exec-host.vue @@ -41,14 +41,14 @@