From e9ac9b9f13138807ad4aa6b913bc04af7e7bba4a Mon Sep 17 00:00:00 2001
From: lijiahang <ljh1553488six@139.com>
Date: Mon, 8 Jul 2024 14:44:33 +0800
Subject: [PATCH] =?UTF-8?q?:zap:=20=E4=BF=AE=E6=94=B9=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E5=80=BC=E9=95=BF=E5=BA=A6.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orion-vue-views-components-form-modal.vue.vm   |  2 +-
 .../host/terminal/manager/HostTerminalManager.java |  2 +-
 .../service/impl/HostTerminalServiceImpl.java      |  2 +-
 .../request/dict/DictValueCreateRequest.java       |  1 -
 .../entity/request/dict/DictValueQueryRequest.java |  1 -
 .../request/dict/DictValueUpdateRequest.java       |  1 -
 .../components/dict-value-form-modal.vue           |  8 ++++----
 .../dict-value/components/dict-value-table.vue     | 14 ++++++--------
 .../views/system/dict-value/types/form.rules.ts    |  4 ++--
 9 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
index c69dde87..9e035c23 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
@@ -1,6 +1,6 @@
 <template>
   <a-modal v-model:visible="visible"
-           body-class="modal-form-large"
+           modal-class="modal-form-large"
            title-align="start"
            :title="title"
            :top="80"
diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/manager/HostTerminalManager.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/manager/HostTerminalManager.java
index 90231fd8..53eca693 100644
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/manager/HostTerminalManager.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/handler/host/terminal/manager/HostTerminalManager.java
@@ -65,7 +65,7 @@ public class HostTerminalManager {
      *
      * @param channelId channelId
      * @param sessionId sessionId
-     * @param T         T
+     * @param <T>       T
      * @return session
      */
     @SuppressWarnings("unchecked")
diff --git a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java
index bdc1f305..3a279328 100644
--- a/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java
+++ b/orion-visor-module-asset/orion-visor-module-asset-service/src/main/java/com/orion/visor/module/asset/service/impl/HostTerminalServiceImpl.java
@@ -93,7 +93,7 @@ public class HostTerminalServiceImpl implements HostTerminalService {
 
     @Override
     public String getTerminalAccessToken() {
-        LoginUser user = SecurityUtils.getLoginUser();
+        LoginUser user = Valid.notNull(SecurityUtils.getLoginUser());
         log.info("HostConnectService.getHostAccessToken userId: {}", user.getId());
         String accessToken = UUIds.random19();
         HostTerminalAccessDTO access = HostTerminalAccessDTO.builder()
diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueCreateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueCreateRequest.java
index 9b0d3d62..1ed9fcfc 100644
--- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueCreateRequest.java
+++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueCreateRequest.java
@@ -30,7 +30,6 @@ public class DictValueCreateRequest implements Serializable {
     private Long keyId;
 
     @NotBlank
-    @Size(max = 512)
     @Schema(description = "配置值")
     private String value;
 
diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueQueryRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueQueryRequest.java
index 4a584194..ac0306e6 100644
--- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueQueryRequest.java
+++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueQueryRequest.java
@@ -28,7 +28,6 @@ public class DictValueQueryRequest extends PageRequest {
     @Schema(description = "配置项名称")
     private String keyName;
 
-    @Size(max = 512)
     @Schema(description = "配置值")
     private String value;
 
diff --git a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java
index f56ac53b..685c1248 100644
--- a/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java
+++ b/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/com/orion/visor/module/infra/entity/request/dict/DictValueUpdateRequest.java
@@ -34,7 +34,6 @@ public class DictValueUpdateRequest implements Serializable {
     private Long keyId;
 
     @NotBlank
-    @Size(max = 512)
     @Schema(description = "配置值")
     private String value;
 
diff --git a/orion-visor-ui/src/views/system/dict-value/components/dict-value-form-modal.vue b/orion-visor-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
index 7b438d6f..cfc0d574 100644
--- a/orion-visor-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
+++ b/orion-visor-ui/src/views/system/dict-value/components/dict-value-form-modal.vue
@@ -24,14 +24,14 @@
                      label="配置项">
           <dict-key-selector v-model="formModel.keyId" @change="changeKey" />
         </a-form-item>
-        <!-- 配置值 -->
-        <a-form-item field="value" label="配置值">
-          <a-input v-model="formModel.value" placeholder="请输入配置值" allow-clear />
-        </a-form-item>
         <!-- 配置描述 -->
         <a-form-item field="label" label="配置描述">
           <a-input v-model="formModel.label" placeholder="请输入配置描述" allow-clear />
         </a-form-item>
+        <!-- 配置值 -->
+        <a-form-item field="value" label="配置值">
+          <a-input v-model="formModel.value" placeholder="请输入配置值" allow-clear />
+        </a-form-item>
         <!-- 排序 -->
         <a-form-item field="sort" label="排序">
           <a-input-number v-model="formModel.sort"
diff --git a/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue b/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
index 4cca8fce..ab425b22 100644
--- a/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
+++ b/orion-visor-ui/src/views/system/dict-value/components/dict-value-table.vue
@@ -88,7 +88,7 @@
         <span class="copy-left" title="复制" @click="copy(record.value)">
           <icon-copy />
         </span>
-        <a-tooltip :content="record.value">
+        <a-tooltip position="tl" :content="record.value">
           <span>{{ record.value }}</span>
         </a-tooltip>
       </template>
@@ -146,13 +146,13 @@
 
   const emits = defineEmits(['openAdd', 'openUpdate', 'openHistory']);
 
-  const selectedKeys = ref<number[]>([]);
-  const tableRenderData = ref<DictValueQueryResponse[]>([]);
-
   const pagination = usePagination();
   const rowSelection = useRowSelection();
   const { loading, setLoading } = useLoading();
 
+  const selectedKeys = ref<Array<number>>([]);
+  const tableRenderData = ref<Array<DictValueQueryResponse>>([]);
+
   const formModel = reactive<DictValueQueryRequest>({
     keyId: undefined,
     keyName: undefined,
@@ -178,13 +178,11 @@
   };
 
   // 删除当前行
-  const deleteRow = async ({ id }: {
-    id: number
-  }) => {
+  const deleteRow = async (record: DictValueQueryResponse) => {
     try {
       setLoading(true);
       // 调用删除接口
-      await deleteDictValue(id);
+      await deleteDictValue(record.id);
       Message.success('删除成功');
       // 重新加载数据
       fetchTableData();
diff --git a/orion-visor-ui/src/views/system/dict-value/types/form.rules.ts b/orion-visor-ui/src/views/system/dict-value/types/form.rules.ts
index bddb52fc..cbf0993d 100644
--- a/orion-visor-ui/src/views/system/dict-value/types/form.rules.ts
+++ b/orion-visor-ui/src/views/system/dict-value/types/form.rules.ts
@@ -17,8 +17,8 @@ export const value = [{
   required: true,
   message: '请输入配置值'
 }, {
-  maxLength: 512,
-  message: '配置值长度不能大于512位'
+  maxLength: 1024,
+  message: '配置值长度不能大于1024位'
 }] as FieldRule[];
 
 export const label = [{