From 5ecb476be51dd8e3351907dfed1603de6ec7fb31 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Sun, 19 Jan 2025 18:56:02 +0800
Subject: [PATCH] =?UTF-8?q?:bookmark:=20=E5=8D=87=E7=BA=A7=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/adminer/build.sh                                  | 2 +-
 docker/mysql/build.sh                                    | 2 +-
 docker/push.sh                                           | 2 +-
 docker/redis/build.sh                                    | 2 +-
 docker/service/build.sh                                  | 2 +-
 .../java/org/dromara/visor/common/constant/AppConst.java | 2 +-
 orion-visor-dependencies/pom.xml                         | 2 +-
 .../java/org/dromara/visor/launch/ReplaceVersion.java    | 2 +-
 orion-visor-ui/.env.development                          | 2 +-
 orion-visor-ui/.env.production                           | 2 +-
 orion-visor-ui/package.json                              | 2 +-
 orion-visor-ui/src/views/exec/exec-command/index.vue     | 9 ++-------
 .../src/views/exec/exec-job-log/types/table.columns.ts   | 1 +
 pom.xml                                                  | 2 +-
 sql/init-4-data.sql                                      | 2 +-
 15 files changed, 16 insertions(+), 20 deletions(-)

diff --git a/docker/adminer/build.sh b/docker/adminer/build.sh
index 7a17a419..6e10de18 100644
--- a/docker/adminer/build.sh
+++ b/docker/adminer/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.3
+version=2.3.0
 docker build -t orion-visor-adminer:${version} .
 docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
 docker tag orion-visor-adminer:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:latest
diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
index 77fee879..0c7db7da 100644
--- a/docker/mysql/build.sh
+++ b/docker/mysql/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.3
+version=2.3.0
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql
diff --git a/docker/push.sh b/docker/push.sh
index 51dbd22f..bb296787 100644
--- a/docker/push.sh
+++ b/docker/push.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.3
+version=2.3.0
 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-adminer:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-mysql:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version}
diff --git a/docker/redis/build.sh b/docker/redis/build.sh
index 61a290d2..a58ef254 100644
--- a/docker/redis/build.sh
+++ b/docker/redis/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.3
+version=2.3.0
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:${version}
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/orionsec/orion-visor-redis:latest
diff --git a/docker/service/build.sh b/docker/service/build.sh
index 1b381b3c..6312f193 100644
--- a/docker/service/build.sh
+++ b/docker/service/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.2.3
+version=2.3.0
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 mv ../../orion-visor-ui/dist ./dist
 docker build --no-cache -t orion-visor-service:${version} .
