Merge pull request #44 from dromara/dev

Dev
dromara · Jul 26, 2024 · 1b2753a · 1b2753a
2 parents b421755 + 29b44b8
commit 1b2753a
Show file tree

Hide file tree

Showing 56 changed files with 208 additions and 177 deletions.
diff --git a/README.md b/README.md
@@ -53,7 +53,7 @@
 
 * 🔗 演示地址: http://101.43.254.243:1081/
 * 🔏 演示账号: admin/admin
-* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor)  [gitcode](https://gitcode.com/qq_41011894/orion-visor/overview)
+* ⭐ 体验后可以点一下 `star` 这对我很重要! [github](https://github.com/dromara/orion-visor) [gitee](https://gitee.com/dromara/orion-visor)  [gitcode](https://gitcode.com/dromara/orion-visor/overview)
 * 🌈 如果本项目对你有帮助请帮忙推广一下 让更多的人知道此项目!
 * 🎭 演示环境部分功能不可用, 完整功能请本地部署!
 * 📛 演示环境请不要随便删除数据!

diff --git a/docker-compose-testing.yml b/docker-compose-testing.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   orion-visor-service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.1
     privileged: true
     ports:
       - 1081:80
@@ -32,7 +32,7 @@ services:
       - orion-visor-mysql
       - orion-visor-redis
   orion-visor-mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.1
     privileged: true
     ports:
       - 3307:3306
@@ -52,7 +52,7 @@ services:
       retries: 10
       start_period: 3s
   orion-visor-redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.1
     privileged: true
     ports:
       - 6380:6379

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3.3'
 services:
   orion-visor-service:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-service:2.1.1
     privileged: true
     ports:
       - 1081:80
@@ -32,7 +32,7 @@ services:
       - orion-visor-mysql
       - orion-visor-redis
   orion-visor-mysql:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-mysql:2.1.1
     privileged: true
     ports:
       - 3307:3306
@@ -52,7 +52,7 @@ services:
       retries: 10
       start_period: 3s
   orion-visor-redis:
-    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.0
+    image: registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:2.1.1
     privileged: true
     ports:
       - 6380:6379

diff --git a/docker/mysql/build.sh b/docker/mysql/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.0
+version=2.1.1
 cp -r ../../sql ./sql
 docker build -t orion-visor-mysql:${version} .
 rm -rf ./sql

diff --git a/docker/redis/build.sh b/docker/redis/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.0
+version=2.1.1
 docker build -t orion-visor-redis:${version} .
 docker tag orion-visor-redis:${version} registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
 docker push registry.cn-hangzhou.aliyuncs.com/lijiahangmax/orion-visor-redis:${version}
diff --git a/docker/service/build.sh b/docker/service/build.sh
@@ -1,5 +1,5 @@
 #/bin/bash
-version=2.1.0
+version=2.1.1
 mv ../../orion-visor-launch/target/orion-visor-launch.jar ./orion-visor-launch.jar
 mv ../../orion-visor-ui/dist ./dist
 docker build -t orion-visor-service:${version} .

diff --git 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.1.0</revision>
+        <revision>2.1.1</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/...or-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java b/...or-framework-common/src/main/java/com/orion/visor/framework/common/constant/AppConst.java
@@ -14,7 +14,7 @@ public interface AppConst extends OrionConst {
     /**
      * 同 ${orion.version} 迭代时候需要手动更改
      */
-    String VERSION = "2.1.0";
+    String VERSION = "2.1.1";
 
     /**
      * 同 ${spring.application.name}

diff --git a/...boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm b/...boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-table.vue.vm
@@ -94,8 +94,8 @@
              :data="tableRenderData"
              :pagination="pagination"
              :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
       #foreach($field in ${table.fields})
       #if(${dictMap.containsKey(${field.propertyName})})
       <!-- $field.comment -->

diff --git a/orion-visor-ui/.env.development b/orion-visor-ui/.env.development
@@ -1,6 +1,6 @@
 VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion-visor/api'
 VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.1.0'
+VITE_APP_VERSION= '2.1.1'
 VITE_APP_RELEASE= 'community'
 VITE_SFTP_PREVIEW_MB= 2
 VITE_DEMO_MODE= false
diff --git a/orion-visor-ui/.env.production b/orion-visor-ui/.env.production
@@ -1,6 +1,6 @@
 VITE_API_BASE_URL= '/orion-visor/api'
 VITE_WS_BASE_URL= '/orion-visor/keep-alive'
-VITE_APP_VERSION= '2.1.0'
+VITE_APP_VERSION= '2.1.1'
 VITE_APP_RELEASE= 'community'
 VITE_SFTP_PREVIEW_MB= 2
 VITE_DEMO_MODE= false
diff --git 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.1.0",
+  "version": "2.1.1",
   "private": true,
   "author": "Jiahang Li",
   "license": "Apache 2.0",

diff --git a/orion-visor-ui/src/components/app/navbar/index.vue b/orion-visor-ui/src/components/app/navbar/index.vue
@@ -50,7 +50,7 @@
             </template>
           </a-button>
         </a-tooltip>
-        <a-dropdown trigger="click" @select="s => changeLocale(s as string)">
+        <a-dropdown trigger="click" @select="(s: string) => changeLocale(s)">
           <div ref="localeRef" class="trigger-btn" />
           <template #content>
             <a-doption v-for="item in locales"

diff --git a/orion-visor-ui/src/components/asset/host-group/tree/index.vue b/orion-visor-ui/src/components/asset/host-group/tree/index.vue
@@ -12,7 +12,7 @@
             :checkable="checkable"
             :check-strictly="true"
             @drop="moveGroup"
-            @select="(s) => emits('onSelected', s)">
+            @select="(s: any) => emits('onSelected', s)">
       <!-- 标题 -->
       <template #title="node">
         <!-- 修改名称输入框 -->

diff --git a/orion-visor-ui/src/components/exec/log/panel-modal/index.vue b/orion-visor-ui/src/components/exec/log/panel-modal/index.vue
@@ -119,11 +119,6 @@
         align-items: center;
       }
     }
-
-    .exec-host-items {
-      width: 100%;
-      height: calc(100% - 38px);
-    }
   }
 
   :deep(.log-header) {

diff --git a/orion-visor-ui/src/components/exec/log/panel/exec-host.vue b/orion-visor-ui/src/components/exec/log/panel/exec-host.vue
@@ -13,23 +13,26 @@
     </div>
     <!-- 主机列表 -->
     <div class="exec-host-items">
-      <div v-for="item in hosts"
-           :key="item.id"
-           class="exec-host-item"
-           :class="[ current === item.id ? 'exec-host-item-selected' : '' ]"
-           @click="emits('selected', item.id)">
-        <!-- 主机名称 -->
-        <div class="exec-host-item-name">
-          <span class="host-name">{{ item.hostName }}</span>
-          <span class="host-address">{{ item.hostAddress }}</span>
+      <a-scrollbar>
+        <div v-for="(item, index) in hosts"
+             :key="item.id"
+             class="exec-host-item"
+             :class="[ current === item.id ? 'exec-host-item-selected' : '' ]"
+             :style="{ marginBottom: index === hosts.length -1 ? 0 : '8px' }"
+             @click="emits('selected', item.id)">
+          <!-- 主机名称 -->
+          <div class="exec-host-item-name">
+            <span class="host-name">{{ item.hostName }}</span>
+            <span class="host-address">{{ item.hostAddress }}</span>
+          </div>
+          <!-- 状态 -->
+          <div class="exec-host-item-status">
+            <a-tag :color="getDictValue(execHostStatusKey, item.status, 'execColor')">
+              {{ getDictValue(execHostStatusKey, item.status) }}
+            </a-tag>
+          </div>
         </div>
-        <!-- 状态 -->
-        <div class="exec-host-item-status">
-          <a-tag :color="getDictValue(execHostStatusKey, item.status, 'execColor')">
-            {{ getDictValue(execHostStatusKey, item.status) }}
-          </a-tag>
-        </div>
-      </div>
+      </a-scrollbar>
     </div>
   </div>
 </template>
@@ -78,13 +81,19 @@
   }
 
   .exec-host-items {
-    position: absolute;
-    width: calc(100% - 32px);
-    height: calc(100% - 68px);
-    overflow: auto;
+    position: relative;
+    width: 100%;
+    height: calc(100% - 38px);
+
+    :deep(.arco-scrollbar) {
+      position: absolute;
+      width: 100%;
+      height: 100%;
 
-    &::-webkit-scrollbar-track {
-      display: none;
+      &-container {
+        height: 100%;
+        overflow-y: auto;
+      }
     }
   }
 
@@ -99,7 +108,6 @@
     display: flex;
     justify-content: space-between;
     align-items: center;
-    margin-bottom: 8px;
     background: var(--color-fill-2);
     transition: all .2s;
     user-select: none;

diff --git a/orion-visor-ui/src/components/exec/template/modal/index.vue b/orion-visor-ui/src/components/exec/template/modal/index.vue
@@ -51,8 +51,8 @@
                :pagination="pagination"
                :bordered="false"
                :scroll="{ x: '100%', y: '60vh' }"
-               @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-               @page-size-change="(size) => fetchTableData(1, size)">
+               @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+               @page-size-change="(size: number) => fetchTableData(1, size)">
         <!-- 模板名称 -->
         <template #name="{ record }">
           <span class="span-blue">{{ record.name }}</span>

diff --git a/orion-visor-ui/src/components/meta/history/modal/index.vue b/orion-visor-ui/src/components/meta/history/modal/index.vue
@@ -34,8 +34,8 @@
                :data="tableRenderData"
                :pagination="pagination"
                :bordered="false"
-               @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-               @page-size-change="(size) => fetchTableData(1, size)">
+               @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+               @page-size-change="(size: number) => fetchTableData(1, size)">
         <!-- 修改前 -->
         <template #beforeValue="{ record }">
           <span class="copy-left"

diff --git a/orion-visor-ui/src/components/system/menu/tree/index.vue b/orion-visor-ui/src/components/system/menu/tree/index.vue
@@ -13,7 +13,7 @@
       <!-- 一级菜单 -->
       <a-menu-item v-if="!menu.children?.length"
                    :key="menu.name"
-                   @click="(e) => goto(e, menu)">
+                   @click="(e: any) => goto(e, menu)">
         <!-- 图标 -->
         <template #icon>
           <component v-if="menu.meta?.icon" :is="menu.meta?.icon" />
@@ -34,7 +34,7 @@
         <!-- 子菜单 -->
         <a-menu-item v-for="child in menu.children"
                      :key="child.name"
-                     @click="(e) => goto(e, child)">
+                     @click="(e: any) => goto(e, child)">
           <!-- 图标 -->
           <template #icon v-if="child.meta?.icon">
             <component :is="child.meta?.icon" />

diff --git a/orion-visor-ui/src/components/view/card-list/components/card-header.vue b/orion-visor-ui/src/components/view/card-list/components/card-header.vue
@@ -14,8 +14,8 @@
                         v-model:page-size="(pagination as any).pageSize"
                         v-bind="pagination as any"
                         :auto-adjust="false"
-                        @change="page => bubblesEmitter(HeaderEmitter.PAGE_CHANGE, page, (pagination as any).pageSize)"
-                        @page-size-change="limit => bubblesEmitter(HeaderEmitter.PAGE_CHANGE, 1, limit)" />
+                        @change="(page: number) => bubblesEmitter(HeaderEmitter.PAGE_CHANGE, page, (pagination as any).pageSize)"
+                        @page-size-change="(limit: number) => bubblesEmitter(HeaderEmitter.PAGE_CHANGE, 1, limit)" />
         </div>
       </div>
       <!-- 操作部分 -->
@@ -48,8 +48,8 @@
                        :placeholder="searchInputPlaceholder as string"
                        size="small"
                        allow-clear
-                       @input="(e) => bubblesEmitter(HeaderEmitter.UPDATE_SEARCH_VALUE, e)"
-                       @change="(e) => bubblesEmitter(HeaderEmitter.UPDATE_SEARCH_VALUE, e)"
+                       @input="(e: string) => bubblesEmitter(HeaderEmitter.UPDATE_SEARCH_VALUE, e)"
+                       @change="(e: string) => bubblesEmitter(HeaderEmitter.UPDATE_SEARCH_VALUE, e)"
                        @keyup.enter="bubblesEmitter(HeaderEmitter.SEARCH)" />
             </div>
             <!-- 过滤条件 -->

diff --git a/orion-visor-ui/src/store/modules/cache/index.ts b/orion-visor-ui/src/store/modules/cache/index.ts
@@ -1,4 +1,4 @@
-import type { CacheState } from './types';
+import type { CacheState, CacheType } from './types';
 import type { AxiosResponse } from 'axios';
 import type { TagType } from '@/api/meta/tag';
 import { getTagList } from '@/api/meta/tag';
@@ -19,14 +19,6 @@ import { getCommandSnippetGroupList } from '@/api/asset/command-snippet-group';
 import { getExecJobList } from '@/api/job/exec-job';
 import { getPathBookmarkGroupList } from '@/api/asset/path-bookmark-group';
 
-export type CacheType = 'users' | 'menus' | 'roles'
-  | 'hostGroups' | 'hostKeys' | 'hostIdentities'
-  | 'dictKeys'
-  | 'authorizedHostKeys' | 'authorizedHostIdentities'
-  | 'commandSnippetGroups' | 'pathBookmarkGroups'
-  | 'execJob'
-  | string
-
 export default defineStore('cache', {
   state: (): CacheState => ({}),
 

diff --git a/orion-visor-ui/src/store/modules/cache/types.ts b/orion-visor-ui/src/store/modules/cache/types.ts
@@ -1,23 +1,12 @@
-import type { UserQueryResponse } from '@/api/user/user';
-import type { MenuQueryResponse } from '@/api/system/menu';
-import type { RoleQueryResponse } from '@/api/user/role';
-import type { HostQueryResponse } from '@/api/asset/host';
-import type { HostGroupQueryResponse } from '@/api/asset/host-group';
-import type { HostKeyQueryResponse } from '@/api/asset/host-key';
-import type { HostIdentityQueryResponse } from '@/api/asset/host-identity';
-import type { DictKeyQueryResponse } from '@/api/system/dict-key';
+// 缓存类型
+export type CacheType = 'users' | 'menus' | 'roles'
+  | 'hostGroups' | 'hostKeys' | 'hostIdentities'
+  | 'dictKeys'
+  | 'authorizedHostKeys' | 'authorizedHostIdentities'
+  | 'commandSnippetGroups' | 'pathBookmarkGroups'
+  | 'execJob'
+  | string
 
 export interface CacheState {
-  users?: UserQueryResponse[];
-  menus?: MenuQueryResponse[];
-  roles?: RoleQueryResponse[];
-  hosts?: HostQueryResponse[];
-  hostGroups?: HostGroupQueryResponse[];
-  hostKeys?: HostKeyQueryResponse[];
-  hostIdentities?: HostIdentityQueryResponse[];
-  dictKeys?: DictKeyQueryResponse[];
-  authorizedHostKeys?: HostKeyQueryResponse[];
-  authorizedHostIdentities?: HostIdentityQueryResponse[];
-
-  [key: string]: unknown;
+  [key: CacheType]: unknown;
 }
diff --git a/orion-visor-ui/src/store/modules/menu/index.ts b/orion-visor-ui/src/store/modules/menu/index.ts
@@ -1,10 +1,10 @@
 import type { RouteMeta, RouteRecordNormalized } from 'vue-router';
 import type { MenuState } from './types';
 import type { MenuQueryResponse } from '@/api/system/menu';
+import router from '@/router';
 import { defineStore } from 'pinia';
 import { Notification } from '@arco-design/web-vue';
 import { getMenuList } from '@/api/user/auth';
-import router from '@/router';
 import { EnabledStatus } from '@/types/const';
 
 export default defineStore('menu', {

diff --git a/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue b/orion-visor-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
@@ -100,8 +100,8 @@
              :data="tableRenderData"
              :pagination="pagination"
              :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
       <!-- 连接用户 -->
       <template #username="{ record }">
         {{ record.username }}

diff --git a/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue b/orion-visor-ui/src/views/asset-audit/sftp-log/components/sftp-log-table.vue
@@ -84,8 +84,8 @@
              :data="tableRenderData"
              :pagination="pagination"
              :bordered="false"
-             @page-change="(page) => fetchTableData(page, pagination.pageSize)"
-             @page-size-change="(size) => fetchTableData(1, size)">
+             @page-change="(page: number) => fetchTableData(page, pagination.pageSize)"
+             @page-size-change="(size: number) => fetchTableData(1, size)">
       <!-- 操作用户 -->
       <template #username="{ record }">
         {{ record.username }}