From a14b28de6a83b7a6019863564aeb07521ffa54e0 Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Fri, 7 Feb 2025 10:07:45 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=E8=BF=9E=E6=8E=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AD=97=E6=AE=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/asset/entity/domain/TerminalConnectLogDO.java    | 6 +++---
 .../request/host/TerminalConnectLogCreateRequest.java       | 6 +++---
 .../entity/request/host/TerminalConnectLogQueryRequest.java | 6 +++---
 .../handler/host/terminal/handler/TerminalCheckHandler.java | 2 +-
 .../asset/service/impl/TerminalConnectLogServiceImpl.java   | 2 +-
 .../src/main/resources/mapper/TerminalConnectLogMapper.xml  | 4 ++--
 .../connect-log/components/connect-log-detail-drawer.vue    | 4 ++--
 7 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java
index 4646913a..4091e219 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/entity/domain/TerminalConnectLogDO.java
@@ -78,9 +78,9 @@ public class TerminalConnectLogDO extends BaseDO {
     @TableField("type")
     private String type;
 
-    @Schema(description = "token")
-    @TableField("token")
-    private String token;
+    @Schema(description = "sessionId")
+    @TableField("session_id")
+    private String sessionId;
 
     @Schema(description = "状态")
     @TableField("status")
diff --git a/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 b/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
index 83b07973..26e86050 100644
--- a/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
+++ b/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
@@ -63,9 +63,9 @@ public class TerminalConnectLogCreateRequest {
     @Schema(description = "状态")
     private String status;
 
-    @Size(max = 128)
-    @Schema(description = "token")
-    private String token;
+    @Size(max = 64)
+    @Schema(description = "sessionId")
+    private String sessionId;
 
     @Schema(description = "拓展信息")
     private Map<String, Object> extra;
diff --git a/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 b/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
index f0505da6..3da046a9 100644
--- a/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
+++ b/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
@@ -69,9 +69,9 @@ public class TerminalConnectLogQueryRequest extends PageRequest {
     @Schema(description = "类型")
     private String type;
 
-    @Size(max = 128)
-    @Schema(description = "token")
-    private String token;
+    @Size(max = 64)
+    @Schema(description = "sessionId")
+    private String sessionId;
 
     @Size(max = 16)
     @Schema(description = "状态")
diff --git a/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 b/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
index 64eb4509..7344e131 100644
--- a/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
+++ b/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
@@ -225,7 +225,7 @@ public class TerminalCheckHandler extends AbstractTerminalHandler<TerminalCheckR
                 .hostName(hostName)
                 .hostAddress(host.getAddress())
                 .status(ex == null ? TerminalConnectStatusEnum.CONNECTING.name() : TerminalConnectStatusEnum.FAILED.name())
-                .token(sessionId)
+                .sessionId(sessionId)
                 .extra(extra)
                 .build();
         // 填充其他信息
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java
index fc503747..e0383480 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalConnectLogServiceImpl.java
@@ -263,7 +263,7 @@ public class TerminalConnectLogServiceImpl implements TerminalConnectLogService
                 .eq(TerminalConnectLogDO::getHostId, request.getHostId())
                 .like(TerminalConnectLogDO::getHostAddress, request.getHostAddress())
                 .eq(TerminalConnectLogDO::getType, request.getType())
-                .like(TerminalConnectLogDO::getToken, request.getToken())
+                .like(TerminalConnectLogDO::getSessionId, request.getSessionId())
                 .eq(TerminalConnectLogDO::getStatus, request.getStatus())
                 .in(TerminalConnectLogDO::getStatus, request.getStatusList())
                 .ge(TerminalConnectLogDO::getStartTime, Arrays1.getIfPresent(request.getStartTimeRange(), 0))
diff --git a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml
index 47f1fa4b..7e11d36b 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/resources/mapper/TerminalConnectLogMapper.xml
@@ -11,7 +11,7 @@
         <result column="host_name" property="hostName"/>
         <result column="host_address" property="hostAddress"/>
         <result column="type" property="type"/>
-        <result column="token" property="token"/>
+        <result column="session_id" property="sessionId"/>
         <result column="status" property="status"/>
         <result column="start_time" property="startTime"/>
         <result column="end_time" property="endTime"/>
@@ -30,7 +30,7 @@
 
     <!-- 通用查询结果列 -->
     <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>
 
     <select id="selectLatestConnectHostId" resultType="java.lang.Long">
diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-detail-drawer.vue b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-detail-drawer.vue
index e6d728aa..9a29e372 100644
--- a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-detail-drawer.vue
+++ b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-detail-drawer.vue
@@ -83,8 +83,8 @@
       </a-descriptions-item>
       <!-- sessionId -->
       <a-descriptions-item label="sessionId">
-        <span class="text-copy" @click="copy(record.extra?.sessionId)">
-          {{ record.extra?.sessionId }}
+        <span class="text-copy" @click="copy(record.sessionId)">
+          {{ record.sessionId }}
         </span>
       </a-descriptions-item>
     </a-descriptions>