Merge branch 'master' of http://39.98.38.2:13000/dumingliang/sh-model-platform

ruoyi-api-patform/src/main/java/com/ruoyi/interfaces/service/impl/MdAppFlowServiceImpl.java

@@ -130,6 +130,7 @@ public class MdAppFlowServiceImpl implements IMdAppFlowService {
                         nodeMap.put("id", completedNode.getId());
                         nodeMap.put("name", completedNode.getName());
                         nodeMap.put("result", executeResult);
+                        nodeMap.put("nodeState", true);
                         WebSocketUsers.sendMessageToUserByText(session, JsonUtils.objectToJson(nodeMap));
                     }
                 }

ruoyi-framework/src/main/java/com/ruoyi/framework/websocket/WebSocketServer.java

@@ -54,7 +54,7 @@ public class WebSocketServer
             WebSocketUsers.put(session.getId(), session);
             LOGGER.info("\n 建立连接 - {}", session);
             LOGGER.info("\n 当前人数 - {}", WebSocketUsers.getUsers().size());
-
+            System.out.println("id:"+session.getId());
             WebSocketUsers.sendMessageToUserByText(session,session.getId());
         }
     }