From dff9353ec897fbd2d50516e2b870631f78a606be Mon Sep 17 00:00:00 2001 From: meixiongfeng <766881921@qq.com> Date: Thu, 1 Feb 2024 11:18:42 +0800 Subject: [PATCH] =?UTF-8?q?#45032=20=E4=BB=BB=E5=8A=A1=20=E3=80=90?= =?UTF-8?q?=E6=A2=A6=E5=B7=A5=E5=9C=BA=E7=B3=BB=E7=BB=9F=E3=80=91=20<-?= =?UTF-8?q?=E5=89=8D=E7=AB=AF->=20=E3=80=90=E6=8E=A0=E5=A4=BA=E3=80=91=20-?= =?UTF-8?q?=20=E7=8E=A9=E5=AE=B6=E5=A7=93=E5=90=8D=E4=B8=A2=E5=A4=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- modules/friend/model_friend.go | 6 +++++ modules/plunder/api_challengeover.go | 4 +++- modules/plunder/api_getlist.go | 32 +++++++++++++++++++++++++ modules/plunder/api_pvpchallenge.go | 4 +++- modules/plunder/api_pvpchallengeover.go | 4 +++- modules/plunder/api_reach.go | 4 +++- modules/user/api_login.go | 2 +- 7 files changed, 51 insertions(+), 5 deletions(-) diff --git a/modules/friend/model_friend.go b/modules/friend/model_friend.go index 892536535..d7e953105 100644 --- a/modules/friend/model_friend.go +++ b/modules/friend/model_friend.go @@ -48,6 +48,9 @@ func (this *ModelFriend) GetFriend(uid string) (info *pb.DBFriend, err error) { this.moduole.Errorln(err) return } + if !user.Created { + return + } info = &pb.DBFriend{ Id: primitive.NewObjectID().Hex(), Uid: uid, @@ -79,6 +82,9 @@ func (this *ModelFriend) GetFriend(uid string) (info *pb.DBFriend, err error) { this.moduole.Errorln(err) return } + if !user.Created { + return + } info = &pb.DBFriend{ Id: primitive.NewObjectID().Hex(), Uid: uid, diff --git a/modules/plunder/api_challengeover.go b/modules/plunder/api_challengeover.go index bf4cfbe27..8eb466e92 100644 --- a/modules/plunder/api_challengeover.go +++ b/modules/plunder/api_challengeover.go @@ -116,7 +116,9 @@ func (this *apiComp) ChallengeOver(session comm.IUserSession, req *pb.PlunderCha } return } - if lock, err = this.module.modelLand.landMutexLock(list.Landid); err != nil { + lock, err = this.module.modelLand.landMutexLock(list.Landid) + lock.Lock() + if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/plunder/api_getlist.go b/modules/plunder/api_getlist.go index c0eb9ccb3..60e178f36 100644 --- a/modules/plunder/api_getlist.go +++ b/modules/plunder/api_getlist.go @@ -4,9 +4,11 @@ import ( "fmt" "go_dreamfactory/comm" "go_dreamfactory/lego/core" + "go_dreamfactory/lego/sys/redis" "go_dreamfactory/pb" "go_dreamfactory/sys/configure" "go_dreamfactory/utils" + "reflect" "go.mongodb.org/mongo-driver/bson" ) @@ -103,6 +105,36 @@ func (this *apiComp) GetList(session comm.IUserSession, req *pb.PlunderGetListRe update["ctime"] = list.Ctime update["freecount"] = list.Freecount } + if user, err := this.module.ModuleUser.GetUser(session.GetUserId()); err == nil { + uinfo := comm.GetUserBaseInfo(user) + if !reflect.DeepEqual(uinfo, list.Uinfo) { + update["uinfo"] = uinfo + // 同步岛屿上的信息 + var lock *redis.RedisMutex + lock, err = this.module.modelLand.landMutexLock(list.Landid) + lock.Lock() + if err != nil { + errdata = &pb.ErrorData{ + Code: pb.ErrorCode_DBError, + Title: pb.ErrorCode_DBError.ToString(), + Message: err.Error(), + } + return + } + defer lock.Unlock() + + for _, v := range land.Uinfo { + if v == list.Uinfo { + v = uinfo + this.module.modelLand.changePlunderLandData(list.Landid, map[string]interface{}{ + "uinfo": land.Uinfo, + }) + break + } + } + list.Uinfo = uinfo + } + } if len(update) > 0 { this.module.modelPlunder.changePlunderData(session.GetUserId(), update) } diff --git a/modules/plunder/api_pvpchallenge.go b/modules/plunder/api_pvpchallenge.go index b6ee66fb3..94eeb8ea0 100644 --- a/modules/plunder/api_pvpchallenge.go +++ b/modules/plunder/api_pvpchallenge.go @@ -66,7 +66,9 @@ func (this *apiComp) PvpChallenge(session comm.IUserSession, req *pb.PlunderPvpC return } - if lock, err = this.module.modelLand.landMutexLock(list.Landid); err != nil { + lock, err = this.module.modelLand.landMutexLock(list.Landid) + lock.Lock() + if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/plunder/api_pvpchallengeover.go b/modules/plunder/api_pvpchallengeover.go index 4a55c8016..59dcee661 100644 --- a/modules/plunder/api_pvpchallengeover.go +++ b/modules/plunder/api_pvpchallengeover.go @@ -46,7 +46,9 @@ func (this *apiComp) PvpChallengeOver(session comm.IUserSession, req *pb.Plunder } return } - if lock, err = this.module.modelLand.landMutexLock(list.Landid); err != nil { + lock, err = this.module.modelLand.landMutexLock(list.Landid) + lock.Lock() + if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/plunder/api_reach.go b/modules/plunder/api_reach.go index 5b80a3389..99a6804da 100644 --- a/modules/plunder/api_reach.go +++ b/modules/plunder/api_reach.go @@ -46,7 +46,9 @@ func (this *apiComp) Reach(session comm.IUserSession, req *pb.PlunderReachReq) ( } return } - if lock, err = this.module.modelLand.landMutexLock(list.Landid); err != nil { + lock, err = this.module.modelLand.landMutexLock(list.Landid) + lock.Lock() + if err != nil { errdata = &pb.ErrorData{ Code: pb.ErrorCode_DBError, Title: pb.ErrorCode_DBError.ToString(), diff --git a/modules/user/api_login.go b/modules/user/api_login.go index 9984a0dd0..827ad0c91 100644 --- a/modules/user/api_login.go +++ b/modules/user/api_login.go @@ -169,7 +169,7 @@ func (this *apiComp) Login(session comm.IUserSession, req *pb.UserLoginReq) (err }) go this.module.AsynHandleSession(session.Clone(), func(session comm.IUserSession) { - if user.Name != "" { // 没创角就没必要通知 + if !user.Created { // 没创角就没必要通知 event.TriggerEvent(comm.EventUserLogin, session) }