manager/orion-visor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🔨 执行日志.

Browse Source
This commit is contained in:
lijiahang
2024-03-20 19:40:37 +08:00
parent 198dcd944c
commit b8bd1d4b22
14 changed files with 111 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostSftpLogServiceImpl.java
View File

@@ -53,7 +53,8 @@ public class HostSftpLogServiceImpl implements HostSftpLogService {
vo.setExtra(extra);
return vo;
}).collect(Collectors.toList());
// 返回 TODO KIT
// 返回
// TODO KIT
DataGrid<HostSftpLogVO> result = new DataGrid<>(rows, dataGrid.getTotal());
result.setPage(dataGrid.getPage());
result.setLimit(dataGrid.getLimit());

44
orion-ops-ui/src/components/xtrem/log-appender/appender.const.ts → orion-ops-ui/src/components/exec/log/panel/const.ts
View File

@@ -1,5 +1,4 @@
import type { IDisposable, ITerminalOptions, ITerminalInitOnlyOptions } from 'xterm';
import type { Terminal } from 'xterm';
import type { IDisposable, ITerminalInitOnlyOptions, ITerminalOptions, Terminal } from 'xterm';
import type { FitAddon } from 'xterm-addon-fit';
import type { SearchAddon } from 'xterm-addon-search';
import type { CanvasAddon } from 'xterm-addon-canvas';
@@ -96,3 +95,44 @@ export interface ILogAppender {
// 关闭
close(): void;
}
/**
* 批量执行状态
*/
export const execStatus = {
// 等待中
WAITING: 'WAITING',
// 运行中
RUNNING: 'RUNNING',
// 执行完成
COMPLETED: 'COMPLETED',
// 执行失败
FAILED: 'FAILED',
};
/**
* 主机执行状态
*/
export const execHostStatus = {
// 等待中
WAITING: 'WAITING',
// 运行中
RUNNING: 'RUNNING',
// 执行完成
COMPLETED: 'COMPLETED',
// 执行失败
FAILED: 'FAILED',
// 执行超时
TIMEOUT: 'TIMEOUT',
// 已中断
INTERRUPTED: 'INTERRUPTED',
};
// 执行状态 字典项
export const execStatusKey = 'execStatus';
// 执行状态 字典项
export const execHostStatusKey = 'execHostStatus';
// 加载的字典值
export const dictKeys = [execStatusKey, execHostStatusKey];

9
orion-ops-ui/src/views/exec/exec-command/components/log-panel-host.vue → orion-ops-ui/src/components/exec/log/panel/exec-host.vue
View File

@@ -5,7 +5,9 @@
<div class="panel-header">
<h3>执行主机</h3>
<!-- 操作 -->
<a-button size="small" @click="emits('back')">
<a-button v-if="visibleBack"
size="small"
@click="emits('back')">
返回
</a-button>
</div>
@@ -34,16 +36,17 @@
<script lang="ts">
export default {
name: 'logPanelHost'
name: 'execHost'
};
</script>
<script lang="ts" setup>
import type { ExecCommandHostResponse } from '@/api/exec/exec';
import { useDictStore } from '@/store';
import { execHostStatusKey } from '@/views/exec/exec-log/types/const';
import { execHostStatusKey } from './const';
const props = defineProps<{
visibleBack: boolean;
current: number;
hosts: Array<ExecCommandHostResponse>;
}>();

37
orion-ops-ui/src/views/exec/exec-command/components/log-panel.vue → orion-ops-ui/src/components/exec/log/panel/index.vue
View File

