diff --git a/pom.xml b/pom.xml index 9e590fb..b3b9232 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ vip.jcfd zkh-framework - 1.5.9 + 1.5.10 pom ZKH Framework A Java framework for ZKH applications diff --git a/zkh-common/pom.xml b/zkh-common/pom.xml index 1dc68d1..f3b440f 100644 --- a/zkh-common/pom.xml +++ b/zkh-common/pom.xml @@ -6,7 +6,7 @@ vip.jcfd zkh-framework - 1.5.9 + 1.5.10 zkh-common diff --git a/zkh-data/pom.xml b/zkh-data/pom.xml index 1b367c8..1c0dd55 100644 --- a/zkh-data/pom.xml +++ b/zkh-data/pom.xml @@ -6,7 +6,7 @@ vip.jcfd zkh-framework - 1.5.9 + 1.5.10 zkh-data diff --git a/zkh-file/pom.xml b/zkh-file/pom.xml index 24ef066..3ac5b31 100644 --- a/zkh-file/pom.xml +++ b/zkh-file/pom.xml @@ -6,7 +6,7 @@ vip.jcfd zkh-framework - 1.5.9 + 1.5.10 zkh-file diff --git a/zkh-log/pom.xml b/zkh-log/pom.xml index d7e0bf6..4bde7d8 100644 --- a/zkh-log/pom.xml +++ b/zkh-log/pom.xml @@ -6,7 +6,7 @@ vip.jcfd zkh-framework - 1.5.9 + 1.5.10 zkh-log diff --git a/zkh-web/pom.xml b/zkh-web/pom.xml index 601c139..40d37c4 100644 --- a/zkh-web/pom.xml +++ b/zkh-web/pom.xml @@ -7,7 +7,7 @@ vip.jcfd zkh-framework - 1.5.9 + 1.5.10 zkh-web diff --git a/zkh-web/src/main/java/vip/jcfd/web/controller/CustomErrorController.java b/zkh-web/src/main/java/vip/jcfd/web/controller/CustomErrorController.java new file mode 100644 index 0000000..6d7e7de --- /dev/null +++ b/zkh-web/src/main/java/vip/jcfd/web/controller/CustomErrorController.java @@ -0,0 +1,23 @@ +package vip.jcfd.web.controller; + +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.boot.web.servlet.error.ErrorController; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import vip.jcfd.common.core.R; + +import java.util.Optional; + +@RestController +public class CustomErrorController implements ErrorController { + + @RequestMapping("/error") + public R handleError(HttpServletRequest request) { + int status = Optional.ofNullable(request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE)) + .map(Object::toString) + .map(Integer::parseInt) + .orElse(500); + return new R<>(status, "发生错误", false, null); + } +}