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-04 15:14:45 +08:00
parent 0f8eebf53c
commit 0538d2aa26
17 changed files with 542 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-card-list.vue.vm
View File

@@ -45,7 +45,9 @@
show-time
allow-clear />
#else
<a-input v-model="formModel.${field.propertyName}" placeholder="请输入${field.comment}" allow-clear />
<a-input v-model="formModel.${field.propertyName}"
placeholder="请输入${field.comment}"
allow-clear />
#end
#end
</a-form-item>

4
orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm
View File

@@ -35,7 +35,9 @@
placeholder="请选择${field.comment}"
show-time />
#else
<a-input v-model="formModel.${field.propertyName}" placeholder="请输入${field.comment}" allow-clear/>
<a-input v-model="formModel.${field.propertyName}"
placeholder="请输入${field.comment}"
allow-clear/>
#end
#end
</a-form-item>

4
orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
View File

@@ -39,7 +39,9 @@
placeholder="请选择${field.comment}"
show-time />
#else
<a-input v-model="formModel.${field.propertyName}" placeholder="请输入${field.comment}" allow-clear />
<a-input v-model="formModel.${field.propertyName}"
placeholder="请输入${field.comment}"
allow-clear />
#end
#end
</a-form-item>

8
orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
View File

@@ -27,7 +27,9 @@
show-time
allow-clear />
#else
<a-input v-model="formModel.${field.propertyName}" placeholder="请输入${field.comment}" allow-clear />
<a-input v-model="formModel.${field.propertyName}"
placeholder="请输入${field.comment}"
allow-clear />
#end
#end
</a-form-item>
@@ -58,7 +60,7 @@
</a-button>
#if($vue.enableRowSelection)
<!-- 删除 -->
<a-popconfirm :content="`确认删除选中的${selectedKeys.length}条记录吗?`"
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br"
type="warning"
@ok="deleteSelectRows">
@@ -183,7 +185,7 @@
setLoading(true);
// 调用删除接口
await batchDelete${vue.featureEntity}(selectedKeys.value);
Message.success(`成功删除${selectedKeys.value.length}条数据`);
Message.success(`成功删除 ${selectedKeys.value.length} 条数据`);
selectedKeys.value = [];
// 重新加载数据
fetchTableData();

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/HostConnectLogOperatorType.java
View File

