diff --git a/src/main/java/cn/stylefeng/guns/core/error/CustomErrorAttributes.java b/src/main/java/cn/stylefeng/guns/core/error/CustomErrorAttributes.java index 6c52efdf..23366ac8 100644 --- a/src/main/java/cn/stylefeng/guns/core/error/CustomErrorAttributes.java +++ b/src/main/java/cn/stylefeng/guns/core/error/CustomErrorAttributes.java @@ -30,17 +30,19 @@ public class CustomErrorAttributes extends DefaultErrorAttributes { Throwable throwable = this.getError(webRequest); if (throwable instanceof ServiceException) { ServiceException serviceException = (ServiceException) throwable; - return BeanUtil.beanToMap(new ErrorResponseData(serviceException.getErrorCode(), serviceException.getUserTip())); + return BeanUtil.beanToMap(new ErrorResponseData<>(serviceException.getErrorCode(), serviceException.getUserTip())); } // 3.如果返回的是404 http状态码 Integer status = (Integer) defaultErrorAttributes.get("status"); if (status.equals(HttpStatus.HTTP_NOT_FOUND)) { - return BeanUtil.beanToMap(new ErrorResponseData(ValidatorExceptionEnum.NOT_FOUND.getErrorCode(), ValidatorExceptionEnum.NOT_FOUND.getUserTip())); + Map customAttrs = BeanUtil.beanToMap(new ErrorResponseData<>(ValidatorExceptionEnum.NOT_FOUND.getErrorCode(), ValidatorExceptionEnum.NOT_FOUND.getUserTip())); + customAttrs.putAll(defaultErrorAttributes); + return customAttrs; } // 4.无法确定的返回服务器异常 - return BeanUtil.beanToMap(new ErrorResponseData(DefaultBusinessExceptionEnum.SYSTEM_RUNTIME_ERROR.getErrorCode(), DefaultBusinessExceptionEnum.SYSTEM_RUNTIME_ERROR.getUserTip())); + return BeanUtil.beanToMap(new ErrorResponseData<>(DefaultBusinessExceptionEnum.SYSTEM_RUNTIME_ERROR.getErrorCode(), DefaultBusinessExceptionEnum.SYSTEM_RUNTIME_ERROR.getUserTip())); } } diff --git a/src/main/resources/db/migration/mysql/V7.2.3_20220623_1646__update_devops_url.sql b/src/main/resources/db/migration/mysql/V7.2.3_20220623_1646__update_devops_url.sql new file mode 100644 index 00000000..91f44951 --- /dev/null +++ b/src/main/resources/db/migration/mysql/V7.2.3_20220623_1646__update_devops_url.sql @@ -0,0 +1 @@ +UPDATE `sys_config` SET `config_value` = concat(config_value, '/guns-devops/**,') WHERE `config_code` = 'SYS_NONE_SECURITY_URLS'; \ No newline at end of file