Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
B
byit-myth-job
Overview
Overview
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
liyuan
byit-myth-job
Commits
12f04a8c
Commit
12f04a8c
authored
Sep 24, 2020
by
huangfusuper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1. 修正脚本运行命令替换
2. 添加java任务返回值携带回写参数
parent
f5fe3b57
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
6 deletions
+1
-6
JavaTaskJobTask.java
...min-core/src/main/java/com/byit/task/JavaTaskJobTask.java
+1
-6
No files found.
byit-myth-core/myth-admin-core/src/main/java/com/byit/task/JavaTaskJobTask.java
View file @
12f04a8c
...
@@ -49,10 +49,6 @@ public class JavaTaskJobTask implements TimerTask {
...
@@ -49,10 +49,6 @@ public class JavaTaskJobTask implements TimerTask {
RunJavaServiceImpl
service
=
SpringUtil
.
getBean
(
RunJavaServiceImpl
.
class
);
RunJavaServiceImpl
service
=
SpringUtil
.
getBean
(
RunJavaServiceImpl
.
class
);
PluginRpcRequestPacket
request
=
new
PluginRpcRequestPacket
();
PluginRpcRequestPacket
request
=
new
PluginRpcRequestPacket
();
String
param
=
javaTask
.
getParam
();
String
param
=
javaTask
.
getParam
();
RunParamWrapped
runParamWrapped
=
JSON
.
parseObject
(
param
,
RunParamWrapped
.
class
);
if
(
runParamWrapped
==
null
)
{
runParamWrapped
=
new
RunParamWrapped
();
}
//保存到日志
//保存到日志
Integer
logId
=
saveLog
(
javaTask
);
Integer
logId
=
saveLog
(
javaTask
);
GetRegConfig
getRegConfig
=
SpringUtil
.
getBean
(
GetRegConfig
.
class
);
GetRegConfig
getRegConfig
=
SpringUtil
.
getBean
(
GetRegConfig
.
class
);
...
@@ -66,8 +62,7 @@ public class JavaTaskJobTask implements TimerTask {
...
@@ -66,8 +62,7 @@ public class JavaTaskJobTask implements TimerTask {
communicationParam
.
setLogId
(
logId
+
""
);
communicationParam
.
setLogId
(
logId
+
""
);
communicationParam
.
setCallbackUrl
(
JSON
.
toJSONString
(
callUrlList
));
communicationParam
.
setCallbackUrl
(
JSON
.
toJSONString
(
callUrlList
));
communicationParam
.
setBody
(
runParamWrapped
.
getPrivateParam
());
communicationParam
.
setBody
(
param
);
communicationParam
.
setPublicParam
(
runParamWrapped
.
getPublicParamMap
());
String
dateFormat
=
DateUtil
.
dateFormat
(
new
Date
(
javaTask
.
getTriggerTime
()),
DateUtil
.
FORMAT_DATE_TIME
);
String
dateFormat
=
DateUtil
.
dateFormat
(
new
Date
(
javaTask
.
getTriggerTime
()),
DateUtil
.
FORMAT_DATE_TIME
);
communicationParam
.
setExpand2
(
dateFormat
);
communicationParam
.
setExpand2
(
dateFormat
);
...
...
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