From 2d8a5387983a0162b5456cbedf4402b70de577ff Mon Sep 17 00:00:00 2001 From: wangchuxiao Date: Wed, 4 Jan 2023 17:21:33 +0800 Subject: [PATCH] errCode --- internal/rpc/friend/friend.go | 31 ++++------- pkg/common/constant/error.go | 8 ++- .../im_mysql_model/group_model_k.go | 55 +++++++++++++++++++ .../im_mysql_model/user_black_list_model.go | 5 +- pkg/common/token_verify/jwt_token.go | 3 +- pkg/common/trace_log/ctx.go | 3 +- 6 files changed, 78 insertions(+), 27 deletions(-) create mode 100644 pkg/common/db/mysql_model/im_mysql_model/group_model_k.go diff --git a/internal/rpc/friend/friend.go b/internal/rpc/friend/friend.go index 412f858da..9bf91ca3a 100644 --- a/internal/rpc/friend/friend.go +++ b/internal/rpc/friend/friend.go @@ -102,41 +102,30 @@ func (s *friendServer) Run() { func (s *friendServer) AddBlacklist(ctx context.Context, req *pbFriend.AddBlacklistReq) (*pbFriend.AddBlacklistResp, error) { log.NewInfo(req.CommID.OperationID, "AddBlacklist args ", req.String()) - ok := token_verify.CheckAccess(req.CommID.OpUserID, req.CommID.FromUserID) + ok := token_verify.CheckAccess(ctx, req.CommID.OpUserID, req.CommID.FromUserID) if !ok { - err := errors.New("CheckAccess false") - log.NewError(req.CommID.OperationID, err.Error(), req.CommID.OpUserID, req.CommID.FromUserID) - return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(constant.ErrNoPermission, err)}, nil + return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(ctx, constant.ErrNoPermission, "accress")}, nil } black := db.Black{OwnerUserID: req.CommID.FromUserID, BlockUserID: req.CommID.ToUserID, OperatorUserID: req.CommID.OpUserID} - - err := imdb.InsertInToUserBlackList(black) + err := imdb.InsertInToUserBlackList(ctx, black) if err != nil { - log.NewError(req.CommID.OperationID, "InsertInToUserBlackList failed ", err.Error()) - return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(constant.ErrDatabase, err)}, nil + return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(ctx, constant.ErrDatabase, err.Error())}, nil } - log.NewInfo(req.CommID.OperationID, "AddBlacklist rpc ok ", req.CommID.FromUserID, req.CommID.ToUserID) - - etcdConn := getcdv3.GetDefaultConn(config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.CommID.OperationID) + etcdConn := getcdv3.GetDefaultConn(ctx, config.Config.Etcd.EtcdSchema, strings.Join(config.Config.Etcd.EtcdAddr, ","), config.Config.RpcRegisterName.OpenImCacheName, req.CommID.OperationID) if etcdConn == nil { - errMsg := req.CommID.OperationID + "getcdv3.GetDefaultConn == nil" - log.NewError(req.CommID.OperationID, errMsg) - return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(constant.ErrInternalServer, err)}, nil + return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(ctx, constant.ErrInternalServer, "conn is nil")}, nil } cacheClient := pbCache.NewCacheClient(etcdConn) - cacheResp, err := cacheClient.DelBlackIDListFromCache(context.Background(), &pbCache.DelBlackIDListFromCacheReq{UserID: req.CommID.FromUserID, OperationID: req.CommID.OperationID}) + cacheResp, err := cacheClient.DelBlackIDListFromCache(ctx, &pbCache.DelBlackIDListFromCacheReq{UserID: req.CommID.FromUserID, OperationID: req.CommID.OperationID}) if err != nil { - log.NewError(req.CommID.OperationID, "DelBlackIDListFromCache rpc call failed ", err.Error()) - return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(constant.ErrInternalServer, err)}, nil + return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(ctx, constant.ErrInternalServer, err.Error())}, nil } if cacheResp.CommonResp.ErrCode != 0 { err = errors.New(fmt.Sprintf("call DelBlackIDListFromCache rpc failed code is %d, err is %s, args is %s", cacheResp.CommonResp.ErrCode, cacheResp.CommonResp.ErrMsg, req.CommID.FromUserID)) - log.NewError(req.CommID.OperationID, "DelBlackIDListFromCache rpc logic call failed ", cacheResp.String()) - return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(constant.ErrInternalServer, err)}, nil + return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(ctx, constant.ErrInternalServer, err.Error())}, nil } - chat.BlackAddedNotification(req) - return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(constant.ErrNone, nil)}, nil + return &pbFriend.AddBlacklistResp{CommonResp: constant.Error2CommResp(ctx, constant.ErrNone, "")}, nil } func (s *friendServer) AddFriend(ctx context.Context, req *pbFriend.AddFriendReq) (*pbFriend.AddFriendResp, error) { diff --git a/pkg/common/constant/error.go b/pkg/common/constant/error.go index 1f4934c95..49f530b7f 100644 --- a/pkg/common/constant/error.go +++ b/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" ) @@ -82,13 +84,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 } diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_model_k.go b/pkg/common/db/mysql_model/im_mysql_model/group_model_k.go new file mode 100644 index 000000000..be8771507 --- /dev/null +++ b/pkg/common/db/mysql_model/im_mysql_model/group_model_k.go @@ -0,0 +1,55 @@ +package im_mysql_model + +import ( + "Open_IM/pkg/common/db" + "Open_IM/pkg/utils" + "time" +) + +type Group struct { + //`json:"operationID" binding:"required"` + //`protobuf:"bytes,1,opt,name=GroupID" json:"GroupID,omitempty"` `json:"operationID" binding:"required"` + GroupID string `gorm:"column:group_id;primary_key;size:64" json:"groupID" binding:"required"` + GroupName string `gorm:"column:name;size:255" json:"groupName"` + Notification string `gorm:"column:notification;size:255" json:"notification"` + Introduction string `gorm:"column:introduction;size:255" json:"introduction"` + FaceURL string `gorm:"column:face_url;size:255" json:"faceURL"` + CreateTime time.Time `gorm:"column:create_time;index:create_time"` + Ex string `gorm:"column:ex" json:"ex;size:1024" json:"ex"` + Status int32 `gorm:"column:status"` + CreatorUserID string `gorm:"column:creator_user_id;size:64"` + GroupType int32 `gorm:"column:group_type"` + NeedVerification int32 `gorm:"column:need_verification"` + LookMemberInfo int32 `gorm:"column:look_member_info" json:"lookMemberInfo"` + ApplyMemberFriend int32 `gorm:"column:apply_member_friend" json:"applyMemberFriend"` + NotificationUpdateTime time.Time `gorm:"column:notification_update_time"` + NotificationUserID string `gorm:"column:notification_user_id;size:64"` +} + +func (*Group) Create(groupList []*Group) error { + return utils.Wrap(db.DB.MysqlDB.DefaultGormDB().Create(&groupList).Error, "") +} + +func (*Group) Delete(groupList []*Group) error { + return nil +} + +func (*Group) Update(groupList []*Group) error { + return nil +} + +func (*Group) UpdateByMap(args map[*Group]map[string]interface{}) error { + return nil +} + +func (*Group) Find(group []*Group) ([]*Group, error) { + return nil, nil +} + +func (*Group) Take(group *Group) (*Group, error) { + return nil, nil +} + +func (*Group) Count(group *Group) (int64, error) { + return 0, nil +} diff --git a/pkg/common/db/mysql_model/im_mysql_model/user_black_list_model.go b/pkg/common/db/mysql_model/im_mysql_model/user_black_list_model.go index b848bff41..6a0708965 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/user_black_list_model.go +++ b/pkg/common/db/mysql_model/im_mysql_model/user_black_list_model.go @@ -2,11 +2,14 @@ package im_mysql_model import ( "Open_IM/pkg/common/db" + "Open_IM/pkg/common/trace_log" "Open_IM/pkg/utils" + "context" "time" ) -func InsertInToUserBlackList(black db.Black) error { +func InsertInToUserBlackList(ctx context.Context, black db.Black) error { + defer trace_log.SetContextInfo(ctx) black.CreateTime = time.Now() return db.DB.MysqlDB.DefaultGormDB().Table("blacks").Create(black).Error } diff --git a/pkg/common/token_verify/jwt_token.go b/pkg/common/token_verify/jwt_token.go index 55067f78f..0b3a261ae 100644 --- a/pkg/common/token_verify/jwt_token.go +++ b/pkg/common/token_verify/jwt_token.go @@ -6,6 +6,7 @@ import ( commonDB "Open_IM/pkg/common/db" "Open_IM/pkg/common/log" "Open_IM/pkg/utils" + "context" "time" go_redis "github.com/go-redis/redis/v8" @@ -139,7 +140,7 @@ func IsManagerUserID(OpUserID string) bool { } } -func CheckAccess(OpUserID string, OwnerUserID string) bool { +func CheckAccess(ctx context.Context, OpUserID string, OwnerUserID string) bool { if utils.IsContain(OpUserID, config.Config.Manager.AppManagerUid) { return true } diff --git a/pkg/common/trace_log/ctx.go b/pkg/common/trace_log/ctx.go index 49857a9f5..bf26d8e4c 100644 --- a/pkg/common/trace_log/ctx.go +++ b/pkg/common/trace_log/ctx.go @@ -3,6 +3,7 @@ package trace_log import ( "Open_IM/pkg/common/constant" "Open_IM/pkg/common/log" + "Open_IM/pkg/utils" "context" "errors" "fmt" @@ -76,7 +77,7 @@ func SetContextInfo(ctx context.Context, funcName string, err error, args ...int var funcInfo FuncInfo funcInfo.Args = make(map[string]interface{}) argsHandle(args, funcInfo.Args) - funcInfo.FuncName = funcName + funcInfo.FuncName = utils.GetSelfFuncName() funcInfo.Err = err *t.Funcs = append(*t.Funcs, funcInfo) }