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
2025-02-07 10:07:45 +08:00
parent ccd7430b8f
commit a14b28de6a
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java
View File

@@ -78,9 +78,9 @@ public class TerminalConnectLogDO extends BaseDO {
@TableField("type") @TableField("type")
private String type; private String type;
@Schema(description = "token") @Schema(description = "sessionId")
@TableField("token") @TableField("session_id")
private String token; private String sessionId;
@Schema(description = "状态") @Schema(description = "状态")
@TableField("status") @TableField("status")

6
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogCreateRequest.java
View File

@@ -63,9 +63,9 @@ public class TerminalConnectLogCreateRequest {
@Schema(description = "状态") @Schema(description = "状态")
private String status; private String status;
@Size(max = 128) @Size(max = 64)
@Schema(description = "token") @Schema(description = "sessionId")
private String token; private String sessionId;
@Schema(description = "拓展信息") @Schema(description = "拓展信息")
private Map<String, Object> extra; private Map<String, Object> extra;

6
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/request/host/TerminalConnectLogQueryRequest.java
View File

@@ -69,9 +69,9 @@ public class TerminalConnectLogQueryRequest extends PageRequest {
@Schema(description = "类型") @Schema(description = "类型")
private String type; private String type;
@Size(max = 128) @Size(max = 64)
@Schema(description = "token") @Schema(description = "sessionId")
private String token; private String sessionId;
@Size(max = 16) @Size(max = 16)
@Schema(description = "状态") @Schema(description = "状态")

2
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/terminal/handler/TerminalCheckHandler.java
View File

@@ -225,7 +225,7 @@ public class TerminalCheckHandler extends AbstractTerminalHandler<TerminalCheckR
.hostName(hostName) .hostName(hostName)
.hostAddress(host.getAddress()) .hostAddress(host.getAddress())
.status(ex == null ? TerminalConnectStatusEnum.CONNECTING.name() : TerminalConnectStatusEnum.FAILED.name()) .status(ex == null ? TerminalConnectStatusEnum.CONNECTING.name() : TerminalConnectStatusEnum.FAILED.name())
.token(sessionId) .sessionId(sessionId)
.extra(extra) .extra(extra)
.build(); .build();
// 填充其他信息 // 填充其他信息

2
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java
View File

@@ -263,7 +263,7 @@ public class TerminalConnectLogServiceImpl implements TerminalConnectLogService
.eq(TerminalConnectLogDO::getHostId, request.getHostId()) .eq(TerminalConnectLogDO::getHostId, request.getHostId())
.like(TerminalConnectLogDO::getHostAddress, request.getHostAddress()) .like(TerminalConnectLogDO::getHostAddress, request.getHostAddress())
.eq(TerminalConnectLogDO::getType, request.getType()) .eq(TerminalConnectLogDO::getType, request.getType())
.like(TerminalConnectLogDO::getToken, request.getToken()) .like(TerminalConnectLogDO::getSessionId, request.getSessionId())
.eq(TerminalConnectLogDO::getStatus, request.getStatus()) .eq(TerminalConnectLogDO::getStatus, request.getStatus())
.in(TerminalConnectLogDO::getStatus, request.getStatusList()) .in(TerminalConnectLogDO::getStatus, request.getStatusList())
.ge(TerminalConnectLogDO::getStartTime, Arrays1.getIfPresent(request.getStartTimeRange(), 0)) .ge(TerminalConnectLogDO::getStartTime, Arrays1.getIfPresent(request.getStartTimeRange(), 0))

4
orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml
View File

@@ -11,7 +11,7 @@
<result column="host_name" property="hostName"/> <result column="host_name" property="hostName"/>
<result column="host_address" property="hostAddress"/> <result column="host_address" property="hostAddress"/>
<result column="type" property="type"/> <result column="type" property="type"/>
<result column="token" property="token"/> <result column="session_id" property="sessionId"/>
<result column="status" property="status"/> <result column="status" property="status"/>
<result column="start_time" property="startTime"/> <result column="start_time" property="startTime"/>
<result column="end_time" property="endTime"/> <result column="end_time" property="endTime"/>
@@ -30,7 +30,7 @@
<!-- 通用查询结果列 --> <!-- 通用查询结果列 -->
<sql id="Base_Column_List"> <sql id="Base_Column_List">
id, user_id, username, host_id, host_name, host_address, type, token, status, start_time, end_time, extra_info, create_time, update_time, deleted id, user_id, username, host_id, host_name, host_address, type, session_id, status, start_time, end_time, extra_info, create_time, update_time, deleted
</sql> </sql>
<select id="selectLatestConnectHostId" resultType="java.lang.Long"> <select id="selectLatestConnectHostId" resultType="java.lang.Long">

4
orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-detail-drawer.vue
View File

@@ -83,8 +83,8 @@
</a-descriptions-item> </a-descriptions-item>
<!-- sessionId --> <!-- sessionId -->
<a-descriptions-item label="sessionId"> <a-descriptions-item label="sessionId">
<span class="text-copy" @click="copy(record.extra?.sessionId)"> <span class="text-copy" @click="copy(record.sessionId)">
{{ record.extra?.sessionId }} {{ record.sessionId }}
</span> </span>
</a-descriptions-item> </a-descriptions-item>
</a-descriptions> </a-descriptions>