Merge branch 'develop' of github.com:FlowCI/flow-platform into develop

Author: yunheli

platform-api/src/main/java/com/flow/platform/api/consumer/CmdLoggingConsumer.java

@@ -18,9 +18,7 @@
 
 import com.flow.platform.core.http.converter.RawGsonMessageConverter;
 import com.flow.platform.domain.CmdType;
-import com.flow.platform.domain.Jsonable;
 import com.flow.platform.util.Logger;
-import com.google.gson.annotations.JsonAdapter;
 import java.util.Map;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.simp.SimpMessagingTemplate;
@@ -78,25 +76,19 @@ protected void handleTextMessage(WebSocketSession session, TextMessage message)
 
         if (category.equals(CmdType.SYSTEM_INFO.toString())) {
             sendAgentSysInfo(content);
-            return;
         }
     }
 
     /**
      * send command log
-     * @param cmdId
-     * @param content
-     * @param number
      */
     private void sendCmdLog(String cmdId, String content, String number) {
-
         String event = String.format("/topic/cmd/%s", cmdId);
         template.convertAndSend(event, "{\"number\": \"" + number + "\", \"content\": \"" + content + "\"}");
     }
 
     /**
      * send agent sys info
-     * @param content
      */
     private void sendAgentSysInfo(String content) {
         Map<String, String> dic = jsonConverter.getGson().fromJson(content, Map.class);

platform-api/src/main/java/com/flow/platform/api/service/job/NodeResultServiceImpl.java

@@ -54,6 +54,8 @@ public class NodeResultServiceImpl extends ApplicationEventService implements No
 
     private final static Logger LOGGER = new Logger(NodeResultService.class);
 
+    private final static char SPACE_REPLACE = '_';
+
     @Autowired
     private NodeResultDao nodeResultDao;
 
@@ -194,15 +196,24 @@ private NodeResult createNodeResult(Job job, NodeTree nodeTree, Node node) {
 
         // generate cc agent cmd id if node is runnable
         if (nodeTree.canRun(node.getPath())) {
-            String agentCmdId = nodeResult.getKey().getJobId() + "-" + nodeResult.getKey().getPath();
-            nodeResult.setCmdId(agentCmdId);
+            nodeResult.setCmdId(createAgentCmdId(nodeResult));
         }
 
         nodeResult.setName(node.getName());
         nodeResult.setNodeTag(node instanceof Flow ? NodeTag.FLOW : NodeTag.STEP);
         return nodeResult;
     }
 
+    /**
+     * Create anget cmd id by job id and node path
+     * @param nodeResult
+     * @return
+     */
+    private String createAgentCmdId(NodeResult nodeResult) {
+        NodeResultKey key = nodeResult.getKey();
+        return key.getJobId() + "-" + key.getPath().replace(' ', SPACE_REPLACE);
+    }
+
     private NodeStatus updateCurrent(Node current, NodeResult currentResult, Cmd cmd, String errorMsg) {
         boolean isAllowFailure = false;
         if (current instanceof Step) {