修改回调接口

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/JavaTaskCallbackThread.java

 package com.byit.thread;
 
+import com.byit.dto.web.ReturnResult;
 import com.byit.enums.JobResultEnum;
 import com.byit.enums.task.RunResultEnum;
 import com.byit.model.JobTaskRunLogWithBLOBs;
@@ -8,12 +9,15 @@ import com.byit.service.impl.JobTaskRunLogServiceImpl;
 import com.byit.util.SpringUtil;
 
 import java.util.Date;
+import java.util.HashMap;
 import java.util.Map;
 
 /**
  * @author huangfu
  */
 public class JavaTaskCallbackThread implements Runnable {
+    public static final String CODE = "code";
+    public static final String MSG = "msg";
     private PluginRpcResponsePacket pluginRpcResponsePacket;
 
     public JavaTaskCallbackThread(PluginRpcResponsePacket pluginRpcResponsePacket) {
@@ -24,9 +28,18 @@ public class JavaTaskCallbackThread implements Runnable {
         String logIdStr = pluginRpcResponsePacket.getExtension();
         int logId = Integer.parseInt(logIdStr);
         JobTaskRunLogServiceImpl mythJobTaskRunLogService = SpringUtil.getBean(JobTaskRunLogServiceImpl.class);
-        Map<String,String> result = (Map<String,String>)pluginRpcResponsePacket.getResult();
+        Map<String,String> result = new HashMap<>(2);
+        Object returnReultObject = pluginRpcResponsePacket.getResult();
+        if(returnReultObject instanceof ReturnResult) {
+            ReturnResult returnResult = (ReturnResult) returnReultObject;
+            result.put(CODE,returnResult.getCode());
+            result.put(MSG,returnResult.getMsg());
+        }else{
+            result = (Map<String,String>)pluginRpcResponsePacket.getResult();
+        }
+
         JobTaskRunLogWithBLOBs jobTaskRunLog = new JobTaskRunLogWithBLOBs();
-        String code= result.get("code");
+        String code= result.get(CODE);
         if(JobResultEnum.SUCCESS.getCode().equals(code)){
             code = RunResultEnum.RUN_SUCCESS.getCode();
         }else if(JobResultEnum.DISPATCH_SUCCESS.getCode().equals(code)){
@@ -34,7 +47,7 @@ public class JavaTaskCallbackThread implements Runnable {
         }else {
             code = RunResultEnum.RUN_ERROR.getCode();
         }
-        jobTaskRunLog.setRunMsg(result.get("msg"));
+        jobTaskRunLog.setRunMsg(result.get(MSG));
         jobTaskRunLog.setRunCode(code);
         jobTaskRunLog.setLogId(logId);
         jobTaskRunLog.setEndTime(new Date());