diff --git a/modules/user/api_login.go b/modules/user/api_login.go index 4fe0e6c0e..df8c76e44 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -31,6 +31,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err err error user *pb.DBUser lastLoginTime int64 + tasks []*pb.BuriedParam = make([]*pb.BuriedParam, 0) ) rsp := &pb.UserLoginResp{} @@ -105,7 +106,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err // 在logintime更新前判断是否是昨天 if utils.IsYestoday(user.Logintime) { - go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype9, 1)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype9, 1)) } else { this.module.ModuleBuried.ResetBuriedByType(user.Uid, comm.Rtype9) } @@ -133,7 +134,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err if this.module.modelUser.isLoginFirst(lastLoginTime) { this.module.ModuleHero.NoLoginDay(user.Uid, int32(utils.DiffDays(lastLoginTime, configure.Now().Unix()))) - go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype8, 1)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype8, 1)) this.module.modelExpand.updateLoginDay(user.Uid, lastLoginTime) // 清理点赞 this.module.ModuleFriend.ResetFriend(user.Uid) @@ -160,18 +161,23 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err } else { //新号 rsp.Ex = &pb.DBUserExpand{} this.module.modelSign.UserSign(session) - go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype8, 1)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype8, 1)) } this.module.ModuleHero.CheckPeachReward(session, user.Ctime) this.module.RecoverUserPsStart(user.Uid) // 日常登录任务 - go this.module.ModuleBuried.TriggerBuried(session.Clone(), comm.GetBuriedParam(comm.Rtype7, 1)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype7, 1)) + tasks = append(tasks, comm.GetBuriedParam(comm.Rtype230, 1, int32(configure.Now().Weekday()))) this.module.ModulePrivilege.CheckDailyPrivilegeMail(session) rsp.Data = user rsp.TimeNow = configure.Now().Unix() // 设置服务器时间 session.SendMsg(string(this.module.GetType()), UserSubTypeLogin, rsp) + if len(tasks) > 0 { + go this.module.ModuleBuried.TriggerBuried(session.Clone(), tasks...) + } + event.TriggerEvent(comm.EventUserLogin, session.Clone()) return }