|
@@ -36,7 +36,6 @@ import org.ssssssss.script.MagicScriptDebugContext;
|
|
import org.ssssssss.script.exception.MagicScriptAssertException;
|
|
import org.ssssssss.script.exception.MagicScriptAssertException;
|
|
import org.ssssssss.script.exception.MagicScriptException;
|
|
import org.ssssssss.script.exception.MagicScriptException;
|
|
import org.ssssssss.script.functions.ObjectConvertExtension;
|
|
import org.ssssssss.script.functions.ObjectConvertExtension;
|
|
-import org.ssssssss.script.functions.StreamExtension;
|
|
|
|
import org.ssssssss.script.parsing.Span;
|
|
import org.ssssssss.script.parsing.Span;
|
|
import org.ssssssss.script.parsing.ast.literal.BooleanLiteral;
|
|
import org.ssssssss.script.parsing.ast.literal.BooleanLiteral;
|
|
import org.ssssssss.script.reflection.JavaInvoker;
|
|
import org.ssssssss.script.reflection.JavaInvoker;
|
|
@@ -264,7 +263,7 @@ public class RequestHandler extends MagicController {
|
|
private Object invokeRequest(RequestEntity requestEntity) throws Throwable {
|
|
private Object invokeRequest(RequestEntity requestEntity) throws Throwable {
|
|
HttpServletRequest request = requestEntity.getRequest();
|
|
HttpServletRequest request = requestEntity.getRequest();
|
|
try {
|
|
try {
|
|
- RequestContext.setRequestAttribute(request, requestEntity.getResponse());
|
|
+ RequestContext.setRequestEntity(requestEntity);
|
|
Object result = ScriptManager.executeScript(requestEntity.getApiInfo().getScript(), requestEntity.getMagicScriptContext());
|
|
Object result = ScriptManager.executeScript(requestEntity.getApiInfo().getScript(), requestEntity.getMagicScriptContext());
|
|
Object value = result;
|
|
Object value = result;
|
|
|
|
|
|
@@ -384,7 +383,7 @@ public class RequestHandler extends MagicController {
|
|
MagicLoggerContext.remove(sessionId);
|
|
MagicLoggerContext.remove(sessionId);
|
|
});
|
|
});
|
|
context.onStart(() -> {
|
|
context.onStart(() -> {
|
|
- RequestContext.setRequestAttribute(request, requestEntity.getResponse());
|
|
+ RequestContext.setRequestEntity(requestEntity);
|
|
MagicLoggerContext.SESSION.set(sessionId);
|
|
MagicLoggerContext.SESSION.set(sessionId);
|
|
logger.info("Create Console Session : {}", sessionId);
|
|
logger.info("Create Console Session : {}", sessionId);
|
|
});
|
|
});
|