Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/main/java/io/github/talelin/merak/bo/FileBO.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ public class FileBO {
private String path;

/**
* LOCAL REMOTE
* LOCAL(本地) 或 REMOTE(远程)
*/
private String type;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -18,6 +15,7 @@
/**
* 响应结果生成工具
*/
@SuppressWarnings("unchecked")
@Slf4j
public class ResponseUtil {

Expand All @@ -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 <T> UnifyResponseVO<T> generateCreatedResponse(int code) {
return (UnifyResponseVO<T>) UnifyResponseVO.builder()
.message(Code.CREATED.getDescription())
.code(code)
.request(RequestUtil.getSimpleRequest())
.build();
}

public static <T> UnifyResponseVO<T> generateSuccessResponse(T data) {
Success success = new Success();
public static <T> UnifyResponseVO<T> generateCreatedResponse(int code, T data) {
return (UnifyResponseVO<T>) UnifyResponseVO.builder()
.message(data)
.code(success.getCode())
.code(code)
.request(RequestUtil.getSimpleRequest())
.build();
}

public static <T> UnifyResponseVO<T> generateUnifyResponse(int code) {
public static <T> UnifyResponseVO<T> generateDeletedResponse(int code) {
return (UnifyResponseVO<T>) UnifyResponseVO.builder()
.message(Code.SUCCESS.getDescription())
.code(code)
.request(RequestUtil.getSimpleRequest())
.build();
}

public static <T> UnifyResponseVO<T> generateDeletedResponse(int code, T data) {
return (UnifyResponseVO<T>) UnifyResponseVO.builder()
.message(data)
.code(code)
.request(RequestUtil.getSimpleRequest())
.build();
}

public static <T> UnifyResponseVO<T> generateUpdatedResponse(int code) {
return (UnifyResponseVO<T>) UnifyResponseVO.builder()
.message(Code.SUCCESS.getDescription())
.code(code)
.request(RequestUtil.getSimpleRequest())
.build();
}

public static <T> UnifyResponseVO<T> generateCreatedResponse(T data) {
Created created = new Created();
setCurrentResponseHttpStatus(created.getHttpCode());
public static <T> UnifyResponseVO<T> generateUpdatedResponse(int code, T data) {
return (UnifyResponseVO<T>) UnifyResponseVO.builder()
.message(data)
.code(created.getCode())
.code(code)
.request(RequestUtil.getSimpleRequest())
.build();
}

public static <T> UnifyResponseVO<T> generateUnifyResponse(Code code, int httpCode) {
setCurrentResponseHttpStatus(httpCode);
public static <T> UnifyResponseVO<T> generateUnifyResponse(int code) {
return (UnifyResponseVO<T>) UnifyResponseVO.builder()
.code(code.getCode())
.message(code.getDescription())
.code(code)
.request(RequestUtil.getSimpleRequest())
.build();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
package io.github.talelin.merak.vo;


import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
Expand Down