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

pkg/common/constant/err_info.go

@@ -2,11 +2,10 @@ package constant
 
 import (
 	sdkws "Open_IM/pkg/proto/sdk_ws"
-	"Open_IM/pkg/utils"
 	"context"
 	"encoding/json"
-	"errors"
 	"fmt"
+	"github.com/pkg/errors"
 	"gorm.io/gorm"
 )
 
@@ -24,12 +23,20 @@ func (e *ErrInfo) Code() int32 {
 	return e.ErrCode
 }
 
+func (e *ErrInfo) Msg(msg string) *ErrInfo {
+	return &ErrInfo{
+		ErrCode:      e.ErrCode,
+		ErrMsg:       msg,
+		DetailErrMsg: e.DetailErrMsg,
+	}
+}
+
 func (e *ErrInfo) Warp() error {
-	return utils.Wrap(e, "")
+	return errors.WithStack(e)
 }
 
 func (e *ErrInfo) WarpMessage(msg string) error {
-	return utils.Wrap(e, msg)
+	return errors.WithMessage(e, "")
 }
 
 func NewErrNetwork(err error) error {
@@ -78,7 +85,7 @@ func CommonResp2Err(resp *sdkws.CommonResp) error {
 	return nil
 }
 
-func Error2CommResp(ctx context.Context, info ErrInfo, detailErrMsg string) *sdkws.CommonResp {
+func Error2CommResp(ctx context.Context, info *ErrInfo, detailErrMsg string) *sdkws.CommonResp {
 	err := &sdkws.CommonResp{
 		ErrCode: info.ErrCode,
 		ErrMsg:  info.ErrMsg,