diff --git a/modules/caravan/model_rank.go b/modules/caravan/model_rank.go index 2eca8d6d3..1354e339e 100644 --- a/modules/caravan/model_rank.go +++ b/modules/caravan/model_rank.go @@ -46,7 +46,7 @@ func (this *ModelRank) SetUsrRankList(uid string) (result *pb.DBCaravanRank, err if err != nil { return } - if model = db.NewDBModelByExpired(db.CrossTag(), comm.TableCaravanRank, conn_); model == nil { + if model = db.NewDBModelNoExpired(db.CrossTag(), comm.TableCaravanRank, conn_); model == nil { err = fmt.Errorf("cand found table :%s,%v", comm.TableCaravanRank, conn_) return } @@ -85,7 +85,7 @@ func (this *ModelRank) ChangeRankList(uId string, data map[string]interface{}) ( return } - model := db.NewDBModelByExpired(db.CrossTag(), comm.TableCaravanRank, conn_) + model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableCaravanRank, conn_) if model == nil { return } @@ -104,7 +104,7 @@ func (this *ModelRank) getRankList(uid string) (list []*pb.CaravanRankInfo, rank return } - model := db.NewDBModelByExpired(db.CrossTag(), comm.TableCaravanRank, conn_) + model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableCaravanRank, conn_) if model == nil { return } diff --git a/modules/caravan/module.go b/modules/caravan/module.go index a24eea312..f810aea87 100644 --- a/modules/caravan/module.go +++ b/modules/caravan/module.go @@ -463,7 +463,7 @@ func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.E if err != nil { return } - model := db.NewDBModelByExpired(db.CrossTag(), comm.TableCaravanRank, conn_) + model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableCaravanRank, conn_) if model == nil { return } diff --git a/modules/friend/module.go b/modules/friend/module.go index 083d77aa9..84eb70e15 100644 --- a/modules/friend/module.go +++ b/modules/friend/module.go @@ -273,7 +273,7 @@ func (this *Friend) UpdateUserBaseInfo(session comm.IUserSession, info *pb.BaseU if err != nil { return } - if model = db.NewDBModelByExpired(db.CrossTag(), comm.TableFriend, conn_); model == nil { + if model = db.NewDBModelNoExpired(db.CrossTag(), comm.TableFriend, conn_); model == nil { err = fmt.Errorf("cand found table :%s,%v", comm.TableFriend, conn_) return } diff --git a/modules/hunting/model_rank.go b/modules/hunting/model_rank.go index 726979749..963105768 100644 --- a/modules/hunting/model_rank.go +++ b/modules/hunting/model_rank.go @@ -40,7 +40,7 @@ func (this *ModelRank) getHuntingRank(uid string) *pb.DBHuntingRecord { data := &pb.DBHuntingRecord{} if !db.IsCross() { if conn_, err := db.Cross(); err == nil { - model := db.NewDBModelByExpired(db.CrossTag(), comm.TableHuntingRank, conn_) + model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableHuntingRank, conn_) if err := model.Get(uid, data); err != nil { return data @@ -89,7 +89,7 @@ func (this *ModelRank) CheckRank(uid string, boosID int32, difficulty int32, lin if err != nil { return } - model := db.NewDBModelByExpired(db.CrossTag(), comm.TableHuntingRank, conn_) + model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableHuntingRank, conn_) // 写入排行榜 record := &pb.DBHuntingRecord{ diff --git a/modules/user/module.go b/modules/user/module.go index 74ba22b25..88c55dd6d 100644 --- a/modules/user/module.go +++ b/modules/user/module.go @@ -233,7 +233,7 @@ func (this *User) CrossUserOnlineList() ([]*pb.CacheUser, error) { if err != nil { return nil, err } - model := db.NewDBModelByExpired(this.service.GetTag(), comm.TableSession, conn) + model := db.NewDBModelNoExpired(this.service.GetTag(), comm.TableSession, conn) var cache []*pb.CacheUser if err := model.GetList(comm.RDS_EMPTY, &cache); err != nil { return nil, err @@ -247,7 +247,7 @@ func (this *User) crossUser(uid string) (*pb.CacheUser, error) { if err != nil { return nil, err } - model := db.NewDBModelByExpired(this.service.GetTag(), comm.TableSession, conn) + model := db.NewDBModelNoExpired(this.service.GetTag(), comm.TableSession, conn) cache := &pb.CacheUser{} if err := model.Get(uid, cache); err != nil { return nil, err @@ -1001,7 +1001,7 @@ func (this *User) RpcGetAllOnlineUser(ctx context.Context, args *pb.EmptyReq, re if err != nil { return err } - model := db.NewDBModelByExpired(this.service.GetTag(), comm.TableSession, conn) + model := db.NewDBModelNoExpired(this.service.GetTag(), comm.TableSession, conn) var cache []*pb.CacheUser if err := model.GetList(comm.RDS_EMPTY, &cache); err != nil { return err @@ -1019,7 +1019,7 @@ func (this *User) RpcGetCrossUserSession(ctx context.Context, req *pb.UIdReq, re if err != nil { return err } - model := db.NewDBModelByExpired(this.service.GetTag(), comm.TableSession, conn) + model := db.NewDBModelNoExpired(this.service.GetTag(), comm.TableSession, conn) if err := model.GetListObj(comm.RDS_EMPTY, req.Uid, reply); err != nil { if err != mongo.ErrNoDocuments { return err diff --git a/modules/viking/model_rank.go b/modules/viking/model_rank.go index 41409a059..a0d1d97ae 100644 --- a/modules/viking/model_rank.go +++ b/modules/viking/model_rank.go @@ -40,7 +40,7 @@ func (this *ModelRank) getVikingRank(uid string) *pb.DBVikingRecord { data := &pb.DBVikingRecord{} if !db.IsCross() { if conn_, err := db.Cross(); err == nil { - model := db.NewDBModelByExpired(db.CrossTag(), comm.TableVikingRank, conn_) + model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableVikingRank, conn_) if err := model.Get(uid, data); err != nil { return data @@ -89,7 +89,7 @@ func (this *ModelRank) CheckRank(uid string, boosID int32, difficulty int32, lin if err != nil { return } - model := db.NewDBModelByExpired(db.CrossTag(), comm.TableVikingRank, conn_) + model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableVikingRank, conn_) // 写入排行榜 record := &pb.DBVikingRecord{ diff --git a/modules/viking/model_srank.go b/modules/viking/model_srank.go index 4853b62cf..c9abaf28e 100644 --- a/modules/viking/model_srank.go +++ b/modules/viking/model_srank.go @@ -46,7 +46,7 @@ func (this *ModelSRank) queryPlayers(uIds []string) (result []*pb.DBVSeasonRecor return } result = make([]*pb.DBVSeasonRecord, 0) - model := db.NewDBModelByExpired(db.CrossTag(), comm.TableVikingSRank, conn) + model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableVikingSRank, conn) if _, err = model.GetByUids(uIds, &result); err != nil && err != mgo.MongodbNil { //this.module.Errorln(err) return @@ -122,7 +122,7 @@ func (this *ModelSRank) CheckSeasonRank(uid string, boosID int32, difficulty int if err != nil { return } - model := db.NewDBModelByExpired(db.CrossTag(), comm.TableVikingSRank, conn_) + model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableVikingSRank, conn_) // 写入排行榜 record = &pb.DBVSeasonRecord{ diff --git a/services/comp_gateroute.go b/services/comp_gateroute.go index c0d9bd47f..f4674eeeb 100644 --- a/services/comp_gateroute.go +++ b/services/comp_gateroute.go @@ -192,7 +192,7 @@ func (this *SCompGateRoute) NoticeUserLogin(ctx context.Context, args *pb.Notice log.Errorf("[RPC] NoticeUserLogin err: %v", err) return err } - model := db.NewDBModelByExpired(this.service.GetTag(), comm.TableSession, conn) + model := db.NewDBModelNoExpired(this.service.GetTag(), comm.TableSession, conn) user := &pb.CacheUser{ Uid: args.UserId, SessionId: args.UserSessionId, diff --git a/sys/db/dbmodel.go b/sys/db/dbmodel.go index e5fffff0f..da2e49c6e 100644 --- a/sys/db/dbmodel.go +++ b/sys/db/dbmodel.go @@ -48,7 +48,7 @@ func NewDBModel(sid string, tableName string, conn *DBConn) *DBModel { DB: conn.Mgo, } } -func NewDBModelByExpired(sid string, tableName string, conn *DBConn) *DBModel { +func NewDBModelNoExpired(sid string, tableName string, conn *DBConn) *DBModel { return &DBModel{ ServiceId: sid, TableName: tableName, @@ -1153,7 +1153,7 @@ func (this *DBModel) GetListObjs(uid string, ids []string, data interface{}) (er } if _, err = pipe.Exec(); err == nil { for i, v := range result { - if tempdata, err = v.Result(); err == nil { + if tempdata, err = v.Result(); err == nil && len(tempdata) > 0 { sliceType.UnsafeGrow(dptr, n+1) elemPtr = sliceType.UnsafeGetIndex(dptr, n) if *((*unsafe.Pointer)(elemPtr)) == nil {