liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2024-01-30 09:51:25 +08:00
commit d2ade131a5
9 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/caravan/model_rank.go
View File

@ -46,7 +46,7 @@ func (this *ModelRank) SetUsrRankList(uid string) (result *pb.DBCaravanRank, err
if err != nil { if err != nil {
return 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_) err = fmt.Errorf("cand found table :%s,%v", comm.TableCaravanRank, conn_)
return return
} }
@ -85,7 +85,7 @@ func (this *ModelRank) ChangeRankList(uId string, data map[string]interface{}) (
return return
} }
model := db.NewDBModelByExpired(db.CrossTag(), comm.TableCaravanRank, conn_) model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableCaravanRank, conn_)
if model == nil { if model == nil {
return return
} }
@ -104,7 +104,7 @@ func (this *ModelRank) getRankList(uid string) (list []*pb.CaravanRankInfo, rank
return return
} }
model := db.NewDBModelByExpired(db.CrossTag(), comm.TableCaravanRank, conn_) model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableCaravanRank, conn_)
if model == nil { if model == nil {
return return
} }

2
modules/caravan/module.go
View File

@ -463,7 +463,7 @@ func (this *Caravan) Rpc_ModuleCaravanSettlement(ctx context.Context, args *pb.E
if err != nil { if err != nil {
return return
} }
model := db.NewDBModelByExpired(db.CrossTag(), comm.TableCaravanRank, conn_) model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableCaravanRank, conn_)
if model == nil { if model == nil {
return return
} }

2
modules/friend/module.go
View File

@ -273,7 +273,7 @@ func (this *Friend) UpdateUserBaseInfo(session comm.IUserSession, info *pb.BaseU
if err != nil { if err != nil {
return 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_) err = fmt.Errorf("cand found table :%s,%v", comm.TableFriend, conn_)
return return
} }

4
modules/hunting/model_rank.go
View File

