diff --git a/internal/rpc/group/group.go b/internal/rpc/group/group.go index 9df6064f6f2a74cba0e0a133ed4238b4bd4ac015..f2ee7eb22dc12c787adc7db0a86557283de40c78 100644 --- a/internal/rpc/group/group.go +++ b/internal/rpc/group/group.go @@ -479,7 +479,7 @@ func (s *groupServer) GroupApplicationResponse(_ context.Context, req *pbGroup.G member.UserID = req.FromUserID member.RoleLevel = constant.GroupOrdinaryUsers member.OperatorUserID = req.OpUserID - member.FaceUrl = user.FaceURL + member.FaceURL = user.FaceURL member.Nickname = user.Nickname err = imdb.InsertIntoGroupMember(member) @@ -596,7 +596,7 @@ func (s *groupServer) SetGroupInfo(ctx context.Context, req *pbGroup.SetGroupInf if group.Introduction != req.GroupInfo.Introduction && req.GroupInfo.Introduction != "" { changedType = changedType | (1 << 2) } - if group.FaceUrl != req.GroupInfo.FaceURL && req.GroupInfo.FaceURL != "" { + if group.FaceURL != req.GroupInfo.FaceURL && req.GroupInfo.FaceURL != "" { changedType = changedType | (1 << 3) } //only administrators can set group information diff --git a/internal/rpc/msg/group_notification.go b/internal/rpc/msg/group_notification.go index abe81e9ed9202243c4c66b141e8a62e71ebb9799..a2b4e8cef834c39a2664031408c6a0e855e5e4ce 100644 --- a/internal/rpc/msg/group_notification.go +++ b/internal/rpc/msg/group_notification.go @@ -54,12 +54,19 @@ func setGroupInfo(groupID string, groupInfo *open_im_sdk.GroupInfo) error { func setGroupMemberInfo(groupID, userID string, groupMemberInfo *open_im_sdk.GroupMemberFullInfo) error { groupMember, err := imdb.GetGroupMemberInfoByGroupIDAndUserID(groupID, userID) - if err != nil { - return utils.Wrap(err, "") + if err == nil { + return utils.Wrap(utils2.GroupMemberDBCopyOpenIM(groupMemberInfo, groupMember), "") } - if err = utils2.GroupMemberDBCopyOpenIM(groupMemberInfo, groupMember); err != nil { + + user, err := imdb.GetUserByUserID(userID) + if err != nil { return utils.Wrap(err, "") } + groupMemberInfo.GroupID = groupID + groupMemberInfo.UserID = user.UserID + groupMemberInfo.Nickname = user.Nickname + groupMemberInfo.AppMangerLevel = user.AppMangerLevel + groupMemberInfo.FaceURL = user.FaceURL return nil } @@ -295,7 +302,7 @@ func GroupOwnerTransferredNotification(req *pbGroup.TransferGroupOwnerReq) { log.Error(req.OperationID, "setGroupMemberInfo failed", req.GroupID, req.NewOwnerUserID) return } - groupNotification(constant.GroupOwnerTransferredNotification, &GroupOwnerTransferredTips, req.OpUserID, "", req.NewOwnerUserID, req.OperationID) + groupNotification(constant.GroupOwnerTransferredNotification, &GroupOwnerTransferredTips, req.OpUserID, req.GroupID, "", req.OperationID) } //message MemberKickedTips{ diff --git a/pkg/common/db/model_struct.go b/pkg/common/db/model_struct.go index 7e136658fed72370a971259d1312b0f23f9bd281..25e3bf0cdc75261fd19e094f95e9b082e3daadb8 100644 --- a/pkg/common/db/model_struct.go +++ b/pkg/common/db/model_struct.go @@ -73,7 +73,7 @@ type Group struct { 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"` + FaceURL string `gorm:"column:face_url;size:255" json:"faceURL"` CreateTime time.Time `gorm:"column:create_time"` Ex string `gorm:"column:ex" json:"ex;size:1024" json:"ex"` Status int32 `gorm:"column:status"` @@ -97,7 +97,7 @@ type GroupMember struct { GroupID string `gorm:"column:group_id;primary_key;size:64"` UserID string `gorm:"column:user_id;primary_key;size:64"` Nickname string `gorm:"column:nickname;size:255"` - FaceUrl string `gorm:"column:user_group_face_url;size:255"` + FaceURL string `gorm:"column:user_group_face_url;size:255"` RoleLevel int32 `gorm:"column:role_level"` JoinTime time.Time `gorm:"column:join_time"` JoinSource int32 `gorm:"column:join_source"` diff --git a/pkg/grpc-etcdv3/getcdv3/register.go b/pkg/grpc-etcdv3/getcdv3/register.go index e1a78dd611f9e55cf1e0aade7d5c1f5d2c155815..3e12486a573f1a10f159c95a058c063cea96ad4a 100644 --- a/pkg/grpc-etcdv3/getcdv3/register.go +++ b/pkg/grpc-etcdv3/getcdv3/register.go @@ -64,9 +64,9 @@ func RegisterEtcd(schema, etcdAddr, myHost string, myPort int, serviceName strin //keepalive kresp, err := cli.KeepAlive(ctx, resp.ID) if err != nil { - return fmt.Errorf("keepalive faild, errmsg:%v, lease id:%d", err, resp.ID) + return fmt.Errorf("keepalive failed, errmsg:%v, lease id:%d", err, resp.ID) } - + fmt.Println("RegisterEtcd ok") go func() { FLOOP: for {