From 7e626ea2193d39217fa7321a865bfab014c5ea69 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 22 五月 2022 13:07:36 +0800
Subject: [PATCH] update xxl-job 2.3.0 => 2.3.1
---
ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java
index 114407b..d7cc0db 100644
--- a/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java
+++ b/ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java
@@ -22,45 +22,45 @@
*/
@Component
public class WebExceptionResolver implements HandlerExceptionResolver {
- private static transient Logger logger = LoggerFactory.getLogger(WebExceptionResolver.class);
+ private static transient Logger logger = LoggerFactory.getLogger(WebExceptionResolver.class);
- @Override
- public ModelAndView resolveException(HttpServletRequest request,
- HttpServletResponse response, Object handler, Exception ex) {
+ @Override
+ public ModelAndView resolveException(HttpServletRequest request,
+ HttpServletResponse response, Object handler, Exception ex) {
- if (!(ex instanceof XxlJobException)) {
- logger.error("WebExceptionResolver:{}", ex);
- }
+ if (!(ex instanceof XxlJobException)) {
+ logger.error("WebExceptionResolver:{}", ex);
+ }
- // if json
- boolean isJson = false;
- if (handler instanceof HandlerMethod) {
- HandlerMethod method = (HandlerMethod)handler;
- ResponseBody responseBody = method.getMethodAnnotation(ResponseBody.class);
- if (responseBody != null) {
- isJson = true;
- }
- }
+ // if json
+ boolean isJson = false;
+ if (handler instanceof HandlerMethod) {
+ HandlerMethod method = (HandlerMethod) handler;
+ ResponseBody responseBody = method.getMethodAnnotation(ResponseBody.class);
+ if (responseBody != null) {
+ isJson = true;
+ }
+ }
- // error result
- ReturnT<String> errorResult = new ReturnT<String>(ReturnT.FAIL_CODE, ex.toString().replaceAll("\n", "<br/>"));
+ // error result
+ ReturnT<String> errorResult = new ReturnT<String>(ReturnT.FAIL_CODE, ex.toString().replaceAll("\n", "<br/>"));
- // response
- ModelAndView mv = new ModelAndView();
- if (isJson) {
- try {
- response.setContentType("application/json;charset=utf-8");
- response.getWriter().print(JacksonUtil.writeValueAsString(errorResult));
- } catch (IOException e) {
- logger.error(e.getMessage(), e);
- }
- return mv;
- } else {
+ // response
+ ModelAndView mv = new ModelAndView();
+ if (isJson) {
+ try {
+ response.setContentType("application/json;charset=utf-8");
+ response.getWriter().print(JacksonUtil.writeValueAsString(errorResult));
+ } catch (IOException e) {
+ logger.error(e.getMessage(), e);
+ }
+ return mv;
+ } else {
- mv.addObject("exceptionMsg", errorResult.getMsg());
- mv.setViewName("/common/common.exception");
- return mv;
- }
- }
-
-}
\ No newline at end of file
+ mv.addObject("exceptionMsg", errorResult.getMsg());
+ mv.setViewName("/common/common.exception");
+ return mv;
+ }
+ }
+
+}
--
Gitblit v1.9.3