diff --git a/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java b/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java index 09f4838f..0411f7e3 100644 --- a/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java +++ b/framework/src/main/java/cn/lili/common/exception/GlobalControllerExceptionHandler.java @@ -44,10 +44,21 @@ public class GlobalControllerExceptionHandler { //如果是自定义异常,则获取异常,返回自定义错误消息 if (e instanceof ServiceException) { - ResultCode resultCode = ((ServiceException) e).getResultCode(); + ServiceException serviceException = ((ServiceException) e); + ResultCode resultCode = serviceException.getResultCode(); + + Integer code = null; + String message = null; + if (resultCode != null) { - return ResultUtil.error(resultCode.code(), resultCode.message()); + code = resultCode.code(); + message = resultCode.message(); } + //如果有扩展消息,则输出异常中,跟随补充异常 + if (!serviceException.getMsg().equals(ServiceException.DEFAULT_MESSAGE)) { + message += ":" + serviceException.getMsg(); + } + return ResultUtil.error(code, message); } //默认错误消息 diff --git a/framework/src/main/java/cn/lili/common/exception/ServiceException.java b/framework/src/main/java/cn/lili/common/exception/ServiceException.java index bdf684b0..4f652afd 100644 --- a/framework/src/main/java/cn/lili/common/exception/ServiceException.java +++ b/framework/src/main/java/cn/lili/common/exception/ServiceException.java @@ -4,13 +4,19 @@ import cn.lili.common.enums.ResultCode; import lombok.Data; /** + * 全局业务异常类 + * * @author Chopper */ @Data public class ServiceException extends RuntimeException { - private String msg; + public static String DEFAULT_MESSAGE = "网络错误,请稍后重试!"; + //异常消息 + private String msg = DEFAULT_MESSAGE; + + //错误码 private ResultCode resultCode; public ServiceException(String msg) { @@ -19,8 +25,7 @@ public class ServiceException extends RuntimeException { } public ServiceException() { - super("网络错误,请稍后重试!"); - this.msg = "网络错误,请稍后重试!"; + super(); } public ServiceException(ResultCode resultCode) {