Commit a79b5fa6 by huangfusuper

..

parent 891fc8b5
...@@ -36,6 +36,7 @@ public class ApiCallbackController { ...@@ -36,6 +36,7 @@ public class ApiCallbackController {
PluginRpcResponsePacket pluginRpcResponsePacket = new PluginRpcResponsePacket(); PluginRpcResponsePacket pluginRpcResponsePacket = new PluginRpcResponsePacket();
pluginRpcResponsePacket.setExtension(javaCallbackLogDto.getLogId()); pluginRpcResponsePacket.setExtension(javaCallbackLogDto.getLogId());
pluginRpcResponsePacket.setResult(javaCallbackLogDto.getReturnResult()); pluginRpcResponsePacket.setResult(javaCallbackLogDto.getReturnResult());
pluginRpcResponsePacket.setExtension1(javaCallbackLogDto.getLogUrl());
MythJobAutoConfigure.LOG_CALLBACK.execute(new JavaTaskCallbackThread(pluginRpcResponsePacket)); MythJobAutoConfigure.LOG_CALLBACK.execute(new JavaTaskCallbackThread(pluginRpcResponsePacket));
} }
} }
...@@ -7,6 +7,7 @@ import com.byit.model.JobTaskRunLogWithBLOBs; ...@@ -7,6 +7,7 @@ import com.byit.model.JobTaskRunLogWithBLOBs;
import com.byit.packet.response.PluginRpcResponsePacket; import com.byit.packet.response.PluginRpcResponsePacket;
import com.byit.service.impl.JobTaskRunLogServiceImpl; import com.byit.service.impl.JobTaskRunLogServiceImpl;
import com.byit.util.SpringUtil; import com.byit.util.SpringUtil;
import org.apache.commons.lang3.StringUtils;
import java.util.Date; import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
...@@ -47,6 +48,11 @@ public class JavaTaskCallbackThread implements Runnable { ...@@ -47,6 +48,11 @@ public class JavaTaskCallbackThread implements Runnable {
}else { }else {
code = RunResultEnum.RUN_ERROR.getCode(); code = RunResultEnum.RUN_ERROR.getCode();
} }
String logUrl = pluginRpcResponsePacket.getExtension1();
if(StringUtils.isNoneBlank(logUrl)){
jobTaskRunLog.setLogRemotelyPath(logUrl);
}
jobTaskRunLog.setRunMsg(result.get(MSG)); jobTaskRunLog.setRunMsg(result.get(MSG));
jobTaskRunLog.setRunCode(code); jobTaskRunLog.setRunCode(code);
jobTaskRunLog.setLogId(logId); jobTaskRunLog.setLogId(logId);
......
...@@ -21,5 +21,5 @@ public class JavaCallbackLogDto implements Serializable { ...@@ -21,5 +21,5 @@ public class JavaCallbackLogDto implements Serializable {
private String logId; private String logId;
private ReturnResult returnResult; private ReturnResult returnResult;
private String hasAllReturnOne; private String logUrl;
} }
...@@ -28,6 +28,10 @@ public class PluginRpcResponsePacket extends BasePacketModel { ...@@ -28,6 +28,10 @@ public class PluginRpcResponsePacket extends BasePacketModel {
private long runTime; private long runTime;
private boolean status = false; private boolean status = false;
private String runIp; private String runIp;
/**
* 扩展字段一 已经使用 放置logurl
*/
private String extension1;
@Override @Override
public Command getCommand() { public Command getCommand() {
return Command.RUN_REMOTELY_JOB_NODE_RESPONSE; return Command.RUN_REMOTELY_JOB_NODE_RESPONSE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment