🔨 批量执行.

2024-03-15 00:26:53 +08:00
parent 6bd2640af7
commit 8caf8de9f6
20 changed files with 106 additions and 57 deletions
--- a/README.md
+++ b/README.md
@@ -2,7 +2,8 @@
 <img style="margin-right: 8px;" src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/8c687ef1-5711-4a93-9db0-79c010af7902.png" width="32px" height="32px"/> orion-ops-pro 是什么
 </h1>

-`orion-ops-pro` 一款开箱即用的一站式智能运维平台, 提供了资产管理、资产授权、Web终端、WebSftp、角色管理、系统管理等功能。致力于简化运维团队的治理工作。它是根据 `orion-ops`
+`orion-ops-pro` 一款开箱即用的一站式智能运维管理平台,
+提供了资产管理、资产授权、Web终端、WebSftp、角色管理、系统管理等功能。致力于简化运维团队的治理工作。它是根据 `orion-ops`
 的产品思路完全重构的一套系统, 重新设计了架构并优化交互逻辑, 操作更快捷友好。

 <p style="text-align: left">
@@ -32,11 +33,12 @@
 github: https://github.com/lijiahangmax/orion-ops-pro  
 gitee: https://gitee.com/lijiahangmax/orion-ops-pro  
 文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/    
-demo: http://101.43.254.243:1081/#/
+demo: http://101.43.254.243:1081/

 演示账号: `admin`    
 演示密码: `admin`  
-留个小星星再走吧⭐
+⭐ 体验后可以点一下 `star` 这对我很重要  
+📞 合作/功能定制请联系底部 备注: '定制'

 ## 特性

@@ -46,10 +48,9 @@ demo: http://101.43.254.243:1081/#/
 * 权限控制: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。
 * 在线终端: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。
 * 文件管理: 实现远程主机大文件的批量上传、下载和在线编辑等操作。
+* 批量操作: 支持远程主机批量执行 shell 命令。
 * 可扩展性: 前后端代码规范统一、代码质量高、健壮且易于阅读和扩展。

-[comment]: <> (  FIXME * 批量操作: 支持远程主机批量执行命令 以及 批量执行上传文件)
-
 [comment]: <> (  FIXME * 调度任务: 维护 cron 表达式, 定时执行主机命令)

 [comment]: <> (  FIXME * 功能强大: 命令批量执行, 任务定时调度, 远程日志查看, 操作日志全记录等)
@@ -112,7 +113,8 @@ roadmap: https://lijiahangmax.gitee.io/orion-ops-pro/#/about/roadmap
  <img src="https://bjuimg.obs.cn-north-4.myhuaweicloud.com/images/2024/2/27/4f1c4e77-8e36-45a3-8be6-9da5387bb96e.jpg" alt="wx" width="298px" height="398px"/>  
 </div>

-📧 微信添加备注: ops
+📧 咨询问题微信备注: ops  
+📧 合作/功能定制备注: 合作

 ## 支持一下

--- a/docs/README.md
+++ b/docs/README.md
@@ -2,7 +2,8 @@
 <img style="margin-right: 8px;" src="./assert/logo.svg" width="32px" height="32px"/> orion-ops-pro 是什么
 </h1>

-`orion-ops-pro` 一款开箱即用的一站式智能运维平台, 提供了资产管理、资产授权、Web终端、WebSftp、角色管理、系统管理等功能。致力于简化运维团队的治理工作。它是根据 `orion-ops`
+`orion-ops-pro` 一款开箱即用的一站式智能运维管理平台,
+提供了资产管理、资产授权、Web终端、WebSftp、角色管理、系统管理等功能。致力于简化运维团队的治理工作。它是根据 `orion-ops`
 的产品思路完全重构的一套系统, 重新设计了架构并优化交互逻辑, 操作更快捷友好。

 <p style="text-align: left">
@@ -32,11 +33,12 @@
 github: https://github.com/lijiahangmax/orion-ops-pro  
 gitee: https://gitee.com/lijiahangmax/orion-ops-pro  
 文档: https://lijiahangmax.gitee.io/orion-ops-pro/#/    
-demo: http://101.43.254.243:1081/#/
+demo: http://101.43.254.243:1081/

 演示账号: `admin`    
 演示密码: `admin`  
-留个小星星再走吧⭐
+⭐ 体验后可以点一下 `star` 这对我很重要  
+📞 合作/功能定制请联系底部 备注: '合作'

 ## 特性

