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
b972ca4e
authored
Aug 19, 2018
by
xuxueli
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
任务调度备注中标注任务触发类型,如Cron触发、父任务触发、API触发等等,方便排查调度日志;
parent
ae7fe92f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
2 deletions
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
View file @
b972ca4e
...
...
@@ -76,7 +76,7 @@ public class XxlJobTrigger {
ReturnT
<
String
>
triggerResult
=
new
ReturnT
<
String
>(
null
);
StringBuffer
triggerMsgSb
=
new
StringBuffer
();
triggerMsgSb
.
append
(
I18nUtil
.
getString
(
"jobconf_trigger_type"
)).
append
(
":"
).
append
(
type
);
triggerMsgSb
.
append
(
I18nUtil
.
getString
(
"jobconf_trigger_admin_adress"
)).
append
(
":"
).
append
(
IpUtil
.
getIp
());
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobconf_trigger_admin_adress"
)).
append
(
":"
).
append
(
IpUtil
.
getIp
());
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobconf_trigger_exe_regtype"
)).
append
(
":"
)
.
append
(
(
group
.
getAddressType
()
==
0
)?
I18nUtil
.
getString
(
"jobgroup_field_addressType_0"
):
I18nUtil
.
getString
(
"jobgroup_field_addressType_1"
)
);
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobconf_trigger_exe_regaddress"
)).
append
(
":"
).
append
(
group
.
getRegistryList
());
...
...
@@ -134,7 +134,8 @@ public class XxlJobTrigger {
ReturnT
<
String
>
triggerResult
=
new
ReturnT
<
String
>(
null
);
StringBuffer
triggerMsgSb
=
new
StringBuffer
();
triggerMsgSb
.
append
(
I18nUtil
.
getString
(
"jobconf_trigger_admin_adress"
)).
append
(
":"
).
append
(
IpUtil
.
getIp
());
triggerMsgSb
.
append
(
I18nUtil
.
getString
(
"jobconf_trigger_type"
)).
append
(
":"
).
append
(
type
);
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobconf_trigger_admin_adress"
)).
append
(
":"
).
append
(
IpUtil
.
getIp
());
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobconf_trigger_exe_regtype"
)).
append
(
":"
)
.
append
(
(
group
.
getAddressType
()
==
0
)?
I18nUtil
.
getString
(
"jobgroup_field_addressType_0"
):
I18nUtil
.
getString
(
"jobgroup_field_addressType_1"
)
);
triggerMsgSb
.
append
(
"<br>"
).
append
(
I18nUtil
.
getString
(
"jobconf_trigger_exe_regaddress"
)).
append
(
":"
).
append
(
group
.
getRegistryList
());
...
...
xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
View file @
b972ca4e
...
...
@@ -98,8 +98,14 @@ $(function() {
"width"
:
'10%'
,
"render"
:
function
(
data
,
type
,
row
)
{
var
jobhandler
=
''
;
if
(
row
.
executorHandler
)
{
jobhandler
=
"<br>JobHandler:"
+
row
.
executorHandler
;
}
var
temp
=
''
;
temp
+=
I18n
.
joblog_field_executorAddress
+
':'
+
(
row
.
executorAddress
?
row
.
executorAddress
:
''
);
temp
+=
jobhandler
;
temp
+=
'<br>'
+
I18n
.
jobinfo_field_executorparam
+
':'
+
row
.
executorParam
;
return
'<a class="logTips" href="javascript:;" >'
+
row
.
jobId
+
'<span style="display:none;">'
+
temp
+
'</span></a>'
;
...
...
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