diff --git a/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/PluginController.java b/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/PluginController.java index fa870d6a..f903984b 100644 --- a/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/PluginController.java +++ b/Bench4Q-Agent/src/main/java/org/bench4q/agent/api/PluginController.java @@ -78,9 +78,4 @@ public class PluginController { return model; } - @RequestMapping(value = "/info", method = RequestMethod.GET) - @ResponseBody - public void info() { - - } } diff --git a/Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/PluginManager.java b/Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/PluginManager.java index f11af4c7..544f2663 100644 --- a/Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/PluginManager.java +++ b/Bench4Q-Agent/src/main/java/org/bench4q/agent/plugin/PluginManager.java @@ -11,7 +11,6 @@ import org.apache.log4j.Logger; import org.bench4q.agent.helper.ClassHelper; import org.bench4q.agent.helper.ClassLoadRestriction; import org.bench4q.agent.share.DealWithLog; -import org.jdom.input.SAXBuilder; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @@ -20,21 +19,11 @@ public class PluginManager { private static final String PLUGIN_PACKAGE_NAME = "org.bench4q.agent.plugin"; private ClassHelper classHelper; private TypeConverter typeConverter; - private SAXBuilder saxBuilder; private Map> plugins; private Logger logger = Logger.getLogger(PluginManager.class); - private SAXBuilder getSaxBuilder() { - return saxBuilder; - } - - private void setSaxBuilder(SAXBuilder saxBuilder) { - this.saxBuilder = saxBuilder; - } - @Autowired public PluginManager(ClassHelper classHelper, TypeConverter typeConverter) { - this.setSaxBuilder(new SAXBuilder()); this.setClassHelper(classHelper); this.setTypeConverter(typeConverter); this.setPlugins(this.getClassHelper().loadClasses(PLUGIN_PACKAGE_NAME, diff --git a/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java index ed9c38ac..d194d39a 100644 --- a/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/ParamTypeEnum.java @@ -2,5 +2,4 @@ package org.bench4q.share.models.master.plugin; public enum ParamTypeEnum { Field, MultiField, CheckBox, Table - } diff --git a/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginInfoModel.java b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginInfoModel.java new file mode 100644 index 00000000..de68527c --- /dev/null +++ b/Bench4Q-Share/src/main/java/org/bench4q/share/models/master/plugin/PluginInfoModel.java @@ -0,0 +1,35 @@ +package org.bench4q.share.models.master.plugin; + +import java.util.List; + +public class PluginInfoModel { + + public static abstract class Type { + } + + public static class Field extends Type { + private String size; + private String text; + } + + public static class NField extends Type { + } + + public static class Table extends Type { + private String column; + } + + public static class Choice extends Type { + } + + public static class CheckBox extends Type { + private List choices; + + } + + public static class ParameterInfoModel { + private String name; + private String label; + private Type type; + } +} diff --git a/Bench4Q-Master/relative Docs/bench4q year final.pptx b/relative Docs/bench4q year final.pptx similarity index 100% rename from Bench4Q-Master/relative Docs/bench4q year final.pptx rename to relative Docs/bench4q year final.pptx diff --git a/relative Docs/取参数状态机.vsdx b/relative Docs/取参数状态机.vsdx new file mode 100644 index 00000000..265a8ee6 Binary files /dev/null and b/relative Docs/取参数状态机.vsdx differ