Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dlink
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zhaowei
dlink
Commits
04de7e61
Commit
04de7e61
authored
Mar 11, 2022
by
wenmo
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
优化 当提交作业无法获取JID时变为提交失败
parent
18da2788
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
2 deletions
+11
-2
Job2MysqlHandler.java
...k-admin/src/main/java/com/dlink/job/Job2MysqlHandler.java
+8
-2
Welcome.tsx
dlink-web/src/pages/Welcome.tsx
+3
-0
No files found.
dlink-admin/src/main/java/com/dlink/job/Job2MysqlHandler.java
View file @
04de7e61
...
@@ -77,10 +77,16 @@ public class Job2MysqlHandler implements JobHandler {
...
@@ -77,10 +77,16 @@ public class Job2MysqlHandler implements JobHandler {
History
history
=
new
History
();
History
history
=
new
History
();
history
.
setId
(
job
.
getId
());
history
.
setId
(
job
.
getId
());
if
(
job
.
isUseGateway
()
&&
Asserts
.
isNullString
(
job
.
getJobId
()))
{
if
(
job
.
isUseGateway
()
&&
Asserts
.
isNullString
(
job
.
getJobId
()))
{
job
.
setJobId
(
"unknown-"
+
LocalDateTime
.
now
().
toString
());
job
.
setJobId
(
"unknown"
);
history
.
setStatus
(
JobStatus
.
FAILED
.
ordinal
());
history
.
setJobId
(
job
.
getJobId
());
history
.
setEndTime
(
job
.
getEndTime
());
history
.
setError
(
"没有获取到任何JID,请自行排查原因"
);
historyService
.
updateById
(
history
);
return
false
;
}
}
history
.
setJobId
(
job
.
getJobId
());
history
.
setStatus
(
job
.
getStatus
().
ordinal
());
history
.
setStatus
(
job
.
getStatus
().
ordinal
());
history
.
setJobId
(
job
.
getJobId
());
history
.
setEndTime
(
job
.
getEndTime
());
history
.
setEndTime
(
job
.
getEndTime
());
if
(
job
.
isUseGateway
())
{
if
(
job
.
isUseGateway
())
{
history
.
setJobManagerAddress
(
job
.
getJobManagerAddress
());
history
.
setJobManagerAddress
(
job
.
getJobManagerAddress
());
...
...
dlink-web/src/pages/Welcome.tsx
View file @
04de7e61
...
@@ -728,6 +728,9 @@ export default (): React.ReactNode => {
...
@@ -728,6 +728,9 @@ export default (): React.ReactNode => {
<
li
>
<
li
>
<
Link
>
修复 报警组刷新当前页面时无法正常显示下拉报警实例
</
Link
>
<
Link
>
修复 报警组刷新当前页面时无法正常显示下拉报警实例
</
Link
>
</
li
>
</
li
>
<
li
>
<
Link
>
优化 当提交作业无法获取JID时变为提交失败
</
Link
>
</
li
>
</
ul
>
</
ul
>
</
Paragraph
>
</
Paragraph
>
</
Timeline
.
Item
>
</
Timeline
.
Item
>
...
...
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