소스 검색

修复进入断点时无法操作的BUG

mxd 4 년 전
부모
커밋
12631799d0
1개의 변경된 파일2개의 추가작업 그리고 7개의 파일을 삭제
  1. 2 7
      src/main/java/org/ssssssss/magicapi/config/RequestHandler.java

+ 2 - 7
src/main/java/org/ssssssss/magicapi/config/RequestHandler.java

@@ -149,6 +149,7 @@ public class RequestHandler {
 	private Object invokeContinueRequest(HttpServletRequest request, HttpServletResponse response) throws IOException {
 		String sessionId = getRequestedSessionId(request);
 		MagicScriptDebugContext context = MagicScriptDebugContext.getDebugContext(sessionId);
+		response.addHeader(HEADER_RESPONSE_WITH_MAGIC_API, "true");
 		if (context == null) {
 			return new JsonBean<>(0, "debug session not found!", resultProvider.buildResult(0, "debug session not found!"));
 		}
@@ -174,16 +175,12 @@ public class RequestHandler {
 			// 初始化debug操作
 			initializeDebug(context, request, response);
 			Object result = executeScript(info.getScript(), context);
+			response.addHeader(HEADER_RESPONSE_WITH_MAGIC_API, "true");
 			if (context.isRunning()) {
 				return new JsonBodyBean<>(1000, context.getId(), resultProvider.buildResult(1000, context.getId(), result), result);
 			} else if (context.isException()) {    //判断是否出现异常
 				return resolveThrowable((Throwable) context.getReturnValue(), response);
 			}
-			if (context.isRunning()) {    //判断是否执行完毕
-				return new JsonBodyBean<>(1000, context.getId(), resultProvider.buildResult(1000, context.getId(), result), result);
-			} else if (context.isException()) {    //判断是否出现异常
-				return resolveThrowable((Throwable) context.getReturnValue(), response);
-			}
 			Object value = result;
 			// 执行后置拦截器
 			if ((value = doPostHandle(info, context, value)) != null) {
@@ -231,7 +228,6 @@ public class RequestHandler {
 	 * 转换请求结果
 	 */
 	private Object convertResult(Object result, HttpServletResponse response) throws IOException {
-		response.addHeader(HEADER_RESPONSE_WITH_MAGIC_API, "true");
 		if (result instanceof ResponseEntity) {
 			ResponseEntity entity = (ResponseEntity) result;
 			for (Map.Entry<String, List<String>> entry : entity.getHeaders().entrySet()) {
@@ -272,7 +268,6 @@ public class RequestHandler {
 	 * 解决异常
 	 */
 	private JsonBean<Object> resolveThrowable(Throwable root, HttpServletResponse response) {
-		response.addHeader(HEADER_RESPONSE_WITH_MAGIC_API, "true");
 		MagicScriptException se = null;
 		Throwable parent = root;
 		do {