lilonglong/magic-api-gitee
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix https://gitee.com/ssssssss-team/magic-api/issues/I5LCLP

Browse Source
This commit is contained in:
mxd 2022-08-27 06:49:35 +08:00
parent 48a1ba13ad
commit 7e70c7c158
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
magic-api/src/main/java/org/ssssssss/magicapi/core/web/RequestHandler.java
View File

@ -159,7 +159,7 @@ public class RequestHandler extends MagicController {
} catch (ValidateException e) {
return afterCompletion(requestEntity, resultProvider.buildResult(requestEntity, RESPONSE_CODE_INVALID, e.getMessage()));
} catch (Throwable root) {
return afterCompletion(requestEntity, processException(requestEntity, root), root);
return processException(requestEntity, root);
}
RequestContext.setRequestEntity(requestEntity);
Object value;
@ -342,7 +342,7 @@ public class RequestHandler extends MagicController {
// 对返回结果包装处理
return afterCompletion(requestEntity, response(requestEntity, result));
} catch (Throwable root) {
return afterCompletion(requestEntity, processException(requestEntity, root), root);
return processException(requestEntity, root);
} finally {
RequestContext.remove();
}
@ -354,7 +354,7 @@ public class RequestHandler extends MagicController {
do {
if (parent instanceof MagicScriptAssertException) {
MagicScriptAssertException sae = (MagicScriptAssertException) parent;
return resultProvider.buildResult(requestEntity, sae.getCode(), sae.getMessage());
return afterCompletion(requestEntity, resultProvider.buildResult(requestEntity, sae.getCode(), sae.getMessage()), root);
}
if (parent instanceof MagicScriptException) {
se = (MagicScriptException) parent;
@ -369,10 +369,11 @@ public class RequestHandler extends MagicController {
));
}
if (configuration.isThrowException()) {
afterCompletion(requestEntity, null, root);
throw root;
}
logger.error("接口{}请求出错", requestEntity.getRequest().getRequestURI(), root);
return resultProvider.buildException(requestEntity, root);
return afterCompletion(requestEntity, resultProvider.buildException(requestEntity, root), root);
}
/**