IM/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2026-05-11 04:25:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'errcode' of https://github.com/OpenIMSDK/Open-IM-Server into errcode

Browse Source 
# Conflicts:
#	pkg/apiresp/gin.go
#	pkg/apiresp/resp.go
This commit is contained in:
withchao
2023-03-24 17:35:22 +08:00
parent 429d5da1d2 4c18e47e96
commit 05ae254d3d
19 changed files with 1187 additions and 1213 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apiresp/resp.go
+7 -10
View File
@@ -5,7 +5,7 @@ import (
"reflect"
)
type ApiCodeResponse struct {
type ApiResponse struct {
ErrCode int `json:"errCode"`
ErrMsg string `json:"errMsg"`
ErrDlt string `json:"errDlt"`
@@ -30,26 +30,23 @@ func isAllFieldsPrivate(v any) bool {
return true
}
func ApiSuccess(data any) *ApiCodeResponse {
func apiSuccess(data any) *ApiResponse {
if isAllFieldsPrivate(data) {
return &ApiCodeResponse{}
return &ApiResponse{}
}
return &ApiCodeResponse{
return &ApiResponse{
Data: data,
}
}
func ApiError(err error) *ApiCodeResponse {
if err == nil {
return ApiSuccess(nil)
}
func ParseError(err error) *ApiResponse {
unwrap := errs.Unwrap(err)
if codeErr, ok := unwrap.(errs.CodeError); ok {
resp := ApiCodeResponse{ErrCode: codeErr.Code(), ErrMsg: codeErr.Msg(), ErrDlt: codeErr.Detail()}
resp := ApiResponse{ErrCode: codeErr.Code(), ErrMsg: codeErr.Msg(), ErrDlt: codeErr.Detail()}
if resp.ErrDlt == "" {
resp.ErrDlt = err.Error()
}
return &resp
}
return &ApiCodeResponse{ErrCode: errs.ServerInternalError, ErrMsg: err.Error()}
return &ApiResponse{ErrCode: errs.ServerInternalError, ErrMsg: err.Error()}
}