blackteay/gin
3
0
Fork 0
mirror of https://github.com/gin-gonic/gin.git synced 2025-10-17 22:32:26 +08:00
Code Issues Projects Releases Wiki Activity

Update json.go

Browse Source
This commit is contained in:
lihang212010 2020-10-16 14:38:13 +08:00 committed by GitHub
parent dccd4e3b72
commit 1473b34fd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
render/json.go
View File

@ -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