diff --git a/modules/battlerecord/core.go b/modules/battlerecord/core.go index 9af2ee0da..2156d1ec8 100644 --- a/modules/battlerecord/core.go +++ b/modules/battlerecord/core.go @@ -8,5 +8,5 @@ import ( type DBBattlePlayRecord struct { Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //唯一ID Record []byte `protobuf:"bytes,3,opt,name=record,proto3" json:"record"` //BattleReport 的序列化数据 - ExpireAt time.Time `json:"expireAt" bson:"expireAt"` //过期时间 + ExpireAt time.Time `bson:"expireAt,omitempty"` } diff --git a/modules/battlerecord/model.go b/modules/battlerecord/model.go index 21995d9d2..766444d14 100644 --- a/modules/battlerecord/model.go +++ b/modules/battlerecord/model.go @@ -22,15 +22,28 @@ func (this *modelComp) Init(service core.IService, module core.IModule, comp cor this.TableName = string(comm.TableBattlerecord) err = this.MCompModel.Init(service, module, comp, options) this.module = module.(*BattleRecord) - // uid 创建索引 - this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ - Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, - }) - indexModel := mongo.IndexModel{ - Keys: bson.M{"expireAt": 1}, // 设置TTL索引列"expire_date" - Options: mgooptions.Index().SetExpireAfterSeconds(0), // 设置过期时间(单位:秒) + // // uid 创建索引 + // this.DB.CreateIndex(core.SqlTable(this.TableName), mongo.IndexModel{ + // Keys: bsonx.Doc{{Key: "uid", Value: bsonx.Int32(1)}}, + // }) + // indexModel := mongo.IndexModel{ + // Keys: bson.M{"expireAt": 1}, // 设置TTL索引列"expire_date" + // Options: mgooptions.Index().SetExpireAfterSeconds(0), // 设置过期时间(单位:秒) + // } + // _, err = this.DB.CreateIndex(core.SqlTable(this.TableName), indexModel) //设置 验证码过期时间索引 + // 通过uid创建索引 + if _, err = this.DB.CreateMany(core.SqlTable(this.TableName), []mongo.IndexModel{ + { + Keys: bsonx.Doc{ + {Key: "uid", Value: bsonx.Int32(1)}, + }, + }, { + Keys: bson.M{"expireAt": 1}, + Options: mgooptions.Index().SetExpireAfterSeconds(0), + }, + }); err != nil { + return } - _, err = this.DB.CreateIndex(core.SqlTable(this.TableName), indexModel) //设置 验证码过期时间索引 return } diff --git a/pb/battlerecord_db.pb.go b/pb/battlerecord_db.pb.go index 58f9f720c..5ca188df5 100644 --- a/pb/battlerecord_db.pb.go +++ b/pb/battlerecord_db.pb.go @@ -26,9 +26,8 @@ type DBBattlePlayRecord struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //唯一ID - ExpireAt int64 `protobuf:"varint,2,opt,name=expireAt,proto3" json:"expireAt" bson:"expireAt"` //过期时间 - Record []byte `protobuf:"bytes,3,opt,name=record,proto3" json:"record"` //BattleReport 的序列化数据 + Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //唯一ID + Record []byte `protobuf:"bytes,3,opt,name=record,proto3" json:"record"` //BattleReport 的序列化数据 } func (x *DBBattlePlayRecord) Reset() { @@ -70,13 +69,6 @@ func (x *DBBattlePlayRecord) GetId() string { return "" } -func (x *DBBattlePlayRecord) GetExpireAt() int64 { - if x != nil { - return x.ExpireAt - } - return 0 -} - func (x *DBBattlePlayRecord) GetRecord() []byte { if x != nil { return x.Record @@ -89,13 +81,12 @@ var File_battlerecord_battlerecord_db_proto protoreflect.FileDescriptor var file_battlerecord_battlerecord_db_proto_rawDesc = []byte{ 0x0a, 0x22, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x2f, 0x62, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x5f, 0x64, 0x62, 0x2e, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x58, 0x0a, 0x12, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, + 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x3c, 0x0a, 0x12, 0x44, 0x42, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x50, 0x6c, 0x61, 0x79, 0x52, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, - 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x78, - 0x70, 0x69, 0x72, 0x65, 0x41, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x65, 0x78, - 0x70, 0x69, 0x72, 0x65, 0x41, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, - 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, 0x72, 0x64, 0x42, 0x06, - 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, + 0x63, 0x6f, 0x72, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x72, 0x65, 0x63, 0x6f, + 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var (