From 9f7943ca94564293bafee05bbd8eb16866a25e0c Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Tue, 1 Sep 2020 23:27:05 +0800 Subject: [PATCH] 1 --- go.mod | 5 ++- im/im_msgid.pb.go | 1 + im/im_proto.pb.go | 66 +++++++++++++++++++++--------- im/im_proto.proto | 6 +++ metautils.go | 102 +++++++++++++++++++++++++++++++++++++++++++--- 5 files changed, 155 insertions(+), 25 deletions(-) diff --git a/go.mod b/go.mod index 3a36331..ab99294 100644 --- a/go.mod +++ b/go.mod @@ -1,3 +1,6 @@ module f5 -require github.com/golang/protobuf v1.4.2 +require ( + github.com/golang/protobuf v1.4.2 + google.golang.org/protobuf v1.23.0 +) diff --git a/im/im_msgid.pb.go b/im/im_msgid.pb.go index b7d5e11..6ee2c53 100644 --- a/im/im_msgid.pb.go +++ b/im/im_msgid.pb.go @@ -10,6 +10,7 @@ It is generated from these files: im_proto.proto It has these top-level messages: + MFTuple IMSocketConnect IMSocketDisconnect */ diff --git a/im/im_proto.pb.go b/im/im_proto.pb.go index d9a5de8..b724f68 100644 --- a/im/im_proto.pb.go +++ b/im/im_proto.pb.go @@ -45,18 +45,36 @@ func (x *ConstantE) UnmarshalJSON(data []byte) error { } func (ConstantE) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } +type MFTuple struct { + Values []string `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"` + XXX_unrecognized []byte `json:"-"` +} + +func (m *MFTuple) Reset() { *m = MFTuple{} } +func (m *MFTuple) String() string { return proto.CompactTextString(m) } +func (*MFTuple) ProtoMessage() {} +func (*MFTuple) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } + +func (m *MFTuple) GetValues() []string { + if m != nil { + return m.Values + } + return nil +} + type IMSocketConnect struct { - IsWebsocket *bool `protobuf:"varint,1,opt,name=is_websocket" json:"is_websocket,omitempty"` - Host *string `protobuf:"bytes,2,opt,name=host" json:"host,omitempty"` - Url *string `protobuf:"bytes,3,opt,name=url" json:"url,omitempty"` - QueryStr *string `protobuf:"bytes,4,opt,name=query_str" json:"query_str,omitempty"` - XXX_unrecognized []byte `json:"-"` + IsWebsocket *bool `protobuf:"varint,1,opt,name=is_websocket" json:"is_websocket,omitempty"` + Host *string `protobuf:"bytes,2,opt,name=host" json:"host,omitempty"` + Url *string `protobuf:"bytes,3,opt,name=url" json:"url,omitempty"` + QueryStr *string `protobuf:"bytes,4,opt,name=query_str" json:"query_str,omitempty"` + Tuples []*MFTuple `protobuf:"bytes,5,rep,name=tuples" json:"tuples,omitempty"` + XXX_unrecognized []byte `json:"-"` } func (m *IMSocketConnect) Reset() { *m = IMSocketConnect{} } func (m *IMSocketConnect) String() string { return proto.CompactTextString(m) } func (*IMSocketConnect) ProtoMessage() {} -func (*IMSocketConnect) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } +func (*IMSocketConnect) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } func (m *IMSocketConnect) GetIsWebsocket() bool { if m != nil && m.IsWebsocket != nil { @@ -86,6 +104,13 @@ func (m *IMSocketConnect) GetQueryStr() string { return "" } +func (m *IMSocketConnect) GetTuples() []*MFTuple { + if m != nil { + return m.Tuples + } + return nil +} + type IMSocketDisconnect struct { XXX_unrecognized []byte `json:"-"` } @@ -93,9 +118,10 @@ type IMSocketDisconnect struct { func (m *IMSocketDisconnect) Reset() { *m = IMSocketDisconnect{} } func (m *IMSocketDisconnect) String() string { return proto.CompactTextString(m) } func (*IMSocketDisconnect) ProtoMessage() {} -func (*IMSocketDisconnect) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } +func (*IMSocketDisconnect) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } func init() { + proto.RegisterType((*MFTuple)(nil), "im.MFTuple") proto.RegisterType((*IMSocketConnect)(nil), "im.IMSocketConnect") proto.RegisterType((*IMSocketDisconnect)(nil), "im.IMSocketDisconnect") proto.RegisterEnum("im.ConstantE", ConstantE_name, ConstantE_value) @@ -104,16 +130,18 @@ func init() { func init() { proto.RegisterFile("im_proto.proto", fileDescriptor1) } var fileDescriptor1 = []byte{ - // 161 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0xe2, 0xcb, 0xcc, 0x8d, 0x2f, - 0x28, 0xca, 0x2f, 0xc9, 0xd7, 0x03, 0x93, 0x42, 0x4c, 0x99, 0xb9, 0x4a, 0xa1, 0x5c, 0xfc, 0x9e, - 0xbe, 0xc1, 0xf9, 0xc9, 0xd9, 0xa9, 0x25, 0xce, 0xf9, 0x79, 0x79, 0xa9, 0xc9, 0x25, 0x42, 0x22, - 0x5c, 0x3c, 0x99, 0xc5, 0xf1, 0xe5, 0xa9, 0x49, 0xc5, 0x60, 0x61, 0x09, 0x46, 0x05, 0x46, 0x0d, - 0x0e, 0x21, 0x1e, 0x2e, 0x96, 0x8c, 0xfc, 0xe2, 0x12, 0x09, 0x26, 0x05, 0x46, 0x0d, 0x4e, 0x21, - 0x6e, 0x2e, 0xe6, 0xd2, 0xa2, 0x1c, 0x09, 0x66, 0x30, 0x47, 0x90, 0x8b, 0xb3, 0xb0, 0x34, 0xb5, - 0xa8, 0x32, 0xbe, 0xb8, 0xa4, 0x48, 0x82, 0x05, 0x24, 0xa4, 0x24, 0xc2, 0x25, 0x04, 0x33, 0xd6, - 0x25, 0xb3, 0x38, 0x19, 0x62, 0xb2, 0x96, 0x0c, 0x17, 0x97, 0x73, 0x7e, 0x5e, 0x71, 0x49, 0x62, - 0x5e, 0x49, 0x7c, 0xaa, 0x10, 0x1f, 0x17, 0x97, 0x6f, 0x62, 0x85, 0xa7, 0xaf, 0x6f, 0x71, 0xba, - 0x67, 0x8a, 0x00, 0x3b, 0x20, 0x00, 0x00, 0xff, 0xff, 0x62, 0x1d, 0x43, 0x64, 0x9f, 0x00, 0x00, - 0x00, + // 204 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x34, 0x8e, 0xbd, 0x4e, 0xc3, 0x30, + 0x14, 0x46, 0xe5, 0xba, 0xb4, 0xe4, 0xa6, 0x2a, 0x60, 0x75, 0x30, 0x82, 0xc1, 0xca, 0x64, 0x31, + 0x64, 0xe0, 0x15, 0x8a, 0x90, 0x32, 0x78, 0x82, 0xdd, 0x0a, 0xc1, 0x02, 0x8b, 0xc4, 0x0e, 0xbe, + 0xd7, 0xfc, 0xbc, 0x3d, 0x8a, 0x81, 0xe5, 0x93, 0xbe, 0xb3, 0x9c, 0x03, 0x7b, 0x3f, 0xd9, 0x39, + 0x45, 0x8a, 0x6d, 0x59, 0xb1, 0xf2, 0x53, 0x73, 0x09, 0x5b, 0x73, 0xff, 0x98, 0xe7, 0xd1, 0x89, + 0x3d, 0x6c, 0x3e, 0xfa, 0x31, 0x3b, 0x94, 0x4c, 0x71, 0x5d, 0x35, 0x09, 0xce, 0x3a, 0xf3, 0x10, + 0x87, 0x37, 0x47, 0xc7, 0x18, 0x82, 0x1b, 0x48, 0x1c, 0x60, 0xe7, 0xd1, 0x7e, 0xba, 0x27, 0x2c, + 0x58, 0x32, 0xc5, 0xf4, 0xa9, 0xd8, 0xc1, 0xfa, 0x35, 0x22, 0xc9, 0x95, 0x62, 0xba, 0x12, 0x35, + 0xf0, 0x9c, 0x46, 0xc9, 0xcb, 0xb9, 0x80, 0xea, 0x3d, 0xbb, 0xf4, 0x6d, 0x91, 0x92, 0x5c, 0x17, + 0x74, 0x05, 0x1b, 0x5a, 0x7c, 0x28, 0x4f, 0x14, 0xd7, 0xf5, 0x6d, 0xdd, 0xfa, 0xa9, 0xfd, 0x6b, + 0x68, 0x0e, 0x20, 0xfe, 0x9d, 0x77, 0x1e, 0x87, 0x5f, 0xed, 0xcd, 0x35, 0xc0, 0x31, 0x06, 0xa4, + 0x3e, 0x90, 0x5d, 0x3a, 0xc1, 0xf4, 0x5f, 0x9d, 0x31, 0xf8, 0xd2, 0x3d, 0x9f, 0x6f, 0x7f, 0x02, + 0x00, 0x00, 0xff, 0xff, 0xef, 0x03, 0x9f, 0xae, 0xd7, 0x00, 0x00, 0x00, } diff --git a/im/im_proto.proto b/im/im_proto.proto index 7734b8d..56f3b26 100644 --- a/im/im_proto.proto +++ b/im/im_proto.proto @@ -6,12 +6,18 @@ enum Constant_e MaxIMMsgId = 7; } +message MFTuple +{ + repeated string values = 1; +} + message IMSocketConnect { optional bool is_websocket = 1; optional string host = 2; optional string url = 3; optional string query_str = 4; + repeated MFTuple tuples = 5; } message IMSocketDisconnect diff --git a/metautils.go b/metautils.go index 745ebb2..dd51526 100644 --- a/metautils.go +++ b/metautils.go @@ -1,10 +1,102 @@ package f5 -func ReadCsvMetaFile(fileName string, clsName string, list interface{}) { - //listType := reflect.TypeOf(list) - //listElemType := listType.Elem() +import ( + "q5" + "os" + "bufio" + "reflect" + "fmt" + + "github.com/golang/protobuf/proto" + "github.com/golang/protobuf/jsonpb" + "google.golang.org/protobuf/reflect/protoreflect" + "google.golang.org/protobuf/reflect/protoregistry" +) + +func ReadCsvMetaFile(fileName string, list interface{}) { + msgType := reflect.TypeOf(list).Elem().Elem().Elem() + + csvReader := &q5.CsvReader{} + csvReader.Load(fileName) + for csvReader.NextLine() { + msg := reflect.New(msgType) + msgPb := msg.Interface().(proto.Message) + + msgReflect := proto.MessageReflect(msgPb) + msgDesc := msgReflect.Descriptor() + fields := msgDesc.Fields() + for i := 0; i < fields.Len(); i++ { + field := fields.Get(i) + + value := csvReader.GetValue(string(field.Name())) + xvalueToPBSampleField(value, field, msgReflect) + } + + newList := reflect.Append(reflect.ValueOf(list), msg) + reflect.ValueOf(list).Elem().Set(newList) + } } -func ReadJsonMetaFile() { +func ReadJsonMetaFile(fileName string, list interface{}) { + msgType := reflect.TypeOf(list).Elem().Elem().Elem() + msg := reflect.New(msgType) + msgPb := msg.Interface().(proto.Message) + msgReflect := proto.MessageReflect(msgPb) + msgDesc := msgReflect.Descriptor() -} \ No newline at end of file + meta, _ := protoregistry.GlobalTypes.FindMessageByName(msgDesc.FullName() + "Metas") + metaList := meta.New() + f, _ := os.Open(fileName) + data, _ := bufio.NewReader(f).ReadString(0) + data = "{\"values\":" + data + data += "}" + err := jsonpb.Unmarshal(f, proto.MessageV1(metaList)) + if err == nil { + fmt.Println("json decode ok", data) + } + + /* msgReflect = proto.MessageReflect(proto.MessageV1(metaList)) + msgDesc = msgReflect.Descriptor() + valuesField := msgDesc.Fields().ByName("values") + values := msgReflect.Get(valuesField) + reflect.ValueOf(list).Elem().Set(reflect.ValueOf(values.List())) + _ = valuesField + fmt.Println(valuesField, values)*/ +} + +func xvalueToPBSampleField( + value *q5.XValue, + field protoreflect.FieldDescriptor, + msgReflect protoreflect.Message) { + switch field.Kind() { + case protoreflect.BoolKind: + msgReflect.Set(field, protoreflect.ValueOfBool(value.GetInt64() != 0)) + break + case protoreflect.EnumKind: + break + case + protoreflect.Int32Kind, protoreflect.Sint32Kind, + protoreflect.Sfixed32Kind, protoreflect.Fixed32Kind: + break + case protoreflect.Uint32Kind: + break + case + protoreflect.Int64Kind, protoreflect.Sint64Kind, + protoreflect.Sfixed64Kind, protoreflect.Fixed64Kind: + break + case protoreflect.Uint64Kind: + break + case protoreflect.FloatKind: + break + case protoreflect.DoubleKind: + break + case protoreflect.StringKind: + break + case protoreflect.BytesKind: + break + case protoreflect.MessageKind: + break + case protoreflect.GroupKind: + break + } +}