From 554c62abf7dff313997cb0f2d2393d42b94e2f1f Mon Sep 17 00:00:00 2001 From: lijiahang Date: Tue, 5 Mar 2024 18:07:26 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20SFTP=20=E6=93=8D=E4=BD=9C=E6=97=A5?= =?UTF-8?q?=E5=BF=97.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/HostSftpLogController.http | 7 +- .../controller/HostSftpLogController.java | 26 +- .../operator/HostTerminalOperatorType.java | 3 + .../module/asset/entity/vo/HostSftpLogVO.java | 40 +-- .../terminal/handler/SftpRemoveHandler.java | 3 +- .../asset/service/HostSftpLogService.java | 12 +- .../service/impl/HostSftpLogServiceImpl.java | 62 +++- .../ops/module/infra/api/OperatorLogApi.java | 14 +- .../infra/api/impl/OperatorLogApiImpl.java | 8 +- orion-ops-ui/src/api/asset/host-sftp-log.ts | 62 ++++ orion-ops-ui/src/assets/style/global.less | 14 + .../src/router/routes/modules/host-audit.ts | 5 + .../components/connect-log-detail-drawer.vue | 30 +- .../components/connect-log-table.vue | 36 +-- .../connect-log/types/table.columns.ts | 16 +- .../sftp-log/components/sftp-log-table.vue | 286 ++++++++++++++++++ .../src/views/host-audit/sftp-log/index.vue | 39 +++ .../views/host-audit/sftp-log/types/const.ts | 14 + .../sftp-log/types/table.columns.ts | 61 ++++ .../components/operator-log-simple-table.vue | 9 +- .../components/operator-log-table.vue | 9 +- .../user/operator-log/types/table.columns.ts | 2 +- 22 files changed, 650 insertions(+), 108 deletions(-) create mode 100644 orion-ops-ui/src/api/asset/host-sftp-log.ts create mode 100644 orion-ops-ui/src/views/host-audit/sftp-log/components/sftp-log-table.vue create mode 100644 orion-ops-ui/src/views/host-audit/sftp-log/index.vue create mode 100644 orion-ops-ui/src/views/host-audit/sftp-log/types/const.ts create mode 100644 orion-ops-ui/src/views/host-audit/sftp-log/types/table.columns.ts diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostSftpLogController.http b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostSftpLogController.http index a299c88b..094101d8 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostSftpLogController.http +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostSftpLogController.http @@ -1,5 +1,5 @@ ### 分页查询 SFTP 操作日志 -POST {{baseUrl}}/asset/sftp-log/query +POST {{baseUrl}}/asset/host-sftp-log/query Content-Type: application/json Authorization: {{token}} @@ -9,4 +9,9 @@ Authorization: {{token}} } +### 删除 SFTP 操作日志 +DELETE {{baseUrl}}/asset/host-sftp-log/delete?idList=1,2,3 +Authorization: {{token}} + + ### diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostSftpLogController.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostSftpLogController.java index 70cb703a..4c3c616c 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostSftpLogController.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/HostSftpLogController.java @@ -1,24 +1,25 @@ package com.orion.ops.module.asset.controller; import com.orion.lang.define.wrapper.DataGrid; +import com.orion.ops.framework.biz.operator.log.core.annotation.OperatorLog; import com.orion.ops.framework.common.validator.group.Page; import com.orion.ops.framework.log.core.annotation.IgnoreLog; import com.orion.ops.framework.log.core.enums.IgnoreLogMode; import com.orion.ops.framework.web.core.annotation.RestWrapper; +import com.orion.ops.module.asset.define.operator.HostTerminalOperatorType; import com.orion.ops.module.asset.entity.request.host.HostSftpLogQueryRequest; import com.orion.ops.module.asset.entity.vo.HostSftpLogVO; import com.orion.ops.module.asset.service.HostSftpLogService; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import lombok.extern.slf4j.Slf4j; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; +import java.util.List; /** * SFTP 操作日志服务 api @@ -32,7 +33,7 @@ import javax.annotation.Resource; @Validated @RestWrapper @RestController -@RequestMapping("/asset/sftp-log") +@RequestMapping("/asset/host-sftp-log") @SuppressWarnings({"ELValidationInJSP", "SpringElInspection"}) public class HostSftpLogController { @@ -42,9 +43,18 @@ public class HostSftpLogController { @IgnoreLog(IgnoreLogMode.RET) @PostMapping("/query") @Operation(summary = "分页查询 SFTP 操作日志") - @PreAuthorize("@ss.hasPermission('infra:operator-log:query')") - public DataGrid querySftpLogPage(@Validated(Page.class) @RequestBody HostSftpLogQueryRequest request) { - return hostSftpLogService.querySftpLogPage(request); + @PreAuthorize("@ss.hasAnyPermission('infra:operator-log:query', 'asset:host-sftp-log:management:query')") + public DataGrid getHostSftpLogPage(@Validated(Page.class) @RequestBody HostSftpLogQueryRequest request) { + return hostSftpLogService.getHostSftpLogPage(request); + } + + @OperatorLog(HostTerminalOperatorType.DELETE_SFTP_LOG) + @DeleteMapping("/delete") + @Operation(summary = "删除 SFTP 操作日志") + @Parameter(name = "idList", description = "idList", required = true) + @PreAuthorize("@ss.hasAnyPermission('infra:operator-log:delete', 'asset:host-sftp-log:management:delete')") + public Integer deleteHostSftpLog(@RequestParam("idList") List idList) { + return hostSftpLogService.deleteHostSftpLog(idList); } } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/HostTerminalOperatorType.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/HostTerminalOperatorType.java index 79221556..4027b399 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/HostTerminalOperatorType.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/define/operator/HostTerminalOperatorType.java @@ -21,6 +21,8 @@ public class HostTerminalOperatorType extends InitializingOperatorTypes { public static final String CONNECT = "host-terminal:connect"; + public static final String DELETE_SFTP_LOG = "host-terminal:delete-sftp-log"; + public static final String SFTP_MKDIR = "host-terminal:sftp-mkdir"; public static final String SFTP_TOUCH = "host-terminal:sftp-touch"; @@ -55,6 +57,7 @@ public class HostTerminalOperatorType extends InitializingOperatorTypes { public OperatorType[] types() { return new OperatorType[]{ new OperatorType(L, CONNECT, "连接主机 ${connectType} ${hostName}"), + new OperatorType(H, DELETE_SFTP_LOG, "删除 SFTP 操作日志 ${count} 条"), new OperatorType(L, SFTP_MKDIR, "创建文件夹 ${hostName} ${path}"), new OperatorType(L, SFTP_TOUCH, "创建文件 ${hostName} ${path}"), new OperatorType(M, SFTP_MOVE, "移动文件 ${hostName} ${path} 至 ${target}"), diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/HostSftpLogVO.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/HostSftpLogVO.java index 40e924dc..5a8d812d 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/HostSftpLogVO.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/HostSftpLogVO.java @@ -32,14 +32,20 @@ public class HostSftpLogVO implements Serializable { @Schema(description = "用户id") private Long userId; - @Schema(description = "主机id") - private Long hostId; - @Schema(description = "用户名") private String username; - @Schema(description = "traceId") - private String traceId; + @Schema(description = "主机id") + private Long hostId; + + @Schema(description = "主机名称") + private String hostName; + + @Schema(description = "主机地址") + private String hostAddress; + + @Schema(description = "操作文件") + private String[] paths; @Schema(description = "请求ip") private String address; @@ -50,40 +56,16 @@ public class HostSftpLogVO implements Serializable { @Schema(description = "userAgent") private String userAgent; - @Schema(description = "风险等级") - private String riskLevel; - - @Schema(description = "模块") - private String module; - @Schema(description = "操作类型") private String type; - @Schema(description = "日志") - private String logInfo; - @Schema(description = "参数") private Map extra; @Schema(description = "操作结果 0失败 1成功") private Integer result; - @Schema(description = "错误信息") - private String errorMessage; - - @Schema(description = "返回值") - private String returnValue; - - @Schema(description = "操作时间") - private Integer duration; - @Schema(description = "开始时间") private Date startTime; - @Schema(description = "结束时间") - private Date endTime; - - @Schema(description = "创建时间") - private Date createTime; - } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java index 5e9a603b..8ed4b629 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/terminal/handler/SftpRemoveHandler.java @@ -2,7 +2,6 @@ package com.orion.ops.module.asset.handler.host.terminal.handler; import com.orion.lang.utils.collect.Maps; import com.orion.ops.framework.biz.operator.log.core.utils.OperatorLogs; -import com.orion.ops.framework.common.constant.Const; import com.orion.ops.framework.common.enums.BooleanBit; import com.orion.ops.module.asset.define.operator.HostTerminalOperatorType; import com.orion.ops.module.asset.handler.host.terminal.enums.OutputTypeEnum; @@ -54,7 +53,7 @@ public class SftpRemoveHandler extends AbstractTerminalHandler .build()); // 保存操作日志 Map extra = Maps.newMap(); - extra.put(OperatorLogs.PATH, String.join(Const.COMMA, paths)); + extra.put(OperatorLogs.PATH, payload.getPath()); this.saveOperatorLog(payload, channel, extra, HostTerminalOperatorType.SFTP_REMOVE, startTime, ex); diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/HostSftpLogService.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/HostSftpLogService.java index 52b176cd..8049d82f 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/HostSftpLogService.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/HostSftpLogService.java @@ -4,6 +4,8 @@ import com.orion.lang.define.wrapper.DataGrid; import com.orion.ops.module.asset.entity.request.host.HostSftpLogQueryRequest; import com.orion.ops.module.asset.entity.vo.HostSftpLogVO; +import java.util.List; + /** * SFTP 操作日志 服务类 * @@ -19,6 +21,14 @@ public interface HostSftpLogService { * @param request request * @return rows */ - DataGrid querySftpLogPage(HostSftpLogQueryRequest request); + DataGrid getHostSftpLogPage(HostSftpLogQueryRequest request); + + /** + * 删除 SFTP 操作日志 + * + * @param idList idList + * @return effect + */ + Integer deleteHostSftpLog(List idList); } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostSftpLogServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostSftpLogServiceImpl.java index 8dcdd540..0d7c376c 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostSftpLogServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/HostSftpLogServiceImpl.java @@ -1,8 +1,12 @@ package com.orion.ops.module.asset.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.orion.lang.define.wrapper.DataGrid; import com.orion.lang.utils.Arrays1; import com.orion.lang.utils.Strings; +import com.orion.ops.framework.biz.operator.log.core.utils.OperatorLogs; +import com.orion.ops.framework.common.constant.ExtraFieldConst; import com.orion.ops.module.asset.convert.HostSftpLogConvert; import com.orion.ops.module.asset.define.operator.HostTerminalOperatorType; import com.orion.ops.module.asset.entity.request.host.HostSftpLogQueryRequest; @@ -33,7 +37,49 @@ public class HostSftpLogServiceImpl implements HostSftpLogService { private OperatorLogApi operatorLogApi; @Override - public DataGrid querySftpLogPage(HostSftpLogQueryRequest request) { + public DataGrid getHostSftpLogPage(HostSftpLogQueryRequest request) { + // 查询 + OperatorLogQueryDTO query = this.buildQueryInfo(request); + DataGrid dataGrid = operatorLogApi.getOperatorLogPage(query); + // 转换 + List rows = dataGrid.stream() + .map(s -> { + JSONObject extra = JSON.parseObject(s.getExtra()); + HostSftpLogVO vo = HostSftpLogConvert.MAPPER.to(s); + vo.setHostId(extra.getLong(ExtraFieldConst.HOST_ID)); + vo.setHostName(extra.getString(ExtraFieldConst.HOST_NAME)); + vo.setHostAddress(extra.getString(ExtraFieldConst.ADDRESS)); + vo.setPaths(extra.getString(ExtraFieldConst.PATH).split("\\|")); + vo.setExtra(extra); + return vo; + }).collect(Collectors.toList()); + // 返回 + DataGrid result = new DataGrid<>(); + result.setRows(rows); + result.setPage(dataGrid.getPage()); + result.setLimit(dataGrid.getLimit()); + result.setSize(dataGrid.getSize()); + result.setTotal(dataGrid.getTotal()); + return result; + } + + @Override + public Integer deleteHostSftpLog(List idList) { + log.info("HostSftpLogService.deleteSftpLog start {}", JSON.toJSONString(idList)); + Integer effect = operatorLogApi.deleteOperatorLog(idList); + log.info("HostSftpLogService.deleteSftpLog finish {}", effect); + // 设置日志参数 + OperatorLogs.add(OperatorLogs.COUNT, effect); + return effect; + } + + /** + * 构建查询对象 + * + * @param request request + * @return query + */ + private OperatorLogQueryDTO buildQueryInfo(HostSftpLogQueryRequest request) { Long hostId = request.getHostId(); String type = request.getType(); // 构建参数 @@ -55,19 +101,7 @@ public class HostSftpLogServiceImpl implements HostSftpLogService { if (hostId != null) { query.setExtra("\"hostId\": " + hostId + ","); } - // 查询 - DataGrid dataGrid = operatorLogApi.getOperatorLogList(query); - // 返回 - DataGrid result = new DataGrid<>(); - List rows = dataGrid.stream() - .map(HostSftpLogConvert.MAPPER::to) - .collect(Collectors.toList()); - result.setRows(rows); - result.setPage(dataGrid.getPage()); - result.setLimit(dataGrid.getLimit()); - result.setSize(dataGrid.getSize()); - result.setTotal(dataGrid.getTotal()); - return result; + return query; } } diff --git a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/OperatorLogApi.java b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/OperatorLogApi.java index 95dfd240..34d16935 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/OperatorLogApi.java +++ b/orion-ops-module-infra/orion-ops-module-infra-provider/src/main/java/com/orion/ops/module/infra/api/OperatorLogApi.java @@ -4,6 +4,8 @@ import com.orion.lang.define.wrapper.DataGrid; import com.orion.ops.module.infra.entity.dto.operator.OperatorLogDTO; import com.orion.ops.module.infra.entity.dto.operator.OperatorLogQueryDTO; +import java.util.List; + /** * 操作日志服务 * @@ -14,11 +16,19 @@ import com.orion.ops.module.infra.entity.dto.operator.OperatorLogQueryDTO; public interface OperatorLogApi { /** - * 操作日志服务 + * 分页查询操作日志 * * @param request request * @return rows */ - DataGrid getOperatorLogList(OperatorLogQueryDTO request); + DataGrid getOperatorLogPage(OperatorLogQueryDTO request); + + /** + * 删除操作日志 + * + * @param idList idList + * @return effect + */ + Integer deleteOperatorLog(List idList); } diff --git a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/OperatorLogApiImpl.java b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/OperatorLogApiImpl.java index 742af4ce..3975301f 100644 --- a/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/OperatorLogApiImpl.java +++ b/orion-ops-module-infra/orion-ops-module-infra-service/src/main/java/com/orion/ops/module/infra/api/impl/OperatorLogApiImpl.java @@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.List; /** * 操作日志服务实现 @@ -29,7 +30,7 @@ public class OperatorLogApiImpl implements OperatorLogApi { private OperatorLogDAO operatorLogDAO; @Override - public DataGrid getOperatorLogList(OperatorLogQueryDTO request) { + public DataGrid getOperatorLogPage(OperatorLogQueryDTO request) { Valid.valid(request); return operatorLogDAO.of() .page(request) @@ -37,6 +38,11 @@ public class OperatorLogApiImpl implements OperatorLogApi { .dataGrid(OperatorLogProviderConvert.MAPPER::to); } + @Override + public Integer deleteOperatorLog(List idList) { + return operatorLogDAO.deleteBatchIds(idList); + } + /** * 构建查询 wrapper * diff --git a/orion-ops-ui/src/api/asset/host-sftp-log.ts b/orion-ops-ui/src/api/asset/host-sftp-log.ts new file mode 100644 index 00000000..cf2a1c7d --- /dev/null +++ b/orion-ops-ui/src/api/asset/host-sftp-log.ts @@ -0,0 +1,62 @@ +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'; + +/** + * SFTP 操作日志 查询请求 + */ +export interface HostSftpLogQueryRequest extends Pagination { + userId?: number; + hostId?: number; + type?: string; + result?: number; + startTimeRange?: string[]; +} + +/** + * SFTP 操作日志 查询响应 + */ +export interface HostSftpLogQueryResponse extends TableData { + id: number; + userId: number; + username: number; + hostId: number; + hostName: string; + hostAddress: string; + address: string; + location: string; + userAgent: string; + paths: string[]; + type: string; + result: string; + startTime: number; + extra: HostSftpLogExtra; +} + +/** + * SFTP 操作日志 拓展对象 + */ +export interface HostSftpLogExtra { + mod: number; + target: string; +} + +/** + * 分页查询 SFTP 操作日志 + */ +export function getHostSftpLogPage(request: HostSftpLogQueryRequest) { + return axios.post>('/asset/host-sftp-log/query', request); +} + +/** + * 删除 SFTP 操作日志 + */ +export function deleteHostSftpLog(idList: Array) { + return axios.delete('/asset/host-sftp-log/delete', { + params: { idList }, + paramsSerializer: params => { + return qs.stringify(params, { arrayFormat: 'comma' }); + } + }); +} diff --git a/orion-ops-ui/src/assets/style/global.less b/orion-ops-ui/src/assets/style/global.less index 890ede99..186e25e3 100644 --- a/orion-ops-ui/src/assets/style/global.less +++ b/orion-ops-ui/src/assets/style/global.less @@ -230,6 +230,20 @@ body { margin-bottom: 16px; } +.text-ellipsis { + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.text-copy { + &:hover { + cursor: pointer; + text-decoration: underline; + color: rgb(var(--arcoblue-6)) + } +} + .copy-left, .copy-right { color: rgb(var(--arcoblue-6)); cursor: pointer; diff --git a/orion-ops-ui/src/router/routes/modules/host-audit.ts b/orion-ops-ui/src/router/routes/modules/host-audit.ts index 0bb9793d..08c70294 100644 --- a/orion-ops-ui/src/router/routes/modules/host-audit.ts +++ b/orion-ops-ui/src/router/routes/modules/host-audit.ts @@ -12,6 +12,11 @@ const HOST_AUDIT: AppRouteRecordRaw = path: '/host-audit/connect-log', component: () => import('@/views/host-audit/connect-log/index.vue'), }, + { + name: 'hostAuditSftpLog', + path: '/host-audit/sftp-log', + component: () => import('@/views/host-audit/sftp-log/index.vue'), + }, ], }; diff --git a/orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-detail-drawer.vue b/orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-detail-drawer.vue index d94c4fdb..8ed9377d 100644 --- a/orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-detail-drawer.vue +++ b/orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-detail-drawer.vue @@ -23,10 +23,11 @@ ({{ record.hostId }}) {{ record.hostName }}
- - + + {{ record.hostAddress }} - {{ record.hostAddress }} @@ -36,14 +37,15 @@ {{ getDictValue(connectStatusKey, record.status) }} - - + + {{ record.extra?.location }}
- - + + {{ record.extra?.address }} - {{ record.extra?.address }} @@ -63,15 +65,21 @@ - {{ record.extra?.traceId }} + + {{ record.extra?.traceId }} + - {{ record.extra?.channelId }} + + {{ record.extra?.channelId }} + - {{ record.extra?.sessionId }} + + {{ record.extra?.sessionId }} + diff --git a/orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-table.vue b/orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-table.vue index e5b4659b..c2bd0c49 100644 --- a/orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-table.vue +++ b/orion-ops-ui/src/views/host-audit/connect-log/components/connect-log-table.vue @@ -3,7 +3,7 @@ @@ -99,19 +99,6 @@ @page-change="(page) => fetchTableData(page, pagination.pageSize)" @page-size-change="(size) => fetchTableData(1, size)" :bordered="false"> - - @@ -136,6 +122,18 @@ }" /> {{ getDictValue(connectStatusKey, record.status) }} + + - + diff --git a/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue b/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue index da225b58..a6809245 100644 --- a/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue +++ b/orion-ops-ui/src/views/user/operator-log/components/operator-log-table.vue @@ -79,16 +79,15 @@ - + diff --git a/orion-ops-ui/src/views/user/operator-log/types/table.columns.ts b/orion-ops-ui/src/views/user/operator-log/types/table.columns.ts index 77687abc..dfe7c6ec 100644 --- a/orion-ops-ui/src/views/user/operator-log/types/table.columns.ts +++ b/orion-ops-ui/src/views/user/operator-log/types/table.columns.ts @@ -33,7 +33,7 @@ const columns = [ ellipsis: true, tooltip: true, }, { - title: '操作地址', + title: '留痕地址', dataIndex: 'address', slotName: 'address', width: 156,