diff --git a/src/main/java/io/github/talelin/merak/bo/FileBO.java b/src/main/java/io/github/talelin/merak/bo/FileBO.java index c7a4403e..87eb8fff 100644 --- a/src/main/java/io/github/talelin/merak/bo/FileBO.java +++ b/src/main/java/io/github/talelin/merak/bo/FileBO.java @@ -10,7 +10,7 @@ public class FileBO { private String path; /** - * LOCAL REMOTE + * LOCAL(本地) 或 REMOTE(远程) */ private String type; diff --git a/src/main/java/io/github/talelin/merak/common/utils/ResponseUtil.java b/src/main/java/io/github/talelin/merak/common/utils/ResponseUtil.java index f0d70122..ffb1f9cd 100644 --- a/src/main/java/io/github/talelin/merak/common/utils/ResponseUtil.java +++ b/src/main/java/io/github/talelin/merak/common/utils/ResponseUtil.java @@ -2,9 +2,6 @@ import io.github.talelin.merak.vo.PageResponseVO; import io.github.talelin.merak.vo.UnifyResponseVO; -import io.github.talelin.autoconfigure.exception.HttpException; -import io.github.talelin.autoconfigure.response.Created; -import io.github.talelin.autoconfigure.response.Success; import io.github.talelin.autoconfigure.beans.Code; import io.github.talelin.autoconfigure.utils.RequestUtil; import lombok.extern.slf4j.Slf4j; @@ -18,6 +15,7 @@ /** * 响应结果生成工具 */ +@SuppressWarnings("unchecked") @Slf4j public class ResponseUtil { @@ -34,45 +32,57 @@ public static void setCurrentResponseHttpStatus(int httpStatus) { getResponse().setStatus(httpStatus); } - public static UnifyResponseVO generateUnifyResponse(HttpException e) { - return UnifyResponseVO.builder() - .message(e.getMessage()) - .code(e.getCode()) + public static UnifyResponseVO generateCreatedResponse(int code) { + return (UnifyResponseVO) UnifyResponseVO.builder() + .message(Code.CREATED.getDescription()) + .code(code) .request(RequestUtil.getSimpleRequest()) .build(); } - public static UnifyResponseVO generateSuccessResponse(T data) { - Success success = new Success(); + public static UnifyResponseVO generateCreatedResponse(int code, T data) { return (UnifyResponseVO) UnifyResponseVO.builder() .message(data) - .code(success.getCode()) + .code(code) .request(RequestUtil.getSimpleRequest()) .build(); } - public static UnifyResponseVO generateUnifyResponse(int code) { + public static UnifyResponseVO generateDeletedResponse(int code) { + return (UnifyResponseVO) UnifyResponseVO.builder() + .message(Code.SUCCESS.getDescription()) + .code(code) + .request(RequestUtil.getSimpleRequest()) + .build(); + } + + public static UnifyResponseVO generateDeletedResponse(int code, T data) { return (UnifyResponseVO) UnifyResponseVO.builder() + .message(data) + .code(code) + .request(RequestUtil.getSimpleRequest()) + .build(); + } + + public static UnifyResponseVO generateUpdatedResponse(int code) { + return (UnifyResponseVO) UnifyResponseVO.builder() + .message(Code.SUCCESS.getDescription()) .code(code) .request(RequestUtil.getSimpleRequest()) .build(); } - public static UnifyResponseVO generateCreatedResponse(T data) { - Created created = new Created(); - setCurrentResponseHttpStatus(created.getHttpCode()); + public static UnifyResponseVO generateUpdatedResponse(int code, T data) { return (UnifyResponseVO) UnifyResponseVO.builder() .message(data) - .code(created.getCode()) + .code(code) .request(RequestUtil.getSimpleRequest()) .build(); } - public static UnifyResponseVO generateUnifyResponse(Code code, int httpCode) { - setCurrentResponseHttpStatus(httpCode); + public static UnifyResponseVO generateUnifyResponse(int code) { return (UnifyResponseVO) UnifyResponseVO.builder() - .code(code.getCode()) - .message(code.getDescription()) + .code(code) .request(RequestUtil.getSimpleRequest()) .build(); } diff --git a/src/main/java/io/github/talelin/merak/vo/UnifyResponseVO.java b/src/main/java/io/github/talelin/merak/vo/UnifyResponseVO.java index 6b69bd10..944dd5dc 100644 --- a/src/main/java/io/github/talelin/merak/vo/UnifyResponseVO.java +++ b/src/main/java/io/github/talelin/merak/vo/UnifyResponseVO.java @@ -1,6 +1,5 @@ package io.github.talelin.merak.vo; - import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data;