test/Jpom
1
0
Fork 0
mirror of https://gitee.com/dromara/Jpom.git synced 2024-11-30 02:48:17 +08:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

fix cron

Browse Source
This commit is contained in:
bwcx_jzy 2021-12-25 15:58:39 +08:00
parent 84315e6dfb
commit 83ccc4d28e
No known key found for this signature in database
GPG Key ID: 5E48E9372088B9E5
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/agent/src/main/java/io/jpom/controller/script/ScriptController.java
View File

@ -108,6 +108,7 @@ public class ScriptController extends BaseAgentController {
}
Assert.notNull(eModel, "对应数据不存在");
eModel.setName(nodeScriptModel.getName());
eModel.setAutoExecCron(autoExecCron);
eModel.setContext(nodeScriptModel.getContext());
scriptServer.updateItem(eModel);
return JsonMessage.getString(200, "修改成功");

7
web-vue/src/pages/build/list-info.vue
View File

@ -262,7 +262,11 @@
<a-input v-model="temp.webhook" placeholder="构建过程请求,非必填，GET请求" />
</a-form-model-item>
<a-form-model-item label="自动构建" prop="autoBuildCron">
<a-auto-complete placeholder="如果需要定时自动构建则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）" option-label-prop="value">
<a-auto-complete
v-model="temp.autoBuildCron"
placeholder="如果需要定时自动构建则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）"
option-label-prop="value"
>
<template slot="dataSource">
<a-select-opt-group v-for="group in cronDataSource" :key="group.title">
<span slot="label">
@ -271,7 +275,6 @@
<a-select-option v-for="opt in group.children" :key="opt.title" :value="opt.value"> {{ opt.title }} {{ opt.value }} </a-select-option>
</a-select-opt-group>
</template>
<a-input v-model="temp.autoBuildCron" placeholder="如果需要定时自动构建则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）" />
</a-auto-complete>
</a-form-model-item>
</a-form-model>

3
web-vue/src/pages/node/node-layout/other/script-list.vue
View File

@ -44,7 +44,7 @@
</div>
</a-form-model-item>
<a-form-model-item label="定时执行" prop="autoExecCron">
<a-auto-complete placeholder="如果需要定时自动执行则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）" option-label-prop="value">
<a-auto-complete v-model="temp.autoExecCron" placeholder="如果需要定时自动执行则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）" option-label-prop="value">
<template slot="dataSource">
<a-select-opt-group v-for="group in cronDataSource" :key="group.title">
<span slot="label">
@ -53,7 +53,6 @@
<a-select-option v-for="opt in group.children" :key="opt.title" :value="opt.value"> {{ opt.title }} {{ opt.value }} </a-select-option>
</a-select-opt-group>
</template>
<a-input v-model="temp.autoExecCron" placeholder="如果需要定时自动执行则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）" />
</a-auto-complete>
</a-form-model-item>
</a-form-model>

3
web-vue/src/pages/node/script-list.vue
View File

@ -65,7 +65,7 @@
</div>
</a-form-model-item>
<a-form-model-item label="定时执行" prop="autoExecCron">
<a-auto-complete placeholder="如果需要定时自动执行则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）" option-label-prop="value">
<a-auto-complete v-model="temp.autoExecCron" placeholder="如果需要定时自动执行则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）" option-label-prop="value">
<template slot="dataSource">
<a-select-opt-group v-for="group in cronDataSource" :key="group.title">
<span slot="label">
@ -74,7 +74,6 @@
<a-select-option v-for="opt in group.children" :key="opt.title" :value="opt.value"> {{ opt.title }} {{ opt.value }} </a-select-option>
</a-select-opt-group>
</template>
<a-input v-model="temp.autoExecCron" placeholder="如果需要定时自动执行则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）" />
</a-auto-complete>
</a-form-model-item>
</a-form-model>

3
web-vue/src/pages/node/ssh/command.vue
View File

@ -70,7 +70,7 @@
<a-button type="primary" @click="handleAddParam">添加参数</a-button>
</a-form-model-item>
<a-form-model-item label="自动执行" prop="autoExecCron">
<a-auto-complete placeholder="如果需要定时自动执行则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）" option-label-prop="value">
<a-auto-complete v-model="temp.autoExecCron" placeholder="如果需要定时自动执行则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）" option-label-prop="value">
<template slot="dataSource">
<a-select-opt-group v-for="group in cronDataSource" :key="group.title">
<span slot="label">
@ -79,7 +79,6 @@
<a-select-option v-for="opt in group.children" :key="opt.title" :value="opt.value"> {{ opt.title }} {{ opt.value }} </a-select-option>
</a-select-opt-group>
</template>
<a-input v-model="temp.autoExecCron" placeholder="如果需要定时自动执行则填写,cron 表达式.默认未开启秒级别,需要去修改配置文件中:[system.timerMatchSecond]）" />
</a-auto-complete>
</a-form-model-item>
<a-form-model-item label="命令描述" prop="desc">