From 1473b34fd4b239215cb06d0bac17a743c05427c1 Mon Sep 17 00:00:00 2001 From: lihang212010 <38468839+lihang212010@users.noreply.github.com> Date: Fri, 16 Oct 2020 14:38:13 +0800 Subject: [PATCH] Update json.go --- render/json.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/render/json.go b/render/json.go index d026bfaa..5bceb9bc 100644 --- a/render/json.go +++ b/render/json.go @@ -52,9 +52,6 @@ var jsonAsciiContentType = []string{"application/json"} // Render (JSON) writes data with custom ContentType. func (r JSON) Render(w http.ResponseWriter) (err error) { - if _, isJson := r.Data.([]byte); isJson { - return - } if err = WriteJSON(w, r.Data); err != nil { panic(err) } @@ -69,6 +66,10 @@ func (r JSON) WriteContentType(w http.ResponseWriter) { // WriteJSON marshals the given interface object and writes it with custom ContentType. func WriteJSON(w http.ResponseWriter, obj interface{}) error { writeContentType(w, jsonContentType) + if _, isJson := r.Data.([]byte); isJson { + _, err = w.Write(jsonBytes) + return err + } jsonBytes, err := json.Marshal(obj) if err != nil { return err