Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
熊鹏飞
/
xxljob220
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
b30db360
authored
Sep 16, 2018
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
新增任务运行模式 "GLUE模式(PowerShell) ",支持PowerShell脚本任务;
parent
e56731d7
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
34 additions
and
4 deletions
doc/XXL-JOB官方文档.md
xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/jobcode.index.ftl
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
xxl-job-admin/src/main/webapp/static/plugins/codemirror/mode/powershell/powershell.js
xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java
doc/XXL-JOB官方文档.md
View file @
b30db360
## 《分
布式任务调度平台XXL-JOB》
## 《分
布式任务调度平台XXL-JOB》
...
@@ -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
...
...
xxl-job-admin/src/main/webapp/WEB-INF/template/jobcode/jobcode.index.ftl
View file @
b30db360
...
@@ -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>
...
...
xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
View file @
b30db360
...
@@ -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>
...
...
xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
View file @
b30db360
...
@@ -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
(
""
);
}
}
});
});
...
...
xxl-job-admin/src/main/webapp/static/plugins/codemirror/mode/powershell/powershell.js
0 → 100644
View file @
b30db360
This diff is collapsed.
Click to expand it.
xxl-job-core/src/main/java/com/xxl/job/core/glue/GlueTypeEnum.java
View file @
b30db360
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment