修复知识库当元数据字段为null时，则不发送该字段

4 files changed, 11 insertions, 18 deletions

diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/HttpClientUtils.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/HttpClientUtils.java
index 82c7714..f25c0d2 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/HttpClientUtils.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/HttpClientUtils.java
@@ -457,7 +457,6 @@ public class HttpClientUtils {
                     logger.info("request header : {}",h);
                 }
             }
-
             MultipartEntityBuilder multipartEntityBuilder = MultipartEntityBuilder.create()
                     .setMode(HttpMultipartMode.BROWSER_COMPATIBLE)
                     .setCharset(Consts.UTF_8)
@@ -465,7 +464,9 @@ public class HttpClientUtils {
                     .addBinaryBody("file", file);
             if (params != null) {
                 for (Map.Entry<String, Object> entry : params.entrySet()) {
-                    multipartEntityBuilder.addTextBody(entry.getKey(), String.valueOf(entry.getValue()), ContentType.create("text/plain", Charset.forName("UTF-8")));
+                    if(entry.getValue()!=null){
+                        multipartEntityBuilder.addTextBody(entry.getKey(), String.valueOf(entry.getValue()), ContentType.create("application/json", Charset.forName("UTF-8")));
+                    }
                 }
             }
 
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/JobUtil.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/JobUtil.java
index aa07641..1302674 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/JobUtil.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/core/utils/JobUtil.java
@@ -174,7 +174,6 @@ public class JobUtil {
         int exitValue = -1;
         BufferedReader bufferedReader = null;
         StringBuffer sb = new StringBuffer();
-        List<String> results = new ArrayList<>();
         try {
             logger.info("execute command: " + command);
             Process process = Runtime.getRuntime().exec(new String[]{"/bin/sh", "-c", command});
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/knowledgeBase/KnowledgeBaseJob.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/knowledgeBase/KnowledgeBaseJob.java
index 8d391eb..460354e 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/knowledgeBase/KnowledgeBaseJob.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/jobhandler/knowledgeBase/KnowledgeBaseJob.java
@@ -80,10 +80,10 @@ public class KnowledgeBaseJob {
                                 String kmMeta = JSONUtil.toJsonStr(dbKm);
                                 if (hasPush) {
                                     knowledgeBaseService.modifyMetadata(String.valueOf(dbKm.get("knowledge_id")), kmMeta);
-                                    JobUtil.infoLog("knowledgeBase metadata save success, metadata : {}  ", kmMeta);
+                                    JobUtil.infoLog("knowledgeBase push success, metadata : {}  ", kmMeta);
                                 } else {
                                     failedTask++;
-                                    JobUtil.infoLog("knowledgeBase metadata save fail, metadata : {}  ", kmMeta);
+                                    JobUtil.infoLog("knowledgeBase push fail, metadata : {}  ", kmMeta);
                                 }
                             }
                         }
diff --git a/galaxy-job-executor/src/main/java/com/mesalab/executor/service/knowledgeBase/KnowledgeBaseService.java b/galaxy-job-executor/src/main/java/com/mesalab/executor/service/knowledgeBase/KnowledgeBaseService.java
index 80ac3ce..26eb9d8 100644
--- a/galaxy-job-executor/src/main/java/com/mesalab/executor/service/knowledgeBase/KnowledgeBaseService.java
+++ b/galaxy-job-executor/src/main/java/com/mesalab/executor/service/knowledgeBase/KnowledgeBaseService.java
@@ -71,7 +71,7 @@ public class KnowledgeBaseService {
                 batchData = null;
                 pageNum++;
             }
-            JobUtil.infoLog("knowledge push file info filename: {},file format: {} , size: {}", tmpFile.getName(), knowledgeBase.getFormat(), tmpFile.length());
+            JobUtil.infoLog("knowledgeBase file info filename: {},file format: {} , size: {}", tmpFile.getName(), knowledgeBase.getFormat(), tmpFile.length());
             if (tmpFile.length() > 0) {
                 pushStatus = push(knowledgeBase, tmpFile, url);
             }
@@ -153,7 +153,7 @@ public class KnowledgeBaseService {
         String params = String.valueOf(sinkParam.get("params"));
         JSONObject jsonObject = JSONUtil.parseObj(params);
         KnowledgeBase knowledgeBase = JSONUtil.toBean(jsonObject, KnowledgeBase.class);
-
+        boolean pushStatus = false;
         try {
             String workDir = JobUtil.exeCmd(workDirCmd);
             String script = "ip";
@@ -179,24 +179,17 @@ public class KnowledgeBaseService {
                 }
                 //push knowledge
                 File file = new File(StringUtil.join(KNOWLEDGE_WORK_DIR, File.separator, filename));
+                JobUtil.infoLog("knowledgeBase file info filename: {},file format: {} , size: {}", file.getName(), knowledgeBase.getFormat(), file.length());
 
-                String resultStr = HttpClientUtils.httpPostFile(url, file, BeanUtil.beanToMap(knowledgeBase));
-                JobUtil.infoLog("ip  knowledgeBase push knowledge result: {},\n message {}", knowledgeBase, resultStr);
-                if ("-1".equals(resultStr)) {
-                    JobUtil.errorLog("ip locate knowledgeBase push fail !");
-                    return false;
-                }
-                Map<String, Object> result = JSONUtil.toBean(resultStr, Map.class);
-                if (result.get("status") != null && "200".equals(String.valueOf(result.get("status")))) {
-                    JobUtil.infoLog("ip locate knowledgeBase push success !");
-                    return true;
+                if (file.length() > 0) {
+                    pushStatus = push(knowledgeBase, file, url);
                 }
             }
         } catch (Exception e) {
             JobUtil.errorLog(e);
             throw new BusinessException(e);
         }
-        return false;
+        return pushStatus;
     }
 
     public String getMetadata(String knowledgeId) {