diff --git a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java
index e5ae290b..444bd022 100644
--- a/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java
+++ b/orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java
@@ -36,7 +36,7 @@ public interface AppConst extends OrionConst {
     /**
      * 同 ${orion.version} 迭代时候需要手动更改
      */
-    String VERSION = "2.2.3";
+    String VERSION = "2.3.0";
 
     /**
      * 同 ${spring.application.name}
diff --git a/orion-visor-dependencies/pom.xml b/orion-visor-dependencies/pom.xml
index 7111afce..92f73f8d 100644
--- a/orion-visor-dependencies/pom.xml
+++ b/orion-visor-dependencies/pom.xml
@@ -14,7 +14,7 @@
     <url>https://github.com/dromara/orion-visor</url>
 
     <properties>
-        <revision>2.2.3</revision>
+        <revision>2.3.0</revision>
         <spring.boot.version>2.7.17</spring.boot.version>
         <spring.boot.admin.version>2.7.15</spring.boot.admin.version>
         <flatten.maven.plugin.version>1.5.0</flatten.maven.plugin.version>
diff --git a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java
index 9bd1e7ef..86558434 100644
--- a/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java
+++ b/orion-visor-launch/src/test/java/org/dromara/visor/launch/ReplaceVersion.java
@@ -61,7 +61,7 @@ public class ReplaceVersion {
             "orion-visor-dependencies/pom.xml"
     };
 
-    private static final String APP_CONST_FILE = "orion-visor-common/src/main/java/org/dromara/visor/framework/common/constant/AppConst.java";
+    private static final String APP_CONST_FILE = "orion-visor-common/src/main/java/org/dromara/visor/common/constant/AppConst.java";
 
     private static final String PACKAGE_JSON_FILE = "orion-visor-ui/package.json";
 
diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development
index ca4f042a..c8ffe522 100644
--- a/orion-visor-ui/.env.development
+++ b/orion-visor-ui/.env.development
@@ -3,4 +3,4 @@ VITE_API_BASE_URL=http://127.0.0.1:9200/orion-visor/api
 # websocket 路径
 VITE_WS_BASE_URL=ws://127.0.0.1:9200/orion-visor/keep-alive
 # 版本号
-VITE_APP_VERSION=2.2.3
+VITE_APP_VERSION=2.3.0
diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production
index c5f0dec0..a147a44a 100644
--- a/orion-visor-ui/.env.production
+++ b/orion-visor-ui/.env.production
@@ -3,4 +3,4 @@ VITE_API_BASE_URL=/orion-visor/api
 # websocket 路径
 VITE_WS_BASE_URL=/orion-visor/keep-alive
 # 版本号
-VITE_APP_VERSION=2.2.3
+VITE_APP_VERSION=2.3.0
diff --git a/orion-visor-ui/package.json b/orion-visor-ui/package.json
index 29835ec3..8212c103 100644
--- a/orion-visor-ui/package.json
+++ b/orion-visor-ui/package.json
@@ -1,7 +1,7 @@
 {
   "name": "orion-visor-ui",
   "description": "Orion Visor UI",
-  "version": "2.2.3",
+  "version": "2.3.0",
   "private": true,
   "author": "Jiahang Li",
   "license": "Apache 2.0",
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 75a03ca2..644c650e 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 exec-container">
+  <div class="layout-container full">
     <!-- 执行面板 -->
     <div v-show="!logVisible" class="panel-wrapper">
       <exec-command-panel @submit="openLog" />
@@ -73,15 +73,10 @@
 
 <style lang="less" scoped>
 
-  .exec-container {
-    width: 100%;
-    height: calc(100vh - 92px);
-  }
-
   .panel-wrapper {
     width: 100%;
-    height: 100%;
     position: relative;
+    height: calc(100vh - 124px);
   }
 
 </style>
diff --git a/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts b/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts
index 69529340..97de9029 100644
--- a/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts
+++ b/orion-visor-ui/src/views/exec/exec-job-log/types/table.columns.ts
@@ -21,6 +21,7 @@ const columns = [
     slotName: 'command',
     align: 'left',
     minWidth: 238,
+    ellipsis: true,
   }, {
     title: '执行用户',
     dataIndex: 'username',
diff --git a/pom.xml b/pom.xml
index 62ba29f1..46841506 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@
     </modules>
 
     <properties>
-        <revision>2.2.3</revision>
+        <revision>2.3.0</revision>
         <maven.compiler.source>8</maven.compiler.source>
         <maven.compiler.target>8</maven.compiler.target>
         <maven.surefire.plugin.version>3.0.0-M5</maven.surefire.plugin.version>
diff --git a/sql/init-4-data.sql b/sql/init-4-data.sql
index b3effb50..c75acf93 100644
--- a/sql/init-4-data.sql
+++ b/sql/init-4-data.sql
@@ -3,7 +3,7 @@
 INSERT INTO `system_user` VALUES (1, 'admin', 'c3284d0f94606de1fd2af172aba15bf3', '管理员', NULL, NULL, NULL, 1, 1, 'NEW', NULL, NULL, NOW(), NOW(), '1', '1', 0);
 
 -- 角色配置
-INSERT INTO `system_role` VALUES (1, '管理员', 'admin', 1, '2023-07-16 21:13:14', '2023-07-17 17:31:29', '1', '1', 0);
+INSERT INTO `system_role` VALUES (1, '管理员', 'admin', 1, NULL, '2023-07-16 21:13:14', '2023-07-17 17:31:29', '1', '1', 0);
 
 -- 角色用户关联
 INSERT INTO `system_user_role` VALUES (1, 1, 1, '2023-07-16 21:15:49', '2023-07-17 18:18:02', '1', '1', 0);