@@ -46,10 +48,9 @@ demo: http://101.43.254.243:1081/#/
 * 权限控制: 全面管理用户角色, 支持动态菜单配置和强制下线等功能。
 * 在线终端: 提供便捷的在线 Web 终端服务, 支持快捷命令、自定义快捷键和主题风格。
 * 文件管理: 实现远程主机大文件的批量上传、下载和在线编辑等操作。
+* 批量操作: 支持远程主机批量执行 shell 命令。
 * 可扩展性: 前后端代码规范统一、代码质量高、健壮且易于阅读和扩展。

-[comment]: <> (  FIXME * 批量操作: 支持远程主机批量执行命令 以及 批量执行上传文件)
-
 [comment]: <> (  FIXME * 调度任务: 维护 cron 表达式, 定时执行主机命令)

 [comment]: <> (  FIXME * 功能强大: 命令批量执行, 任务定时调度, 远程日志查看, 操作日志全记录等)
@@ -112,7 +113,8 @@ roadmap: https://lijiahangmax.gitee.io/orion-ops-pro/#/about/roadmap
  <img src="./assert/img/wx.jpg" alt="wx" width="298px" height="398px"/>  
 </div>

-📧 微信添加备注: ops
+📧 咨询问题微信备注: ops  
+📧 合作/功能定制备注: 合作

 ## 支持一下

--- a/docs/about/update.md
+++ b/docs/about/update.md
@@ -1,5 +1,15 @@
 ⚡ 注意: 应用不支持跨版本升级, 可以进行多次升级

+## v1.0.2
+
+> sql 脚本
+
+```sql
+ALTER TABLE `host_connect_log` 
+MODIFY COLUMN `start_time` datetime(3) NULL DEFAULT NULL COMMENT '开始时间' AFTER `token`,
+MODIFY COLUMN `end_time` datetime(3) NULL DEFAULT NULL COMMENT '结束时间' AFTER `start_time`;
+```
+
 ## v1.0.1

 > sql 脚本
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecController.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecController.java
@@ -75,6 +75,5 @@ public class ExecController {
    }

    // TODO tail log
