From b1bde50f9c1a477e59fe881e6f69f6c6ec4b542b Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Fri, 25 Aug 2023 14:24:40 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=BF=94=E5=9B=9E=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 ++ .../java/cn/lihongjie/coal/config/RResponseBodyAdvice.java | 5 +++++ src/main/java/cn/lihongjie/coal/dto/R.java | 4 ++++ 3 files changed, 11 insertions(+) diff --git a/.gitignore b/.gitignore index d34289ff..be7a0f38 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,5 @@ build/ .vscode/ *.log +src/main/resources/rebel.xml +coal.log.*.gz diff --git a/src/main/java/cn/lihongjie/coal/config/RResponseBodyAdvice.java b/src/main/java/cn/lihongjie/coal/config/RResponseBodyAdvice.java index a11d0960..84093bfd 100644 --- a/src/main/java/cn/lihongjie/coal/config/RResponseBodyAdvice.java +++ b/src/main/java/cn/lihongjie/coal/config/RResponseBodyAdvice.java @@ -29,6 +29,11 @@ public class RResponseBodyAdvice implements ResponseBodyAdvice { if (!selectedContentType.includes(MediaType.APPLICATION_JSON)) { return body; } + + if (body == null) { + return R.success(); + } + if (body instanceof byte[]) { return body; } diff --git a/src/main/java/cn/lihongjie/coal/dto/R.java b/src/main/java/cn/lihongjie/coal/dto/R.java index 9165c9a1..0dbb4841 100644 --- a/src/main/java/cn/lihongjie/coal/dto/R.java +++ b/src/main/java/cn/lihongjie/coal/dto/R.java @@ -33,6 +33,10 @@ public class R { } + public static R success() { + return success(null); + } + public static R success(T data) { return create(data, "ok", ""); }