diff --git a/src/main/java/xyz/wbsite/dbtool/web/action/GlobalController.java b/src/main/java/xyz/wbsite/dbtool/web/action/GlobalController.java index 0e44119b..0e01a11e 100644 --- a/src/main/java/xyz/wbsite/dbtool/web/action/GlobalController.java +++ b/src/main/java/xyz/wbsite/dbtool/web/action/GlobalController.java @@ -17,10 +17,7 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter; import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver; import xyz.wbsite.dbtool.web.config.ActionConfig; import xyz.wbsite.dbtool.web.frame.auth.LocalData; -import xyz.wbsite.dbtool.web.frame.base.BaseResponse; -import xyz.wbsite.dbtool.web.frame.base.ErrorType; -import xyz.wbsite.dbtool.web.frame.base.Screen; -import xyz.wbsite.dbtool.web.frame.base.Token; +import xyz.wbsite.dbtool.web.frame.base.*; import xyz.wbsite.dbtool.web.frame.utils.MapperUtil; import javax.servlet.http.HttpServletRequest; @@ -265,6 +262,8 @@ public class GlobalController implements ErrorController { arg[i] = data; } else if (parameter.getType() == MultipartFile.class) { arg[i] = file; + } else if (BaseRequest.class.isAssignableFrom(parameter.getType())) { + arg[i] = MapperUtil.toJava(data, parameter.getType()); } } return methodC.invoke(ajax, arg); diff --git a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java index 72d28f90..c25033e6 100644 --- a/src/main/resources/modules/SpringBoot/java/action/GlobalController.java +++ b/src/main/resources/modules/SpringBoot/java/action/GlobalController.java @@ -269,6 +269,8 @@ public class GlobalController implements ErrorController { arg[i] = data; } else if (parameter.getType() == MultipartFile.class) { arg[i] = file; + } else if (BaseRequest.class.isAssignableFrom(parameter.getType())) { + arg[i] = MapperUtil.toJava(data, parameter.getType()); } } return methodC.invoke(ajax, arg);