opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-21 06:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

错误返回新增data字段

Browse Source
This commit is contained in:
TangBin
2018-08-23 16:31:23 +08:00
parent 4c07ae8a1e
commit a85f3d7176
3 changed files with 89 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/httperrors/httperrors.go
+6 -2
View File
@@ -8,18 +8,22 @@ import (
"yunion.io/x/onecloud/pkg/util/httputils"
)
func HTTPError(w http.ResponseWriter, msg string, statusCode int, class string) {
func HTTPError(w http.ResponseWriter, msg string, statusCode int, class string, error httputils.Error) {
w.WriteHeader(statusCode)
w.Header().Set("Content-Type", "application/json")
body := jsonutils.NewDict()
body.Add(jsonutils.NewInt(int64(statusCode)), "code")
body.Add(jsonutils.NewString(msg), "details")
body.Add(jsonutils.NewString(class), "class")
err := jsonutils.NewDict()
err.Add(jsonutils.NewString(error.Id), "id")
err.Add(jsonutils.NewStringArray(error.Fields), "fields")
body.Add(err, "data")
w.Write([]byte(body.String()))
}
func JsonClientError(w http.ResponseWriter, e *httputils.JSONClientError) {
HTTPError(w, e.Details, e.Code, e.Class)
HTTPError(w, e.Details, e.Code, e.Class, e.Data)
}
func GeneralServerError(w http.ResponseWriter, e error) {