From 25359f0f6638c8d9c7b36cfd47e2ebca2f34f661 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Wed, 15 Jan 2025 23:44:54 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BF=AE=E6=94=B9=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=A4=A7=E5=B0=8F.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../module/infra/define/cache/UserCacheKeyDefine.java      | 4 ++--
 orion-visor-ui/src/layout/full-layout.vue                  | 2 +-
 orion-visor-ui/src/views/asset/grant/index.vue             | 7 ++-----
 orion-visor-ui/src/views/exec/batch-upload/index.vue       | 4 +---
 orion-visor-ui/src/views/exec/exec-command/index.vue       | 7 ++++++-
 sql/常用.sql                                               | 1 +
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java
index 3860f7b5..ff179ef0 100644
--- a/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java
+++ b/orion-visor-modules/orion-visor-module-infra/orion-visor-module-infra-service/src/main/java/org/dromara/visor/module/infra/define/cache/UserCacheKeyDefine.java
@@ -68,7 +68,7 @@ public interface UserCacheKeyDefine {
             .desc("用户登录 token ${id} ${time}")
             .type(LoginTokenDTO.class)
             .struct(RedisCacheStruct.STRING)
-            .timeout(24, TimeUnit.HOURS)
+            .timeout(24 * 60, TimeUnit.MINUTES)
             .build();
 
     CacheKeyDefine LOGIN_REFRESH = new CacheKeyBuilder()
@@ -76,7 +76,7 @@ public interface UserCacheKeyDefine {
             .desc("用户刷新 token ${id} ${time}")
             .type(LoginTokenDTO.class)
             .struct(RedisCacheStruct.STRING)
-            .timeout(32, TimeUnit.HOURS)
+            .timeout(32 * 60, TimeUnit.MINUTES)
             .build();
 
 }
diff --git a/orion-visor-ui/src/layout/full-layout.vue b/orion-visor-ui/src/layout/full-layout.vue
index 6452d38c..3cf8b52f 100644
--- a/orion-visor-ui/src/layout/full-layout.vue
+++ b/orion-visor-ui/src/layout/full-layout.vue
@@ -8,7 +8,7 @@
                    :z-index="9999"
                    style="width: 100%; height: 100%;"
                    :content="userStore.username || ''">
-        <PageLayout />
+        <page-layout />
       </a-watermark>
     </a-layout-content>
   </a-layout>
diff --git a/orion-visor-ui/src/views/asset/grant/index.vue b/orion-visor-ui/src/views/asset/grant/index.vue
index 06da5b60..bfef9767 100644
--- a/orion-visor-ui/src/views/asset/grant/index.vue
+++ b/orion-visor-ui/src/views/asset/grant/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="view-container">
+  <div class="layout-container view-container">
     <a-tabs v-model:active-key="activeKey"
             class="tabs-container simple-card"
             size="large"
@@ -52,11 +52,8 @@
 
 <style lang="less" scoped>
   .view-container {
-    display: flex;
     width: 100%;
-    height: 100%;
-    position: relative;
-    padding: 16px;
+    height: calc(100vh - 92px);
   }
 
   .tabs-container {
diff --git a/orion-visor-ui/src/views/exec/batch-upload/index.vue b/orion-visor-ui/src/views/exec/batch-upload/index.vue
index 3517afea..c31dfd75 100644
--- a/orion-visor-ui/src/views/exec/batch-upload/index.vue
+++ b/orion-visor-ui/src/views/exec/batch-upload/index.vue
@@ -45,9 +45,7 @@
 
   .upload-container {
     width: 100%;
-    height: 100%;
-    position: relative;
-    display: flex;
+    height: calc(100vh - 92px);
   }
 
 </style>
diff --git a/orion-visor-ui/src/views/exec/exec-command/index.vue b/orion-visor-ui/src/views/exec/exec-command/index.vue
index 15ab7b37..75a03ca2 100644
--- a/orion-visor-ui/src/views/exec/exec-command/index.vue
+++ b/orion-visor-ui/src/views/exec/exec-command/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="layout-container full">
+  <div class="layout-container exec-container">
     <!-- 执行面板 -->
     <div v-show="!logVisible" class="panel-wrapper">
       <exec-command-panel @submit="openLog" />
@@ -73,6 +73,11 @@
 
 <style lang="less" scoped>
 
+  .exec-container {
+    width: 100%;
+    height: calc(100vh - 92px);
+  }
+
   .panel-wrapper {
     width: 100%;
     height: 100%;
diff --git a/sql/常用.sql b/sql/常用.sql
index 4836ac21..253043a4 100644
--- a/sql/常用.sql
+++ b/sql/常用.sql
@@ -21,3 +21,4 @@ ADD COLUMN `deleted` tinyint(1) DEFAULT '0' COMMENT '是否删除 0未删除 1
 DELETE FROM dict_key WHERE deleted = 1;
 DELETE FROM dict_value WHERE deleted = 1;
 DELETE FROM system_menu WHERE deleted = 1;
+DELETE FROM system_setting WHERE deleted = 1;