master
wangbing 5 years ago
parent 84be9226e8
commit 661cdbb95c

@ -17,10 +17,7 @@ import org.springframework.web.servlet.mvc.method.annotation.SseEmitter;
import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver; import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver;
import xyz.wbsite.dbtool.web.config.ActionConfig; import xyz.wbsite.dbtool.web.config.ActionConfig;
import xyz.wbsite.dbtool.web.frame.auth.LocalData; import xyz.wbsite.dbtool.web.frame.auth.LocalData;
import xyz.wbsite.dbtool.web.frame.base.BaseResponse; import xyz.wbsite.dbtool.web.frame.base.*;
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.utils.MapperUtil; import xyz.wbsite.dbtool.web.frame.utils.MapperUtil;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -265,6 +262,8 @@ public class GlobalController implements ErrorController {
arg[i] = data; arg[i] = data;
} else if (parameter.getType() == MultipartFile.class) { } else if (parameter.getType() == MultipartFile.class) {
arg[i] = file; arg[i] = file;
} else if (BaseRequest.class.isAssignableFrom(parameter.getType())) {
arg[i] = MapperUtil.toJava(data, parameter.getType());
} }
} }
return methodC.invoke(ajax, arg); return methodC.invoke(ajax, arg);

@ -269,6 +269,8 @@ public class GlobalController implements ErrorController {
arg[i] = data; arg[i] = data;
} else if (parameter.getType() == MultipartFile.class) { } else if (parameter.getType() == MultipartFile.class) {
arg[i] = file; arg[i] = file;
} else if (BaseRequest.class.isAssignableFrom(parameter.getType())) {
arg[i] = MapperUtil.toJava(data, parameter.getType());
} }
} }
return methodC.invoke(ajax, arg); return methodC.invoke(ajax, arg);

Loading…
Cancel
Save

Powered by TurnKey Linux.