From 31af860d7b4e1c23a7f4ea819a9bdcaa0b61bb21 Mon Sep 17 00:00:00 2001 From: lijiahang Date: Wed, 10 Apr 2024 16:43:05 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E9=85=8D=E7=BD=AE=E5=91=BD?= =?UTF-8?q?=E4=BB=A4=E6=8F=90=E7=A4=BA=E7=AC=A6.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/core/generator/CodeGenerators.java | 5 +++-- .../ops/module/asset/controller/ExecJobController.http | 4 ++-- .../module/asset/service/impl/ExecJobServiceImpl.java | 9 --------- orion-ops-ui/.env.development | 2 +- orion-ops-ui/.env.production | 2 +- orion-ops-ui/src/components/view/exec-editor/const.ts | 9 +++++++++ orion-ops-ui/src/components/view/exec-editor/index.vue | 10 +++++----- 7 files changed, 21 insertions(+), 20 deletions(-) diff --git a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java index 9ab2b642..a0ca3570 100644 --- a/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java +++ b/orion-ops-framework/orion-ops-spring-boot-starter-mybatis/src/main/java/com/orion/ops/framework/mybatis/core/generator/CodeGenerators.java @@ -44,17 +44,18 @@ public class CodeGenerators { // .color("blue", "gray", "red", "green", "white") // .valueUseFields() // .build(), - Template.create("exec_job", "计划执行任务", "exec") + Template.create("exec_job", "计划任务", "exec") .disableUnitTest() .vue("exec", "exec-job") .enableDrawerForm() .dict("execJobStatus", "status") + .comment("计划任务状态") .field("execJobStatus") .fields("DISABLED", "ENABLED") .labels("禁用", "启用") .values(0, 1) .build(), - Template.create("exec_job_host", "计划执行任务主机", "exec") + Template.create("exec_job_host", "计划任务主机", "exec") .disableUnitTest() .vue("exec", "exec-job-host") .build(), diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.http b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.http index 3d5f83b2..6a7015b3 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.http +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/controller/ExecJobController.http @@ -37,8 +37,8 @@ Content-Type: application/json Authorization: {{token}} { - "id": "", - "status": "" + "id": 5, + "status": 0 } diff --git a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobServiceImpl.java b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobServiceImpl.java index 0c315dab..c38d2e94 100644 --- a/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobServiceImpl.java +++ b/orion-ops-module-asset/orion-ops-module-asset-service/src/main/java/com/orion/ops/module/asset/service/impl/ExecJobServiceImpl.java @@ -50,15 +50,6 @@ import java.util.stream.Collectors; @Service public class ExecJobServiceImpl implements ExecJobService { - // TODO 测试 SSH 禁用后是什么样子的 - // TODO 操作日志 菜单 - // TODO 执行日志抽象 - // TODO 测试 quartz - - // 内置参数 params.put("source", request.getSource()); - // params.put("sourceId", request.getSourceId()); - // params.put("seq", request.getExecSeq()); - private static final String QUARTZ_TYPE = "Exec"; @Resource diff --git a/orion-ops-ui/.env.development b/orion-ops-ui/.env.development index 8cb0c78b..ddb8cfa5 100644 --- a/orion-ops-ui/.env.development +++ b/orion-ops-ui/.env.development @@ -1,4 +1,4 @@ VITE_API_BASE_URL= 'http://127.0.0.1:9200/orion/api' VITE_WS_BASE_URL= 'ws://127.0.0.1:9200/orion/keep-alive' -VITE_APP_VERSION= '1.0.2' +VITE_APP_VERSION= '1.0.3' VITE_SFTP_PREVIEW_MB= 2 diff --git a/orion-ops-ui/.env.production b/orion-ops-ui/.env.production index c343de86..d34ed664 100644 --- a/orion-ops-ui/.env.production +++ b/orion-ops-ui/.env.production @@ -1,4 +1,4 @@ VITE_API_BASE_URL= '/orion/api' VITE_WS_BASE_URL= '/orion/keep-alive' -VITE_APP_VERSION= '1.0.2' +VITE_APP_VERSION= '1.0.3' VITE_SFTP_PREVIEW_MB= 2 diff --git a/orion-ops-ui/src/components/view/exec-editor/const.ts b/orion-ops-ui/src/components/view/exec-editor/const.ts index 403785a5..9cfb857b 100644 --- a/orion-ops-ui/src/components/view/exec-editor/const.ts +++ b/orion-ops-ui/src/components/view/exec-editor/const.ts @@ -1,3 +1,12 @@ +// 触发提示前缀 +export const triggerPrefix = '_'; + +// 触发提示前缀 +export const templatePrefix = '@{{ '; + +// 触发提示后缀 +export const templateSuffix = ' }}'; + // 模板参数 export interface TemplateParam { name?: string; diff --git a/orion-ops-ui/src/components/view/exec-editor/index.vue b/orion-ops-ui/src/components/view/exec-editor/index.vue index 72c42ed7..9700e74c 100644 --- a/orion-ops-ui/src/components/view/exec-editor/index.vue +++ b/orion-ops-ui/src/components/view/exec-editor/index.vue @@ -12,7 +12,7 @@