From 979f61720962244f8175d06013a62365af749d3f Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Thu, 12 Jan 2023 17:17:42 +0800 Subject: [PATCH 1/2] 1 --- pkg/common/constant/err_info.go | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkg/common/constant/err_info.go b/pkg/common/constant/err_info.go index 00d0ef3db..7158bdec7 100644 --- a/pkg/common/constant/err_info.go +++ b/pkg/common/constant/err_info.go @@ -2,6 +2,7 @@ package constant import ( sdkws "Open_IM/pkg/proto/sdk_ws" + "Open_IM/pkg/utils" "context" "encoding/json" "errors" @@ -23,6 +24,14 @@ func (e *ErrInfo) Code() int32 { 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 { return toDetail(err, ErrNetwork) } From 0f4170907f3a6ec72d70b36c7b5936eb9be37fa5 Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Thu, 12 Jan 2023 17:20:28 +0800 Subject: [PATCH 2/2] 1 --- internal/rpc/group/group.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 95b9b0f39..540c3f20d 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -740,7 +740,8 @@ func (s *groupServer) GroupApplicationResponse(ctx context.Context, req *pbGroup } else if req.HandleResult == constant.GroupResponseRefuse { chat.GroupApplicationRejectedNotification(req) } else { - return nil, utils.Wrap(constant.ErrArgs, "") + //return nil, utils.Wrap(constant.ErrArgs, "") + return nil, constant.ErrArgs.Warp() } return resp, nil }