@@ -1,22 +1,23 @@
<template>
<div class="log-panel-container" v-if="command">
<!-- 执行主机 -->
<log-panel-host class="host-container"
:current="currentHostExecId"
:hosts="command.hosts"
@selected="selectedHost"
@back="emits('back')" />
<exec-host class="exec-host-container"
:visibleBack="visibleBack"
:current="currentHostExecId"
:hosts="command.hosts"
@selected="selectedHost"
@back="emits('back')" />
<!-- 日志容器 -->
<log-panel-view ref="logView"
class="log-container"
:current="currentHostExecId"
:command="command" />
<log-view ref="logView"
class="log-view-container"
:current="currentHostExecId"
:command="command" />
</div>
</template>
<script lang="ts">
export default {
name: 'logPanel'
name: 'execLogPanel'
};
</script>
@@ -24,9 +25,13 @@
import type { ExecCommandResponse } from '@/api/exec/exec';
import { onUnmounted, ref, nextTick } from 'vue';
import { getExecLogStatus } from '@/api/exec/exec-log';
import { execHostStatus, execStatus } from '@/views/exec/exec-log/types/const';
import LogPanelHost from './log-panel-host.vue';
import LogPanelView from './log-panel-view.vue';
import { execHostStatus, execStatus } from './const';
import ExecHost from './exec-host.vue';
import LogView from './log-view.vue';
const props = defineProps<{
visibleBack: boolean
}>();
const emits = defineEmits(['back']);
@@ -146,20 +151,20 @@
position: absolute;
}
.host-container, .log-container {
.exec-host-container, .log-view-container {
height: 100%;
border-radius: 4px;
position: relative;
background: var(--color-bg-2);
}
.host-container {
.exec-host-container {
width: @host-width;
padding: 16px;
margin-right: 16px;
}
.log-container {
.log-view-container {
width: calc(100% - @host-real-width);
}

4
orion-ops-ui/src/components/xtrem/log-appender/log-appender.ts → orion-ops-ui/src/components/exec/log/panel/log-appender.ts
View File

@@ -1,6 +1,6 @@
import type { ILogAppender, LogAddons, LogAppenderConf, LogDomRef } from './appender.const';
import type { ILogAppender, LogAddons, LogAppenderConf, LogDomRef } from './const';
import type { ExecTailRequest } from '@/api/exec/exec';
import { AppenderOptions } from './appender.const';
import { AppenderOptions } from './const';
import { getExecLogTailToken } from '@/api/exec/exec';
import { webSocketBaseUrl } from '@/utils/env';
import { Message } from '@arco-design/web-vue';

6
orion-ops-ui/src/views/exec/exec-command/components/log-panel-appender.vue → orion-ops-ui/src/components/exec/log/panel/log-item.vue
View File

@@ -155,15 +155,15 @@
<script lang="ts">
export default {
name: 'logPanelAppender'
name: 'logItem'
};
</script>
<script lang="ts" setup>
import type { ExecCommandHostResponse } from '@/api/exec/exec';
import type { ILogAppender } from '@/components/xtrem/log-appender/appender.const';
import type { ILogAppender } from './const';
import { ref } from 'vue';
import { execHostStatus, execHostStatusKey } from '@/views/exec/exec-log/types/const';
import { execHostStatus, execHostStatusKey } from './const';
import { formatDuration } from '@/utils';
import { useDictStore } from '@/store';
import { downloadExecLogFile } from '@/api/exec/exec';

24
orion-ops-ui/src/views/exec/exec-command/components/log-panel-view.vue → orion-ops-ui/src/components/exec/log/panel/log-view.vue
View File

@@ -1,30 +1,30 @@
<template>
<div class="container">
<template v-if="appender">
<log-panel-appender class="log-view"
v-show="current === host.id"
v-for="host in command.hosts"
:key="host.id"
:ref="addRef as unknown as VNodeRef"
:host="host"
:appender="appender as ILogAppender" />
<log-item class="log-item"
v-show="current === host.id"
v-for="host in command.hosts"
:key="host.id"
:ref="addRef as unknown as VNodeRef"
:host="host"
:appender="appender as ILogAppender" />
</template>
</div>
</template>
<script lang="ts">
export default {
name: 'logPanelView'
name: 'logView'
};
</script>
<script lang="ts" setup>
import type { VNodeRef } from 'vue';
import type { ExecCommandResponse } from '@/api/exec/exec';
import type { LogDomRef, ILogAppender } from '@/components/xtrem/log-appender/appender.const';
import type { LogDomRef, ILogAppender } from './const';
import { nextTick, onBeforeMount, ref, watch } from 'vue';
import LogAppender from '@/components/xtrem/log-appender/log-appender';
import LogPanelAppender from './log-panel-appender.vue';
import LogAppender from './log-appender';
import LogItem from './log-item.vue';
const props = defineProps<{
current: number;
@@ -88,7 +88,7 @@
</script>
<style lang="less" scoped>
.log-view {
.log-item {
width: 100%;
height: 100%;
position: relative;

19
orion-ops-ui/src/views/exec/exec-command/components/exec-history.vue
View File

@@ -1,19 +0,0 @@
<template>
<div>
his
</div>
</template>
<script lang="ts">
export default {
name: 'execHistory'
};
</script>
<script lang="ts" setup>
</script>
<style lang="less" scoped>
</style>

5
orion-ops-ui/src/views/exec/exec-command/components/exec-panel.vue
View File

@@ -220,10 +220,11 @@
@command-gap: @form-width + @history-width + 32px;
.exec-container {
width: calc(100% - 32px);
height: calc(100% - 32px);
display: flex;
justify-content: space-between;
width: 100%;
height: 100%;
position: absolute;
.exec-form-container {
width: @form-width;

47
orion-ops-ui/src/views/exec/exec-command/index.vue
View File

@@ -4,9 +4,10 @@
<exec-panel v-show="!logVisible"
@submit="openLog" />
<!-- 执行日志 -->
<log-panel v-if="logVisible"
ref="log"
@back="setLogVisible(false)" />
<exec-log-panel v-if="logVisible"
ref="log"
:visibleBack="true"
@back="setLogVisible(false)" />
</div>
</template>
@@ -23,7 +24,7 @@
import { useDictStore } from '@/store';
import { dictKeys } from '@/views/exec/exec-log/types/const';
import ExecPanel from './components/exec-panel.vue';
import LogPanel from './components/log-panel.vue';
import ExecLogPanel from '@/components/exec/log/panel/index.vue';
const { visible: logVisible, setVisible: setLogVisible } = useVisible();
const { loadKeys } = useDictStore();
@@ -43,44 +44,6 @@
await loadKeys(dictKeys);
});
onMounted(() => {
openLog({
id: 65,
hosts: [
{
id: 103,
hostId: 5,
hostName: 'main-55',
hostAddress: '192.412.53.2',
status: 'INTERRUPTED'
}, {
id: 76,
hostId: 1,
hostName: 'main-11',
hostAddress: '192.412.53.2',
status: 'WAITING'
}, {
id: 77,
hostId: 2,
hostName: 'main-22',
hostAddress: '192.412.53.2',
status: 'RUNNING'
}, {
id: 78,
hostId: 3,
hostName: 'main-33',
hostAddress: '192.412.53.2',
status: 'COMPLETED'
}, {
id: 79,
hostId: 4,
hostName: 'main-44',
hostAddress: '192.412.53.2',
status: 'TIMEOUT'
},]
} as ExecCommandResponse);
});
</script>
<style lang="less" scoped>

16
orion-ops-ui/src/views/exec/exec-log/components/exec-host-log-table.vue
View File

@@ -58,10 +58,11 @@
@click="emits('viewParams', record.parameter)">
参数
</a-button>
<!-- 日志 -->
<!-- 下载 -->
<a-button type="text"
size="mini">
日志
size="mini"
@click="downloadLogFile(record.id)">
下载
</a-button>
<!-- 中断 -->
<a-popconfirm content="确认要中断命令吗, 删除后会中断执行?"
@@ -109,8 +110,9 @@
import { useDictStore } from '@/store';
import { useExpandable } from '@/types/table';
import { dateFormat, formatDuration } from '@/utils';
import { interruptHostExec } from '@/api/exec/exec';
import { downloadExecLogFile, interruptHostExec } from '@/api/exec/exec';
import { copy } from '@/hooks/copy';
import { downloadFile } from '@/utils/file';
const props = defineProps<{
row: ExecLogQueryResponse;
@@ -122,6 +124,12 @@
const { loading, setLoading } = useLoading();
const { toOptions, getDictValue } = useDictStore();
// 下载文件
const downloadLogFile = async (id: number) => {
const data = await downloadExecLogFile(id);
downloadFile(data);
};
// 中断执行
const interruptedHost = async (record: ExecHostLogQueryResponse) => {
try {

2
orion-ops-ui/src/views/exec/exec-log/components/exec-log-table.vue
View File

@@ -221,7 +221,7 @@
const emits = defineEmits(['viewCommand', 'viewParams', 'viewLog', 'openClear']);
// TODO 日志 ctrl日志 ctrl重新执行
// TODO 日志 ctrl日志
const pagination = usePagination();
const rowSelection = useRowSelection();

4
orion-ops-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue
View File

@@ -184,9 +184,7 @@
return false;
}
}
if (parameter.value.length) {
formModel.value.parameter = JSON.stringify(parameter.value);
}
formModel.value.parameter = JSON.stringify(parameter.value);
if (isAddHandle.value) {
// 新增
await createExecTemplate(formModel.value);

12
orion-ops-ui/src/views/exec/exec-template/components/exec-template-table.vue
View File

@@ -79,8 +79,7 @@
<a-button v-permission="['asset:exec:exec-command']"
type="text"
size="mini"
title="ctrl + 鼠标左键新页面打开"
@click="openExec($event, record)">
@click="emits('openExec', record)">
执行
</a-button>
<!-- 修改 -->
@@ -136,15 +135,6 @@
command: undefined,
});
// 打开执行
const openExec = (e: any, record: ExecTemplateQueryResponse) => {
if (e.ctrlKey) {
// TODO 新页面打开
} else {
emits('openExec', record);
}
};
// 删除当前行
const deleteRow = async ({ id }: {
id: number