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
a79b5fa6
Commit
a79b5fa6
authored
Jul 24, 2020
by
huangfusuper
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
..
parent
891fc8b5
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
1 deletion
+12
-1
ApiCallbackController.java
...min/src/main/java/com/byit/api/ApiCallbackController.java
+1
-0
JavaTaskCallbackThread.java
...src/main/java/com/byit/thread/JavaTaskCallbackThread.java
+6
-0
JavaCallbackLogDto.java
...re/src/main/java/com/byit/dto/api/JavaCallbackLogDto.java
+1
-1
PluginRpcResponsePacket.java
...ava/com/byit/packet/response/PluginRpcResponsePacket.java
+4
-0
No files found.
byit-myth-admin/src/main/java/com/byit/api/ApiCallbackController.java
View file @
a79b5fa6
...
...
@@ -36,6 +36,7 @@ public class ApiCallbackController {
PluginRpcResponsePacket
pluginRpcResponsePacket
=
new
PluginRpcResponsePacket
();
pluginRpcResponsePacket
.
setExtension
(
javaCallbackLogDto
.
getLogId
());
pluginRpcResponsePacket
.
setResult
(
javaCallbackLogDto
.
getReturnResult
());
pluginRpcResponsePacket
.
setExtension1
(
javaCallbackLogDto
.
getLogUrl
());
MythJobAutoConfigure
.
LOG_CALLBACK
.
execute
(
new
JavaTaskCallbackThread
(
pluginRpcResponsePacket
));
}
}
byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/JavaTaskCallbackThread.java
View file @
a79b5fa6
...
...
@@ -7,6 +7,7 @@ import com.byit.model.JobTaskRunLogWithBLOBs;
import
com.byit.packet.response.PluginRpcResponsePacket
;
import
com.byit.service.impl.JobTaskRunLogServiceImpl
;
import
com.byit.util.SpringUtil
;
import
org.apache.commons.lang3.StringUtils
;
import
java.util.Date
;
import
java.util.HashMap
;
...
...
@@ -47,6 +48,11 @@ public class JavaTaskCallbackThread implements Runnable {
}
else
{
code
=
RunResultEnum
.
RUN_ERROR
.
getCode
();
}
String
logUrl
=
pluginRpcResponsePacket
.
getExtension1
();
if
(
StringUtils
.
isNoneBlank
(
logUrl
)){
jobTaskRunLog
.
setLogRemotelyPath
(
logUrl
);
}
jobTaskRunLog
.
setRunMsg
(
result
.
get
(
MSG
));
jobTaskRunLog
.
setRunCode
(
code
);
jobTaskRunLog
.
setLogId
(
logId
);
...
...
byit-myth-core/myth-dto-core/src/main/java/com/byit/dto/api/JavaCallbackLogDto.java
View file @
a79b5fa6
...
...
@@ -21,5 +21,5 @@ public class JavaCallbackLogDto implements Serializable {
private
String
logId
;
private
ReturnResult
returnResult
;
private
String
hasAllReturnOne
;
private
String
logUrl
;
}
byit-plugin-core/byit-plugin-rpc-common/src/main/java/com/byit/packet/response/PluginRpcResponsePacket.java
View file @
a79b5fa6
...
...
@@ -28,6 +28,10 @@ public class PluginRpcResponsePacket extends BasePacketModel {
private
long
runTime
;
private
boolean
status
=
false
;
private
String
runIp
;
/**
* 扩展字段一 已经使用 放置logurl
*/
private
String
extension1
;
@Override
public
Command
getCommand
()
{
return
Command
.
RUN_REMOTELY_JOB_NODE_RESPONSE
;
...
...
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