Merge remote-tracking branch 'origin/errcode' into errcode

# Conflicts:
#	internal/rpc/friend/friend.go
#	pkg/common/db/mysql_model/im_mysql_model/user_black_list_model.go

pkg/common/constant/error.go

@@ -2,8 +2,10 @@ package constant
 
 import (
 	sdkws "Open_IM/pkg/proto/sdk_ws"
+	"context"
 	"encoding/json"
 	"errors"
+
 	"gorm.io/gorm"
 )
 
@@ -83,13 +85,13 @@ func ToAPIErrWithErr(err error) ErrInfo {
 	return ErrDefaultOther
 }
 
-func Error2CommResp(info ErrInfo, detailErr error) *sdkws.CommonResp {
+func Error2CommResp(ctx context.Context, info ErrInfo, detailErrMsg string) *sdkws.CommonResp {
 	err := &sdkws.CommonResp{
 		ErrCode: info.ErrCode,
 		ErrMsg:  info.ErrMsg,
 	}
-	if detailErr != nil {
-		err.DetailErrMsg = detailErr.Error()
+	if detailErrMsg != "" {
+		err.DetailErrMsg = detailErrMsg
 	}
 	return err
 }