diff --git a/pb.bat b/pb.bat index 429c184b3..0e3355eaf 100644 --- a/pb.bat +++ b/pb.bat @@ -7,21 +7,10 @@ set PROJECT_ROOT=. set SRC=%PROJECT_ROOT%\pb\proto set TAR=%PROJECT_ROOT%\pb - - - protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\*.proto protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\friend\*.proto protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\pack\*.proto +protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=import %SRC%\mail\*.proto - - - - - - -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=source_relative %SRC%\*.proto -protoc --proto_path=%SRC% --go_out=%TAR% --go_opt=paths=source_relative %SRC%\*.proto - pause \ No newline at end of file diff --git a/pb/friend_db.pb.go b/pb/friend_db.pb.go index b926171c2..8e5d8ac2a 100644 --- a/pb/friend_db.pb.go +++ b/pb/friend_db.pb.go @@ -25,8 +25,6 @@ type Cache_FriendData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty" bson:"_id"` //tags:{bson:"_id"}用户Id - FriendId []string `protobuf:"bytes,2,rep,name=friendId,proto3" json:"friendId,omitempty"` UserId string `protobuf:"bytes,1,opt,name=userId,proto3" json:"userId,omitempty" bson:"_id"` // ID FriendIds []string `protobuf:"bytes,2,rep,name=friendIds,proto3" json:"friendIds,omitempty"` //好友ID ApplyIds []string `protobuf:"bytes,3,rep,name=applyIds,proto3" json:"applyIds,omitempty"` //申请用户ID @@ -72,10 +70,8 @@ func (x *Cache_FriendData) GetUserId() string { return "" } -func (x *Cache_FriendData) GetFriendId() []string { func (x *Cache_FriendData) GetFriendIds() []string { if x != nil { - return x.FriendId return x.FriendIds } return nil @@ -99,12 +95,6 @@ var File_friend_friend_db_proto protoreflect.FileDescriptor var file_friend_friend_db_proto_rawDesc = []byte{ 0x0a, 0x16, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x2f, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x5f, - 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x46, 0x0a, 0x10, 0x43, 0x61, 0x63, 0x68, - 0x65, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, - 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, 0x73, - 0x65, 0x72, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, - 0x18, 0x02, 0x20, 0x03, 0x28, 0x09, 0x52, 0x08, 0x66, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x49, 0x64, - 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0x80, 0x01, 0x0a, 0x10, 0x43, 0x61, 0x63, 0x68, 0x65, 0x5f, 0x46, 0x72, 0x69, 0x65, 0x6e, 0x64, 0x44, 0x61, 0x74, 0x61, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x75, diff --git a/pb/mail_db.pb.go b/pb/mail_db.pb.go index be7ff2453..c4a422a41 100644 --- a/pb/mail_db.pb.go +++ b/pb/mail_db.pb.go @@ -80,7 +80,7 @@ type DB_MailData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - ObjId string `protobuf:"bytes,1,opt,name=ObjId,proto3" json:"ObjId,omitempty"` // tags:{bson:"_id"} + ObjId string `protobuf:"bytes,1,opt,name=ObjId,proto3" json:"ObjId,omitempty" bson:"_id"` // ID UserId string `protobuf:"bytes,2,opt,name=UserId,proto3" json:"UserId,omitempty"` Title string `protobuf:"bytes,3,opt,name=Title,proto3" json:"Title,omitempty"` // 邮件标题 Contex string `protobuf:"bytes,4,opt,name=Contex,proto3" json:"Contex,omitempty"` // 邮件内容 diff --git a/pb/pack_db.pb.go b/pb/pack_db.pb.go index ef6f55447..c55ce43db 100644 --- a/pb/pack_db.pb.go +++ b/pb/pack_db.pb.go @@ -106,8 +106,6 @@ type DB_UserPackData struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UserId string `protobuf:"bytes,1,opt,name=UserId,proto3" json:"UserId,omitempty" bson:"_id"` //tags:{bson:"_id"}用户Id - Pack []*DB_GridData `protobuf:"bytes,2,rep,name=Pack,proto3" json:"Pack,omitempty"` //背包列表 UserId string `protobuf:"bytes,1,opt,name=UserId,proto3" json:"UserId,omitempty" bson:"_id"` // 用户Id Pack []*DB_GridData `protobuf:"bytes,2,rep,name=Pack,proto3" json:"Pack,omitempty"` //背包列表 } diff --git a/pb/proto/friend/friend_db.proto b/pb/proto/friend/friend_db.proto index b93ff5adb..5262c988f 100644 --- a/pb/proto/friend/friend_db.proto +++ b/pb/proto/friend/friend_db.proto @@ -3,7 +3,7 @@ option go_package = ".;pb"; message Cache_FriendData { - string userId = 1;// @go_tags(`json:"userId,omitempty" bson:"_id"`) ID + string userId = 1;// @go_tags(`bson:"_id"`) ID repeated string friendIds = 2; //好友ID repeated string applyIds = 3;//申请用户ID repeated string blackIds = 4;//黑名单ID diff --git a/pb/proto/mail/mail_db.proto b/pb/proto/mail/mail_db.proto index aab8a6960..425629b70 100644 --- a/pb/proto/mail/mail_db.proto +++ b/pb/proto/mail/mail_db.proto @@ -12,7 +12,7 @@ message MailAttachment { // 附件 } message DB_MailData { - string ObjId = 1; // tags:{bson:"_id"} + string ObjId = 1; // @go_tags(`bson:"_id"`) ID string UserId = 2; string Title = 3; // 邮件标题 string Contex = 4; // 邮件内容