From 774496e19293da4c0bd60ac5bfd4a067d1e7b17e Mon Sep 17 00:00:00 2001 From: mxd <838425805@qq.com> Date: Sun, 19 Jul 2020 12:17:36 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=97=A5=E5=BF=97=E8=BE=93?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ssssssss/magicapi/config/WebUIController.java | 13 ++++++++----- src/main/resources/magicapi-support/js/index.js | 2 -- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/ssssssss/magicapi/config/WebUIController.java b/src/main/java/org/ssssssss/magicapi/config/WebUIController.java index c97f4d31..db79ec0a 100644 --- a/src/main/java/org/ssssssss/magicapi/config/WebUIController.java +++ b/src/main/java/org/ssssssss/magicapi/config/WebUIController.java @@ -262,9 +262,7 @@ public class WebUIController { /** * 测试运行 * - * @param servletRequest * @param request 请求参数 - * @return */ @RequestMapping("/test") @ResponseBody @@ -294,9 +292,14 @@ public class WebUIController { context.setTimeout(this.debugTimeout); //设置断点超时时间 if (sessionId != null) { context.setId(sessionId.toString()); - context.onComplete(() -> MagicLoggerContext.remove(sessionId.toString())); - logger.info("Start Console Session : {}", sessionId); - context.onStart(() -> MDC.put(MagicLoggerContext.MAGIC_CONSOLE_SESSION, sessionId.toString())); + context.onComplete(() -> { + logger.info("Close Console Session : {}", sessionId); + MagicLoggerContext.remove(sessionId.toString()); + }); + context.onStart(() -> { + MDC.put(MagicLoggerContext.MAGIC_CONSOLE_SESSION, sessionId.toString()); + logger.info("Create Console Session : {}", sessionId); + }); } Object result = MagicScriptEngine.execute(MagicScriptCompiler.compile(script.toString()), context); if (context.isRunning()) { //判断是否执行完毕 diff --git a/src/main/resources/magicapi-support/js/index.js b/src/main/resources/magicapi-support/js/index.js index 18732bb0..d4195b57 100644 --- a/src/main/resources/magicapi-support/js/index.js +++ b/src/main/resources/magicapi-support/js/index.js @@ -558,11 +558,9 @@ var MagicEditor = { var _this = this; source.addEventListener('create',function(e){ _this.navigateTo(4); - _this.appendLog('info','Create Console Session : ' + e.data); callback&&callback(e.data); }) source.addEventListener('close',function(e){ - _this.appendLog('info','Close Console Session : ' + e.data); source.close(); }) source.addEventListener('log',function(e){