✨ 配置命令提示符.

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(),

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": "",
+  "id": 5,
-  "status": ""
+  "status": 0
 }
 
 

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

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

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

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;

orion-ops-ui/src/components/view/exec-editor/index.vue

@@ -12,7 +12,7 @@
 <script lang="ts" setup>
   import type { TemplateParam } from './const';
   import { onMounted, onUnmounted, ref } from 'vue';
-  import { builtinsParams } from './const';
+  import { builtinsParams, templatePrefix, templateSuffix, triggerPrefix } from './const';
   import * as monaco from 'monaco-editor';
   import { language } from 'monaco-editor/esm/vs/basic-languages/shell/shell.js';
 
@@ -48,9 +48,9 @@
         // 内置参数提示
         builtinsParams.forEach(s => {
           suggestions.push({
-            label: '_' + s.name,
+            label: triggerPrefix + s.name,
             kind: monaco.languages.CompletionItemKind.Variable,
-            insertText: `@{{ ${s.name} }}`,
+            insertText: templatePrefix + s.name + templateSuffix,
             detail: s.desc || '',
             documentation: s.desc || '',
           });
@@ -61,9 +61,9 @@
             return;
           }
           suggestions.push({
-            label: '_' + s.name,
+            label: triggerPrefix + s.name,
             kind: monaco.languages.CompletionItemKind.Field,
-            insertText: `@{{ ${s.name} }}`,
+            insertText: templatePrefix + s.name + templateSuffix,
             detail: s.desc || '',
             documentation: s.desc || '',
           });