Browse Source

测试时将header参数放在http header中

mxd 4 years ago
parent
commit
fc5c24a25c

+ 2 - 1
src/main/java/org/ssssssss/magicapi/config/WebUIController.java

@@ -13,6 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
+import org.ssssssss.magicapi.context.HeaderContext;
 import org.ssssssss.magicapi.context.RequestContext;
 import org.ssssssss.magicapi.functions.DatabaseQuery;
 import org.ssssssss.magicapi.functions.ResponseFunctions;
@@ -337,7 +338,7 @@ public class WebUIController {
 				context.putMapIntoContext((Map<String, Object>) request.get("path"));
 				context.set("cookie", request.get("cookie"));
 				context.set("session", request.get("session"));
-				context.set("header", request.get("header"));
+				context.set("header", new HeaderContext(servletRequest));
 				context.set("body", request.get("body"));
 			} catch (Exception e) {
 				return new JsonBean<>(0, "请求参数填写错误", resultProvider.buildResult(0, "请求参数填写错误"));

+ 5 - 0
src/main/resources/magicapi-support/js/index.js

@@ -495,6 +495,7 @@ var MagicEditor = {
     ajax : function(options){
         $.ajax({
             url : options.url,
+            headers : options.headers,
             async : options.async,
             type : 'post',
             dataType : 'json',
@@ -569,6 +570,7 @@ var MagicEditor = {
             var _this = this;
             this.ajax({
                 url : 'continue',
+                headers : _this.requestHeaders,
                 data : {
                     id : this.debugSessionId,
                     breakpoints : _this.getBreakPoints().join(','),
@@ -660,6 +662,8 @@ var MagicEditor = {
         var request = _this.requestEditor.getValue();
         try{
             request = JSON.parse(request);
+            _this.requestHeaders = request.header;
+            delete request.header;
             if(typeof request != 'object'){
                 _this.setStatusBar('请求参数有误!');
                 _this.alert('运行测试','请求参数有误!');
@@ -697,6 +701,7 @@ var MagicEditor = {
             $('.button-continue,.button-step-over').addClass('disabled');
             _this.ajax({
                 url : 'test',
+                headers : _this.requestHeaders,
                 data : JSON.stringify(request),
                 contentType : 'application/json;charset=utf-8',
                 success : function(data,json,xhr){