@ -40,7 +40,7 @@ func (this *ModelRank) getHuntingRank(uid string) *pb.DBHuntingRecord {
data := &pb.DBHuntingRecord{} data := &pb.DBHuntingRecord{}
if !db.IsCross() { if !db.IsCross() {
if conn_, err := db.Cross(); err == nil { 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 { if err := model.Get(uid, data); err != nil {
return data return data
@ -89,7 +89,7 @@ func (this *ModelRank) CheckRank(uid string, boosID int32, difficulty int32, lin
if err != nil { if err != nil {
return return
} }
model := db.NewDBModelByExpired(db.CrossTag(), comm.TableHuntingRank, conn_) model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableHuntingRank, conn_)
// 写入排行榜 // 写入排行榜
record := &pb.DBHuntingRecord{ record := &pb.DBHuntingRecord{

8
modules/user/module.go
View File

@ -233,7 +233,7 @@ func (this *User) CrossUserOnlineList() ([]*pb.CacheUser, error) {
if err != nil { if err != nil {
return nil, err 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 var cache []*pb.CacheUser
if err := model.GetList(comm.RDS_EMPTY, &cache); err != nil { if err := model.GetList(comm.RDS_EMPTY, &cache); err != nil {
return nil, err return nil, err
@ -247,7 +247,7 @@ func (this *User) crossUser(uid string) (*pb.CacheUser, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
model := db.NewDBModelByExpired(this.service.GetTag(), comm.TableSession, conn) model := db.NewDBModelNoExpired(this.service.GetTag(), comm.TableSession, conn)
cache := &pb.CacheUser{} cache := &pb.CacheUser{}
if err := model.Get(uid, cache); err != nil { if err := model.Get(uid, cache); err != nil {
return nil, err return nil, err
@ -1001,7 +1001,7 @@ func (this *User) RpcGetAllOnlineUser(ctx context.Context, args *pb.EmptyReq, re
if err != nil { if err != nil {
return err return err
} }
model := db.NewDBModelByExpired(this.service.GetTag(), comm.TableSession, conn) model := db.NewDBModelNoExpired(this.service.GetTag(), comm.TableSession, conn)
var cache []*pb.CacheUser var cache []*pb.CacheUser
if err := model.GetList(comm.RDS_EMPTY, &cache); err != nil { if err := model.GetList(comm.RDS_EMPTY, &cache); err != nil {
return err return err
@ -1019,7 +1019,7 @@ func (this *User) RpcGetCrossUserSession(ctx context.Context, req *pb.UIdReq, re
if err != nil { if err != nil {
return err 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 := model.GetListObj(comm.RDS_EMPTY, req.Uid, reply); err != nil {
if err != mongo.ErrNoDocuments { if err != mongo.ErrNoDocuments {
return err return err

4
modules/viking/model_rank.go
View File

@ -40,7 +40,7 @@ func (this *ModelRank) getVikingRank(uid string) *pb.DBVikingRecord {
data := &pb.DBVikingRecord{} data := &pb.DBVikingRecord{}
if !db.IsCross() { if !db.IsCross() {
if conn_, err := db.Cross(); err == nil { 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 { if err := model.Get(uid, data); err != nil {
return data return data
@ -89,7 +89,7 @@ func (this *ModelRank) CheckRank(uid string, boosID int32, difficulty int32, lin
if err != nil { if err != nil {
return return
} }
model := db.NewDBModelByExpired(db.CrossTag(), comm.TableVikingRank, conn_) model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableVikingRank, conn_)
// 写入排行榜 // 写入排行榜
record := &pb.DBVikingRecord{ record := &pb.DBVikingRecord{

4
modules/viking/model_srank.go
View File

@ -46,7 +46,7 @@ func (this *ModelSRank) queryPlayers(uIds []string) (result []*pb.DBVSeasonRecor
return return
} }
result = make([]*pb.DBVSeasonRecord, 0) 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 { if _, err = model.GetByUids(uIds, &result); err != nil && err != mgo.MongodbNil {
//this.module.Errorln(err) //this.module.Errorln(err)
return return
@ -122,7 +122,7 @@ func (this *ModelSRank) CheckSeasonRank(uid string, boosID int32, difficulty int
if err != nil { if err != nil {
return return
} }
model := db.NewDBModelByExpired(db.CrossTag(), comm.TableVikingSRank, conn_) model := db.NewDBModelNoExpired(db.CrossTag(), comm.TableVikingSRank, conn_)
// 写入排行榜 // 写入排行榜
record = &pb.DBVSeasonRecord{ record = &pb.DBVSeasonRecord{

2
services/comp_gateroute.go
View File

@ -192,7 +192,7 @@ func (this *SCompGateRoute) NoticeUserLogin(ctx context.Context, args *pb.Notice
log.Errorf("[RPC] NoticeUserLogin err: %v", err) log.Errorf("[RPC] NoticeUserLogin err: %v", err)
return err return err
} }
model := db.NewDBModelByExpired(this.service.GetTag(), comm.TableSession, conn) model := db.NewDBModelNoExpired(this.service.GetTag(), comm.TableSession, conn)
user := &pb.CacheUser{ user := &pb.CacheUser{
Uid: args.UserId, Uid: args.UserId,
SessionId: args.UserSessionId, SessionId: args.UserSessionId,

4
sys/db/dbmodel.go
View File

@ -48,7 +48,7 @@ func NewDBModel(sid string, tableName string, conn *DBConn) *DBModel {
DB: conn.Mgo, DB: conn.Mgo,
} }
} }
func NewDBModelByExpired(sid string, tableName string, conn *DBConn) *DBModel { func NewDBModelNoExpired(sid string, tableName string, conn *DBConn) *DBModel {
return &DBModel{ return &DBModel{
ServiceId: sid, ServiceId: sid,
TableName: tableName, TableName: tableName,
@ -1153,7 +1153,7 @@ func (this *DBModel) GetListObjs(uid string, ids []string, data interface{}) (er
} }
if _, err = pipe.Exec(); err == nil { if _, err = pipe.Exec(); err == nil {
for i, v := range result { 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) sliceType.UnsafeGrow(dptr, n+1)
elemPtr = sliceType.UnsafeGetIndex(dptr, n) elemPtr = sliceType.UnsafeGetIndex(dptr, n)
if *((*unsafe.Pointer)(elemPtr)) == nil { if *((*unsafe.Pointer)(elemPtr)) == nil {