|
|
@@ -11,6 +11,7 @@ import org.springframework.web.servlet.ModelAndView;
|
|
11
|
11
|
|
|
12
|
12
|
import javax.servlet.http.HttpServletRequest;
|
|
13
|
13
|
import javax.servlet.http.HttpServletResponse;
|
|
|
14
|
+import java.io.IOException;
|
|
14
|
15
|
|
|
15
|
16
|
/**
|
|
16
|
17
|
* common exception resolver
|
|
|
@@ -23,19 +24,34 @@ public class WebExceptionResolver implements HandlerExceptionResolver {
|
|
23
|
24
|
public ModelAndView resolveException(HttpServletRequest request,
|
|
24
|
25
|
HttpServletResponse response, Object handler, Exception ex) {
|
|
25
|
26
|
logger.error("WebExceptionResolver:{}", ex);
|
|
26
|
|
-
|
|
27
|
|
- ModelAndView mv = new ModelAndView();
|
|
|
27
|
+
|
|
|
28
|
+ // if json
|
|
|
29
|
+ boolean isJson = false;
|
|
28
|
30
|
HandlerMethod method = (HandlerMethod)handler;
|
|
29
|
31
|
ResponseBody responseBody = method.getMethodAnnotation(ResponseBody.class);
|
|
30
|
32
|
if (responseBody != null) {
|
|
31
|
|
- response.setContentType("application/json;charset=UTF-8");
|
|
32
|
|
- mv.addObject("result", JacksonUtil.writeValueAsString(new ReturnT<String>(500, ex.toString().replaceAll("\n", "<br/>"))));
|
|
33
|
|
- mv.setViewName("/common/common.result");
|
|
|
33
|
+ isJson = true;
|
|
|
34
|
+ }
|
|
|
35
|
+
|
|
|
36
|
+ // error result
|
|
|
37
|
+ ReturnT<String> errorResult = new ReturnT<String>(ReturnT.FAIL_CODE, ex.toString().replaceAll("\n", "<br/>"));
|
|
|
38
|
+
|
|
|
39
|
+ // response
|
|
|
40
|
+ ModelAndView mv = new ModelAndView();
|
|
|
41
|
+ if (isJson) {
|
|
|
42
|
+ try {
|
|
|
43
|
+ response.setContentType("application/json;charset=utf-8");
|
|
|
44
|
+ response.getWriter().print(JacksonUtil.writeValueAsString(errorResult));
|
|
|
45
|
+ } catch (IOException e) {
|
|
|
46
|
+ logger.error(e.getMessage(), e);
|
|
|
47
|
+ }
|
|
|
48
|
+ return mv;
|
|
34
|
49
|
} else {
|
|
35
|
|
- mv.addObject("exceptionMsg", ex.toString().replaceAll("\n", "<br/>"));
|
|
|
50
|
+
|
|
|
51
|
+ mv.addObject("exceptionMsg", errorResult.getMsg());
|
|
36
|
52
|
mv.setViewName("/common/common.exception");
|
|
|
53
|
+ return mv;
|
|
37
|
54
|
}
|
|
38
|
|
- return mv;
|
|
39
|
55
|
}
|
|
40
|
56
|
|
|
41
|
57
|
}
|
xuxueli