From aa2b43293dedc7367e3c820e26142a54fb734f3d Mon Sep 17 00:00:00 2001 From: withchao <993506633@qq.com> Date: Mon, 9 Jan 2023 14:51:31 +0800 Subject: [PATCH] group --- internal/rpc/group/group.go | 15 ++++++--------- .../im_mysql_model/group_member_model_k.go | 12 ++++++------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 9c8060416..e42047a1d 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -259,7 +259,7 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo var groupNode open_im_sdk.GroupInfo num, err := rocksCache.GetGroupMemberNumFromCache(groupID) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), err.Error(), groupID) + trace_log.SetContextInfo(ctx, "GetGroupMemberNumFromCache", err, "groupID", groupID) continue } owner, err := (*imdb.GroupMember)(nil).TakeOwnerInfo(ctx, groupID) @@ -277,7 +277,7 @@ func (s *groupServer) GetJoinedGroupList(ctx context.Context, req *pbGroup.GetJo continue } if group.Status == constant.GroupStatusDismissed { - trace_log.SetContextInfo(ctx, "GetGroupInfoFromCache", err, "groupID", groupID) + trace_log.SetContextInfo(ctx, "group.Status == constant.GroupStatusDismissed", nil, "groupID", groupID) continue } utils.CopyStructFields(&groupNode, group) @@ -698,9 +698,7 @@ func (s *groupServer) GetGroupMembersInfo(ctx context.Context, req *pbGroup.GetG for _, userID := range req.MemberList { groupMember, err := rocksCache.GetGroupMemberInfoFromCache(req.GroupID, userID) if err != nil { - log.NewError(req.OperationID, utils.GetSelfFuncName(), req.GroupID, userID, err.Error()) - var errResult error - + trace_log.SetContextInfo(ctx, "GetGroupMemberInfoFromCache", err, "groupID", req.GroupID, "userID", userID) continue } var memberNode open_im_sdk.GroupMemberFullInfo @@ -708,9 +706,8 @@ func (s *groupServer) GetGroupMembersInfo(ctx context.Context, req *pbGroup.GetG memberNode.JoinTime = int32(groupMember.JoinTime.Unix()) resp.MemberList = append(resp.MemberList, &memberNode) } - if SetErr(ctx, "GetGroupMemberInfoFromCache", err, &resp.CommonResp.ErrCode, &resp.CommonResp.ErrMsg, "groupID", req.GroupID) - return resp, nil + return } func FillGroupInfoByGroupID(operationID, groupID string, groupInfo *open_im_sdk.GroupInfo) error { @@ -1788,7 +1785,7 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr } else { m["ex"] = nil } - if err := imdb.UpdateGroupMemberInfoByMap(groupMember, m);err != nil { + if err := imdb.UpdateGroupMemberInfoByMap(groupMember, m); err != nil { SetErrorForResp(err, resp.CommonResp) return } @@ -1807,7 +1804,7 @@ func (s *groupServer) SetGroupMemberInfo(ctx context.Context, req *pbGroup.SetGr return } -func (s *groupServer) GetGroupAbstractInfo(ctx context.Context, req *pbGroup.GetGroupAbstractInfoReq) (resp *pbGroup.GetGroupAbstractInfoResp,_ error) { +func (s *groupServer) GetGroupAbstractInfo(ctx context.Context, req *pbGroup.GetGroupAbstractInfoReq) (resp *pbGroup.GetGroupAbstractInfoResp, _ error) { resp = &pbGroup.GetGroupAbstractInfoResp{CommonResp: &open_im_sdk.CommonResp{}} ctx = trace_log.NewRpcCtx(ctx, utils.GetSelfFuncName(), req.OperationID) defer func() { diff --git a/pkg/common/db/mysql_model/im_mysql_model/group_member_model_k.go b/pkg/common/db/mysql_model/im_mysql_model/group_member_model_k.go index b92833dc0..7739e13b2 100644 --- a/pkg/common/db/mysql_model/im_mysql_model/group_member_model_k.go +++ b/pkg/common/db/mysql_model/im_mysql_model/group_member_model_k.go @@ -38,33 +38,33 @@ type GroupMember struct { func (*GroupMember) Create(ctx context.Context, groupMemberList []*GroupMember) (err error) { defer func() { - trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupMemberList", groupMemberList) + trace_log.SetContextInfo(ctx, utils.GetFuncName(1), err, "groupMemberList", groupMemberList) }() return utils.Wrap(db.DB.MysqlDB.DefaultGormDB().Create(&groupMemberList).Error, "") } func (*GroupMember) Delete(ctx context.Context, groupMembers []*GroupMember) (err error) { defer func() { - trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupMembers", groupMembers) + trace_log.SetContextInfo(ctx, utils.GetFuncName(1), err, "groupMembers", groupMembers) }() return utils.Wrap(db.DB.MysqlDB.DefaultGormDB().Delete(groupMembers).Error, "") } func (*GroupMember) UpdateByMap(ctx context.Context, groupID string, userID string, args map[string]interface{}) (err error) { defer func() { - trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupID", groupID, "userID", userID, "args", args) + trace_log.SetContextInfo(ctx, utils.GetFuncName(1), err, "groupID", groupID, "userID", userID, "args", args) }() return utils.Wrap(db.DB.MysqlDB.DefaultGormDB().Model(&GroupMember{}).Where("group_id = ? and user_id = ?", groupID, userID).Updates(args).Error, "") } func (*GroupMember) Update(ctx context.Context, groupMembers []*GroupMember) (err error) { - defer func() { trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupMembers", groupMembers) }() + defer func() { trace_log.SetContextInfo(ctx, utils.GetFuncName(1), err, "groupMembers", groupMembers) }() return utils.Wrap(db.DB.MysqlDB.DefaultGormDB().Updates(&groupMembers).Error, "") } func (*GroupMember) Find(ctx context.Context, groupMembers []*GroupMember) (groupList []*GroupMember, err error) { defer func() { - trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupMembers", groupMembers, "groupList", groupList) + trace_log.SetContextInfo(ctx, utils.GetFuncName(1), err, "groupMembers", groupMembers, "groupList", groupList) }() var where [][]interface{} for _, groupMember := range groupMembers { @@ -76,7 +76,7 @@ func (*GroupMember) Find(ctx context.Context, groupMembers []*GroupMember) (grou func (*GroupMember) Take(ctx context.Context, groupID string, userID string) (groupMember *GroupMember, err error) { defer func() { - trace_log.SetContextInfo(ctx, utils.GetSelfFuncName(), err, "groupID", groupID, "userID", userID, "groupMember", *groupMember) + trace_log.SetContextInfo(ctx, utils.GetFuncName(1), err, "groupID", groupID, "userID", userID, "groupMember", *groupMember) }() groupMember = &GroupMember{} return groupMember, utils.Wrap(db.DB.MysqlDB.DefaultGormDB().Where("group_id = ? and user_id = ?", groupID, userID).Take(groupMember).Error, "")