|
@@ -76,7 +76,7 @@ public class GlobalWebExceptionHandlerAutoConfiguration {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
ApiResult<Void> ret = ApiResult.fail(e.getCode(), msg);
|
|
ApiResult<Void> ret = ApiResult.fail(e.getCode(), msg);
|
|
|
- return createResponseEntity(HttpStatus.BAD_REQUEST, ret);
|
|
|
|
|
|
|
+ return createResponseEntity(HttpStatus.OK, ret);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -89,7 +89,7 @@ public class GlobalWebExceptionHandlerAutoConfiguration {
|
|
|
|
|
|
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__INTERNAL_ERROR;
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__INTERNAL_ERROR;
|
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.INTERNAL_SERVER_ERROR.value(), this.determineI18nMessage(msgEnum));
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.INTERNAL_SERVER_ERROR.value(), this.determineI18nMessage(msgEnum));
|
|
|
- return createResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR, ret);
|
|
|
|
|
|
|
+ return createResponseEntity(HttpStatus.OK, ret);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -102,7 +102,7 @@ public class GlobalWebExceptionHandlerAutoConfiguration {
|
|
|
|
|
|
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__NO_LOGIN;
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__NO_LOGIN;
|
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.UNAUTHORIZED.value(), this.determineI18nMessage(msgEnum));
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.UNAUTHORIZED.value(), this.determineI18nMessage(msgEnum));
|
|
|
- return createResponseEntity(HttpStatus.UNAUTHORIZED, ret);
|
|
|
|
|
|
|
+ return createResponseEntity(HttpStatus.OK, ret);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -115,7 +115,7 @@ public class GlobalWebExceptionHandlerAutoConfiguration {
|
|
|
|
|
|
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__PERMISSION_NOT_MATCH;
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__PERMISSION_NOT_MATCH;
|
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.FORBIDDEN.value(), this.determineI18nMessage(msgEnum));
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.FORBIDDEN.value(), this.determineI18nMessage(msgEnum));
|
|
|
- return createResponseEntity(HttpStatus.FORBIDDEN, ret);
|
|
|
|
|
|
|
+ return createResponseEntity(HttpStatus.OK, ret);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -128,7 +128,7 @@ public class GlobalWebExceptionHandlerAutoConfiguration {
|
|
|
|
|
|
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__ROLE_NOT_MATCH;
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__ROLE_NOT_MATCH;
|
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.FORBIDDEN.value(), this.determineI18nMessage(msgEnum));
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.FORBIDDEN.value(), this.determineI18nMessage(msgEnum));
|
|
|
- return createResponseEntity(HttpStatus.FORBIDDEN, ret);
|
|
|
|
|
|
|
+ return createResponseEntity(HttpStatus.OK, ret);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -141,7 +141,7 @@ public class GlobalWebExceptionHandlerAutoConfiguration {
|
|
|
|
|
|
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__NOT_FOUND;
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__NOT_FOUND;
|
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.NOT_FOUND.value(), this.determineI18nMessage(msgEnum));
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.NOT_FOUND.value(), this.determineI18nMessage(msgEnum));
|
|
|
- return createResponseEntity(HttpStatus.NOT_FOUND, ret);
|
|
|
|
|
|
|
+ return createResponseEntity(HttpStatus.OK, ret);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -162,7 +162,7 @@ public class GlobalWebExceptionHandlerAutoConfiguration {
|
|
|
|
|
|
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__UNACCEPTABLE_PARAMETERS;
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__UNACCEPTABLE_PARAMETERS;
|
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.NOT_ACCEPTABLE.value(), this.determineI18nMessage(msgEnum));
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.NOT_ACCEPTABLE.value(), this.determineI18nMessage(msgEnum));
|
|
|
- return createResponseEntity(HttpStatus.NOT_ACCEPTABLE, ret);
|
|
|
|
|
|
|
+ return createResponseEntity(HttpStatus.OK, ret);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -177,7 +177,7 @@ public class GlobalWebExceptionHandlerAutoConfiguration {
|
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__UNACCEPTABLE_PARAMETERS;
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__UNACCEPTABLE_PARAMETERS;
|
|
|
ApiResult<InvalidFieldUtil.InvalidField> ret =
|
|
ApiResult<InvalidFieldUtil.InvalidField> ret =
|
|
|
ApiResult.fail(HttpStatus.NOT_ACCEPTABLE.value(), this.determineI18nMessage(msgEnum), InvalidFieldUtil.getInvalidField(e.getBindingResult()));
|
|
ApiResult.fail(HttpStatus.NOT_ACCEPTABLE.value(), this.determineI18nMessage(msgEnum), InvalidFieldUtil.getInvalidField(e.getBindingResult()));
|
|
|
- return createResponseEntity(HttpStatus.NOT_ACCEPTABLE, ret);
|
|
|
|
|
|
|
+ return createResponseEntity(HttpStatus.OK, ret);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -192,7 +192,7 @@ public class GlobalWebExceptionHandlerAutoConfiguration {
|
|
|
|
|
|
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__METHOD_NOT_ALLOWED;
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__METHOD_NOT_ALLOWED;
|
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.METHOD_NOT_ALLOWED.value(), this.determineI18nMessage(msgEnum));
|
|
ApiResult<Void> ret = ApiResult.fail(HttpStatus.METHOD_NOT_ALLOWED.value(), this.determineI18nMessage(msgEnum));
|
|
|
- return createResponseEntity(HttpStatus.METHOD_NOT_ALLOWED, ret);
|
|
|
|
|
|
|
+ return createResponseEntity(HttpStatus.OK, ret);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -214,7 +214,7 @@ public class GlobalWebExceptionHandlerAutoConfiguration {
|
|
|
|
|
|
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__INTERNAL_ERROR;
|
|
GlobalWebExceptionI18nMessageEnum msgEnum = GlobalWebExceptionI18nMessageEnum.GLOBAL__INTERNAL_ERROR;
|
|
|
ApiResult<Void> ret = ApiResult.fail(responseCode, this.determineI18nMessage(msgEnum));
|
|
ApiResult<Void> ret = ApiResult.fail(responseCode, this.determineI18nMessage(msgEnum));
|
|
|
- return createResponseEntity(HttpStatus.INTERNAL_SERVER_ERROR, ret);
|
|
|
|
|
|
|
+ return createResponseEntity(HttpStatus.OK, ret);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
/*
|