diff --git a/binary/pool.go b/binary/pool.go index 645d10a4..76197a5f 100644 --- a/binary/pool.go +++ b/binary/pool.go @@ -91,37 +91,37 @@ func releaseZlibWriter(w *zlibWriter) { } } -const size128k = 128 * 1024 +const size256k = 256 * 1024 -var b128kPool = sync.Pool{ +var b256kPool = sync.Pool{ New: func() interface{} { return make128kSlicePointer() }, } -// Get128KBytes 获取一个128k大小 []byte -func Get128KBytes() *[]byte { - buf := b128kPool.Get().(*[]byte) +// Get256KBytes 获取一个128k大小 []byte +func Get256KBytes() *[]byte { + buf := b256kPool.Get().(*[]byte) if buf == nil { return make128kSlicePointer() } - if cap(*buf) < size128k { + if cap(*buf) < size256k { return make128kSlicePointer() } - *buf = (*buf)[:size128k] + *buf = (*buf)[:size256k] return buf } -// Put128KBytes 放回一个128k大小 []byte -func Put128KBytes(b *[]byte) { - if cap(*b) < size128k || cap(*b) > 2*size128k { // 太大或太小的 []byte 不要放入 +// Put256KBytes 放回一个128k大小 []byte +func Put256KBytes(b *[]byte) { + if cap(*b) < size256k || cap(*b) > 2*size256k { // 太大或太小的 []byte 不要放入 return } *b = (*b)[:cap(*b)] - b128kPool.Put(b) + b256kPool.Put(b) } func make128kSlicePointer() *[]byte { - data := make([]byte, size128k) + data := make([]byte, size256k) return &data } diff --git a/client/builders.go b/client/builders.go index 891ff405..fc43433d 100644 --- a/client/builders.go +++ b/client/builders.go @@ -7,7 +7,7 @@ import ( "math/rand" "time" - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/binary/jce" diff --git a/client/decoders.go b/client/decoders.go index 1d243dc2..fe06d64c 100644 --- a/client/decoders.go +++ b/client/decoders.go @@ -10,8 +10,8 @@ import ( "sync" "time" - "github.com/golang/protobuf/proto" "github.com/pkg/errors" + "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/binary/jce" diff --git a/client/face.go b/client/face.go index 9de3d1c2..84e0f4c3 100644 --- a/client/face.go +++ b/client/face.go @@ -3,8 +3,8 @@ package client import ( "fmt" - "github.com/golang/protobuf/proto" "github.com/pkg/errors" + "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/client/pb/faceroam" "github.com/Mrs4s/MiraiGo/protocol/packets" diff --git a/client/highway.go b/client/highway.go index 3baef8c2..3c79c2a2 100644 --- a/client/highway.go +++ b/client/highway.go @@ -46,9 +46,9 @@ func (c *QQClient) highwayUploadStream(ip uint32, port int, updKey []byte, strea defer conn.Close() offset := 0 reader := binary.NewNetworkReader(conn) - chunk := *binary.Get128KBytes() + chunk := *binary.Get256KBytes() defer func() { // 延迟捕获 chunk - binary.Put128KBytes(&chunk) + binary.Put256KBytes(&chunk) }() w := binary.NewWriter() defer binary.PutBuffer(w) @@ -116,7 +116,7 @@ func (c *QQClient) highwayUploadByBDH(stream io.Reader, length int64, cmdId int3 } ext = binary.NewTeaCipher(c.bigDataSession.SessionKey).Encrypt(ext) } - const chunkSize = 8192 * 16 + const chunkSize = 256 * 1024 conn, err := net.DialTimeout("tcp", c.srvSsoAddrs[0], time.Second*20) if err != nil { return nil, errors.Wrap(err, "connect error") @@ -131,9 +131,9 @@ func (c *QQClient) highwayUploadByBDH(stream io.Reader, length int64, cmdId int3 return nil, errors.Wrap(err, "echo error") } var rspExt []byte - chunk := *binary.Get128KBytes() + chunk := *binary.Get256KBytes() defer func() { // 延迟捕获 chunk - binary.Put128KBytes(&chunk) + binary.Put256KBytes(&chunk) }() w := binary.NewWriter() defer binary.PutBuffer(w) diff --git a/client/image.go b/client/image.go index c239a40b..0d43408e 100644 --- a/client/image.go +++ b/client/image.go @@ -50,7 +50,7 @@ func (c *QQClient) UploadGroupImage(groupCode int64, img io.ReadSeeker) (*messag c.srvSsoAddrs = append(c.srvSsoAddrs, fmt.Sprintf("%v:%v", binary.UInt32ToIPV4Address(uint32(addr)), rsp.UploadPort[i])) } } - if _, err = c.highwayUploadByBDH(img, length, 2, rsp.UploadKey, EmptyBytes, fh, false); err == nil { + if _, err = c.highwayUploadByBDH(img, length, 2, rsp.UploadKey, fh, EmptyBytes, false); err == nil { goto ok } return nil, errors.Wrap(err, "upload failed") @@ -88,7 +88,7 @@ func (c *QQClient) UploadGroupImageByFile(groupCode int64, path string) (*messag } if len(c.srvSsoAddrs) == 0 { for i, addr := range rsp.UploadIp { - c.srvSsoAddrs = append(c.srvSsoAddrs, fmt.Sprintf("%v:%v", binary.UInt32ToIPV4Address(uint32(addr)), rsp.UploadPort[i])) + c.srvSsoAddrs = append(c.srvSsoAddrs, fmt.Sprintf("%v:%v", binary.UInt32ToIPV4Address(addr), rsp.UploadPort[i])) } } if _, err = c.highwayUploadFileMultiThreadingByBDH(path, 2, 1, rsp.UploadKey, EmptyBytes, false); err == nil { diff --git a/client/offline_file.go b/client/offline_file.go index 9cf33a70..8cc4a5ef 100644 --- a/client/offline_file.go +++ b/client/offline_file.go @@ -1,10 +1,11 @@ package client import ( - "github.com/Mrs4s/MiraiGo/client/pb/cmd0x346" - "github.com/Mrs4s/MiraiGo/protocol/packets" "github.com/pkg/errors" "google.golang.org/protobuf/proto" + + "github.com/Mrs4s/MiraiGo/client/pb/cmd0x346" + "github.com/Mrs4s/MiraiGo/protocol/packets" ) func init() { diff --git a/client/pb/cmd0x346/cmd0x346.pb.go b/client/pb/cmd0x346/cmd0x346.pb.go index 42c59001..f2f50628 100644 --- a/client/pb/cmd0x346/cmd0x346.pb.go +++ b/client/pb/cmd0x346/cmd0x346.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: cmd0x346.proto package cmd0x346 import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type ApplyCleanTrafficRsp struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -5462,8 +5456,8 @@ var file_cmd0x346_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x72, 0x65, 0x74, 0x4d, 0x73, 0x67, 0x12, 0x25, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x1e, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x46, 0x69, 0x6c, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x49, - 0x6e, 0x66, 0x6f, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x3b, 0x63, 0x6d, 0x64, 0x30, 0x78, 0x33, 0x34, - 0x36, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x66, 0x6f, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, 0x2f, 0x3b, 0x63, 0x6d, 0x64, 0x30, 0x78, 0x33, + 0x34, 0x36, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/cmd0x346/cmd0x346.proto b/client/pb/cmd0x346/cmd0x346.proto index d8392be5..86c0b244 100644 --- a/client/pb/cmd0x346/cmd0x346.proto +++ b/client/pb/cmd0x346/cmd0x346.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;cmd0x346"; +option go_package = "./;cmd0x346"; message ApplyCleanTrafficRsp { int32 retCode = 10; diff --git a/client/pb/cmd0x3f6/cmd0x3f6.pb.go b/client/pb/cmd0x3f6/cmd0x3f6.pb.go index 781a2a9f..ef9455e5 100644 --- a/client/pb/cmd0x3f6/cmd0x3f6.pb.go +++ b/client/pb/cmd0x3f6/cmd0x3f6.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: cmd0x3f6.proto package cmd0x3f6 import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type C3F6ReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -808,8 +802,8 @@ var file_cmd0x3f6_proto_rawDesc = []byte{ 0x66, 0x61, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x18, 0x0a, 0x07, 0x74, 0x72, 0x61, 0x63, 0x65, 0x49, 0x64, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x74, 0x72, 0x61, 0x63, 0x65, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x18, 0x0e, 0x20, 0x01, 0x28, - 0x0d, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x3b, 0x63, 0x6d, - 0x64, 0x30, 0x78, 0x33, 0x66, 0x36, + 0x0d, 0x52, 0x05, 0x61, 0x70, 0x70, 0x49, 0x64, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, 0x2f, 0x3b, 0x63, + 0x6d, 0x64, 0x30, 0x78, 0x33, 0x66, 0x36, } var ( diff --git a/client/pb/cmd0x3f6/cmd0x3f6.proto b/client/pb/cmd0x3f6/cmd0x3f6.proto index 0024d7e3..2a2a848c 100644 --- a/client/pb/cmd0x3f6/cmd0x3f6.proto +++ b/client/pb/cmd0x3f6/cmd0x3f6.proto @@ -1,5 +1,5 @@ syntax = "proto2"; -option go_package = ".;cmd0x3f6"; +option go_package = "./;cmd0x3f6"; message C3F6ReqBody { optional uint32 subCmd = 1; diff --git a/client/pb/cmd0x6ff/smbcmd0x519.pb.go b/client/pb/cmd0x6ff/smbcmd0x519.pb.go index 5931b8bf..0da27087 100644 --- a/client/pb/cmd0x6ff/smbcmd0x519.pb.go +++ b/client/pb/cmd0x6ff/smbcmd0x519.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: smbcmd0x519.proto package cmd0x6ff import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type C519CRMMsgHead struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1342,7 +1336,7 @@ var file_smbcmd0x519_proto_rawDesc = []byte{ 0x06, 0x63, 0x69, 0x74, 0x79, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x04, 0x52, 0x06, 0x63, 0x69, 0x74, 0x79, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x69, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x04, 0x52, 0x08, 0x72, 0x65, 0x67, 0x69, 0x6f, 0x6e, 0x69, - 0x64, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x3b, 0x63, 0x6d, 0x64, 0x30, 0x78, 0x36, 0x66, 0x66, + 0x64, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, 0x2f, 0x3b, 0x63, 0x6d, 0x64, 0x30, 0x78, 0x36, 0x66, 0x66, } var ( diff --git a/client/pb/cmd0x6ff/smbcmd0x519.proto b/client/pb/cmd0x6ff/smbcmd0x519.proto index 79c7703c..1a9d7bdc 100644 --- a/client/pb/cmd0x6ff/smbcmd0x519.proto +++ b/client/pb/cmd0x6ff/smbcmd0x519.proto @@ -1,5 +1,5 @@ syntax = "proto2"; -option go_package = ".;cmd0x6ff"; +option go_package = "./;cmd0x6ff"; message C519CRMMsgHead { optional uint32 crmSubCmd = 1; diff --git a/client/pb/cmd0x6ff/subcmd0x501.pb.go b/client/pb/cmd0x6ff/subcmd0x501.pb.go index 1e7e1528..a82fb6d2 100644 --- a/client/pb/cmd0x6ff/subcmd0x501.pb.go +++ b/client/pb/cmd0x6ff/subcmd0x501.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: subcmd0x501.proto package cmd0x6ff import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type C501ReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -457,8 +451,8 @@ var file_subcmd0x501_proto_rawDesc = []byte{ 0x69, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x07, 0x52, 0x02, 0x69, 0x70, 0x12, 0x12, 0x0a, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x70, 0x6f, 0x72, 0x74, 0x12, 0x12, 0x0a, 0x04, 0x61, 0x72, 0x65, 0x61, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, - 0x61, 0x72, 0x65, 0x61, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x3b, 0x63, 0x6d, 0x64, 0x30, 0x78, 0x36, - 0x66, 0x66, + 0x61, 0x72, 0x65, 0x61, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, 0x2f, 0x3b, 0x63, 0x6d, 0x64, 0x30, 0x78, + 0x36, 0x66, 0x66, } var ( diff --git a/client/pb/cmd0x6ff/subcmd0x501.proto b/client/pb/cmd0x6ff/subcmd0x501.proto index adacb433..dc101ec3 100644 --- a/client/pb/cmd0x6ff/subcmd0x501.proto +++ b/client/pb/cmd0x6ff/subcmd0x501.proto @@ -1,5 +1,5 @@ syntax = "proto2"; -option go_package = ".;cmd0x6ff"; +option go_package = "./;cmd0x6ff"; message C501ReqBody { optional SubCmd0x501ReqBody ReqBody = 1281; diff --git a/client/pb/exciting/group.pb.go b/client/pb/exciting/group.pb.go index 7abe1846..d5708066 100644 --- a/client/pb/exciting/group.pb.go +++ b/client/pb/exciting/group.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: group.proto package exciting import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type GroupFileUploadExt struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -684,8 +678,8 @@ var file_group_proto_rawDesc = []byte{ 0x6e, 0x67, 0x55, 0x72, 0x6c, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x75, 0x6e, 0x6b, 0x6e, 0x6f, 0x77, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x3b, 0x65, 0x78, 0x63, - 0x69, 0x74, 0x69, 0x6e, 0x67, + 0x09, 0x52, 0x04, 0x68, 0x6f, 0x73, 0x74, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, 0x2f, 0x3b, 0x65, 0x78, + 0x63, 0x69, 0x74, 0x69, 0x6e, 0x67, } var ( diff --git a/client/pb/exciting/group.proto b/client/pb/exciting/group.proto index b8b525d4..12436ee8 100644 --- a/client/pb/exciting/group.proto +++ b/client/pb/exciting/group.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;exciting"; +option go_package = "./;exciting"; message GroupFileUploadExt { optional int32 unknown1 = 1; diff --git a/client/pb/faceroam/faceroam.pb.go b/client/pb/faceroam/faceroam.pb.go index 974e9d25..fcddb221 100644 --- a/client/pb/faceroam/faceroam.pb.go +++ b/client/pb/faceroam/faceroam.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: faceroam.proto package faceroam import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type PlatInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -516,8 +510,8 @@ var file_faceroam_proto_rawDesc = []byte{ 0x78, 0x52, 0x6f, 0x61, 0x6d, 0x53, 0x69, 0x7a, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0b, 0x6d, 0x61, 0x78, 0x52, 0x6f, 0x61, 0x6d, 0x53, 0x69, 0x7a, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x6d, 0x6f, 0x6a, 0x69, 0x54, 0x79, 0x70, 0x65, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0d, 0x52, - 0x09, 0x65, 0x6d, 0x6f, 0x6a, 0x69, 0x54, 0x79, 0x70, 0x65, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x3b, - 0x66, 0x61, 0x63, 0x65, 0x72, 0x6f, 0x61, 0x6d, + 0x09, 0x65, 0x6d, 0x6f, 0x6a, 0x69, 0x54, 0x79, 0x70, 0x65, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, 0x2f, + 0x3b, 0x66, 0x61, 0x63, 0x65, 0x72, 0x6f, 0x61, 0x6d, } var ( diff --git a/client/pb/faceroam/faceroam.proto b/client/pb/faceroam/faceroam.proto index c284e5fa..bda50299 100644 --- a/client/pb/faceroam/faceroam.proto +++ b/client/pb/faceroam/faceroam.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;faceroam"; +option go_package = "./;faceroam"; message PlatInfo { optional int64 implat = 1; diff --git a/client/pb/highway/bdhExtInfo.pb.go b/client/pb/highway/bdhExtInfo.pb.go index ca3b183a..a74250b7 100644 --- a/client/pb/highway/bdhExtInfo.pb.go +++ b/client/pb/highway/bdhExtInfo.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: bdhExtInfo.proto package highway import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type CommFileExtReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1232,8 +1226,8 @@ var file_bdhExtInfo_proto_rawDesc = []byte{ 0x0a, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x08, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x73, 0x74, 0x61, 0x72, 0x74, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x69, 0x73, 0x41, 0x75, 0x64, 0x69, 0x6f, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x69, - 0x73, 0x41, 0x75, 0x64, 0x69, 0x6f, 0x42, 0x0b, 0x5a, 0x09, 0x2e, 0x3b, 0x68, 0x69, 0x67, 0x68, - 0x77, 0x61, 0x79, + 0x73, 0x41, 0x75, 0x64, 0x69, 0x6f, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x2f, 0x3b, 0x68, 0x69, 0x67, + 0x68, 0x77, 0x61, 0x79, } var ( diff --git a/client/pb/highway/bdhExtInfo.proto b/client/pb/highway/bdhExtInfo.proto index 3942af7d..5a213576 100644 --- a/client/pb/highway/bdhExtInfo.proto +++ b/client/pb/highway/bdhExtInfo.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;highway"; +option go_package = "./;highway"; message CommFileExtReq { optional uint32 actionType = 1; diff --git a/client/pb/longmsg/longmsg.pb.go b/client/pb/longmsg/longmsg.pb.go index 2ab2a8a0..b5792654 100644 --- a/client/pb/longmsg/longmsg.pb.go +++ b/client/pb/longmsg/longmsg.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.12.3 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: longmsg.proto package longmsg import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type LongMsgDeleteReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -668,8 +662,8 @@ var file_longmsg_proto_rawDesc = []byte{ 0x77, 0x6e, 0x52, 0x73, 0x70, 0x12, 0x2f, 0x0a, 0x09, 0x6d, 0x73, 0x67, 0x44, 0x65, 0x6c, 0x52, 0x73, 0x70, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x4c, 0x6f, 0x6e, 0x67, 0x4d, 0x73, 0x67, 0x44, 0x65, 0x6c, 0x65, 0x74, 0x65, 0x52, 0x73, 0x70, 0x52, 0x09, 0x6d, 0x73, 0x67, - 0x44, 0x65, 0x6c, 0x52, 0x73, 0x70, 0x42, 0x0b, 0x5a, 0x09, 0x2e, 0x3b, 0x6c, 0x6f, 0x6e, 0x67, - 0x6d, 0x73, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x44, 0x65, 0x6c, 0x52, 0x73, 0x70, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x2f, 0x3b, 0x6c, 0x6f, 0x6e, + 0x67, 0x6d, 0x73, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/longmsg/longmsg.proto b/client/pb/longmsg/longmsg.proto index cf3db7f5..38e43d0f 100644 --- a/client/pb/longmsg/longmsg.proto +++ b/client/pb/longmsg/longmsg.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;longmsg"; +option go_package = "./;longmsg"; message LongMsgDeleteReq { bytes msgResid = 1; diff --git a/client/pb/msf/register_proxy.pb.go b/client/pb/msf/register_proxy.pb.go index 65449ea8..bd97d434 100644 --- a/client/pb/msf/register_proxy.pb.go +++ b/client/pb/msf/register_proxy.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: register_proxy.proto package msf import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type DiscussList struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -655,7 +649,8 @@ var file_register_proxy_proto_rawDesc = []byte{ 0x1c, 0x0a, 0x09, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x53, 0x65, 0x71, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x09, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x53, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, - 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x6d, 0x73, 0x66, + 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x2f, 0x3b, 0x6d, 0x73, + 0x66, } var ( diff --git a/client/pb/msf/register_proxy.proto b/client/pb/msf/register_proxy.proto index 50ea1117..bbbf2ade 100644 --- a/client/pb/msf/register_proxy.proto +++ b/client/pb/msf/register_proxy.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;msf"; +option go_package = "./;msf"; message DiscussList { optional uint64 discussCode = 1; diff --git a/client/pb/msg/head.pb.go b/client/pb/msg/head.pb.go index 1bb5ba27..4abed7cc 100644 --- a/client/pb/msg/head.pb.go +++ b/client/pb/msg/head.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: head.proto package msg import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type C2CHead struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1298,7 +1292,8 @@ var file_head_proto_rawDesc = []byte{ 0x79, 0x70, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x06, 0x72, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x12, 0x1a, 0x0a, 0x08, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x65, - 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x6d, 0x73, 0x67, + 0x72, 0x72, 0x6f, 0x72, 0x4d, 0x73, 0x67, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x2f, 0x3b, 0x6d, 0x73, + 0x67, } var ( diff --git a/client/pb/msg/head.proto b/client/pb/msg/head.proto index 8f055128..0ff60d1e 100644 --- a/client/pb/msg/head.proto +++ b/client/pb/msg/head.proto @@ -1,5 +1,5 @@ syntax = "proto2"; -option go_package = ".;msg"; +option go_package = "./;msg"; message C2CHead { optional uint64 toUin = 1; diff --git a/client/pb/msg/msg.pb.go b/client/pb/msg/msg.pb.go index 10edbf74..a48bb593 100644 --- a/client/pb/msg/msg.pb.go +++ b/client/pb/msg/msg.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: msg.proto package msg import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type SyncFlag int32 const ( @@ -8137,8 +8131,8 @@ var file_msg_proto_rawDesc = []byte{ 0x07, 0x62, 0x69, 0x6e, 0x64, 0x55, 0x69, 0x6e, 0x2a, 0x2e, 0x0a, 0x08, 0x53, 0x79, 0x6e, 0x63, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x09, 0x0a, 0x05, 0x53, 0x54, 0x41, 0x52, 0x54, 0x10, 0x00, 0x12, 0x0d, 0x0a, 0x09, 0x43, 0x4f, 0x4e, 0x54, 0x49, 0x4e, 0x55, 0x4d, 0x45, 0x10, 0x01, 0x12, 0x08, - 0x0a, 0x04, 0x53, 0x54, 0x4f, 0x50, 0x10, 0x02, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x6d, 0x73, - 0x67, + 0x0a, 0x04, 0x53, 0x54, 0x4f, 0x50, 0x10, 0x02, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x2f, 0x3b, 0x6d, + 0x73, 0x67, } var ( diff --git a/client/pb/msg/msg.proto b/client/pb/msg/msg.proto index dfedc7ce..e775151c 100644 --- a/client/pb/msg/msg.proto +++ b/client/pb/msg/msg.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;msg"; +option go_package = "./;msg"; message GetMessageRequest { optional SyncFlag syncFlag = 1; diff --git a/client/pb/msg/objmsg.pb.go b/client/pb/msg/objmsg.pb.go index e9c732d5..73319091 100644 --- a/client/pb/msg/objmsg.pb.go +++ b/client/pb/msg/objmsg.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: objmsg.proto package msg import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type MsgPic struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -379,8 +373,8 @@ var file_objmsg_proto_rawDesc = []byte{ 0x69, 0x6d, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x53, 0x68, 0x61, 0x31, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x66, 0x69, 0x6c, 0x65, 0x53, 0x68, 0x61, 0x31, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x78, 0x74, 0x18, 0x07, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x65, 0x78, - 0x74, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x6d, 0x73, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x74, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x2f, 0x3b, 0x6d, 0x73, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/msg/objmsg.proto b/client/pb/msg/objmsg.proto index 1387b09f..6733055d 100644 --- a/client/pb/msg/objmsg.proto +++ b/client/pb/msg/objmsg.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;msg"; +option go_package = "./;msg"; message MsgPic { bytes smallPicUrl = 1; diff --git a/client/pb/msg/report.pb.go b/client/pb/msg/report.pb.go index de13db6d..773039d6 100644 --- a/client/pb/msg/report.pb.go +++ b/client/pb/msg/report.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: report.proto package msg import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type PbMsgReadedReportReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -731,7 +725,7 @@ var file_report_proto_rawDesc = []byte{ 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x6d, 0x73, 0x67, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x79, 0x6e, 0x63, 0x43, 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x73, 0x79, 0x6e, 0x63, 0x43, - 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x42, 0x07, 0x5a, 0x05, 0x2e, 0x3b, 0x6d, 0x73, 0x67, + 0x6f, 0x6f, 0x6b, 0x69, 0x65, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x2f, 0x3b, 0x6d, 0x73, 0x67, } var ( diff --git a/client/pb/msg/report.proto b/client/pb/msg/report.proto index b52fb1f3..799f0de1 100644 --- a/client/pb/msg/report.proto +++ b/client/pb/msg/report.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;msg"; +option go_package = "./;msg"; message PbMsgReadedReportReq { repeated PbGroupReadedReportReq grpReadReport = 1; diff --git a/client/pb/msgtype0x210/subMsgType0x27.pb.go b/client/pb/msgtype0x210/subMsgType0x27.pb.go index 4f4391cd..9eca49df 100644 --- a/client/pb/msgtype0x210/subMsgType0x27.pb.go +++ b/client/pb/msgtype0x210/subMsgType0x27.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: subMsgType0x27.proto package msgtype0x210 import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type AddGroup struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -3900,8 +3894,8 @@ var file_subMsgType0x27_proto_rawDesc = []byte{ 0x12, 0x0a, 0x04, 0x58, 0x55, 0x69, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x04, 0x52, 0x04, 0x58, 0x55, 0x69, 0x6e, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x04, 0x52, 0x02, 0x69, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, - 0x0d, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x42, 0x10, 0x5a, 0x0e, 0x2e, 0x3b, 0x6d, 0x73, 0x67, - 0x74, 0x79, 0x70, 0x65, 0x30, 0x78, 0x32, 0x31, 0x30, + 0x0d, 0x52, 0x04, 0x66, 0x6c, 0x61, 0x67, 0x42, 0x11, 0x5a, 0x0f, 0x2e, 0x2f, 0x3b, 0x6d, 0x73, + 0x67, 0x74, 0x79, 0x70, 0x65, 0x30, 0x78, 0x32, 0x31, 0x30, } var ( diff --git a/client/pb/msgtype0x210/subMsgType0x27.proto b/client/pb/msgtype0x210/subMsgType0x27.proto index 40543f51..a8e673a1 100644 --- a/client/pb/msgtype0x210/subMsgType0x27.proto +++ b/client/pb/msgtype0x210/subMsgType0x27.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;msgtype0x210"; +option go_package = "./;msgtype0x210"; message AddGroup { optional uint32 groupid = 1; diff --git a/client/pb/multimsg/multimsg.pb.go b/client/pb/multimsg/multimsg.pb.go index edc64fb4..9873fe74 100644 --- a/client/pb/multimsg/multimsg.pb.go +++ b/client/pb/multimsg/multimsg.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.12.3 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: multimsg.proto package multimsg import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type ExternMsg struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -748,8 +742,8 @@ var file_multimsg_proto_rawDesc = []byte{ 0x52, 0x73, 0x70, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x15, 0x2e, 0x4d, 0x75, 0x6c, 0x74, 0x69, 0x4d, 0x73, 0x67, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x44, 0x6f, 0x77, 0x6e, 0x52, 0x73, 0x70, 0x52, 0x14, 0x6d, 0x75, 0x6c, 0x74, 0x69, 0x6d, 0x73, 0x67, 0x41, 0x70, 0x70, 0x6c, 0x79, 0x64, - 0x6f, 0x77, 0x6e, 0x52, 0x73, 0x70, 0x42, 0x0c, 0x5a, 0x0a, 0x2e, 0x3b, 0x6d, 0x75, 0x6c, 0x74, - 0x69, 0x6d, 0x73, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x77, 0x6e, 0x52, 0x73, 0x70, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, 0x2f, 0x3b, 0x6d, 0x75, 0x6c, + 0x74, 0x69, 0x6d, 0x73, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/multimsg/multimsg.proto b/client/pb/multimsg/multimsg.proto index 4105cf73..63233548 100644 --- a/client/pb/multimsg/multimsg.proto +++ b/client/pb/multimsg/multimsg.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;multimsg"; +option go_package = "./;multimsg"; message ExternMsg { int32 channelType = 1; diff --git a/client/pb/notify/group0x857.pb.go b/client/pb/notify/group0x857.pb.go index fb23b0d8..79f8e177 100644 --- a/client/pb/notify/group0x857.pb.go +++ b/client/pb/notify/group0x857.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: group0x857.proto package notify import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type NotifyMsgBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -913,9 +907,9 @@ var file_group0x857_proto_rawDesc = []byte{ 0x69, 0x63, 0x6b, 0x12, 0x1e, 0x0a, 0x0a, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x73, 0x65, 0x6e, 0x64, 0x65, 0x72, 0x4e, 0x69, 0x63, 0x6b, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x78, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x0b, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x78, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x0a, 0x5a, - 0x08, 0x2e, 0x3b, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x65, 0x78, 0x74, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x0b, 0x5a, + 0x09, 0x2e, 0x2f, 0x3b, 0x6e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/client/pb/notify/group0x857.proto b/client/pb/notify/group0x857.proto index b6a38734..a6572770 100644 --- a/client/pb/notify/group0x857.proto +++ b/client/pb/notify/group0x857.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;notify"; +option go_package = "./;notify"; message NotifyMsgBody { AIOGrayTipsInfo optMsgGrayTips = 5; diff --git a/client/pb/oidb/oidb.pb.go b/client/pb/oidb/oidb.pb.go index bc413b37..0e686f88 100644 --- a/client/pb/oidb/oidb.pb.go +++ b/client/pb/oidb/oidb.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type OIDBSSOPkg struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1275,8 +1269,8 @@ var file_oidb_proto_rawDesc = []byte{ 0x01, 0x28, 0x05, 0x52, 0x06, 0x6d, 0x73, 0x67, 0x53, 0x65, 0x71, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x73, 0x67, 0x52, 0x61, 0x6e, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x6d, 0x73, 0x67, 0x52, 0x61, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x61, 0x69, 0x6f, 0x55, 0x69, 0x6e, 0x18, - 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x69, 0x6f, 0x55, 0x69, 0x6e, 0x42, 0x08, 0x5a, - 0x06, 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x61, 0x69, 0x6f, 0x55, 0x69, 0x6e, 0x42, 0x09, 0x5a, + 0x07, 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/oidb/oidb.proto b/client/pb/oidb/oidb.proto index c71117c6..0a89d34b 100644 --- a/client/pb/oidb/oidb.proto +++ b/client/pb/oidb/oidb.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message OIDBSSOPkg { int32 command = 1; diff --git a/client/pb/oidb/oidb0x5eb.pb.go b/client/pb/oidb/oidb0x5eb.pb.go index bf6f68bc..83d19bb6 100644 --- a/client/pb/oidb/oidb0x5eb.pb.go +++ b/client/pb/oidb/oidb0x5eb.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0x5eb.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type D5EBReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1845,8 +1839,8 @@ var file_oidb0x5eb_proto_rawDesc = []byte{ 0x69, 0x6b, 0x65, 0x52, 0x61, 0x6e, 0x6b, 0x69, 0x6e, 0x67, 0x4c, 0x69, 0x73, 0x74, 0x46, 0x6c, 0x61, 0x67, 0x12, 0x24, 0x0a, 0x0c, 0x61, 0x70, 0x6f, 0x6c, 0x6c, 0x6f, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0xe4, 0xcf, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x61, 0x70, 0x6f, 0x6c, - 0x6c, 0x6f, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x6f, 0x69, - 0x64, 0x62, + 0x6c, 0x6f, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x6f, + 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0x5eb.proto b/client/pb/oidb/oidb0x5eb.proto index 59f07906..5a3e8a6b 100644 --- a/client/pb/oidb/oidb0x5eb.proto +++ b/client/pb/oidb/oidb0x5eb.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message D5EBReqBody { repeated uint64 uins = 1; diff --git a/client/pb/oidb/oidb0x6d6.pb.go b/client/pb/oidb/oidb0x6d6.pb.go index 26e6e1f2..1437fa41 100644 --- a/client/pb/oidb/oidb0x6d6.pb.go +++ b/client/pb/oidb/oidb0x6d6.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0x6d6.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type DeleteFileReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1536,8 +1530,8 @@ var file_oidb0x6d6_proto_rawDesc = []byte{ 0x56, 0x36, 0x18, 0x0d, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0d, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x49, 0x70, 0x4c, 0x61, 0x6e, 0x56, 0x36, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x75, 0x70, 0x6c, - 0x6f, 0x61, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x6f, 0x69, 0x64, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x61, 0x64, 0x50, 0x6f, 0x72, 0x74, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x6f, 0x69, + 0x64, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/oidb/oidb0x6d6.proto b/client/pb/oidb/oidb0x6d6.proto index 57be6b75..518f50f3 100644 --- a/client/pb/oidb/oidb0x6d6.proto +++ b/client/pb/oidb/oidb0x6d6.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message DeleteFileReqBody { int64 groupCode = 1; diff --git a/client/pb/oidb/oidb0x6d7.pb.go b/client/pb/oidb/oidb0x6d7.pb.go index 694f6905..d7d4573f 100644 --- a/client/pb/oidb/oidb0x6d7.pb.go +++ b/client/pb/oidb/oidb0x6d7.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0x6d7.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type CreateFolderReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -804,8 +798,8 @@ var file_oidb0x6d7_proto_rawDesc = []byte{ 0x12, 0x38, 0x0a, 0x0d, 0x6d, 0x6f, 0x76, 0x65, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x52, 0x73, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x4d, 0x6f, 0x76, 0x65, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x52, 0x73, 0x70, 0x42, 0x6f, 0x64, 0x79, 0x52, 0x0d, 0x6d, 0x6f, 0x76, - 0x65, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x52, 0x73, 0x70, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, - 0x6f, 0x69, 0x64, 0x62, + 0x65, 0x46, 0x6f, 0x6c, 0x64, 0x65, 0x72, 0x52, 0x73, 0x70, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, + 0x3b, 0x6f, 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0x6d7.proto b/client/pb/oidb/oidb0x6d7.proto index c410d9ab..d930787c 100644 --- a/client/pb/oidb/oidb0x6d7.proto +++ b/client/pb/oidb/oidb0x6d7.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message CreateFolderReqBody { optional uint64 groupCode = 1; diff --git a/client/pb/oidb/oidb0x6d8.pb.go b/client/pb/oidb/oidb0x6d8.pb.go index c9814c23..b994f912 100644 --- a/client/pb/oidb/oidb0x6d8.pb.go +++ b/client/pb/oidb/oidb0x6d8.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0x6d8.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type D6D8ReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1520,8 +1514,8 @@ var file_oidb0x6d8_proto_rawDesc = []byte{ 0x65, 0x53, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x75, 0x70, 0x6c, 0x6f, 0x61, 0x64, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x66, 0x69, 0x6c, 0x65, 0x49, 0x64, - 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x65, 0x49, 0x64, 0x42, 0x08, - 0x5a, 0x06, 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, + 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x66, 0x69, 0x6c, 0x65, 0x49, 0x64, 0x42, 0x09, + 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0x6d8.proto b/client/pb/oidb/oidb0x6d8.proto index 3c2fbe44..fabcb014 100644 --- a/client/pb/oidb/oidb0x6d8.proto +++ b/client/pb/oidb/oidb0x6d8.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message D6D8ReqBody { optional GetFileInfoReqBody fileInfoReq = 1; diff --git a/client/pb/oidb/oidb0x6d9.pb.go b/client/pb/oidb/oidb0x6d9.pb.go index 1d78d978..cb31d388 100644 --- a/client/pb/oidb/oidb0x6d9.pb.go +++ b/client/pb/oidb/oidb0x6d9.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0x6d9.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type GroupFileFeedsInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1116,8 +1110,8 @@ var file_oidb0x6d9_proto_rawDesc = []byte{ 0x76, 0x65, 0x42, 0x75, 0x73, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x09, 0x73, 0x61, 0x76, 0x65, 0x42, 0x75, 0x73, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x73, 0x61, 0x76, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, - 0x73, 0x61, 0x76, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x42, 0x08, 0x5a, 0x06, - 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, + 0x73, 0x61, 0x76, 0x65, 0x46, 0x69, 0x6c, 0x65, 0x50, 0x61, 0x74, 0x68, 0x42, 0x09, 0x5a, 0x07, + 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0x6d9.proto b/client/pb/oidb/oidb0x6d9.proto index abad0851..8412ba20 100644 --- a/client/pb/oidb/oidb0x6d9.proto +++ b/client/pb/oidb/oidb0x6d9.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message GroupFileFeedsInfo { optional uint32 busId = 1; diff --git a/client/pb/oidb/oidb0x769.pb.go b/client/pb/oidb/oidb0x769.pb.go index 7cb48cae..7b5e91a4 100644 --- a/client/pb/oidb/oidb0x769.pb.go +++ b/client/pb/oidb/oidb0x769.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0x769.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type CPU struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1121,8 +1115,8 @@ var file_oidb0x769_proto_rawDesc = []byte{ 0x68, 0x6f, 0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x75, 0x74, 0x68, 0x6f, 0x72, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x72, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x75, 0x72, 0x6c, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x18, 0x04, 0x20, - 0x01, 0x28, 0x04, 0x52, 0x06, 0x75, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x42, 0x08, 0x5a, 0x06, 0x2e, - 0x3b, 0x6f, 0x69, 0x64, 0x62, + 0x01, 0x28, 0x04, 0x52, 0x06, 0x75, 0x69, 0x6e, 0x4e, 0x75, 0x6d, 0x42, 0x09, 0x5a, 0x07, 0x2e, + 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0x769.proto b/client/pb/oidb/oidb0x769.proto index 3fb50055..39ef977c 100644 --- a/client/pb/oidb/oidb0x769.proto +++ b/client/pb/oidb/oidb0x769.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message CPU { optional string model = 1; diff --git a/client/pb/oidb/oidb0x88d.pb.go b/client/pb/oidb/oidb0x88d.pb.go index ddfb6805..2c4df6fe 100644 --- a/client/pb/oidb/oidb0x88d.pb.go +++ b/client/pb/oidb/oidb0x88d.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0x88d.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type D88DGroupHeadPortraitInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1658,7 +1652,7 @@ var file_oidb0x88d_proto_rawDesc = []byte{ 0x1e, 0x0a, 0x0a, 0x67, 0x65, 0x6f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x67, 0x65, 0x6f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x14, 0x0a, 0x05, 0x70, 0x6f, 0x69, 0x49, 0x64, 0x18, 0x07, 0x20, 0x01, 0x28, 0x04, 0x52, 0x05, - 0x70, 0x6f, 0x69, 0x49, 0x64, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, + 0x70, 0x6f, 0x69, 0x49, 0x64, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0x88d.proto b/client/pb/oidb/oidb0x88d.proto index c75d1158..5545717a 100644 --- a/client/pb/oidb/oidb0x88d.proto +++ b/client/pb/oidb/oidb0x88d.proto @@ -1,6 +1,6 @@ syntax = "proto2"; // 似乎查询服务端是通过 exists flag 来返回 group info 的 这地方只能用 proto2 -option go_package = ".;oidb"; +option go_package = "./;oidb"; message D88DGroupHeadPortraitInfo { diff --git a/client/pb/oidb/oidb0x8a7.pb.go b/client/pb/oidb/oidb0x8a7.pb.go index 286fdce3..1ab176b4 100644 --- a/client/pb/oidb/oidb0x8a7.pb.go +++ b/client/pb/oidb/oidb0x8a7.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0x8a7.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type D8A7ReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -215,7 +209,7 @@ var file_oidb0x8a7_proto_rawDesc = []byte{ 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x4d, 0x73, 0x67, 0x31, 0x12, 0x1e, 0x0a, 0x0a, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x4d, 0x73, 0x67, 0x32, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x0a, 0x70, 0x72, 0x6f, 0x6d, 0x70, 0x74, 0x4d, 0x73, 0x67, - 0x32, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, + 0x32, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0x8a7.proto b/client/pb/oidb/oidb0x8a7.proto index 9bc5b66f..406dd848 100644 --- a/client/pb/oidb/oidb0x8a7.proto +++ b/client/pb/oidb/oidb0x8a7.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message D8A7ReqBody { optional uint32 subCmd = 1; diff --git a/client/pb/oidb/oidb0x8fc.pb.go b/client/pb/oidb/oidb0x8fc.pb.go index 03028e86..370149b6 100644 --- a/client/pb/oidb/oidb0x8fc.pb.go +++ b/client/pb/oidb/oidb0x8fc.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0x8fc.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type D8FCReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -661,8 +655,8 @@ var file_oidb0x8fc_proto_rawDesc = []byte{ 0x0a, 0x14, 0x44, 0x38, 0x46, 0x43, 0x52, 0x69, 0x63, 0x68, 0x43, 0x61, 0x72, 0x64, 0x4e, 0x61, 0x6d, 0x65, 0x45, 0x6c, 0x65, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x74, 0x72, 0x6c, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x63, 0x74, 0x72, 0x6c, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x65, - 0x78, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x74, 0x65, 0x78, 0x74, 0x42, 0x08, - 0x5a, 0x06, 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, + 0x78, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x74, 0x65, 0x78, 0x74, 0x42, 0x09, + 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0x8fc.proto b/client/pb/oidb/oidb0x8fc.proto index 44b924b8..0923117e 100644 --- a/client/pb/oidb/oidb0x8fc.proto +++ b/client/pb/oidb/oidb0x8fc.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message D8FCReqBody { optional int64 groupCode = 1; diff --git a/client/pb/oidb/oidb0x990.pb.go b/client/pb/oidb/oidb0x990.pb.go index 2dad7f95..5d23fdc6 100644 --- a/client/pb/oidb/oidb0x990.pb.go +++ b/client/pb/oidb/oidb0x990.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0x990.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type TranslateReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -309,8 +303,8 @@ var file_oidb0x990_proto_rawDesc = []byte{ 0x0b, 0x73, 0x72, 0x63, 0x54, 0x65, 0x78, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x22, 0x0a, 0x0d, 0x64, 0x73, 0x74, 0x5f, 0x74, 0x65, 0x78, 0x74, 0x5f, 0x6c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0b, 0x64, 0x73, 0x74, 0x54, 0x65, 0x78, 0x74, 0x4c, 0x69, 0x73, 0x74, - 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/oidb/oidb0x990.proto b/client/pb/oidb/oidb0x990.proto index 4010d862..81ee55e4 100644 --- a/client/pb/oidb/oidb0x990.proto +++ b/client/pb/oidb/oidb0x990.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message TranslateReqBody { // TranslateReq translate_req = 1; diff --git a/client/pb/oidb/oidb0xD79.proto b/client/pb/oidb/oidb0xD79.proto index 4baf540c..7412257f 100644 --- a/client/pb/oidb/oidb0xD79.proto +++ b/client/pb/oidb/oidb0xD79.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message D79ReqBody { uint64 seq = 1; diff --git a/client/pb/oidb/oidb0xb77.pb.go b/client/pb/oidb/oidb0xb77.pb.go index 18a2d061..1525721f 100644 --- a/client/pb/oidb/oidb0xb77.pb.go +++ b/client/pb/oidb/oidb0xb77.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0xb77.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type DB77ReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -470,8 +464,8 @@ var file_oidb0xb77_proto_rawDesc = []byte{ 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x61, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x55, 0x72, 0x6c, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x6d, 0x75, 0x73, 0x69, 0x63, 0x55, 0x72, - 0x6c, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x6c, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/oidb/oidb0xb77.proto b/client/pb/oidb/oidb0xb77.proto index 240a8422..2f5d952b 100644 --- a/client/pb/oidb/oidb0xb77.proto +++ b/client/pb/oidb/oidb0xb77.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message DB77ReqBody { uint64 appId = 1; diff --git a/client/pb/oidb/oidb0xbcb.pb.go b/client/pb/oidb/oidb0xbcb.pb.go index 882b7d24..c52ad010 100644 --- a/client/pb/oidb/oidb0xbcb.pb.go +++ b/client/pb/oidb/oidb0xbcb.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0xbcb.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type CheckUrlReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -678,8 +672,8 @@ var file_oidb0xbcb_proto_rawDesc = []byte{ 0x74, 0x46, 0x72, 0x6f, 0x6d, 0x18, 0x08, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x07, 0x72, 0x65, 0x74, 0x46, 0x72, 0x6f, 0x6d, 0x12, 0x22, 0x0a, 0x0c, 0x6f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x69, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x04, 0x52, 0x0c, 0x6f, 0x70, 0x65, 0x72, - 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x69, 0x74, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x6f, 0x69, - 0x64, 0x62, + 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x42, 0x69, 0x74, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x6f, + 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0xbcb.proto b/client/pb/oidb/oidb0xbcb.proto index f8bd970f..6ad38f18 100644 --- a/client/pb/oidb/oidb0xbcb.proto +++ b/client/pb/oidb/oidb0xbcb.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message CheckUrlReq { repeated string url = 1; diff --git a/client/pb/oidb/oidb0xd79.pb.go b/client/pb/oidb/oidb0xd79.pb.go index b0434ead..cd7c21e4 100644 --- a/client/pb/oidb/oidb0xd79.pb.go +++ b/client/pb/oidb/oidb0xd79.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0xD79.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type D79ReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -275,8 +269,8 @@ var file_oidb0xD79_proto_rawDesc = []byte{ 0x22, 0x31, 0x0a, 0x0a, 0x44, 0x37, 0x39, 0x43, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x12, 0x23, 0x0a, 0x0d, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x65, 0x6e, 0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x0c, 0x73, 0x6c, 0x69, 0x63, 0x65, 0x43, 0x6f, 0x6e, 0x74, - 0x65, 0x6e, 0x74, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x6e, 0x74, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/oidb/oidb0xdad.pb.go b/client/pb/oidb/oidb0xdad.pb.go index ea264926..c693ab34 100644 --- a/client/pb/oidb/oidb0xdad.pb.go +++ b/client/pb/oidb/oidb0xdad.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0xdad.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type DADReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -213,8 +207,8 @@ var file_oidb0xdad_proto_rawDesc = []byte{ 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x10, 0x0a, 0x03, 0x73, 0x69, 0x67, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x03, 0x73, 0x69, 0x67, 0x12, 0x14, 0x0a, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x42, 0x08, 0x5a, 0x06, 0x2e, - 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x01, 0x28, 0x0d, 0x52, 0x05, 0x61, 0x70, 0x70, 0x69, 0x64, 0x42, 0x09, 0x5a, 0x07, 0x2e, + 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/oidb/oidb0xdad.proto b/client/pb/oidb/oidb0xdad.proto index 4fb64cba..31ecc56e 100644 --- a/client/pb/oidb/oidb0xdad.proto +++ b/client/pb/oidb/oidb0xdad.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message DADReqBody { int64 client = 1; diff --git a/client/pb/oidb/oidb0xe07.pb.go b/client/pb/oidb/oidb0xe07.pb.go index a2110931..72050d04 100644 --- a/client/pb/oidb/oidb0xe07.pb.go +++ b/client/pb/oidb/oidb0xe07.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0xe07.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type DE07ReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -697,8 +691,8 @@ var file_oidb0xe07_proto_rawDesc = []byte{ 0x72, 0x65, 0x73, 0x73, 0x57, 0x65, 0x69, 0x67, 0x68, 0x74, 0x12, 0x30, 0x0a, 0x13, 0x61, 0x66, 0x74, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x18, 0x70, 0x20, 0x01, 0x28, 0x05, 0x52, 0x13, 0x61, 0x66, 0x74, 0x65, 0x72, 0x43, 0x6f, - 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x42, 0x08, 0x5a, 0x06, - 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6d, 0x70, 0x72, 0x65, 0x73, 0x73, 0x48, 0x65, 0x69, 0x67, 0x68, 0x74, 0x42, 0x09, 0x5a, 0x07, + 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/oidb/oidb0xe07.proto b/client/pb/oidb/oidb0xe07.proto index bc764ca1..e4ccaac6 100644 --- a/client/pb/oidb/oidb0xe07.proto +++ b/client/pb/oidb/oidb0xe07.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message DE07ReqBody { int32 version = 1; diff --git a/client/pb/oidb/oidb0xe5b.pb.go b/client/pb/oidb/oidb0xe5b.pb.go index 0630ca78..33c84678 100644 --- a/client/pb/oidb/oidb0xe5b.pb.go +++ b/client/pb/oidb/oidb0xe5b.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0xe5b.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type LifeAchievementItem struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -287,8 +281,8 @@ var file_oidb0xe5b_proto_rawDesc = []byte{ 0x6c, 0x69, 0x66, 0x65, 0x41, 0x63, 0x68, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x2c, 0x0a, 0x11, 0x61, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x4f, 0x70, 0x65, 0x6e, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x61, 0x63, 0x68, 0x69, 0x65, 0x76, 0x65, 0x6d, - 0x65, 0x6e, 0x74, 0x4f, 0x70, 0x65, 0x6e, 0x69, 0x64, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x6f, - 0x69, 0x64, 0x62, + 0x65, 0x6e, 0x74, 0x4f, 0x70, 0x65, 0x6e, 0x69, 0x64, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x3b, + 0x6f, 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0xe5b.proto b/client/pb/oidb/oidb0xe5b.proto index 8867bd01..168845c9 100644 --- a/client/pb/oidb/oidb0xe5b.proto +++ b/client/pb/oidb/oidb0xe5b.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message LifeAchievementItem { optional uint32 achievementId = 1; diff --git a/client/pb/oidb/oidb0xeac.pb.go b/client/pb/oidb/oidb0xeac.pb.go index 0b789be2..6b876375 100644 --- a/client/pb/oidb/oidb0xeac.pb.go +++ b/client/pb/oidb/oidb0xeac.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0xeac.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type EACReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -178,8 +172,8 @@ var file_oidb0xeac_proto_rawDesc = []byte{ 0x0a, 0x0a, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x0a, 0x64, 0x69, 0x67, 0x65, 0x73, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, - 0x0d, 0x52, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x08, 0x5a, 0x06, - 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, + 0x0d, 0x52, 0x09, 0x65, 0x72, 0x72, 0x6f, 0x72, 0x43, 0x6f, 0x64, 0x65, 0x42, 0x09, 0x5a, 0x07, + 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0xeac.proto b/client/pb/oidb/oidb0xeac.proto index 69d7692e..c04b35bd 100644 --- a/client/pb/oidb/oidb0xeac.proto +++ b/client/pb/oidb/oidb0xeac.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; /* message ArkMsg { diff --git a/client/pb/oidb/oidb0xec4.pb.go b/client/pb/oidb/oidb0xec4.pb.go index 6bb984c9..04510e36 100644 --- a/client/pb/oidb/oidb0xec4.pb.go +++ b/client/pb/oidb/oidb0xec4.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: oidb0xec4.proto package oidb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Comment struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -606,8 +600,8 @@ var file_oidb0xec4_proto_rawDesc = []byte{ 0x0a, 0x03, 0x72, 0x65, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x72, 0x65, 0x74, 0x12, 0x2a, 0x0a, 0x10, 0x61, 0x6e, 0x73, 0x77, 0x65, 0x72, 0x65, 0x64, 0x51, 0x75, 0x65, 0x73, 0x74, 0x4e, 0x75, 0x6d, 0x18, 0x06, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x10, 0x61, 0x6e, 0x73, 0x77, - 0x65, 0x72, 0x65, 0x64, 0x51, 0x75, 0x65, 0x73, 0x74, 0x4e, 0x75, 0x6d, 0x42, 0x08, 0x5a, 0x06, - 0x2e, 0x3b, 0x6f, 0x69, 0x64, 0x62, + 0x65, 0x72, 0x65, 0x64, 0x51, 0x75, 0x65, 0x73, 0x74, 0x4e, 0x75, 0x6d, 0x42, 0x09, 0x5a, 0x07, + 0x2e, 0x2f, 0x3b, 0x6f, 0x69, 0x64, 0x62, } var ( diff --git a/client/pb/oidb/oidb0xec4.proto b/client/pb/oidb/oidb0xec4.proto index 60f6e8d4..12a249d9 100644 --- a/client/pb/oidb/oidb0xec4.proto +++ b/client/pb/oidb/oidb0xec4.proto @@ -1,5 +1,5 @@ syntax = "proto2"; -option go_package = ".;oidb"; +option go_package = "./;oidb"; message Comment { optional string id = 1; diff --git a/client/pb/profilecard/accountsearch.pb.go b/client/pb/profilecard/accountsearch.pb.go index eebb109f..9d53172a 100644 --- a/client/pb/profilecard/accountsearch.pb.go +++ b/client/pb/profilecard/accountsearch.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.13.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: accountsearch.proto package profilecard import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type Location struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -915,8 +909,8 @@ var file_accountsearch_proto_rawDesc = []byte{ 0x08, 0x52, 0x0e, 0x6b, 0x65, 0x79, 0x77, 0x6f, 0x72, 0x64, 0x53, 0x75, 0x69, 0x63, 0x69, 0x64, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x65, 0x78, 0x61, 0x63, 0x74, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x18, 0x12, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0b, 0x65, 0x78, 0x61, 0x63, 0x74, 0x53, 0x65, 0x61, - 0x72, 0x63, 0x68, 0x42, 0x0f, 0x5a, 0x0d, 0x2e, 0x3b, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, - 0x63, 0x61, 0x72, 0x64, + 0x72, 0x63, 0x68, 0x42, 0x10, 0x5a, 0x0e, 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, + 0x65, 0x63, 0x61, 0x72, 0x64, } var ( diff --git a/client/pb/profilecard/accountsearch.proto b/client/pb/profilecard/accountsearch.proto index 319d8561..c8aa27dc 100644 --- a/client/pb/profilecard/accountsearch.proto +++ b/client/pb/profilecard/accountsearch.proto @@ -1,6 +1,6 @@ syntax = "proto2"; -option go_package = ".;profilecard"; +option go_package = "./;profilecard"; /* message Color { diff --git a/client/pb/profilecard/busi.pb.go b/client/pb/profilecard/busi.pb.go index dac3a9e2..e479b465 100644 --- a/client/pb/profilecard/busi.pb.go +++ b/client/pb/profilecard/busi.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: busi.proto package profilecard import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type BusiColor struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1085,8 +1079,8 @@ var file_busi_proto_rawDesc = []byte{ 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x72, 0x65, 0x64, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x68, 0x6f, 0x74, 0x44, 0x69, 0x66, 0x66, 0x18, 0x06, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x68, 0x6f, 0x74, 0x44, 0x69, 0x66, 0x66, 0x42, 0x0f, 0x5a, 0x0d, 0x2e, - 0x3b, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x63, 0x61, 0x72, 0x64, + 0x28, 0x05, 0x52, 0x07, 0x68, 0x6f, 0x74, 0x44, 0x69, 0x66, 0x66, 0x42, 0x10, 0x5a, 0x0e, 0x2e, + 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x63, 0x61, 0x72, 0x64, } var ( diff --git a/client/pb/profilecard/busi.proto b/client/pb/profilecard/busi.proto index fb32a8d2..869a6ac4 100644 --- a/client/pb/profilecard/busi.proto +++ b/client/pb/profilecard/busi.proto @@ -1,5 +1,5 @@ syntax = "proto2"; -option go_package = ".;profilecard"; +option go_package = "./;profilecard"; message BusiColor { optional int32 r = 1; diff --git a/client/pb/profilecard/gate.pb.go b/client/pb/profilecard/gate.pb.go index b00f56d2..e5205c83 100644 --- a/client/pb/profilecard/gate.pb.go +++ b/client/pb/profilecard/gate.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: gate.proto package profilecard import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type GateCommTaskInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -965,8 +959,8 @@ var file_gate_proto_rawDesc = []byte{ 0x69, 0x70, 0x43, 0x61, 0x72, 0x65, 0x12, 0x2a, 0x0a, 0x07, 0x71, 0x69, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x09, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x10, 0x2e, 0x47, 0x61, 0x74, 0x65, 0x51, 0x69, 0x64, 0x49, 0x6e, 0x66, 0x6f, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x07, 0x71, 0x69, 0x64, 0x49, 0x6e, - 0x66, 0x6f, 0x42, 0x0f, 0x5a, 0x0d, 0x2e, 0x3b, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, 0x63, - 0x61, 0x72, 0x64, + 0x66, 0x6f, 0x42, 0x10, 0x5a, 0x0e, 0x2e, 0x2f, 0x3b, 0x70, 0x72, 0x6f, 0x66, 0x69, 0x6c, 0x65, + 0x63, 0x61, 0x72, 0x64, } var ( diff --git a/client/pb/profilecard/gate.proto b/client/pb/profilecard/gate.proto index a8d43b88..cb9fa1cb 100644 --- a/client/pb/profilecard/gate.proto +++ b/client/pb/profilecard/gate.proto @@ -1,5 +1,5 @@ syntax = "proto2"; -option go_package = ".;profilecard"; +option go_package = "./;profilecard"; message GateCommTaskInfo { optional int32 appid = 1; diff --git a/client/pb/pttcenter/shortvideo.pb.go b/client/pb/pttcenter/shortvideo.pb.go index 9ba6c313..705c4c06 100644 --- a/client/pb/pttcenter/shortvideo.pb.go +++ b/client/pb/pttcenter/shortvideo.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: shortvideo.proto package pttcenter import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type ShortVideoReqBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -1161,9 +1155,9 @@ var file_shortvideo_proto_rawDesc = []byte{ 0x20, 0x0a, 0x0b, 0x73, 0x75, 0x62, 0x42, 0x75, 0x73, 0x69, 0x54, 0x79, 0x70, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x73, 0x75, 0x62, 0x42, 0x75, 0x73, 0x69, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x75, 0x73, 0x65, 0x72, 0x43, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, - 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x43, 0x6e, 0x74, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, - 0x3b, 0x70, 0x74, 0x74, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x28, 0x05, 0x52, 0x07, 0x75, 0x73, 0x65, 0x72, 0x43, 0x6e, 0x74, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, + 0x2f, 0x3b, 0x70, 0x74, 0x74, 0x63, 0x65, 0x6e, 0x74, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/pttcenter/shortvideo.proto b/client/pb/pttcenter/shortvideo.proto index 31387a02..2283692e 100644 --- a/client/pb/pttcenter/shortvideo.proto +++ b/client/pb/pttcenter/shortvideo.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;pttcenter"; +option go_package = "./;pttcenter"; message ShortVideoReqBody { int32 cmd = 1; diff --git a/client/pb/qweb/app.pb.go b/client/pb/qweb/app.pb.go index 9cc00aff..4230488b 100644 --- a/client/pb/qweb/app.pb.go +++ b/client/pb/qweb/app.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: app.proto package qweb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type GetAppInfoByIdReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -465,8 +459,8 @@ var file_app_proto_rawDesc = []byte{ 0x05, 0x20, 0x03, 0x28, 0x09, 0x52, 0x0e, 0x62, 0x75, 0x73, 0x69, 0x6e, 0x65, 0x73, 0x73, 0x44, 0x6f, 0x6d, 0x61, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x75, 0x64, 0x70, 0x49, 0x70, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x06, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x75, 0x64, 0x70, 0x49, 0x70, 0x4c, - 0x69, 0x73, 0x74, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x71, 0x77, 0x65, 0x62, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x69, 0x73, 0x74, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x71, 0x77, 0x65, 0x62, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/qweb/app.proto b/client/pb/qweb/app.proto index 799e3d1f..fe735452 100644 --- a/client/pb/qweb/app.proto +++ b/client/pb/qweb/app.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;qweb"; +option go_package = "./;qweb"; message GetAppInfoByIdReq { //CommonExt ExtInfo = 1; diff --git a/client/pb/qweb/protocol.pb.go b/client/pb/qweb/protocol.pb.go index 371656ab..0658a147 100644 --- a/client/pb/qweb/protocol.pb.go +++ b/client/pb/qweb/protocol.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.11.4 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: protocol.proto package qweb import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type QWebReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -195,8 +189,8 @@ var file_protocol_proto_rawDesc = []byte{ 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x65, 0x72, 0x72, 0x4d, 0x73, 0x67, 0x12, 0x1a, 0x0a, 0x08, 0x62, 0x75, 0x73, 0x69, 0x42, 0x75, 0x66, 0x66, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x08, 0x62, 0x75, 0x73, 0x69, 0x42, 0x75, 0x66, - 0x66, 0x42, 0x08, 0x5a, 0x06, 0x2e, 0x3b, 0x71, 0x77, 0x65, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x33, + 0x66, 0x42, 0x09, 0x5a, 0x07, 0x2e, 0x2f, 0x3b, 0x71, 0x77, 0x65, 0x62, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/qweb/protocol.proto b/client/pb/qweb/protocol.proto index 41adb96d..8df205fb 100644 --- a/client/pb/qweb/protocol.proto +++ b/client/pb/qweb/protocol.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;qweb"; +option go_package = "./;qweb"; message QWebReq { int64 seq = 1; diff --git a/client/pb/richmedia/tts.pb.go b/client/pb/richmedia/tts.pb.go index d4d62097..9deaf964 100644 --- a/client/pb/richmedia/tts.pb.go +++ b/client/pb/richmedia/tts.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.13.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: tts.proto package richmedia import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type TtsRspBody struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -229,9 +223,9 @@ var file_tts_proto_rawDesc = []byte{ 0x6d, 0x65, 0x53, 0x69, 0x7a, 0x65, 0x22, 0x36, 0x0a, 0x0c, 0x54, 0x74, 0x73, 0x56, 0x6f, 0x69, 0x63, 0x65, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x05, 0x76, 0x6f, 0x69, 0x63, 0x65, 0x12, 0x10, 0x0a, 0x03, - 0x73, 0x65, 0x71, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x73, 0x65, 0x71, 0x42, 0x0d, - 0x5a, 0x0b, 0x2e, 0x3b, 0x72, 0x69, 0x63, 0x68, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x65, 0x71, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x03, 0x73, 0x65, 0x71, 0x42, 0x0e, + 0x5a, 0x0c, 0x2e, 0x2f, 0x3b, 0x72, 0x69, 0x63, 0x68, 0x6d, 0x65, 0x64, 0x69, 0x61, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/client/pb/richmedia/tts.proto b/client/pb/richmedia/tts.proto index b7ab8218..e15ad1c4 100644 --- a/client/pb/richmedia/tts.proto +++ b/client/pb/richmedia/tts.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;richmedia"; +option go_package = "./;richmedia"; message TtsRspBody { uint32 ret_code = 1; diff --git a/client/pb/structmsg/structmsg.pb.go b/client/pb/structmsg/structmsg.pb.go index 5d7bcc11..17b867b7 100644 --- a/client/pb/structmsg/structmsg.pb.go +++ b/client/pb/structmsg/structmsg.pb.go @@ -1,18 +1,16 @@ // Code generated by protoc-gen-go. DO NOT EDIT. // versions: -// protoc-gen-go v1.25.0 -// protoc v3.14.0 +// protoc-gen-go v1.26.0 +// protoc v3.17.1 // source: structmsg.proto package structmsg import ( - reflect "reflect" - sync "sync" - - proto "github.com/golang/protobuf/proto" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" + reflect "reflect" + sync "sync" ) const ( @@ -22,10 +20,6 @@ const ( _ = protoimpl.EnforceVersion(protoimpl.MaxVersion - 20) ) -// This is a compile-time assertion that a sufficiently up-to-date version -// of the legacy proto package is being used. -const _ = proto.ProtoPackageIsVersion4 - type AddFrdSNInfo struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache @@ -2773,9 +2767,9 @@ var file_structmsg_proto_rawDesc = []byte{ 0x61, 0x63, 0x6b, 0x6c, 0x69, 0x73, 0x74, 0x12, 0x31, 0x0a, 0x0c, 0x61, 0x64, 0x64, 0x46, 0x72, 0x64, 0x53, 0x4e, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x36, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x41, 0x64, 0x64, 0x46, 0x72, 0x64, 0x53, 0x4e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x0c, 0x61, 0x64, - 0x64, 0x46, 0x72, 0x64, 0x53, 0x4e, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x0d, 0x5a, 0x0b, 0x2e, 0x3b, - 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x6d, 0x73, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x64, 0x46, 0x72, 0x64, 0x53, 0x4e, 0x49, 0x6e, 0x66, 0x6f, 0x42, 0x0e, 0x5a, 0x0c, 0x2e, 0x2f, + 0x3b, 0x73, 0x74, 0x72, 0x75, 0x63, 0x74, 0x6d, 0x73, 0x67, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/client/pb/structmsg/structmsg.proto b/client/pb/structmsg/structmsg.proto index ebf04b7b..790fb952 100644 --- a/client/pb/structmsg/structmsg.proto +++ b/client/pb/structmsg/structmsg.proto @@ -1,6 +1,6 @@ syntax = "proto3"; -option go_package = ".;structmsg"; +option go_package = "./;structmsg"; message AddFrdSNInfo { int32 notSeeDynamic = 1; diff --git a/client/private_msg.go b/client/private_msg.go index 075636b1..dac4d501 100644 --- a/client/private_msg.go +++ b/client/private_msg.go @@ -5,8 +5,7 @@ import ( "time" "github.com/pkg/errors" - - "github.com/golang/protobuf/proto" + "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/message" diff --git a/client/qidian.go b/client/qidian.go index c26cecad..c633f5de 100644 --- a/client/qidian.go +++ b/client/qidian.go @@ -7,14 +7,15 @@ import ( "io/ioutil" "net/http" + "github.com/pkg/errors" + "google.golang.org/protobuf/proto" + "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/client/pb/cmd0x3f6" "github.com/Mrs4s/MiraiGo/client/pb/cmd0x6ff" "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/protocol/packets" "github.com/Mrs4s/MiraiGo/utils" - "github.com/golang/protobuf/proto" - "github.com/pkg/errors" ) func init() { diff --git a/client/sync.go b/client/sync.go index c5030e53..4c469a52 100644 --- a/client/sync.go +++ b/client/sync.go @@ -5,13 +5,15 @@ import ( "sync" "time" + "google.golang.org/protobuf/proto" + "github.com/Mrs4s/MiraiGo/binary/jce" "github.com/Mrs4s/MiraiGo/client/pb/msf" "github.com/Mrs4s/MiraiGo/client/pb/msg" "github.com/Mrs4s/MiraiGo/client/pb/oidb" "github.com/Mrs4s/MiraiGo/message" "github.com/Mrs4s/MiraiGo/protocol/packets" - "github.com/golang/protobuf/proto" + "github.com/pkg/errors" ) diff --git a/client/system_msg.go b/client/system_msg.go index a2578a83..16cf1c25 100644 --- a/client/system_msg.go +++ b/client/system_msg.go @@ -1,9 +1,10 @@ package client import ( + "google.golang.org/protobuf/proto" + "github.com/Mrs4s/MiraiGo/client/pb/structmsg" "github.com/Mrs4s/MiraiGo/protocol/packets" - "google.golang.org/protobuf/proto" ) type ( diff --git a/client/translate.go b/client/translate.go index 85ede66a..fcfe33ac 100644 --- a/client/translate.go +++ b/client/translate.go @@ -1,9 +1,11 @@ package client import ( + "google.golang.org/protobuf/proto" + "github.com/Mrs4s/MiraiGo/client/pb/oidb" "github.com/Mrs4s/MiraiGo/protocol/packets" - "github.com/golang/protobuf/proto" + "github.com/pkg/errors" ) diff --git a/client/tts.go b/client/tts.go index 39aee0b9..33a0191c 100644 --- a/client/tts.go +++ b/client/tts.go @@ -3,11 +3,12 @@ package client import ( "fmt" + "github.com/pkg/errors" + "google.golang.org/protobuf/proto" + "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/client/pb/richmedia" "github.com/Mrs4s/MiraiGo/utils" - "github.com/golang/protobuf/proto" - "github.com/pkg/errors" ) func (c *QQClient) GetTts(text string) ([]byte, error) { diff --git a/go.mod b/go.mod index 48cb3400..419deca3 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,6 @@ module github.com/Mrs4s/MiraiGo go 1.16 require ( - github.com/golang/protobuf v1.4.3 github.com/json-iterator/go v1.1.10 github.com/modern-go/reflect2 v1.0.1 github.com/pkg/errors v0.9.1 diff --git a/go.sum b/go.sum index c618df25..6a116543 100644 --- a/go.sum +++ b/go.sum @@ -16,9 +16,8 @@ github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:x github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs= github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w= github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= +github.com/golang/protobuf v1.4.1 h1:ZFgWrT+bLgsYPirOnRfKLYJLvssAegOj/hgyMFdJZe0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= -github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU= @@ -77,7 +76,6 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE= google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo= google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= -google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.25.0 h1:Ejskq+SyPohKW+1uil0JJMtmHCgJPJ/qWTxr8qp+R4c= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= diff --git a/message/message.go b/message/message.go index f9c41e8c..72676404 100644 --- a/message/message.go +++ b/message/message.go @@ -8,8 +8,8 @@ import ( "strconv" "strings" - "github.com/golang/protobuf/proto" jsoniter "github.com/json-iterator/go" + "google.golang.org/protobuf/proto" "github.com/Mrs4s/MiraiGo/binary" "github.com/Mrs4s/MiraiGo/client/pb/msg"