-    // TODO parameterSchema 存储

 }
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecLogDO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/domain/ExecLogDO.java
@@ -56,6 +56,10 @@ public class ExecLogDO extends BaseDO {
    @TableField("command")
    private String command;

+    @Schema(description = "参数 schema")
+    @TableField("parameter_schema")
+    private String parameterSchema;
+
    @Schema(description = "超时时间")
    @TableField("timeout")
    private Integer timeout;
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandRequest.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/request/exec/ExecCommandRequest.java
@@ -38,6 +38,10 @@ public class ExecCommandRequest {
    @Schema(description = "执行参数")
    private String parameter;

+    @NotBlank
+    @Schema(description = "参数 schema")
+    private String parameterSchema;
+
    @NotEmpty
    @Schema(description = "执行主机")
    private List<Long> hostIdList;
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecLogVO.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/entity/vo/ExecLogVO.java
@@ -40,6 +40,9 @@ public class ExecLogVO implements Serializable {
    @Schema(description = "执行命令")
    private String command;

+    @Schema(description = "参数 schema")
+    private String parameterSchema;
+
    @Schema(description = "超时时间")
    private Integer timeout;

--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/handler/ExecCommandHandler.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/handler/host/exec/handler/ExecCommandHandler.java
@@ -2,6 +2,7 @@ package com.orion.ops.module.asset.handler.host.exec.handler;

 import com.alibaba.fastjson.JSON;
 import com.orion.lang.exception.AuthenticationException;
+import com.orion.lang.exception.ConnectionRuntimeException;
 import com.orion.lang.exception.argument.InvalidArgumentException;
 import com.orion.lang.support.timeout.TimeoutChecker;
 import com.orion.lang.utils.Strings;
@@ -82,7 +83,6 @@ public class ExecCommandHandler implements IExecCommandHandler {
        }
        // 执行回调
        if (this.interrupted) {
-            // TODO 测试
            // 中断执行
            this.updateStatus(ExecHostStatusEnum.INTERRUPTED, null);
        } else if (ex != null) {
@@ -192,6 +192,8 @@ public class ExecCommandHandler implements IExecCommandHandler {
            message = "执行超时";
        } else if (ex instanceof InvalidArgumentException) {
            message = ex.getMessage();
+        } else if (ex instanceof ConnectionRuntimeException) {
+            message = "连接失败";
        } else if (ex instanceof AuthenticationException) {
            message = "认证失败";
        } else {
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecServiceImpl.java
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecServiceImpl.java
@@ -102,6 +102,7 @@ public class ExecServiceImpl implements ExecService {
                .source(ExecSourceEnum.BATCH.name())
                .description(Strings.ifBlank(request.getDescription(), Strings.retain(command, 60) + Const.OMIT))
                .command(command)
+                .parameterSchema(request.getParameterSchema())
                .timeout(request.getTimeout())
                .status(ExecStatusEnum.WAITING.name())
                .build();
@@ -159,6 +160,7 @@ public class ExecServiceImpl implements ExecService {
                .timeout(execLog.getTimeout())
                .command(execLog.getCommand())
                .parameter(hostLogs.get(0).getParameter())
+                .parameterSchema(execLog.getParameterSchema())
                .hostIdList(hostIdList)
                .build();
        return this.execCommand(request);
--- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml
+++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/resources/mapper/ExecLogMapper.xml
@@ -11,6 +11,7 @@
        <result column="source_id" property="sourceId"/>
        <result column="description" property="description"/>
        <result column="command" property="command"/>
+        <result column="parameter_schema" property="parameterSchema"/>
        <result column="timeout" property="timeout"/>
        <result column="status" property="status"/>
        <result column="start_time" property="startTime"/>
@@ -24,7 +25,7 @@

    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
-        id, user_id, username, source, source_id, description, command, timeout, status, start_time, finish_time, create_time, update_time, creator, updater, deleted
+        id, user_id, username, source, source_id, description, command, parameter_schema, timeout, status, start_time, finish_time, create_time, update_time, creator, updater, deleted
    </sql>

 </mapper>
--- a/orion-ops-ui/src/api/exec/exec.ts
+++ b/orion-ops-ui/src/api/exec/exec.ts
@@ -33,9 +33,9 @@ export interface ExecCommandResponse {
 }

 /**
- * 执行命令
+ * 批量执行命令
 */
-export function execCommand(request: ExecCommandRequest) {
+export function batchExecCommand(request: ExecCommandRequest) {
  return axios.post<ExecCommandResponse>('/asset/exec/exec-command', request);
 }

--- a/orion-ops-ui/src/components/view/exec-editor/index.vue
+++ b/orion-ops-ui/src/components/view/exec-editor/index.vue
@@ -48,10 +48,11 @@
        // 内置参数提示
        builtinsParams.forEach(s => {
          suggestions.push({
-            label: s.name,
-            kind: monaco.languages.CompletionItemKind.Function,
+            label: '_' + s.name,
+            kind: monaco.languages.CompletionItemKind.Variable,
            insertText: `@{{ ${s.name} }}`,
            detail: s.desc || '',
+            documentation: s.desc || '',
          });
        });
        // 命令参数提示
@@ -60,10 +61,11 @@
            return;
          }
          suggestions.push({
-            label: s.name,
-            kind: monaco.languages.CompletionItemKind.Function,
+            label: '_' + s.name,
+            kind: monaco.languages.CompletionItemKind.Field,
            insertText: `@{{ ${s.name} }}`,
            detail: s.desc || '',
+            documentation: s.desc || '',
          });
        });
        return {
--- a/orion-ops-ui/src/utils/index.ts
+++ b/orion-ops-ui/src/utils/index.ts
@@ -108,6 +108,9 @@ export function formatDuration(start: number, end?: number): string {
    return '';
  }
  const duration = (end - start) / 1000;
+  if (duration < 1) {
+    return `${duration.toFixed(1)}s`;
+  }
  const minutes = Math.floor(duration / 60);
  const seconds = Math.floor(duration % 60);
  let result = '';
@@ -188,7 +191,7 @@ export const resetObject = (obj: any, ignore: string[] = []) => {
 export const objectTruthKeyCount = (obj: any, ignore: string[] = []) => {
  return Object.keys(obj)
    .filter(s => !ignore.includes(s))
-    .reduce(function(acc, curr) {
+    .reduce(function (acc, curr) {
      const currVal = obj[curr];
      return acc + ~~(currVal !== undefined && currVal !== null && currVal?.length !== 0 && currVal !== '');
    }, 0);
@@ -221,7 +224,7 @@ export function detectZoom() {
 * 获取唯一的 UUID
 */
 export function getUUID() {
-  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
+  return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function (c) {
    const r = Math.random() * 16 | 0;
    const v = c === 'x' ? r : (r & 0x3 | 0x8);
    return v.toString(16);
--- a/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
+++ b/orion-ops-ui/src/views/asset-audit/connect-log/components/connect-log-table.vue
@@ -19,10 +19,6 @@
                       placeholder="请选择主机"
                       allow-clear />
      </a-form-item>
-      <!-- 主机地址 -->
-      <a-form-item field="hostAddress" label="主机地址">
-        <a-input v-model="formModel.hostAddress" placeholder="请输入主机地址" allow-clear />
-      </a-form-item>
      <!-- 状态 -->
      <a-form-item field="status" label="状态">
        <a-select v-model="formModel.status"
@@ -30,6 +26,10 @@
                  :options="toOptions(connectStatusKey)"
                  allow-clear />
      </a-form-item>
+      <!-- 主机地址 -->
+      <a-form-item field="hostAddress" label="主机地址">
+        <a-input v-model="formModel.hostAddress" placeholder="请输入主机地址" allow-clear />
+      </a-form-item>
      <!-- 类型 -->
      <a-form-item field="type" label="类型">
        <a-select v-model="formModel.type"
--- a/orion-ops-ui/src/views/exec/exec-command/index.vue
+++ b/orion-ops-ui/src/views/exec/exec-command/index.vue
@@ -1,5 +1,7 @@
 <template>
-  <div>123</div>
+  <div class="layout-container">
+
+  </div>
 </template>

 <script lang="ts">
--- a/orion-ops-ui/src/views/exec/exec-log/components/exec-log-table.vue
+++ b/orion-ops-ui/src/views/exec/exec-log/components/exec-log-table.vue
@@ -7,31 +7,12 @@
                  @submit="fetchTableData"
                  @reset="fetchTableData"
                  @keyup.enter="() => fetchTableData()">
-      <!-- id -->
-      <a-form-item field="id" label="id">
-        <a-input-number v-model="formModel.id"
-                        placeholder="请输入id"
-                        allow-clear
-                        hide-button />
-      </a-form-item>
-      <!-- 执行用户 -->
-      <a-form-item field="userId" label="执行用户">
-        <user-selector v-model="formModel.userId"
-                       placeholder="请选择执行用户"
-                       allow-clear />
-      </a-form-item>
      <!-- 执行描述 -->
      <a-form-item field="description" label="执行描述">
        <a-input v-model="formModel.description"
                 placeholder="请输入执行描述"
                 allow-clear />
      </a-form-item>
-      <!-- 执行命令 -->
-      <a-form-item field="command" label="执行命令">
-        <a-input v-model="formModel.command"
-                 placeholder="请输入执行命令"
-                 allow-clear />
-      </a-form-item>
      <!-- 执行状态 -->
      <a-form-item field="status" label="执行状态">
        <a-select v-model="formModel.status"
@@ -39,6 +20,25 @@
                  placeholder="请选择执行状态"
                  allow-clear />
      </a-form-item>
+      <!-- 执行用户 -->
+      <a-form-item field="userId" label="执行用户">
+        <user-selector v-model="formModel.userId"
+                       placeholder="请选择执行用户"
+                       allow-clear />
+      </a-form-item>
+      <!-- 执行命令 -->
+      <a-form-item field="command" label="执行命令">
+        <a-input v-model="formModel.command"
+                 placeholder="请输入执行命令"
+                 allow-clear />
+      </a-form-item>
+      <!-- id -->
+      <a-form-item field="id" label="id">
+        <a-input-number v-model="formModel.id"
+                        placeholder="请输入id"
+                        allow-clear
+                        hide-button />
+      </a-form-item>
      <!-- 执行时间 -->
      <a-form-item field="startTimeRange" label="执行时间">
        <a-range-picker v-model="formModel.startTimeRange"
@@ -204,6 +204,7 @@
 </script>

 <script lang="ts" setup>
+  import type { TableData } from '@arco-design/web-vue/es/table/interface';
  import type { ExecLogQueryRequest, ExecLogQueryResponse } from '@/api/exec/exec-log';
  import { reactive, ref, onMounted, onUnmounted } from 'vue';
  import { batchDeleteExecLog, deleteExecLog, getExecHostLogList, getExecLogPage, getExecLogStatus } from '@/api/exec/exec-log';
@@ -312,7 +313,7 @@
  };

  // 加载主机数据
-  const loadHostExecData = async (key: number, record: ExecLogQueryResponse) => {
+  const loadHostExecData = async (key: number | string, record: TableData) => {
    if (record.hosts) {
      return;
    }
--- a/orion-ops-ui/src/views/exec/exec-template/components/exec-template-exec-drawer.vue
+++ b/orion-ops-ui/src/views/exec/exec-template/components/exec-template-exec-drawer.vue
@@ -44,10 +44,11 @@
            </template>
          </a-input-number>
        </a-form-item>
-        <!-- 模板命令 -->
+        <!-- 执行命令 -->
        <a-form-item field="command"
-                     label="模板命令"
-                     :wrapper-col-props="{ span: 24 }">
+                     label="执行命令"
+                     :wrapper-col-props="{ span: 24 }"
+                     :help="'使用 @{{ xxx }} 来替换参数, 输入_可以获取全部变量'">
          <exec-editor v-model="formModel.command"
                       containerClass="command-editor"
                       theme="vs-dark"
@@ -72,7 +73,7 @@
                     :field="item.name as string"
                     :label="item.name"
                     required>
-          <a-input v-model="parameterFormModel[item.name]"
+          <a-input v-model="parameterFormModel[item.name as string]"
                   :placeholder="item.desc"
                   allow-clear />
        </a-form-item>
@@ -101,7 +102,7 @@
  import { Message } from '@arco-design/web-vue';
  import ExecEditor from '@/components/view/exec-editor/index.vue';
  import AuthorizedHostModal from '@/components/asset/host/authorized-host-modal/index.vue';
-  import { execCommand } from '@/api/exec/exec';
+  import { batchExecCommand } from '@/api/exec/exec';

  const { visible, setVisible } = useVisible();
  const { loading, setLoading } = useLoading();
@@ -166,7 +167,8 @@
      if (error) {
        return false;
      }
-      await execCommand({
+      // 执行命令
+      await batchExecCommand({
        ...formModel.value,
        parameter: JSON.stringify(parameterFormModel.value),
        parameterSchema: JSON.stringify(parameterSchema.value),
--- a/orion-ops-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue
+++ b/orion-ops-ui/src/views/exec/exec-template/components/exec-template-form-drawer.vue
@@ -34,7 +34,8 @@
        <!-- 模板命令 -->
        <a-form-item field="command"
                     label="模板命令"
-                     :wrapper-col-props="{ span: 24 }">
+                     :wrapper-col-props="{ span: 24 }"
+                     :help="'使用 @{{ xxx }} 来替换参数, 输入_可以获取全部变量'">
          <exec-editor v-model="formModel.command"
                       containerClass="command-editor"
                       theme="vs-dark"
--- a/orion-ops-ui/src/views/exec/exec-template/components/exec-template-table.vue
+++ b/orion-ops-ui/src/views/exec/exec-template/components/exec-template-table.vue
@@ -79,7 +79,8 @@
          <a-button v-permission="['asset:exec:exec-command']"
                    type="text"
                    size="mini"
-                    @click="emits('openExec', record)">
+                    title="ctrl + 鼠标左键新页面打开"
+                    @click="openExec($event, record)">
            执行
          </a-button>
          <!-- 修改 -->
@@ -120,7 +121,6 @@
  import { Message } from '@arco-design/web-vue';
  import useLoading from '@/hooks/loading';
  import columns from '../types/table.columns';
-  import {} from '../types/const';
  import { usePagination } from '@/types/table';
  import useCopy from '@/hooks/copy';

@@ -137,6 +137,15 @@
    command: undefined,
  });

+  // 打开执行
+  const openExec = (e: any, record: ExecTemplateQueryResponse) => {
+    if (e.ctrlKey) {
+      // TODO 新页面打开
+    } else {
+      emits('openExec', record);
+    }
+  };
+
  // 删除当前行
  const deleteRow = async ({ id }: {
    id: number
--- a/orion-ops-ui/src/views/exec/exec-template/types/const.ts
+++ b/orion-ops-ui/src/views/exec/exec-template/types/const.ts