提交 b30db360 authored 作者: xuxueli's avatar xuxueli

新增任务运行模式 "GLUE模式(PowerShell) ",支持PowerShell脚本任务;

上级 e56731d7
...@@ -1241,7 +1241,8 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段 ...@@ -1241,7 +1241,8 @@ Tips: 历史版本(V1.3.x)目前已经Release至稳定版本, 进入维护阶段
- 25、任务调度备注中标注任务触发类型,如Cron触发、父任务触发、API触发等等,方便排查调度日志; - 25、任务调度备注中标注任务触发类型,如Cron触发、父任务触发、API触发等等,方便排查调度日志;
- 26、底层日志组件SimpleDateFormat线程安全问题修复; - 26、底层日志组件SimpleDateFormat线程安全问题修复;
- 27、执行器通讯线程优化,corePoolSize从256降低至32; - 27、执行器通讯线程优化,corePoolSize从256降低至32;
- 28、【迭代中】分片任务失败重试优化,仅重试当前失败的分片; - 28、【迭代中】新增任务运行模式 "GLUE模式(PowerShell) ",支持PowerShell脚本任务;
- 29、【迭代中】分片任务失败重试优化,仅重试当前失败的分片;
### TODO LIST ### TODO LIST
......
...@@ -134,6 +134,9 @@ ...@@ -134,6 +134,9 @@
<#elseif jobInfo.glueType == "GLUE_NODEJS" > <#elseif jobInfo.glueType == "GLUE_NODEJS" >
<#assign glueTypeModeSrc = "${request.contextPath}/static/plugins/codemirror/mode/javascript/javascript.js" /> <#assign glueTypeModeSrc = "${request.contextPath}/static/plugins/codemirror/mode/javascript/javascript.js" />
<#assign glueTypeIdeMode = "text/javascript" /> <#assign glueTypeIdeMode = "text/javascript" />
<#elseif jobInfo.glueType == "GLUE_POWERSHELL" >
<#assign glueTypeModeSrc = "${request.contextPath}/static/plugins/codemirror/mode/powershell/powershell.js" />
<#assign glueTypeIdeMode = "powershell" />
</#if> </#if>
......
...@@ -268,7 +268,28 @@ console.log("${I18n.jobinfo_shard_total}: " + arguments[4]) ...@@ -268,7 +268,28 @@ console.log("${I18n.jobinfo_shard_total}: " + arguments[4])
console.log("Good bye!") console.log("Good bye!")
process.exit(0) process.exit(0)
</textarea> </textarea>
<textarea class="glueSource_powershell" style="display:none;" >
Write-Host "xxl-job: hello powershell"
if($args.Count -eq 3) {
$executorparam = $args[0]
$shard_index = $args[1]
$shard_total = $args[2]
} Else {
$executorparam = ""
$shard_index = $args[0]
$shard_total = $args[1]
}
Write-Host "${I18n.jobinfo_script_location}: " $MyInvocation.MyCommand.Definition
Write-Host "${I18n.jobinfo_field_executorparam}: " $executorparam
Write-Host "${I18n.jobinfo_shard_index}: " $shard_index
Write-Host "${I18n.jobinfo_shard_total}: " $shard_total
Write-Host "Good bye!"
exit 0
</textarea>
</form> </form>
</div> </div>
</div> </div>
......
...@@ -374,6 +374,10 @@ $(function() { ...@@ -374,6 +374,10 @@ $(function() {
$("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_php").val() ); $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_php").val() );
} else if ('GLUE_NODEJS'==glueType){ } else if ('GLUE_NODEJS'==glueType){
$("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_nodejs").val() ); $("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_nodejs").val() );
} else if ('GLUE_POWERSHELL'==glueType){
$("#addModal .form textarea[name='glueSource']").val( $("#addModal .form .glueSource_powershell").val() );
} else {
$("#addModal .form textarea[name='glueSource']").val("");
} }
}); });
......
...@@ -10,7 +10,8 @@ public enum GlueTypeEnum { ...@@ -10,7 +10,8 @@ public enum GlueTypeEnum {
GLUE_SHELL("GLUE(Shell)", true, "bash", ".sh"), GLUE_SHELL("GLUE(Shell)", true, "bash", ".sh"),
GLUE_PYTHON("GLUE(Python)", true, "python", ".py"), GLUE_PYTHON("GLUE(Python)", true, "python", ".py"),
GLUE_PHP("GLUE(PHP)", true, "php", ".php"), GLUE_PHP("GLUE(PHP)", true, "php", ".php"),
GLUE_NODEJS("GLUE(Nodejs)", true, "node", ".js"); GLUE_NODEJS("GLUE(Nodejs)", true, "node", ".js"),
GLUE_POWERSHELL("GLUE(PowerShell)", true, "powershell ", ".ps1");
private String desc; private String desc;
private boolean isScript; private boolean isScript;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论