blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-06-15 15:19:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
wangchuxiao 2023-01-12 17:26:16 +08:00
commit 8be1ee90f6
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
internal/rpc/group/group.go
View File

@ -740,7 +740,8 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup
} else if req.HandleResult == constant.GroupResponseRefuse { } else if req.HandleResult == constant.GroupResponseRefuse {
chat.GroupApplicationRejectedNotification(req) chat.GroupApplicationRejectedNotification(req)
} else { } else {
return nil, utils.Wrap(constant.ErrArgs, "") //return nil, utils.Wrap(constant.ErrArgs, "")
return nil, constant.ErrArgs.Warp()
} }
return resp, nil return resp, nil
} }

9
pkg/common/constant/err_info.go
View File

@ -2,6 +2,7 @@ package constant
import ( import (
sdkws "Open_IM/pkg/proto/sdk_ws" sdkws "Open_IM/pkg/proto/sdk_ws"
"Open_IM/pkg/utils"
"context" "context"
"encoding/json" "encoding/json"
"errors" "errors"
@ -23,6 +24,14 @@ func (e *ErrInfo) Code() int32 {
return e.ErrCode return e.ErrCode
} }
func (e *ErrInfo) Warp() error {
return utils.Wrap(e, "")
}
func (e *ErrInfo) WarpMessage(msg string) error {
return utils.Wrap(e, msg)
}
func NewErrNetwork(err error) error { func NewErrNetwork(err error) error {
return toDetail(err, ErrNetwork) return toDetail(err, ErrNetwork)
} }