修复前端日志不输出的BUG

spider-flow-core/src/main/java/org/spiderflow/core/Spider.java

@@ -141,7 +141,7 @@ public class Spider {
 			return;
 		}
 		//判断条件，如果不成立则不执行
-		if (!executeCondition(fromNode, node, context, variables)) {
+		if (!executeCondition(fromNode, node, variables)) {
 			return;
 		}
 		logger.debug("执行节点[{}:{}]", node.getNodeName(), node.getNodeId());
@@ -189,6 +189,7 @@ public class Spider {
 						runnableNode.setState(RunnableNode.State.RUNNING);
 						if (context.isRunning()) {
 							try {
+								SpiderContextHolder.set(context);
 								//死循环检测，当执行节点次数大于阈值时，结束本次测试
 								AtomicInteger executeCount = context.get(ATOMIC_DEAD_CYCLE);
 								if (executeCount != null && executeCount.incrementAndGet() > deadCycle) {
@@ -218,6 +219,7 @@ public class Spider {
 								if (node.isSync()) {
 									context.unlock();
 								}
+								SpiderContextHolder.remove();
 							}
 						}
 					});
@@ -227,7 +229,7 @@ public class Spider {
 		}
 	}
 
-	private boolean executeCondition(SpiderNode fromNode, SpiderNode node, SpiderContext context, Map<String, Object> variables) {
+	private boolean executeCondition(SpiderNode fromNode, SpiderNode node, Map<String, Object> variables) {
 		if (fromNode != null) {
 			String condition = node.getCondition(fromNode.getNodeId());
 			if (StringUtils.isNotBlank(condition)) { // 判断是否有条件

spider-flow-core/src/main/java/org/spiderflow/core/job/SpiderJob.java

@@ -1,11 +1,8 @@
 package org.spiderflow.core.job;
 
-import java.util.Date;
-import java.util.HashMap;
-import java.util.Map;
-
 import org.apache.commons.lang3.time.DateFormatUtils;
-import org.quartz.*;
+import org.quartz.JobDataMap;
+import org.quartz.JobExecutionContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.spiderflow.context.SpiderContext;
@@ -20,6 +17,10 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.scheduling.quartz.QuartzJobBean;
 import org.springframework.stereotype.Component;
 
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 爬虫定时执行
  *
@@ -68,8 +69,8 @@ public class SpiderJob extends QuartzJobBean {
 		task.setFlowId(spiderFlow.getId());
 		task.setBeginTime(new Date());
 		try {
-			taskService.save(task);
 			context = SpiderJobContext.create(this.spiderLogPath, spiderFlow.getId() + task.getId() + ".log");
+			taskService.save(task);
 			SpiderContextHolder.set(context);
 			contextMap.put(task.getId(), context);
 			logger.info("开始执行任务{}", spiderFlow.getName());

spider-flow-web/src/main/java/org/spiderflow/model/SpiderWebSocketContext.java

@@ -10,10 +10,10 @@ import java.util.Date;
 
 /**
  * WebSocket通讯中爬虫的上下文域
- * @author Administrator
  *
+ * @author Administrator
  */
-public class SpiderWebSocketContext extends SpiderContext{
+public class SpiderWebSocketContext extends SpiderContext {
 
     private static final long serialVersionUID = -1205530535069540245L;
 
@@ -33,11 +33,17 @@ public class SpiderWebSocketContext extends SpiderContext{
         write(new WebSocketEvent<>("log", DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss.SSS"), log));
     }
 
-	public synchronized <T> void write(WebSocketEvent<T> event){
+    public <T> void write(WebSocketEvent<T> event) {
         try {
-			session.getAsyncRemote().sendText(JSON.toJSONString(event, FastJsonSerializer.serializeConfig));
+            String message = JSON.toJSONString(event, FastJsonSerializer.serializeConfig);
+            if(session.isOpen()){
+                synchronized (session){
+                    session.getBasicRemote().sendText(message);
+                }
+            }else{
+                System.out.println("close:" + session.getId() + ":"+message);
+            }
         } catch (Throwable ignored) {
-
         }
     }
 }

spider-flow-web/src/main/java/org/spiderflow/websocket/WebSocketEditorServer.java

@@ -15,8 +15,8 @@ import javax.websocket.server.ServerEndpoint;
 
 /**
  * WebSocket通讯编辑服务
- * @author Administrator
  *
+ * @author Administrator
  */
 @ServerEndpoint("/ws")
 @Component
@@ -27,34 +27,31 @@ public class WebSocketEditorServer {
     private SpiderWebSocketContext context;
 
     @OnMessage
-	public void onMessage(String message,Session session){
+    public void onMessage(String message, Session session) {
         JSONObject event = JSON.parseObject(message);
-		if(context == null){
-			context = new SpiderWebSocketContext(session);
-		}
         String eventType = event.getString("eventType");
-		if("test".equals(eventType)){
+        if ("test".equals(eventType)) {
+            context = new SpiderWebSocketContext(session);
             context.setRunning(true);
-			final SpiderWebSocketContext spiderContext = context;
-			new Thread(()->{
+            new Thread(() -> {
                 String xml = event.getString("message");
-				if(xml != null){
-					spider.runWithTest(SpiderFlowUtils.loadXMLFromString(xml), spiderContext);
-					spiderContext.write(new WebSocketEvent<>("finish", null));
-				}else{
-					spiderContext.write(new WebSocketEvent<>("error", "xml不正确！"));
+                if (xml != null) {
+                    spider.runWithTest(SpiderFlowUtils.loadXMLFromString(xml), context);
+                    context.write(new WebSocketEvent<>("finish", null));
+                } else {
+                    context.write(new WebSocketEvent<>("error", "xml不正确！"));
                 }
+                context.setRunning(false);
             }).start();
-		}else if("stop".equals(eventType)){
+        } else if ("stop".equals(eventType) && context != null) {
             context.setRunning(false);
         }
     }
 
     @OnClose
-	public void onClose(Session session){
-		if(context != null){
+    public void onClose(Session session) {
+        System.out.println("close");
         context.setRunning(false);
     }
-	}
 
 }