blackteay/open-im-server
1
0
Fork 0
mirror of https://github.com/openimsdk/open-im-server.git synced 2025-04-06 04:15:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bug :pushMsg.MsgData.OfflinePushInfo==nil

Browse Source
This commit is contained in:
skiffer-git 2022-09-01 21:58:22 +08:00
parent ac2cc154b4
commit e990118475
3 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
internal/push/logic/push_to_client.go
View File

@ -297,8 +297,11 @@ func GetOfflinePushOpts(pushMsg *pbPush.PushMsgReq) (opts push.PushOpts, err err
log.NewDebug(pushMsg.OperationID, opts) log.NewDebug(pushMsg.OperationID, opts)
} }
} }
opts.IOSBadgeCount = pushMsg.MsgData.OfflinePushInfo.IOSBadgeCount if pushMsg.MsgData.OfflinePushInfo != nil {
opts.IOSPushSound = pushMsg.MsgData.OfflinePushInfo.IOSPushSound opts.IOSBadgeCount = pushMsg.MsgData.OfflinePushInfo.IOSBadgeCount
opts.IOSPushSound = pushMsg.MsgData.OfflinePushInfo.IOSPushSound
}
return opts, nil return opts, nil
} }

1
internal/rpc/group/group.go
View File

@ -142,6 +142,7 @@ func (s *groupServer) CreateGroup(ctx context.Context, req *pbGroup.CreateGroupR
return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, http.WrapError(constant.ErrDB) return &pbGroup.CreateGroupResp{ErrCode: constant.ErrDB.ErrCode, ErrMsg: constant.ErrDB.ErrMsg}, http.WrapError(constant.ErrDB)
} }
} }
if req.GroupInfo.GroupType != constant.SuperGroup { if req.GroupInfo.GroupType != constant.SuperGroup {
//to group member //to group member
for _, user := range req.InitMemberList { for _, user := range req.InitMemberList {

14
pkg/common/db/mysql_model/im_mysql_model/group_member_model.go
View File

@ -34,6 +34,20 @@ func InsertIntoGroupMember(toInsertInfo db.GroupMember) error {
return nil return nil
} }
func BatchInsertIntoGroupMember(toInsertInfoList []*db.GroupMember) error {
//MessageList []*model_struct.LocalChatLog
//return utils.Wrap(d.conn.Create(MessageList).Error, "BatchInsertMessageList failed")
for _, toInsertInfo := range toInsertInfoList {
toInsertInfo.JoinTime = time.Now()
if toInsertInfo.RoleLevel == 0 {
toInsertInfo.RoleLevel = constant.GroupOrdinaryUsers
}
toInsertInfo.MuteEndTime = time.Unix(int64(time.Now().Second()), 0)
}
return db.DB.MysqlDB.DefaultGormDB().Create(toInsertInfoList).Error
}
func GetGroupMemberListByUserID(userID string) ([]db.GroupMember, error) { func GetGroupMemberListByUserID(userID string) ([]db.GroupMember, error) {
var groupMemberList []db.GroupMember var groupMemberList []db.GroupMember
err := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("user_id=?", userID).Find(&groupMemberList).Error err := db.DB.MysqlDB.DefaultGormDB().Table("group_members").Where("user_id=?", userID).Find(&groupMemberList).Error