update 适配 javax.servlet 替换为 jakarta.servlet 更新所有代码 update 适配 ServletUtils 更...

疯狂的狮子Li

2023-01-13 0fc796b90d3f44b81ef30285edb897223df439f7

 ruoyi-extend/ruoyi-xxl-job-admin/src/main/java/com/xxl/job/admin/controller/resolver/WebExceptionResolver.java

@@ -11,8 +11,8 @@
import org.springframework.web.servlet.HandlerExceptionResolver;
import org.springframework.web.servlet.ModelAndView;

import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;

/**
@@ -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;
      }
   }
	
}
            mv.addObject("exceptionMsg", errorResult.getMsg());
            mv.setViewName("/common/common.exception");
            return mv;
        }
    }

}