From f8f38b0a183e7f0267e2f3e8b6bfe4d199da56d7 Mon Sep 17 00:00:00 2001 From: mxd <838425805@qq.com> Date: Thu, 27 Jan 2022 21:16:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=AE=9A=E6=97=B6=E4=BB=BB?= =?UTF-8?q?=E5=8A=A1=E6=97=A0=E6=B3=95DEBUG=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/ssssssss/magicapi/task/web/MagicTaskController.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/web/MagicTaskController.java b/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/web/MagicTaskController.java index 586a0a3b..02823238 100644 --- a/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/web/MagicTaskController.java +++ b/magic-api-plugins/magic-api-plugin-task/src/main/java/org/ssssssss/magicapi/task/web/MagicTaskController.java @@ -3,6 +3,7 @@ package org.ssssssss.magicapi.task.web; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.ResponseBody; import org.ssssssss.magicapi.core.config.MagicConfiguration; +import org.ssssssss.magicapi.core.config.WebSocketSessionManager; import org.ssssssss.magicapi.core.logging.MagicLoggerContext; import org.ssssssss.magicapi.core.model.DebugRequest; import org.ssssssss.magicapi.core.model.JsonBean; @@ -28,11 +29,14 @@ public class MagicTaskController extends MagicController implements MagicExcepti String script = entity.getScript(); DebugRequest debugRequest = DebugRequest.create(request); MagicLoggerContext.SESSION.set(debugRequest.getRequestedClientId()); + String sessionAndScriptId = debugRequest.getRequestedClientId() + debugRequest.getRequestedScriptId(); try { MagicScriptDebugContext magicScriptContext = debugRequest.createMagicScriptContext(configuration.getDebugTimeout()); + WebSocketSessionManager.addMagicScriptContext(sessionAndScriptId, magicScriptContext); magicScriptContext.setScriptName(MagicConfiguration.getMagicResourceService().getScriptName(entity)); return new JsonBean<>(ScriptManager.executeScript(script, magicScriptContext)); } finally { + WebSocketSessionManager.removeMagicScriptContext(sessionAndScriptId); MagicLoggerContext.SESSION.remove(); } }