@@ -26,7 +26,7 @@ public class HostConnectLogOperatorType extends InitializingOperatorTypes {
public OperatorType[] types() {
return new OperatorType[]{
new OperatorType(H, DELETE, "删除主机连接记录 <sb>${count}</sb>条"),
new OperatorType(H, CLEAR, "清理主机连接记录 <sb>${count}</sb>条"),
new OperatorType(H, CLEAR, "清空主机连接记录 <sb>${count}</sb>条"),
new OperatorType(M, FORCE_OFFLINE, "强制下线主机连接 <sb>${hostName}</sb>"),
};
}

9
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/HostConnectLogVO.java
View File

@@ -8,6 +8,7 @@ import lombok.NoArgsConstructor;
import java.io.Serializable;
import java.util.Date;
import java.util.Map;
/**
* 主机连接日志 视图响应对象
@@ -56,12 +57,6 @@ public class HostConnectLogVO implements Serializable {
private Date endTime;
@Schema(description = "额外信息")
private String extraInfo;
@Schema(description = "创建时间")
private Date createTime;
@Schema(description = "修改时间")
private Date updateTime;
private Map<String, Object> extra;
}

26
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/session/SshSession.java
View File

@@ -1,7 +1,5 @@
package com.orion.ops.module.asset.handler.host.terminal.session;
import com.orion.lang.utils.ansi.AnsiAppender;
import com.orion.lang.utils.ansi.style.color.AnsiForeground;
import com.orion.lang.utils.io.Streams;
import com.orion.net.host.SessionStore;
import com.orion.net.host.ssh.shell.ShellExecutor;
@@ -99,26 +97,6 @@ public class SshSession extends TerminalSession implements ISshSession {
Streams.close(sessionStore);
}
@Override
public void forceOffline() {
if (this.close) {
return;
}
// 发送消息
String body = AnsiAppender.create()
.newLine()
.append(AnsiForeground.BRIGHT_RED, TerminalMessage.FORCED_OFFLINE)
.toString();
SshOutputResponse resp = SshOutputResponse.builder()
.type(OutputTypeEnum.SSH_OUTPUT.getType())
.sessionId(sessionId)
.body(body)
.build();
WebSockets.sendText(channel, OutputTypeEnum.SSH_OUTPUT.format(resp));
// 强制下线
super.forceOffline();
}
/**
* 标准输出处理
*
@@ -148,12 +126,12 @@ public class SshSession extends TerminalSession implements ISshSession {
* eof 回调
*/
private void eofCallback() {
log.info("terminal eof回调 {}, forClose: {}", sessionId, this.close);
log.info("terminal eof回调 {}, forClose: {}, forceOffline: {}", sessionId, this.close, this.forceOffline);
// 发送关闭信息
TerminalCloseResponse resp = TerminalCloseResponse.builder()
.type(OutputTypeEnum.CLOSE.getType())
.sessionId(this.sessionId)
.msg(TerminalMessage.CLOSED_CONNECTION)
.msg(this.forceOffline ? TerminalMessage.FORCED_OFFLINE : TerminalMessage.CLOSED_CONNECTION)
.build();
WebSockets.sendText(channel, OutputTypeEnum.CLOSE.format(resp));
// 需要调用关闭 - 可能是 logout 需要手动触发

6
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/session/TerminalSession.java
View File

@@ -28,6 +28,8 @@ public abstract class TerminalSession implements ITerminalSession {
protected volatile boolean close;
protected volatile boolean forceOffline;
public TerminalSession(String sessionId, WebSocketSession channel, TerminalConfig config) {
this.sessionId = sessionId;
this.channel = channel;
@@ -41,6 +43,7 @@ public abstract class TerminalSession implements ITerminalSession {
@Override
public void close() {
log.info("terminal close {}", sessionId);
// 检查并且关闭
if (this.checkAndClose()) {
// 修改状态
@@ -50,6 +53,8 @@ public abstract class TerminalSession implements ITerminalSession {
@Override
public void forceOffline() {
log.info("terminal forceOffline {}", sessionId);
this.forceOffline = true;
this.checkAndClose();
}
@@ -59,7 +64,6 @@ public abstract class TerminalSession implements ITerminalSession {
* @return close
*/
private boolean checkAndClose() {
log.info("terminal close {}", sessionId);
if (close) {
return false;
}

2
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/HostConnectLogService.java
View File

@@ -78,7 +78,7 @@ public interface HostConnectLogService {
Long getHostConnectLogCount(HostConnectLogQueryRequest request);
/**
* 清理主机连接日志
* 清空主机连接日志
*
* @param request request
* @return effect

7
orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostConnectLogServiceImpl.java
View File

@@ -71,7 +71,11 @@ public class HostConnectLogServiceImpl implements HostConnectLogService {
// 查询
return hostConnectLogDAO.of(wrapper)
.page(request)
.dataGrid(HostConnectLogConvert.MAPPER::to);
.dataGrid(s -> {
HostConnectLogVO vo = HostConnectLogConvert.MAPPER.to(s);
vo.setExtra(JSON.parseObject(s.getExtraInfo()));
return vo;
});
}
@Override
@@ -97,7 +101,6 @@ public class HostConnectLogServiceImpl implements HostConnectLogService {
@Override
public Integer deleteHostConnectLog(List<Long> idList) {
// TODO 测试一下参数
log.info("HostConnectLogService.deleteHostConnectLog start {}", JSON.toJSONString(idList));
int effect = hostConnectLogDAO.deleteBatchIds(idList);
log.info("HostConnectLogService.deleteHostConnectLog finish {}", effect);

42
orion-ops-ui/src/api/asset/host-connect-log.ts
View File

@@ -1,11 +1,13 @@
import type { DataGrid, Pagination } from '@/types/global';
import type { TableData } from '@arco-design/web-vue/es/table/interface';
import axios from 'axios';
import qs from 'query-string';
/**
* 主机连接日志查询请求
*/
export interface HostConnectLogQueryRequest extends Pagination {
id?: number;
userId?: number;
hostId?: number;
hostAddress?: string;
@@ -21,6 +23,7 @@ export interface HostConnectLogQueryRequest extends Pagination {
export interface HostConnectLogQueryResponse extends TableData {
id: number;
userId: number;
username: number;
hostId: number;
hostName: string;
hostAddress: string;
@@ -29,11 +32,7 @@ export interface HostConnectLogQueryResponse extends TableData {
status: string;
startTime: number;
endTime: number;
extraInfo: string;
createTime: number;
updateTime: number;
creator: string;
updater: string;
extra: Record<string, any>;
}
/**
@@ -52,3 +51,36 @@ export function getLatestConnectHostId(type: string, limit: number) {
limit
});
}
/**
* 删除主机连接日志
*/
export function deleteHostConnectLog(idList: Array<number>) {
return axios.delete('/asset/host-connect-log/delete', {
params: { idList },
paramsSerializer: params => {
return qs.stringify(params, { arrayFormat: 'comma' });
}
});
}
/**
* 查询主机连接日志数量
*/
export function getHostConnectLogCount(request: HostConnectLogQueryRequest) {
return axios.post<number>('/asset/host-connect-log/query-count', request);
}
/**
* 清空主机连接日志
*/
export function clearHostConnectLog(request: HostConnectLogQueryRequest) {
return axios.post<number>('/asset/host-connect-log/clear', request);
}
/**
* 强制断开主机连接
*/
export function hostForceOffline(request: HostConnectLogQueryRequest) {
return axios.put('/asset/host-connect-log/force-offline', request);
}

173
orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-clear-modal.vue Normal file
View File

@@ -0,0 +1,173 @@
<template>
<a-modal v-model:visible="visible"
body-class="modal-form"
title-align="start"
title="清空主机连接日志"
:align-center="false"
:draggable="true"
:mask-closable="false"
:unmount-on-close="true"
ok-text="清空"
:ok-button-props="{ disabled: loading }"
:cancel-button-props="{ disabled: loading }"
:on-before-ok="handlerOk"
@close="handleClose">
<a-spin class="full" :loading="loading">
<a-form :model="formModel"
label-align="right"
:style="{ width: '460px' }"
:label-col-props="{ span: 5 }"
:wrapper-col-props="{ span: 19 }">
<!-- 连接用户 -->
<a-form-item field="userId" label="连接用户">
<user-selector v-model="formModel.userId"
placeholder="请选择用户"
allow-clear />
</a-form-item>
<!-- 连接主机 -->
<a-form-item field="hostId" label="连接主机">
<host-selector v-model="formModel.hostId"
placeholder="请选择主机"
allow-clear />
</a-form-item>
<!-- 主机地址 -->
<a-form-item field="hostAddress" label="主机地址">
<a-input v-model="formModel.hostAddress"
placeholder="请输入主机地址"
allow-clear />
</a-form-item>
<!-- 连接状态 -->
<a-form-item field="status" label="连接状态">
<a-select v-model="formModel.status"
placeholder="请选择状态"
:options="toOptions(connectStatusKey)"
allow-clear />
</a-form-item>
<!-- 连接类型 -->
<a-form-item field="type" label="连接类型">
<a-select v-model="formModel.type"
placeholder="请选择类型"
:options="toOptions(connectTypeKey)"
allow-clear />
</a-form-item>
<!-- 开始时间 -->
<a-form-item field="startTimeRange" label="开始时间">
<a-range-picker v-model="formModel.startTimeRange"
style="width: 100%"
:time-picker-props="{ defaultValue: ['00:00:00', '23:59:59'] }"
show-time
format="YYYY-MM-DD HH:mm:ss" />
</a-form-item>
</a-form>
</a-spin>
</a-modal>
</template>
<script lang="ts">
export default {
name: 'hostAuditConnectLogClearModal'
};
</script>
<script lang="ts" setup>
import type { HostConnectLogQueryRequest } from '@/api/asset/host-connect-log';
import { ref } from 'vue';
import useLoading from '@/hooks/loading';
import useVisible from '@/hooks/visible';
import { connectStatusKey, connectTypeKey } from '../types/const';
import { getHostConnectLogCount, clearHostConnectLog } from '@/api/asset/host-connect-log';
import { Message, Modal } from '@arco-design/web-vue';
import { useDictStore } from '@/store';
import UserSelector from '@/components/user/user/user-selector.vue';
import HostSelector from '@/components/asset/host/host-selector.vue';
const { visible, setVisible } = useVisible();
const { loading, setLoading } = useLoading();
const defaultForm = (): HostConnectLogQueryRequest => {
return {
userId: undefined,
hostId: undefined,
hostAddress: undefined,
type: undefined,
status: undefined,
startTimeRange: undefined,
};
};
const formModel = ref<HostConnectLogQueryRequest>({});
const emits = defineEmits(['clear']);
const { toOptions } = useDictStore();
// 打开
const open = (record: any) => {
renderForm({ ...defaultForm(), ...record });
setVisible(true);
};
// 渲染表单
const renderForm = (record: any) => {
formModel.value = Object.assign({}, record);
};
defineExpose({ open });
// 确定
const handlerOk = async () => {
setLoading(true);
try {
// 获取总数量
const { data } = await getHostConnectLogCount(formModel.value);
if (data) {
// 清空
doClear(data);
} else {
// 无数据
Message.warning('当前条件未查询到数据');
}
} catch (e) {
} finally {
setLoading(false);
}
return false;
};
// 执行删除
const doClear = (count: number) => {
Modal.confirm({
title: '删除清空',
content: `确定要删除 ${count} 条数据吗? 确定后将立即删除且无法恢复!`,
onOk: async () => {
setLoading(true);
try {
// 调用删除
await clearHostConnectLog(formModel.value);
emits('clear');
// 清空
setVisible(false);
handlerClear();
} catch (e) {
} finally {
setLoading(false);
}
}
});
};
// 关闭
const handleClose = () => {
handlerClear();
};
// 清空
const handlerClear = () => {
setLoading(false);
};
</script>
<style lang="less" scoped>
</style>

125
orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-detail-drawer.vue Normal file
View File

@@ -0,0 +1,125 @@
<template>
<a-drawer v-model:visible="visible"
title="主机连接日志详情"
:width="420"
:mask-closable="false"
:unmount-on-close="true"
ok-text="关闭"
:hide-cancel="true"
@cancel="handleClose">
<a-descriptions class="detail-container"
size="large"
:label-style="{ display: 'flex', width: '90px' }"
:column="1">
<!-- id -->
<a-descriptions-item label="id">
{{ record.id }}
</a-descriptions-item>
<!-- 连接用户 -->
<a-descriptions-item label="连接用户">
<span>({{ record.userId }}) {{ record.username }}</span>
</a-descriptions-item>
<!-- 连接主机 -->
<a-descriptions-item label="连接主机">
<span>({{ record.hostId }}) {{ record.hostName }}</span>
<br>
<span class="copy-left" title="复制" @click="copy(record.hostAddress)">
<icon-copy />
</span>
<span class="host-address">{{ record.hostAddress }}</span>
</a-descriptions-item>
<!-- 连接类型 -->
<a-descriptions-item label="连接类型">
{{ getDictValue(connectTypeKey, record.type) }}
</a-descriptions-item>
<!-- 连接状态 -->
<a-descriptions-item label="连接状态">
{{ getDictValue(connectStatusKey, record.status) }}
</a-descriptions-item>
<!-- 连接地址 -->
<a-descriptions-item label="连接地址">
<span>{{ record.extra?.location }}</span>
<br>
<span class="copy-left" title="复制" @click="copy(record.extra?.address)">
<icon-copy />
</span>
<span class="connect-address">{{ record.extra?.address }}</span>
</a-descriptions-item>
<!-- userAgent -->
<a-descriptions-item label="userAgent">
{{ record.extra?.userAgent }}
</a-descriptions-item>
<!-- 开始时间 -->
<a-descriptions-item label="开始时间">
{{ dateFormat(new Date(record.startTime)) }}
</a-descriptions-item>
<!-- 结束时间 -->
<a-descriptions-item label="结束时间">
{{ dateFormat(new Date(record.endTime)) }}
</a-descriptions-item>
</a-descriptions>
</a-drawer>
</template>
<script lang="ts">
export default {
name: 'hostAuditConnectLogDetailDrawer'
};
</script>
<script lang="ts" setup>
import type { HostConnectLogQueryResponse } from '@/api/asset/host-connect-log';
import { ref } from 'vue';
import useLoading from '@/hooks/loading';
import useVisible from '@/hooks/visible';
import { connectStatusKey, connectTypeKey } from '../types/const';
import { useDictStore } from '@/store';
import { dateFormat } from '@/utils';
import useCopy from '@/hooks/copy';
const { getDictValue } = useDictStore();
const { copy } = useCopy();
const { visible, setVisible } = useVisible();
const { loading, setLoading } = useLoading();
const record = ref<HostConnectLogQueryResponse>({} as HostConnectLogQueryResponse);
const emits = defineEmits(['clear']);
const { toOptions } = useDictStore();
// 打开
const open = (s: any) => {
record.value = s;
setVisible(true);
};
defineExpose({ open });
// 关闭
const handleClose = () => {
handlerClear();
};
// 清空
const handlerClear = () => {
setLoading(false);
};
</script>
<style lang="less" scoped>
.detail-container {
padding: 24px;
}
:deep(.arco-descriptions-item-value) {
color: var(--color-text-1);
}
.host-address, .connect-address {
margin-top: 4px;
display: inline-block;
color: rgb(var(--arcoblue-6));
}
</style>

175
orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-table.vue
View File

@@ -37,10 +37,6 @@
:options="toOptions(connectTypeKey)"
allow-clear />
</a-form-item>
<!-- token -->
<a-form-item field="token" label="token" label-col-flex="50px">
<a-input v-model="formModel.token" placeholder="请输入token" allow-clear />
</a-form-item>
<!-- 开始时间 -->
<a-form-item field="startTimeRange" label="开始时间" label-col-flex="50px">
<a-range-picker v-model="formModel.startTimeRange"
@@ -62,20 +58,61 @@
</div>
</div>
<!-- 右侧操作 -->
<div class="table-right-bar-handle" />
<div class="table-right-bar-handle">
<a-space>
<!-- 清空 -->
<a-button v-permission="['asset:host-connect-log:management:clear']"
status="danger"
@click="openClear">
清空
<template #icon>
<icon-close />
</template>
</a-button>
<!-- 删除 -->
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br"
type="warning"
@ok="deleteSelectRows">
<a-button v-permission="['asset:host-connect-log:management:delete']"
type="secondary"
status="danger"
:disabled="selectedKeys.length === 0">
删除
<template #icon>
<icon-delete />
</template>
</a-button>
</a-popconfirm>
</a-space>
</div>
</template>
<!-- table -->
<a-table row-key="id"
class="table-wrapper-8"
ref="tableRef"
label-align="left"
:loading="loading"
v-model:selected-keys="selectedKeys"
:row-selection="rowSelection"
:columns="columns"
:data="tableRenderData"
:pagination="pagination"
@page-change="(page) => fetchTableData(page, pagination.pageSize)"
@page-size-change="(size) => fetchTableData(1, size)"
:bordered="false">
<!-- 连接地址 -->
<template #address="{ record }">
<span class="connect-location" :title="record.extra?.location">
{{ record.extra?.location }}
</span>
<br>
<span class="copy-left" title="复制" @click="copy(record.extra?.address)">
<icon-copy />
</span>
<span class="connect-address" :title="record.extra?.address">
{{ record.extra?.address }}
</span>
</template>
<!-- 连接用户 -->
<template #username="{ record }">
{{ record.username }}
@@ -89,7 +126,7 @@
<span class="copy-left" title="复制" @click="copy(record.hostAddress)">
<icon-copy />
</span>
<span class="host-address">
<span class="host-address" :title="record.hostAddress">
{{ record.hostAddress }}
</span>
</template>
@@ -97,10 +134,51 @@
<template #status="{ record }">
<span class="circle" :style="{
background: getDictValue(connectStatusKey, record.status, 'color')
}" />
}" />
{{ getDictValue(connectStatusKey, record.status) }}
</template>
<!-- 操作 -->
<template #handle="{ record }">
<div class="table-handle-wrapper">
<!-- 详情 -->
<a-button type="text"
size="mini"
@click="openDetail(record)">
详情
</a-button>
<!-- 下线 -->
<a-popconfirm v-if="record.status === HostConnectStatus.CONNECTING"
content="确认要强制下线吗?"
position="left"
type="warning"
@ok="forceOffline(record)">
<a-button v-permission="['asset:host-connect-log:management:force-offline']"
type="text"
size="mini"
status="danger">
下线
</a-button>
</a-popconfirm>
<!-- 删除 -->
<a-popconfirm content="确认删除这条记录吗?"
position="left"
type="warning"
@ok="deleteRow(record)">
<a-button v-permission="['asset:host-connect-log:management:delete']"
type="text"
size="mini"
status="danger">
删除
</a-button>
</a-popconfirm>
</div>
</template>
</a-table>
<!-- 清空模态框 -->
<connect-log-clear-modal ref="clearModal"
@clear="fetchTableData" />
<!-- 详情模态框 -->
<connect-log-detail-drawer ref="detailModal" />
</a-card>
</template>
@@ -113,21 +191,28 @@
<script lang="ts" setup>
import type { HostConnectLogQueryRequest, HostConnectLogQueryResponse } from '@/api/asset/host-connect-log';
import { reactive, ref, onMounted } from 'vue';
import { getHostConnectLogPage } from '@/api/asset/host-connect-log';
import useLoading from '@/hooks/loading';
import columns from '../types/table.columns';
import { connectStatusKey, connectTypeKey, HostConnectType } from '../types/const';
import { usePagination } from '@/types/table';
import { deleteHostConnectLog, getHostConnectLogPage, hostForceOffline } from '@/api/asset/host-connect-log';
import { connectStatusKey, connectTypeKey, HostConnectStatus } from '../types/const';
import { usePagination, useRowSelection } from '@/types/table';
import { useDictStore } from '@/store';
import { Message } from '@arco-design/web-vue';
import columns from '../types/table.columns';
import useLoading from '@/hooks/loading';
import useCopy from '@/hooks/copy';
import UserSelector from '@/components/user/user/user-selector.vue';
import HostSelector from '@/components/asset/host/host-selector.vue';
import ConnectLogClearModal from './connect-log-clear-modal.vue';
import ConnectLogDetailDrawer from './connect-log-detail-drawer.vue';
const emits = defineEmits(['openAdd', 'openUpdate']);
const tableRenderData = ref<HostConnectLogQueryResponse[]>([]);
const selectedKeys = ref<number[]>([]);
const clearModal = ref();
const detailModal = ref();
const pagination = usePagination();
const rowSelection = useRowSelection();
const { loading, setLoading } = useLoading();
const { toOptions, getDictValue } = useDictStore();
const { copy } = useCopy();
@@ -137,7 +222,6 @@
hostId: undefined,
hostAddress: undefined,
type: undefined,
token: undefined,
status: undefined,
startTimeRange: undefined,
});
@@ -151,6 +235,7 @@
pagination.total = data.total;
pagination.current = request.page;
pagination.pageSize = request.limit;
selectedKeys.value = [];
} catch (e) {
} finally {
setLoading(false);
@@ -162,6 +247,64 @@
doFetchTableData({ page, limit, ...form });
};
// 打开清空
const openClear = () => {
clearModal.value?.open({ ...formModel });
};
// 打开详情
const openDetail = (record: HostConnectLogQueryResponse) => {
detailModal.value?.open(record);
};
// 强制下线
const forceOffline = async (record: HostConnectLogQueryResponse) => {
try {
setLoading(true);
await hostForceOffline({ id: record.id });
record.status = HostConnectStatus.FORCE_OFFLINE;
record.endTime = Date.now();
Message.success('已下线');
} catch (e) {
} finally {
setLoading(false);
}
};
// 删除选中行
const deleteSelectRows = async () => {
try {
setLoading(true);
// 调用删除接口
await deleteHostConnectLog(selectedKeys.value);
Message.success(`成功删除 ${selectedKeys.value.length} 条数据`);
selectedKeys.value = [];
// 重新加载数据
fetchTableData();
} catch (e) {
} finally {
setLoading(false);
}
};
// 删除当前行
const deleteRow = async ({ id }: {
id: number
}) => {
try {
setLoading(true);
// 调用删除接口
await deleteHostConnectLog([id]);
Message.success('删除成功');
selectedKeys.value = [];
// 重新加载数据
fetchTableData();
} catch (e) {
} finally {
setLoading(false);
}
};
onMounted(() => {
fetchTableData();
});
@@ -169,11 +312,11 @@
</script>
<style lang="less" scoped>
.host-name {
.host-name, .connect-location {
color: var(--color-text-2);
}
.host-address {
.host-address, .connect-address {
margin-top: 4px;
display: inline-block;
color: var(--color-text-3);

10
orion-ops-ui/src/views/host-audit/connect-log/types/const.ts
View File

@@ -1,7 +1,15 @@
// 主机连接类型
export const HostConnectType = {
SSH: 'SSH',
SFTP: 'SFTP'
SFTP: 'SFTP',
};
// 主机连接状态
export const HostConnectStatus = {
CONNECTING: 'CONNECTING',
COMPLETE: 'COMPLETE',
FAILED: 'FAILED',
FORCE_OFFLINE: 'FORCE_OFFLINE',
};
// 主机连接状态 字典项

15
orion-ops-ui/src/views/host-audit/connect-log/types/table.columns.ts
View File

@@ -3,12 +3,12 @@ import { dateFormat } from '@/utils';
const columns = [
{
title: 'id',
dataIndex: 'id',
slotName: 'id',
width: 70,
title: '连接地址',
dataIndex: 'address',
slotName: 'address',
width: 156,
align: 'left',
fixed: 'left',
ellipsis: true,
}, {
title: '连接用户',
dataIndex: 'username',
@@ -16,7 +16,6 @@ const columns = [
width: 180,
align: 'left',
ellipsis: true,
tooltip: true,
}, {
title: '连接主机',
dataIndex: 'hostName',
@@ -34,7 +33,7 @@ const columns = [
dataIndex: 'status',
slotName: 'status',
align: 'left',
width: 96,
width: 106,
}, {
title: '连接时间',
dataIndex: 'connectTime',
@@ -50,7 +49,7 @@ const columns = [
title: '操作',
slotName: 'handle',
width: 180,
align: 'center',
align: 'left',
fixed: 'right',
},
] as TableColumnData[];

4
orion-ops-ui/src/views/system/dict-value/components/dict-value-table.vue
View File

@@ -46,7 +46,7 @@
</template>
</a-button>
<!-- 删除 -->
<a-popconfirm :content="`确认删除选中的${selectedKeys.length}条记录吗?`"
<a-popconfirm :content="`确认删除选中的 ${selectedKeys.length} 条记录吗?`"
position="br"
type="warning"
@ok="deleteSelectRows">
@@ -167,7 +167,7 @@
setLoading(true);
// 调用删除接口
await batchDeleteDictValue(selectedKeys.value);
Message.success(`成功删除${selectedKeys.value.length}条数据`);
Message.success(`成功删除 ${selectedKeys.value.length} 条数据`);
selectedKeys.value = [];
// 重新加载数据
fetchTableData();