From 79d9f69ed4f6c2277f914b3d7175529eb59e8d47 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sat, 8 Mar 2025 12:44:33 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=E7=BB=88=E7=AB=AF?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orion-vue-views-types-card.fields.ts.vm         |  2 +-
 .../asset/handler/host/jsch/SessionMessage.java     |  6 +++---
 .../asset/service/impl/TerminalServiceImpl.java     |  3 ++-
 .../src/components/exec/log/panel/index.vue         |  6 +++---
 .../asset-audit/connect-log/types/table.columns.ts  |  5 ++---
 .../views/asset/host-identity/types/card.fields.ts  |  2 +-
 .../asset/host-identity/types/table.columns.ts      |  3 +++
 .../src/views/asset/host-key/types/card.fields.ts   |  2 +-
 .../src/views/asset/host-list/types/card.fields.ts  |  2 +-
 .../components/setting/terminal-example.vue         | 13 +++++++------
 .../src/views/host/terminal/types/const.ts          |  2 +-
 11 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm
index 1951b820..6ad2e6fa 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-types-card.fields.ts.vm
@@ -3,7 +3,7 @@ import { dateFormat } from '@/utils';
 
 const fieldConfig = {
   rowGap: '10px',
-  labelSpan: 8,
+  labelSpan: 6,
   minHeight: '22px',
   fields: [
     {
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/jsch/SessionMessage.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionMessage.java
index ebf25a86..e3783dd1 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionMessage.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/handler/host/jsch/SessionMessage.java
@@ -31,10 +31,10 @@ package org.dromara.visor.module.asset.handler.host.jsch;
  */
 public interface SessionMessage {
 
-    String AUTHENTICATION_FAILURE = "authentication failed. please check the configuration. - {}";
+    String AUTHENTICATION_FAILURE = "身份认证失败. {}";
 
-    String SERVER_UNREACHABLE = "remote server unreachable. please check the configuration. - {}";
+    String SERVER_UNREACHABLE = "无法连接至服务器. {}";
 
-    String CONNECTION_TIMEOUT = "connection timeout. - {}";
+    String CONNECTION_TIMEOUT = "连接服务器超时. {}";
 
 }
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/TerminalServiceImpl.java b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java
index 70c358ec..85e0ad97 100644
--- a/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java
+++ b/orion-visor-modules/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/org/dromara/visor/module/asset/service/impl/TerminalServiceImpl.java
@@ -48,6 +48,7 @@ import org.dromara.visor.module.asset.enums.HostIdentityTypeEnum;
 import org.dromara.visor.module.asset.enums.HostSshAuthTypeEnum;
 import org.dromara.visor.module.asset.handler.host.config.model.HostSshConfigModel;
 import org.dromara.visor.module.asset.handler.host.extra.model.HostSshExtraModel;
+import org.dromara.visor.module.asset.service.AssetAuthorizedDataService;
 import org.dromara.visor.module.asset.service.HostConfigService;
 import org.dromara.visor.module.asset.service.HostExtraService;
 import org.dromara.visor.module.asset.service.TerminalService;
@@ -81,7 +82,7 @@ public class TerminalServiceImpl implements TerminalService {
     private HostExtraService hostExtraService;
 
     @Resource
-    private AssetAuthorizedDataServiceImpl assetAuthorizedDataService;
+    private AssetAuthorizedDataService assetAuthorizedDataService;
 
     @Resource
     private HostDAO hostDAO;
diff --git a/orion-visor-ui/src/components/exec/log/panel/index.vue b/orion-visor-ui/src/components/exec/log/panel/index.vue
index c9805140..c6a31209 100644
--- a/orion-visor-ui/src/components/exec/log/panel/index.vue
+++ b/orion-visor-ui/src/components/exec/log/panel/index.vue
@@ -27,7 +27,7 @@
 <script lang="ts" setup>
   import type { ExecLogQueryResponse } from '@/api/exec/exec-log';
   import type { ExecType, ILogAppender } from '../const';
-  import { onUnmounted, ref, nextTick, onMounted } from 'vue';
+  import { onUnmounted, ref, nextTick, onMounted, markRaw } from 'vue';
   import { getExecCommandLogStatus } from '@/api/exec/exec-command-log';
   import { getExecJobLogStatus } from '@/api/exec/exec-job-log';
   import { dictKeys, ExecHostStatus, ExecStatus } from '../const';
@@ -58,11 +58,11 @@
     const { log_webScrollLines } = await useCacheStore().loadSystemSetting();
     const scrollLines = toAnonymousNumber(log_webScrollLines) || 1000;
     // 创建 appender
-    appender.value = new LogAppender({
+    appender.value = markRaw(new LogAppender({
       id: record.id,
       type: props.type,
       scrollLines,
-    });
+    }));
     // 定时查询执行状态
     if (record.status === ExecStatus.WAITING ||
       record.status === ExecStatus.RUNNING) {
diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts b/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts
index 5e28853b..5ce6f3d9 100644
--- a/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/asset-audit/connect-log/types/table.columns.ts
@@ -1,5 +1,4 @@
 import type { TableColumnData } from '@arco-design/web-vue/es/table/interface';
-import { dateFormat } from '@/utils';
 
 const columns = [
   {
@@ -32,8 +31,8 @@ const columns = [
     title: '状态',
     dataIndex: 'status',
     slotName: 'status',
-    align: 'center',
-    width: 106,
+    align: 'left',
+    width: 118,
   }, {
     title: '留痕地址',
     dataIndex: 'address',
diff --git a/orion-visor-ui/src/views/asset/host-identity/types/card.fields.ts b/orion-visor-ui/src/views/asset/host-identity/types/card.fields.ts
index d304c818..87a63c78 100644
--- a/orion-visor-ui/src/views/asset/host-identity/types/card.fields.ts
+++ b/orion-visor-ui/src/views/asset/host-identity/types/card.fields.ts
@@ -3,7 +3,7 @@ import { dateFormat } from '@/utils';
 
 const fieldConfig = {
   rowGap: '10px',
-  labelSpan: 8,
+  labelSpan: 6,
   minHeight: '22px',
   fields: [
     {
diff --git a/orion-visor-ui/src/views/asset/host-identity/types/table.columns.ts b/orion-visor-ui/src/views/asset/host-identity/types/table.columns.ts
index a1eb5cd6..25bf53c6 100644
--- a/orion-visor-ui/src/views/asset/host-identity/types/table.columns.ts
+++ b/orion-visor-ui/src/views/asset/host-identity/types/table.columns.ts
@@ -19,6 +19,8 @@ const columns = [
     title: '用户名',
     dataIndex: 'username',
     slotName: 'username',
+    ellipsis: true,
+    tooltip: true
   }, {
     title: '类型',
     dataIndex: 'type',
@@ -28,6 +30,7 @@ const columns = [
     title: '主机密钥',
     dataIndex: 'keyId',
     slotName: 'keyId',
+    width: 180,
   }, {
     title: '描述',
     dataIndex: 'description',
diff --git a/orion-visor-ui/src/views/asset/host-key/types/card.fields.ts b/orion-visor-ui/src/views/asset/host-key/types/card.fields.ts
index a11da082..b4d3561d 100644
--- a/orion-visor-ui/src/views/asset/host-key/types/card.fields.ts
+++ b/orion-visor-ui/src/views/asset/host-key/types/card.fields.ts
@@ -3,7 +3,7 @@ import { dateFormat } from '@/utils';
 
 const fieldConfig = {
   rowGap: '10px',
-  labelSpan: 8,
+  labelSpan: 6,
   minHeight: '22px',
   fields: [
     {
diff --git a/orion-visor-ui/src/views/asset/host-list/types/card.fields.ts b/orion-visor-ui/src/views/asset/host-list/types/card.fields.ts
index 5621db12..59ef8ee5 100644
--- a/orion-visor-ui/src/views/asset/host-list/types/card.fields.ts
+++ b/orion-visor-ui/src/views/asset/host-list/types/card.fields.ts
@@ -2,7 +2,7 @@ import type { CardField, CardFieldConfig } from '@/types/card';
 
 const fieldConfig = {
   rowGap: '10px',
-  labelSpan: 8,
+  labelSpan: 6,
   minHeight: '22px',
   fields: [
     {
diff --git a/orion-visor-ui/src/views/host/terminal/components/setting/terminal-example.vue b/orion-visor-ui/src/views/host/terminal/components/setting/terminal-example.vue
index e5ab9f2a..42664150 100644
--- a/orion-visor-ui/src/views/host/terminal/components/setting/terminal-example.vue
+++ b/orion-visor-ui/src/views/host/terminal/components/setting/terminal-example.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="terminal-example" ref="terminal" />
+  <div class="terminal-example" ref="terminalRef" />
 </template>
 
 <script lang="ts">
@@ -11,31 +11,32 @@
 <script lang="ts" setup>
   import type { TerminalThemeSchema } from '@/api/asset/terminal';
   import { Terminal } from '@xterm/xterm';
-  import { onMounted, onUnmounted, ref } from 'vue';
+  import { markRaw, onMounted, onUnmounted, ref } from 'vue';
 
   const props = defineProps<{
     schema: TerminalThemeSchema | Record<string, any>;
   }>();
 
-  const terminal = ref();
+  const terminalRef = ref();
   const term = ref();
 
   onMounted(() => {
-    term.value = new Terminal({
+    const terminal = new Terminal({
       theme: { ...props.schema, cursor: props.schema.background },
       cols: 42,
       rows: 6,
       fontSize: 15,
       cursorInactiveStyle: 'none',
     });
-    term.value.open(terminal.value);
-    term.value.write(
+    terminal.open(terminalRef.value);
+    terminal.write(
       '[root@OrionServer usr]#\r\n' +
       'dr-xr-xr-x.  2 root root bin\r\n' +
       'dr-xr-xr-x.  2 root root sbin\r\n' +
       'drwxr-xr-x.  4 root root src\r\n' +
       'lrwxrwxrwx.  1 root root tmp -> ../var/tmp '
     );
+    term.value = markRaw(terminal);
   });
 
   defineExpose({ term });
diff --git a/orion-visor-ui/src/views/host/terminal/types/const.ts b/orion-visor-ui/src/views/host/terminal/types/const.ts
index 8e6ed2a9..9a6bbc87 100644
--- a/orion-visor-ui/src/views/host/terminal/types/const.ts
+++ b/orion-visor-ui/src/views/host/terminal/types/const.ts
@@ -363,7 +363,7 @@ export const TransferReceiver = {
 };
 
 // 会话关闭信息
-export const sessionCloseMsg = 'session closed...';
+export const sessionCloseMsg = '会话已结束...';
 
 // 打开 settingModal key
 export const openSettingModalKey = Symbol();