diff --git a/Bench4Q-Master/src/main/resources/org/bench4q/master/config/FilterType.properties b/Bench4Q-Master/src/main/resources/org/bench4q/master/config/FilterType.properties new file mode 100644 index 00000000..e53e045f --- /dev/null +++ b/Bench4Q-Master/src/main/resources/org/bench4q/master/config/FilterType.properties @@ -0,0 +1 @@ +filter.type.list=text/css,text/html,text/plain,image/*,*javascript,application/json,application/xml \ No newline at end of file diff --git a/Bench4Q-Web/src/main/java/org/bench4q/web/api/ScriptController.java b/Bench4Q-Web/src/main/java/org/bench4q/web/api/ScriptController.java index e05ad197..a8d35355 100644 --- a/Bench4Q-Web/src/main/java/org/bench4q/web/api/ScriptController.java +++ b/Bench4Q-Web/src/main/java/org/bench4q/web/api/ScriptController.java @@ -6,6 +6,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import javax.servlet.http.HttpServletRequest; import javax.xml.bind.JAXBException; import org.apache.log4j.Logger; @@ -357,6 +358,21 @@ public class ScriptController extends BaseController { return map; } + + @RequestMapping("loadFilterTypeList") + public @ResponseBody + Map loadFilterTypeList(HttpServletRequest request, + @ModelAttribute("accessToken") String accessToken) { + OperateScriptServerResponseModel responseModel = this.getScriptMessager().loadFilterTypeList(accessToken); + Map map = new HashMap(); + if(responseModel.isSuccess()){ + map.put("filterTypeList", responseModel.getFilterTypeList()); + success(map); + }else{ + fail(map, responseModel.getFailCauseString()); + } + return map; + } private void updateRunScenarioModel(RunScenarioModel runScenarioModel) { List behaviorModels = new LinkedList(); diff --git a/Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/ScriptMessager.java b/Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/ScriptMessager.java index 917c9767..9b83d20a 100644 --- a/Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/ScriptMessager.java +++ b/Bench4Q-Web/src/main/java/org/bench4q/web/masterMessager/ScriptMessager.java @@ -189,6 +189,12 @@ public class ScriptMessager extends MasterMessager { accessToken); } + public OperateScriptServerResponseModel loadFilterTypeList(String accessToken) { + String url = this.getBaseUrl() + "/loadFilterTypeList"; + return this.getOperateScriptServerResponseModelByPost(url, null, + accessToken); + } + private OperateScriptServerResponseModel getOperateScriptServerResponseModelByPost( String url, Map params, String accessToken) { HttpResponse httpResponse = null;