|
@@ -1,8 +1,7 @@
|
1
|
1
|
package com.xxl.job.admin.controller.resolver;
|
2
|
2
|
|
3
|
|
-import javax.servlet.http.HttpServletRequest;
|
4
|
|
-import javax.servlet.http.HttpServletResponse;
|
5
|
|
-
|
|
3
|
+import com.xxl.job.admin.core.model.ReturnT;
|
|
4
|
+import com.xxl.job.core.util.JacksonUtil;
|
6
|
5
|
import org.slf4j.Logger;
|
7
|
6
|
import org.slf4j.LoggerFactory;
|
8
|
7
|
import org.springframework.web.bind.annotation.ResponseBody;
|
|
@@ -10,8 +9,8 @@ import org.springframework.web.method.HandlerMethod;
|
10
|
9
|
import org.springframework.web.servlet.HandlerExceptionResolver;
|
11
|
10
|
import org.springframework.web.servlet.ModelAndView;
|
12
|
11
|
|
13
|
|
-import com.xxl.job.admin.core.model.ReturnT;
|
14
|
|
-import com.xxl.job.core.util.JacksonUtil;
|
|
12
|
+import javax.servlet.http.HttpServletRequest;
|
|
13
|
+import javax.servlet.http.HttpServletResponse;
|
15
|
14
|
|
16
|
15
|
/**
|
17
|
16
|
* common exception resolver
|
|
@@ -29,6 +28,7 @@ public class WebExceptionResolver implements HandlerExceptionResolver {
|
29
|
28
|
HandlerMethod method = (HandlerMethod)handler;
|
30
|
29
|
ResponseBody responseBody = method.getMethodAnnotation(ResponseBody.class);
|
31
|
30
|
if (responseBody != null) {
|
|
31
|
+ response.setContentType("application/json;charset=UTF-8");
|
32
|
32
|
mv.addObject("result", JacksonUtil.writeValueAsString(new ReturnT<String>(500, ex.toString().replaceAll("\n", "<br/>"))));
|
33
|
33
|
mv.setViewName("/common/common.result");
|
34
|
34
|
} else {
|