Elgato_dark/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan synced 2026-04-21 13:37:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

🎨 JsonArg uses ShouldBindJSON and returns more diagnosable errors (#17413)

Browse source
This commit is contained in:
Jeffrey Chen 2026-04-05 16:51:27 +08:00 committed by GitHub
parent 4065982c9a
commit 29092a385f
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
kernel/util/net.go
View file

@ -19,6 +19,7 @@ package util
import (
"errors"
"fmt"
"io"
"net"
"net/http"
"net/url"
@ -203,9 +204,15 @@ func GetRemoteAddr(req *http.Request) string {
func JsonArg(c *gin.Context, result *gulu.Result) (arg map[string]any, ok bool) {
arg = map[string]any{}
if err := c.BindJSON(&arg); err != nil {
if err := c.ShouldBindJSON(&arg); err != nil {
result.Code = -1
result.Msg = "parses request failed"
var detail string
if errors.Is(err, io.EOF) {
detail = "the request body is empty or truncated (EOF)"
} else {
detail = err.Error()
}
result.Msg = fmt.Sprintf("Parses request [%s] failed: %s", c.Request.URL.Path, detail)
return
}