From c04a59775ee986f33fe19e21ae02cff9f6b002a7 Mon Sep 17 00:00:00 2001
From: yujian <yujian@163.com>
Date: 星期二, 14 四月 2020 11:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java b/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
index d14d239..7eb6b03 100644
--- a/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
+++ b/fanli/src/main/java/com/yeshi/fanli/aspect/SignValidateAspect.java
@@ -42,7 +42,7 @@
}
@Around(EDP)
- public Object testAround(ProceedingJoinPoint joinPoint) throws IOException {
+ public Object testAround(ProceedingJoinPoint joinPoint) throws Throwable {
Object[] args = joinPoint.getArgs();
PrintWriter out = null;
ServletRequestAttributes servletContainer = (ServletRequestAttributes) RequestContextHolder
@@ -125,7 +125,10 @@
} catch (Throwable e) {
LogHelper.errorDetailInfo(e, getHttpServletParams(request), request.getRequestURI().toString());
- out.print(JsonUtil.loadFalseResult(90009, "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�"));
+ if (!Constant.IS_TEST)
+ out.print(JsonUtil.loadFalseResult(90009, "鏈嶅姟鍣ㄥ唴閮ㄩ敊璇�"));
+ else
+ throw e;
}
return obj;
} else {
--
Gitblit v1.8.0