diff --git a/plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/AllExceptionHandler.java b/plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/AllExceptionHandler.java deleted file mode 100644 index 00fb1e4..0000000 --- a/plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/AllExceptionHandler.java +++ /dev/null @@ -1,29 +0,0 @@ -package xyz.zhouxy.plusone.exception.handler; - -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; - -import lombok.extern.slf4j.Slf4j; -import xyz.zhouxy.plusone.util.RestfulResult; - -/** - * 处理所有异常的处理器 - * - * @author ZhouXY - */ -@ConditionalOnProperty(prefix = "plusone.exception", name = "handle-all-exception", havingValue = "true") -@RestControllerAdvice -@Slf4j -public class AllExceptionHandler extends BaseExceptionHandler { - protected AllExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) { - super(exceptionInfoHolder); - } - - @ExceptionHandler(Exception.class) - public ResponseEntity handleException(Throwable e) { - log.error(e.getMessage(), e); - return this.buildExceptionResponse(e); - } -} diff --git a/plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/AllExceptionHandlerConfig.java b/plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/AllExceptionHandlerConfig.java new file mode 100644 index 0000000..fd05fdb --- /dev/null +++ b/plusone-basic/plusone-basic-application/src/main/java/xyz/zhouxy/plusone/exception/handler/AllExceptionHandlerConfig.java @@ -0,0 +1,20 @@ +package xyz.zhouxy.plusone.exception.handler; + +import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +import xyz.zhouxy.plusone.exception.handler.BaseExceptionHandler.ExceptionInfoHolder; + +/** + * AllExceptionHandlerConfig + */ +@Configuration +@ConditionalOnProperty(prefix = "plusone.exception", name = "handle-all-exception", havingValue = "true") +public class AllExceptionHandlerConfig { + + @Bean + AllExceptionHandler getAllExceptionHandler(ExceptionInfoHolder exceptionInfoHolder) { + return new AllExceptionHandler(exceptionInfoHolder); + } +} diff --git a/plusone-basic/plusone-basic-common/pom.xml b/plusone-basic/plusone-basic-common/pom.xml index 85e0354..828e5b0 100644 --- a/plusone-basic/plusone-basic-common/pom.xml +++ b/plusone-basic/plusone-basic-common/pom.xml @@ -39,7 +39,7 @@ xyz.zhouxy.plusone plusone-exception-handler - 0.0.2-SNAPSHOT + 0.0.3-SNAPSHOT