代码优化

src/main/java/org/ssssssss/magicapi/config/MagicCorsFilter.java

@@ -1,6 +1,7 @@
 package org.ssssssss.magicapi.config;
 
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.http.HttpHeaders;
 
 import javax.servlet.*;
 import javax.servlet.http.HttpServletRequest;
@@ -21,18 +22,14 @@ public class MagicCorsFilter implements Filter {
 
 	public void process(HttpServletRequest request, HttpServletResponse response) {
 		String value = request.getHeader("Origin");
-		response.setHeader("Access-Control-Allow-Origin", StringUtils.isBlank(value) ? "*" : value);
-		response.setHeader("Access-Control-Allow-Credentials", "true");
-		value = request.getHeader("Access-Control-Request-Headers");
+		response.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_ORIGIN, StringUtils.isBlank(value) ? "*" : value);
+		response.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_CREDENTIALS, "true");
+		value = request.getHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_HEADERS);
 		if (StringUtils.isNotBlank(value)) {
-			response.setHeader("Access-Control-Allow-Headers", value);
-		}
-		value = request.getHeader("Access-Control-Request-Method");
-		if (StringUtils.isNotBlank(value)) {
-			response.setHeader("Access-Control-Allow-Method", value);
-		} else {
-			response.setHeader("Access-Control-Allow-Method", "GET,POST,OPTIONS,PUT,DELETE");
+			response.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_HEADERS, value);
 		}
+		value = request.getHeader(HttpHeaders.ACCESS_CONTROL_REQUEST_METHOD);
+		response.setHeader(HttpHeaders.ACCESS_CONTROL_ALLOW_METHODS, StringUtils.isBlank(value) ? "GET,POST,OPTIONS,PUT,DELETE" : value);
 	}
 
 	@Override

src/main/java/org/ssssssss/magicapi/config/RequestHandler.java

@@ -79,6 +79,8 @@ public class RequestHandler extends MagicController {
 			return value;
 		}
 		if (requestedFromTest) {
+			response.setHeader(HEADER_RESPONSE_WITH_MAGIC_API, "true");
+			response.setHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, HEADER_RESPONSE_WITH_MAGIC_API);
 			if (isRequestedFromContinue(request)) {
 				return invokeContinueRequest(request, response);
 			}
@@ -90,14 +92,13 @@ public class RequestHandler extends MagicController {
 	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!"));
 		}
 		// 重置断点
 		context.setBreakpoints(getRequestedBreakpoints(request));
 		// 步进
-		context.setStepInto("1".equalsIgnoreCase(request.getHeader(HEADER_REQUEST_STEP_INTO)));
+		context.setStepInto("true".equalsIgnoreCase(request.getHeader(HEADER_REQUEST_STEP_INTO)));
 		try {
 			context.singal();    //等待语句执行到断点或执行完毕
 		} catch (InterruptedException e) {
@@ -115,8 +116,6 @@ public class RequestHandler extends MagicController {
 		try {
 			// 初始化debug操作
 			initializeDebug(context, request, response);
-			response.addHeader(HEADER_RESPONSE_WITH_MAGIC_API, "true");
-			response.setHeader(HttpHeaders.ACCESS_CONTROL_EXPOSE_HEADERS, HEADER_RESPONSE_WITH_MAGIC_API);
 			Object result = executeScript(info.getScript(), context);
 			if (context.isRunning()) {
 				return new JsonBodyBean<>(1000, context.getId(), resultProvider.buildResult(1000, context.getId(), result), result);