From 54747b4c57f1c44b5c973ad585768c83049429de Mon Sep 17 00:00:00 2001
From: cheliequan <liequanche@126.com>
Date: 星期五, 10 二月 2023 16:56:08 +0800
Subject: [PATCH] 更新gofast版本使用protobufV3
---
aiocean.pb.go | 337 ++++++++++++++++++++++++++++++++++----------------------
1 files changed, 205 insertions(+), 132 deletions(-)
diff --git a/aiocean.pb.go b/aiocean.pb.go
index f41ed47..c252110 100644
--- a/aiocean.pb.go
+++ b/aiocean.pb.go
@@ -35,7 +35,7 @@
TaskId string `protobuf:"bytes,9,opt,name=taskId,proto3" json:"taskId,omitempty"`
TaskName string `protobuf:"bytes,10,opt,name=taskName,proto3" json:"taskName,omitempty"`
SdkName string `protobuf:"bytes,11,opt,name=sdkName,proto3" json:"sdkName,omitempty"`
- PicMaxUrl string `protobuf:"bytes,12,opt,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"`
+ PicMaxUrl []string `protobuf:"bytes,12,rep,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"`
VideoUrl string `protobuf:"bytes,13,opt,name=videoUrl,proto3" json:"videoUrl,omitempty"`
PicDate string `protobuf:"bytes,14,opt,name=picDate,proto3" json:"picDate,omitempty"`
TargetInfo []*TargetInfo `protobuf:"bytes,15,rep,name=targetInfo,proto3" json:"targetInfo,omitempty"`
@@ -161,11 +161,11 @@
return ""
}
-func (m *EsDataBase) GetPicMaxUrl() string {
+func (m *EsDataBase) GetPicMaxUrl() []string {
if m != nil {
return m.PicMaxUrl
}
- return ""
+ return nil
}
func (m *EsDataBase) GetVideoUrl() string {
@@ -271,7 +271,7 @@
TaskId string `protobuf:"bytes,9,opt,name=taskId,proto3" json:"taskId,omitempty"`
TaskName string `protobuf:"bytes,10,opt,name=taskName,proto3" json:"taskName,omitempty"`
SdkName string `protobuf:"bytes,11,opt,name=sdkName,proto3" json:"sdkName,omitempty"`
- PicMaxUrl string `protobuf:"bytes,12,opt,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"`
+ PicMaxUrl []string `protobuf:"bytes,12,rep,name=picMaxUrl,proto3" json:"picMaxUrl,omitempty"`
VideoUrl string `protobuf:"bytes,13,opt,name=videoUrl,proto3" json:"videoUrl,omitempty"`
PicDate string `protobuf:"bytes,14,opt,name=picDate,proto3" json:"picDate,omitempty"`
TargetInfo []*TargetInfo `protobuf:"bytes,15,rep,name=targetInfo,proto3" json:"targetInfo,omitempty"`
@@ -399,11 +399,11 @@
return ""
}
-func (m *AIOcean) GetPicMaxUrl() string {
+func (m *AIOcean) GetPicMaxUrl() []string {
if m != nil {
return m.PicMaxUrl
}
- return ""
+ return nil
}
func (m *AIOcean) GetVideoUrl() string {
@@ -513,10 +513,11 @@
type TargetInfo struct {
TargetId string `protobuf:"bytes,1,opt,name=targetId,proto3" json:"targetId,omitempty"`
- TargetScore float32 `protobuf:"fixed32,2,opt,name=targetScore,proto3" json:"targetScore,omitempty"`
- Feature string `protobuf:"bytes,3,opt,name=feature,proto3" json:"feature,omitempty"`
- PicSmUrl string `protobuf:"bytes,4,opt,name=picSmUrl,proto3" json:"picSmUrl,omitempty"`
- TargetLocation *TargetLocation `protobuf:"bytes,5,opt,name=targetLocation,proto3" json:"targetLocation,omitempty"`
+ TargetType string `protobuf:"bytes,2,opt,name=targetType,proto3" json:"targetType,omitempty"`
+ TargetScore float64 `protobuf:"fixed64,3,opt,name=targetScore,proto3" json:"targetScore,omitempty"`
+ Feature string `protobuf:"bytes,4,opt,name=feature,proto3" json:"feature,omitempty"`
+ PicSmUrl string `protobuf:"bytes,5,opt,name=picSmUrl,proto3" json:"picSmUrl,omitempty"`
+ TargetLocation *TargetLocation `protobuf:"bytes,6,opt,name=targetLocation,proto3" json:"targetLocation,omitempty"`
}
func (m *TargetInfo) Reset() { *m = TargetInfo{} }
@@ -559,7 +560,14 @@
return ""
}
-func (m *TargetInfo) GetTargetScore() float32 {
+func (m *TargetInfo) GetTargetType() string {
+ if m != nil {
+ return m.TargetType
+ }
+ return ""
+}
+
+func (m *TargetInfo) GetTargetScore() float64 {
if m != nil {
return m.TargetScore
}
@@ -640,8 +648,8 @@
}
type Location struct {
- X float32 `protobuf:"fixed32,1,opt,name=x,proto3" json:"x,omitempty"`
- Y float32 `protobuf:"fixed32,2,opt,name=y,proto3" json:"y,omitempty"`
+ X float64 `protobuf:"fixed64,1,opt,name=x,proto3" json:"x,omitempty"`
+ Y float64 `protobuf:"fixed64,2,opt,name=y,proto3" json:"y,omitempty"`
}
func (m *Location) Reset() { *m = Location{} }
@@ -677,14 +685,14 @@
var xxx_messageInfo_Location proto.InternalMessageInfo
-func (m *Location) GetX() float32 {
+func (m *Location) GetX() float64 {
if m != nil {
return m.X
}
return 0
}
-func (m *Location) GetY() float32 {
+func (m *Location) GetY() float64 {
if m != nil {
return m.Y
}
@@ -778,7 +786,7 @@
type BaseInfo struct {
TableId string `protobuf:"bytes,1,opt,name=tableId,proto3" json:"tableId,omitempty"`
TableName string `protobuf:"bytes,2,opt,name=tableName,proto3" json:"tableName,omitempty"`
- CompareScore float32 `protobuf:"fixed32,3,opt,name=compareScore,proto3" json:"compareScore,omitempty"`
+ CompareScore float64 `protobuf:"fixed64,3,opt,name=compareScore,proto3" json:"compareScore,omitempty"`
BwType string `protobuf:"bytes,4,opt,name=bwType,proto3" json:"bwType,omitempty"`
TargetId string `protobuf:"bytes,5,opt,name=targetId,proto3" json:"targetId,omitempty"`
TargetName string `protobuf:"bytes,6,opt,name=targetName,proto3" json:"targetName,omitempty"`
@@ -835,7 +843,7 @@
return ""
}
-func (m *BaseInfo) GetCompareScore() float32 {
+func (m *BaseInfo) GetCompareScore() float64 {
if m != nil {
return m.CompareScore
}
@@ -904,59 +912,60 @@
func init() { proto.RegisterFile("aiocean.proto", fileDescriptor_e7fb370e860fe148) }
var fileDescriptor_e7fb370e860fe148 = []byte{
- // 829 bytes of a gzipped FileDescriptorProto
+ // 835 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x55, 0xcd, 0x6e, 0x23, 0x45,
- 0x10, 0xce, 0x38, 0xbb, 0xf6, 0xa4, 0x9c, 0x64, 0xa1, 0x59, 0x96, 0x66, 0x41, 0xa3, 0x68, 0x84,
- 0x50, 0x0e, 0x28, 0x87, 0x65, 0xc5, 0x19, 0x87, 0x70, 0xb0, 0x64, 0x7e, 0x34, 0x09, 0x0f, 0xd0,
- 0x9e, 0xa9, 0x38, 0x2d, 0xcf, 0x4c, 0x8f, 0x66, 0xda, 0xd9, 0xf8, 0x01, 0xb8, 0xf3, 0x30, 0x88,
- 0x03, 0x47, 0x4e, 0x1c, 0x73, 0xe4, 0x88, 0x92, 0x17, 0x41, 0x55, 0x3d, 0xbf, 0x86, 0x03, 0x0f,
- 0x90, 0x93, 0xfb, 0xfb, 0xaa, 0x5c, 0x55, 0x5d, 0x5d, 0x5f, 0x0d, 0x1c, 0x29, 0x6d, 0x62, 0x54,
- 0xf9, 0x59, 0x51, 0x1a, 0x6b, 0x84, 0xcf, 0x3f, 0x59, 0xb5, 0x0a, 0x7f, 0x1b, 0x03, 0x7c, 0x5b,
- 0x5d, 0x28, 0xab, 0xce, 0x55, 0x85, 0xe2, 0x18, 0x46, 0x3a, 0x91, 0xde, 0x89, 0x77, 0x7a, 0x10,
- 0x8d, 0x74, 0x22, 0x5e, 0x83, 0x1f, 0xab, 0x0c, 0x4b, 0x35, 0x4f, 0xe4, 0x88, 0xd9, 0x16, 0x8b,
- 0x00, 0xc0, 0x9d, 0xbf, 0x57, 0x19, 0xca, 0x7d, 0xb6, 0xf6, 0x98, 0xce, 0x3e, 0x4b, 0x92, 0x52,
- 0x3e, 0xeb, 0xdb, 0x89, 0x11, 0x9f, 0xc1, 0x91, 0xca, 0x55, 0xba, 0xbd, 0xc4, 0xf2, 0x16, 0xcb,
- 0x79, 0x22, 0x9f, 0xb3, 0xcb, 0x90, 0x14, 0xa7, 0xf0, 0xa2, 0x47, 0x70, 0xaa, 0x31, 0xfb, 0xed,
- 0xd2, 0xbb, 0xf1, 0x0a, 0x39, 0xf9, 0x77, 0xbc, 0x42, 0x7c, 0x0a, 0x07, 0x71, 0xba, 0xa9, 0x2c,
- 0x67, 0xf4, 0xd9, 0xa3, 0x23, 0xc4, 0x2b, 0x18, 0x5b, 0x55, 0xad, 0xe7, 0x89, 0x3c, 0x60, 0x53,
- 0x8d, 0xa8, 0x0f, 0x74, 0xe2, 0xf4, 0xe0, 0xfa, 0xd0, 0x60, 0x21, 0x61, 0x52, 0x25, 0xce, 0x34,
- 0x65, 0x53, 0x03, 0x29, 0x57, 0xa1, 0xe3, 0xef, 0xd4, 0xdd, 0x4f, 0x65, 0x2a, 0x0f, 0x5d, 0xae,
- 0x96, 0xa0, 0x98, 0xb7, 0x3a, 0x41, 0x43, 0xc6, 0x23, 0x17, 0xb3, 0xc1, 0x14, 0xb3, 0xd0, 0xf1,
- 0x85, 0xb2, 0x28, 0x8f, 0x5d, 0xcc, 0x1a, 0x8a, 0xb7, 0x00, 0x56, 0x95, 0x2b, 0xb4, 0xf3, 0xfc,
- 0xda, 0xc8, 0x17, 0x27, 0xfb, 0xa7, 0xd3, 0x37, 0x2f, 0xcf, 0x9a, 0xf7, 0x3c, 0xbb, 0x6a, 0x6d,
- 0x51, 0xcf, 0x4f, 0x9c, 0xc0, 0xd4, 0xd8, 0x1b, 0x2c, 0x17, 0x6a, 0x89, 0x69, 0x25, 0xdf, 0xe3,
- 0x98, 0x7d, 0x8a, 0x5e, 0xab, 0xba, 0x31, 0xef, 0x6a, 0x87, 0xf7, 0xdd, 0x6b, 0x75, 0x0c, 0x55,
- 0x9b, 0xea, 0x35, 0x72, 0x49, 0xc2, 0x55, 0xdb, 0x60, 0x71, 0x06, 0xfe, 0x52, 0x55, 0xc8, 0x15,
- 0x7d, 0xc0, 0x15, 0x89, 0xae, 0xa2, 0xf3, 0xda, 0x12, 0xb5, 0x3e, 0x74, 0x3b, 0x5d, 0xcd, 0x52,
- 0x55, 0x66, 0xf2, 0xe5, 0x89, 0x77, 0xea, 0x47, 0x0d, 0xa4, 0x2a, 0x74, 0x35, 0x8b, 0xd7, 0xce,
- 0xf8, 0x21, 0x1b, 0x7b, 0x0c, 0xdd, 0x5e, 0xd1, 0x21, 0xda, 0xa4, 0x58, 0xc9, 0x57, 0xbb, 0xb7,
- 0x9f, 0xb5, 0xb6, 0xa8, 0xe7, 0x47, 0xef, 0xa0, 0xab, 0x6f, 0x4c, 0x9a, 0x62, 0x6c, 0xe5, 0x47,
- 0x1c, 0xb4, 0x23, 0xe8, 0x66, 0xba, 0xba, 0xc0, 0x14, 0x2d, 0x4a, 0xc9, 0xc6, 0x16, 0x53, 0xa5,
- 0xb1, 0xc9, 0x2d, 0xe6, 0x56, 0x7e, 0xec, 0xde, 0xa1, 0x86, 0xe1, 0xcf, 0x13, 0x98, 0xcc, 0xe6,
- 0x3f, 0x90, 0xa8, 0x9e, 0x54, 0xf3, 0xa4, 0x9a, 0x27, 0xd5, 0xfc, 0x1f, 0xd5, 0x90, 0x25, 0xd5,
- 0xf9, 0xfa, 0x4a, 0xad, 0xe4, 0x6b, 0x67, 0xa9, 0xa1, 0xf8, 0x0a, 0xa6, 0xf5, 0x91, 0x1b, 0xf2,
- 0xc9, 0x6e, 0x91, 0xdd, 0x47, 0x2a, 0xea, 0x3b, 0x86, 0x7f, 0x78, 0x00, 0xdd, 0xf3, 0xb9, 0x91,
- 0x63, 0xd4, 0x08, 0xb2, 0xc5, 0xf4, 0x9c, 0xee, 0x7c, 0x19, 0x9b, 0x12, 0x59, 0x99, 0xa3, 0xa8,
- 0x4f, 0x51, 0x79, 0xd7, 0xa8, 0xec, 0xa6, 0x6c, 0x94, 0xd9, 0x40, 0x8a, 0x5b, 0xe8, 0xf8, 0x32,
- 0xa3, 0xb1, 0x73, 0xa2, 0x6c, 0xb1, 0xf8, 0x1a, 0x8e, 0x5d, 0x90, 0x85, 0x89, 0x95, 0xd5, 0x26,
- 0x67, 0x4d, 0x4e, 0xdf, 0xc8, 0xdd, 0x01, 0x6b, 0xec, 0xd1, 0x8e, 0x7f, 0x68, 0xe1, 0x78, 0xe8,
- 0x21, 0xbe, 0x80, 0x89, 0x35, 0xc5, 0x02, 0xaf, 0x2d, 0x5f, 0x63, 0x30, 0x1b, 0x6d, 0x98, 0xc6,
- 0x45, 0xbc, 0x85, 0xe9, 0xd2, 0x58, 0x6b, 0xb2, 0x48, 0xaf, 0x6e, 0x2c, 0xdf, 0xec, 0xbf, 0xff,
- 0xd1, 0x77, 0x0b, 0x3f, 0x07, 0xbf, 0xcd, 0x77, 0x08, 0xde, 0x1d, 0x67, 0x1a, 0x45, 0xde, 0x1d,
- 0xa1, 0x6d, 0xdd, 0x1f, 0x6f, 0x1b, 0xfe, 0xee, 0x01, 0x74, 0x33, 0x42, 0x4d, 0x5a, 0x95, 0x66,
- 0x53, 0xb4, 0x1d, 0x6e, 0x20, 0xcd, 0x21, 0xcf, 0xcf, 0x02, 0x6f, 0x31, 0xad, 0x37, 0x5f, 0x8f,
- 0xa1, 0x26, 0x96, 0x9b, 0x14, 0xaf, 0xf0, 0xce, 0xd6, 0xfd, 0x6d, 0xb1, 0x08, 0xe1, 0x30, 0xc1,
- 0x6b, 0xcc, 0x63, 0xbc, 0xb4, 0xa4, 0x96, 0x67, 0x3c, 0x53, 0x03, 0x8e, 0xf6, 0x8c, 0xae, 0x16,
- 0x3a, 0x5f, 0x73, 0x83, 0xfd, 0xa8, 0x46, 0x4e, 0x65, 0xf9, 0x9a, 0x07, 0x67, 0xdc, 0xa8, 0xcc,
- 0xe1, 0xf0, 0xd7, 0x11, 0xf8, 0xe7, 0x3d, 0x09, 0x59, 0xb5, 0x4c, 0xb1, 0x2b, 0xbd, 0x86, 0x34,
- 0xec, 0x7c, 0xe4, 0x85, 0xe4, 0x2a, 0xef, 0x08, 0x2a, 0x2e, 0x36, 0x59, 0xa1, 0x4a, 0x74, 0xa3,
- 0xb3, 0xcf, 0xad, 0x19, 0x70, 0x54, 0xdc, 0xf2, 0xdd, 0xd5, 0xb6, 0xc0, 0x7a, 0x3e, 0x6a, 0x34,
- 0x98, 0xc8, 0xe7, 0x3b, 0x13, 0x19, 0x34, 0x6b, 0xa9, 0xb7, 0xa1, 0x7b, 0x0c, 0xe5, 0x75, 0xe8,
- 0x47, 0x1d, 0xd3, 0xe4, 0xb9, 0xdd, 0x3c, 0xe0, 0xc8, 0x27, 0x33, 0xb9, 0xb6, 0xa6, 0x74, 0x6d,
- 0x77, 0xdb, 0x79, 0xc0, 0x51, 0x6d, 0xa9, 0x5b, 0x51, 0xf5, 0x82, 0x76, 0xa8, 0x2f, 0x54, 0x18,
- 0x08, 0xf5, 0x5c, 0xfe, 0xf9, 0x10, 0x78, 0xf7, 0x0f, 0x81, 0xf7, 0xf7, 0x43, 0xe0, 0xfd, 0xf2,
- 0x18, 0xec, 0xdd, 0x3f, 0x06, 0x7b, 0x7f, 0x3d, 0x06, 0x7b, 0xcb, 0x31, 0x4f, 0xd5, 0x97, 0xff,
- 0x04, 0x00, 0x00, 0xff, 0xff, 0x90, 0x68, 0x92, 0xe0, 0x53, 0x0a, 0x00, 0x00,
+ 0x10, 0xce, 0x24, 0xbb, 0xb6, 0x53, 0x4e, 0xb2, 0xd0, 0x2c, 0x4b, 0xb3, 0x20, 0xcb, 0x1a, 0x21,
+ 0x94, 0x03, 0xca, 0x61, 0x59, 0x71, 0xc6, 0x21, 0x1c, 0x2c, 0x99, 0x1f, 0x4d, 0xc2, 0x03, 0xb4,
+ 0x67, 0x2a, 0x4e, 0xcb, 0x33, 0xd3, 0xa3, 0x99, 0x76, 0x36, 0x79, 0x00, 0xee, 0x3c, 0x0c, 0xe2,
+ 0xc0, 0x13, 0x70, 0xcc, 0x91, 0x23, 0x72, 0x5e, 0x04, 0x55, 0xf5, 0xfc, 0xf4, 0x18, 0x90, 0x78,
+ 0x80, 0x9c, 0xdc, 0xdf, 0x57, 0xe5, 0xaa, 0xea, 0xae, 0xfa, 0x6a, 0xe0, 0x58, 0x69, 0x13, 0xa3,
+ 0xca, 0xcf, 0x8a, 0xd2, 0x58, 0x23, 0x46, 0xfc, 0x93, 0x55, 0xab, 0xf0, 0xb7, 0x01, 0xc0, 0xb7,
+ 0xd5, 0x85, 0xb2, 0xea, 0x5c, 0x55, 0x28, 0x4e, 0x60, 0x5f, 0x27, 0x32, 0x98, 0x06, 0xa7, 0x87,
+ 0xd1, 0xbe, 0x4e, 0xc4, 0x6b, 0x18, 0xc5, 0x2a, 0xc3, 0x52, 0xcd, 0x13, 0xb9, 0xcf, 0x6c, 0x8b,
+ 0xc5, 0x04, 0xc0, 0x9d, 0xbf, 0x57, 0x19, 0xca, 0x03, 0xb6, 0x7a, 0x4c, 0x67, 0x9f, 0x25, 0x49,
+ 0x29, 0x9f, 0xf9, 0x76, 0x62, 0xc4, 0x67, 0x70, 0xac, 0x72, 0x95, 0xde, 0x5f, 0x62, 0x79, 0x8b,
+ 0xe5, 0x3c, 0x91, 0xcf, 0xd9, 0xa5, 0x4f, 0x8a, 0x53, 0x78, 0xe1, 0x11, 0x9c, 0x6a, 0xc0, 0x7e,
+ 0xbb, 0xf4, 0x6e, 0xbc, 0x42, 0x0e, 0xff, 0x19, 0xaf, 0x10, 0x9f, 0xc2, 0x61, 0x9c, 0x6e, 0x2a,
+ 0xcb, 0x19, 0x47, 0xec, 0xd1, 0x11, 0xe2, 0x15, 0x0c, 0xac, 0xaa, 0xd6, 0xf3, 0x44, 0x1e, 0xb2,
+ 0xa9, 0x46, 0xf4, 0x0e, 0x74, 0xe2, 0xf4, 0xe0, 0xde, 0xa1, 0xc1, 0x42, 0xc2, 0xb0, 0x4a, 0x9c,
+ 0x69, 0xcc, 0xa6, 0x06, 0x52, 0xae, 0x42, 0xc7, 0xdf, 0xa9, 0xbb, 0x9f, 0xca, 0x54, 0x1e, 0x4d,
+ 0x0f, 0x28, 0x57, 0x4b, 0x50, 0xcc, 0x5b, 0x9d, 0xa0, 0x21, 0xe3, 0xb1, 0x8b, 0xd9, 0x60, 0x8a,
+ 0x59, 0xe8, 0xf8, 0x42, 0x59, 0x94, 0x27, 0x2e, 0x66, 0x0d, 0xc5, 0x5b, 0x00, 0xab, 0xca, 0x15,
+ 0xda, 0x79, 0x7e, 0x6d, 0xe4, 0x8b, 0xe9, 0xc1, 0xe9, 0xf8, 0xcd, 0xcb, 0xb3, 0xa6, 0x9f, 0x67,
+ 0x57, 0xad, 0x2d, 0xf2, 0xfc, 0xc4, 0x14, 0xc6, 0xc6, 0xde, 0x60, 0xb9, 0x50, 0x4b, 0x4c, 0x2b,
+ 0xf9, 0x1e, 0xc7, 0xf4, 0x29, 0xea, 0x56, 0x75, 0x63, 0xde, 0xd5, 0x0e, 0xef, 0xbb, 0x6e, 0x75,
+ 0x0c, 0x55, 0x9b, 0xea, 0x35, 0x72, 0x49, 0xc2, 0x55, 0xdb, 0x60, 0x71, 0x06, 0xa3, 0xa5, 0xaa,
+ 0x90, 0x2b, 0xfa, 0x80, 0x2b, 0x12, 0x5d, 0x45, 0xe7, 0xb5, 0x25, 0x6a, 0x7d, 0xe8, 0x76, 0xba,
+ 0x9a, 0xa5, 0xaa, 0xcc, 0xe4, 0xcb, 0x69, 0x70, 0x3a, 0x8a, 0x1a, 0x48, 0x55, 0xe8, 0x6a, 0x16,
+ 0xaf, 0x9d, 0xf1, 0x43, 0x36, 0x7a, 0x0c, 0xdd, 0x5e, 0xd1, 0x21, 0xda, 0xa4, 0x58, 0xc9, 0x57,
+ 0xbb, 0xb7, 0x9f, 0xb5, 0xb6, 0xc8, 0xf3, 0xa3, 0x3e, 0xe8, 0xea, 0x1b, 0x93, 0xa6, 0x18, 0x5b,
+ 0xf9, 0x11, 0x07, 0xed, 0x08, 0xba, 0x99, 0xae, 0x2e, 0x30, 0x45, 0x8b, 0x52, 0xb2, 0xb1, 0xc5,
+ 0x54, 0x69, 0x6c, 0x72, 0x8b, 0xb9, 0x95, 0x1f, 0xbb, 0x3e, 0xd4, 0x30, 0xfc, 0x79, 0x08, 0xc3,
+ 0xd9, 0xfc, 0x07, 0x12, 0xd5, 0x93, 0x6a, 0x9e, 0x54, 0xf3, 0xa4, 0x9a, 0xff, 0xa3, 0x1a, 0xb2,
+ 0xa4, 0x3a, 0x5f, 0x5f, 0xa9, 0x95, 0x7c, 0xed, 0x2c, 0x35, 0x14, 0x5f, 0xc1, 0xb8, 0x3e, 0xf2,
+ 0x83, 0x7c, 0xb2, 0x5b, 0x64, 0xf7, 0x91, 0x8a, 0x7c, 0xc7, 0x70, 0x1b, 0x00, 0x74, 0xed, 0x73,
+ 0x23, 0xc7, 0xa8, 0x11, 0x64, 0x8b, 0xe9, 0x99, 0xdc, 0xf9, 0xea, 0xbe, 0xc0, 0x5a, 0x98, 0x1e,
+ 0x43, 0xed, 0x76, 0xe8, 0x32, 0x36, 0xa5, 0xd3, 0x66, 0x10, 0xf9, 0x14, 0x95, 0x7f, 0x8d, 0xca,
+ 0x6e, 0x4a, 0xac, 0x95, 0xd9, 0x40, 0xca, 0x5b, 0xe8, 0xf8, 0x32, 0xa3, 0xb1, 0x74, 0x8a, 0x6c,
+ 0xb1, 0xf8, 0x1a, 0x4e, 0x5c, 0x90, 0x85, 0x89, 0x95, 0xd5, 0x26, 0x67, 0x2d, 0x8e, 0xdf, 0xc8,
+ 0xdd, 0x01, 0x6c, 0xec, 0xd1, 0x8e, 0x7f, 0x68, 0xe1, 0xa4, 0xef, 0x21, 0xbe, 0x80, 0xa1, 0x35,
+ 0xc5, 0x02, 0xaf, 0x2d, 0x5f, 0xb3, 0x37, 0x3b, 0x6d, 0x98, 0xc6, 0x45, 0xbc, 0x85, 0xf1, 0xd2,
+ 0x58, 0x6b, 0xb2, 0x48, 0xaf, 0x6e, 0x2c, 0x5f, 0xfd, 0xdf, 0xff, 0xe1, 0xbb, 0x85, 0x9f, 0xc3,
+ 0xa8, 0xcd, 0x77, 0x04, 0xc1, 0x1d, 0x67, 0x0a, 0xa2, 0xe0, 0x8e, 0xd0, 0x3d, 0x47, 0x09, 0xa2,
+ 0xe0, 0x3e, 0xfc, 0x3d, 0x00, 0xe8, 0x66, 0x88, 0x1e, 0x69, 0x55, 0x9a, 0x4d, 0xd1, 0x76, 0xa0,
+ 0x81, 0xd4, 0x00, 0x9e, 0xaf, 0x05, 0xde, 0x62, 0xda, 0x34, 0xa0, 0x63, 0xe8, 0x11, 0xcb, 0x4d,
+ 0x8a, 0x57, 0x78, 0x67, 0xeb, 0xcd, 0xd8, 0x62, 0x11, 0xc2, 0x51, 0x82, 0xd7, 0x98, 0xc7, 0x78,
+ 0x69, 0x49, 0x4d, 0xcf, 0x78, 0xe6, 0x7a, 0x1c, 0xed, 0x21, 0x5d, 0x2d, 0x74, 0xbe, 0xe6, 0x16,
+ 0x8c, 0xa2, 0x1a, 0x39, 0x15, 0xe6, 0x6b, 0x1e, 0xac, 0x41, 0xa3, 0x42, 0x87, 0xc3, 0x5f, 0xf7,
+ 0x61, 0x74, 0xee, 0x49, 0xcc, 0xaa, 0x65, 0x8a, 0x5d, 0xe9, 0x35, 0x24, 0x31, 0xf0, 0x91, 0x17,
+ 0x96, 0xab, 0xbc, 0x23, 0xa8, 0xb8, 0xd8, 0x64, 0x85, 0x2a, 0xd1, 0x1f, 0x9d, 0x1e, 0x47, 0xc5,
+ 0x2d, 0xdf, 0xf1, 0xe4, 0xb9, 0xd1, 0xa9, 0x51, 0x6f, 0x62, 0x9f, 0xff, 0xd7, 0xc4, 0x7a, 0x1b,
+ 0xdc, 0x63, 0x28, 0xaf, 0x43, 0x3f, 0xea, 0x98, 0x26, 0xcf, 0xed, 0xee, 0x1e, 0x47, 0x3e, 0x99,
+ 0xc9, 0xb5, 0x35, 0xa5, 0x7b, 0x76, 0xb7, 0xbd, 0x7b, 0x1c, 0xd5, 0x96, 0xba, 0x15, 0x56, 0x2f,
+ 0x70, 0x87, 0x7c, 0x21, 0x43, 0x4f, 0xc8, 0xe7, 0xf2, 0x8f, 0xed, 0x24, 0x78, 0xd8, 0x4e, 0x82,
+ 0xbf, 0xb6, 0x93, 0xe0, 0x97, 0xc7, 0xc9, 0xde, 0xc3, 0xe3, 0x64, 0xef, 0xcf, 0xc7, 0xc9, 0xde,
+ 0x72, 0xc0, 0x53, 0xf5, 0xe5, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x4e, 0x91, 0xae, 0xe0, 0x73,
+ 0x0a, 0x00, 0x00,
}
func (m *EsDataBase) Marshal() (dAtA []byte, err error) {
@@ -1041,10 +1050,19 @@
i += copy(dAtA[i:], m.SdkName)
}
if len(m.PicMaxUrl) > 0 {
- dAtA[i] = 0x62
- i++
- i = encodeVarintAiocean(dAtA, i, uint64(len(m.PicMaxUrl)))
- i += copy(dAtA[i:], m.PicMaxUrl)
+ for _, s := range m.PicMaxUrl {
+ dAtA[i] = 0x62
+ i++
+ l = len(s)
+ for l >= 1<<7 {
+ dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
+ l >>= 7
+ i++
+ }
+ dAtA[i] = uint8(l)
+ i++
+ i += copy(dAtA[i:], s)
+ }
}
if len(m.VideoUrl) > 0 {
dAtA[i] = 0x6a
@@ -1263,10 +1281,19 @@
i += copy(dAtA[i:], m.SdkName)
}
if len(m.PicMaxUrl) > 0 {
- dAtA[i] = 0x62
- i++
- i = encodeVarintAiocean(dAtA, i, uint64(len(m.PicMaxUrl)))
- i += copy(dAtA[i:], m.PicMaxUrl)
+ for _, s := range m.PicMaxUrl {
+ dAtA[i] = 0x62
+ i++
+ l = len(s)
+ for l >= 1<<7 {
+ dAtA[i] = uint8(uint64(l)&0x7f | 0x80)
+ l >>= 7
+ i++
+ }
+ dAtA[i] = uint8(l)
+ i++
+ i += copy(dAtA[i:], s)
+ }
}
if len(m.VideoUrl) > 0 {
dAtA[i] = 0x6a
@@ -1446,26 +1473,32 @@
i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetId)))
i += copy(dAtA[i:], m.TargetId)
}
- if m.TargetScore != 0 {
- dAtA[i] = 0x15
+ if len(m.TargetType) > 0 {
+ dAtA[i] = 0x12
i++
- encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.TargetScore))))
- i += 4
+ i = encodeVarintAiocean(dAtA, i, uint64(len(m.TargetType)))
+ i += copy(dAtA[i:], m.TargetType)
+ }
+ if m.TargetScore != 0 {
+ dAtA[i] = 0x19
+ i++
+ encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.TargetScore))))
+ i += 8
}
if len(m.Feature) > 0 {
- dAtA[i] = 0x1a
+ dAtA[i] = 0x22
i++
i = encodeVarintAiocean(dAtA, i, uint64(len(m.Feature)))
i += copy(dAtA[i:], m.Feature)
}
if len(m.PicSmUrl) > 0 {
- dAtA[i] = 0x22
+ dAtA[i] = 0x2a
i++
i = encodeVarintAiocean(dAtA, i, uint64(len(m.PicSmUrl)))
i += copy(dAtA[i:], m.PicSmUrl)
}
if m.TargetLocation != nil {
- dAtA[i] = 0x2a
+ dAtA[i] = 0x32
i++
i = encodeVarintAiocean(dAtA, i, uint64(m.TargetLocation.Size()))
n1, err1 := m.TargetLocation.MarshalTo(dAtA[i:])
@@ -1531,16 +1564,16 @@
var l int
_ = l
if m.X != 0 {
- dAtA[i] = 0xd
+ dAtA[i] = 0x9
i++
- encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.X))))
- i += 4
+ encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.X))))
+ i += 8
}
if m.Y != 0 {
- dAtA[i] = 0x15
+ dAtA[i] = 0x11
i++
- encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.Y))))
- i += 4
+ encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.Y))))
+ i += 8
}
return i, nil
}
@@ -1635,10 +1668,10 @@
i += copy(dAtA[i:], m.TableName)
}
if m.CompareScore != 0 {
- dAtA[i] = 0x1d
+ dAtA[i] = 0x19
i++
- encoding_binary.LittleEndian.PutUint32(dAtA[i:], uint32(math.Float32bits(float32(m.CompareScore))))
- i += 4
+ encoding_binary.LittleEndian.PutUint64(dAtA[i:], uint64(math.Float64bits(float64(m.CompareScore))))
+ i += 8
}
if len(m.BwType) > 0 {
dAtA[i] = 0x22
@@ -1744,9 +1777,11 @@
if l > 0 {
n += 1 + l + sovAiocean(uint64(l))
}
- l = len(m.PicMaxUrl)
- if l > 0 {
- n += 1 + l + sovAiocean(uint64(l))
+ if len(m.PicMaxUrl) > 0 {
+ for _, s := range m.PicMaxUrl {
+ l = len(s)
+ n += 1 + l + sovAiocean(uint64(l))
+ }
}
l = len(m.VideoUrl)
if l > 0 {
@@ -1855,9 +1890,11 @@
if l > 0 {
n += 1 + l + sovAiocean(uint64(l))
}
- l = len(m.PicMaxUrl)
- if l > 0 {
- n += 1 + l + sovAiocean(uint64(l))
+ if len(m.PicMaxUrl) > 0 {
+ for _, s := range m.PicMaxUrl {
+ l = len(s)
+ n += 1 + l + sovAiocean(uint64(l))
+ }
}
l = len(m.VideoUrl)
if l > 0 {
@@ -1936,8 +1973,12 @@
if l > 0 {
n += 1 + l + sovAiocean(uint64(l))
}
+ l = len(m.TargetType)
+ if l > 0 {
+ n += 1 + l + sovAiocean(uint64(l))
+ }
if m.TargetScore != 0 {
- n += 5
+ n += 9
}
l = len(m.Feature)
if l > 0 {
@@ -1978,10 +2019,10 @@
var l int
_ = l
if m.X != 0 {
- n += 5
+ n += 9
}
if m.Y != 0 {
- n += 5
+ n += 9
}
return n
}
@@ -2032,7 +2073,7 @@
n += 1 + l + sovAiocean(uint64(l))
}
if m.CompareScore != 0 {
- n += 5
+ n += 9
}
l = len(m.BwType)
if l > 0 {
@@ -2482,7 +2523,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.PicMaxUrl = string(dAtA[iNdEx:postIndex])
+ m.PicMaxUrl = append(m.PicMaxUrl, string(dAtA[iNdEx:postIndex]))
iNdEx = postIndex
case 13:
if wireType != 2 {
@@ -3293,7 +3334,7 @@
if postIndex > l {
return io.ErrUnexpectedEOF
}
- m.PicMaxUrl = string(dAtA[iNdEx:postIndex])
+ m.PicMaxUrl = append(m.PicMaxUrl, string(dAtA[iNdEx:postIndex]))
iNdEx = postIndex
case 13:
if wireType != 2 {
@@ -3821,17 +3862,49 @@
m.TargetId = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 2:
- if wireType != 5 {
- return fmt.Errorf("proto: wrong wireType = %d for field TargetScore", wireType)
+ if wireType != 2 {
+ return fmt.Errorf("proto: wrong wireType = %d for field TargetType", wireType)
}
- var v uint32
- if (iNdEx + 4) > l {
+ var stringLen uint64
+ for shift := uint(0); ; shift += 7 {
+ if shift >= 64 {
+ return ErrIntOverflowAiocean
+ }
+ if iNdEx >= l {
+ return io.ErrUnexpectedEOF
+ }
+ b := dAtA[iNdEx]
+ iNdEx++
+ stringLen |= uint64(b&0x7F) << shift
+ if b < 0x80 {
+ break
+ }
+ }
+ intStringLen := int(stringLen)
+ if intStringLen < 0 {
+ return ErrInvalidLengthAiocean
+ }
+ postIndex := iNdEx + intStringLen
+ if postIndex < 0 {
+ return ErrInvalidLengthAiocean
+ }
+ if postIndex > l {
return io.ErrUnexpectedEOF
}
- v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
- iNdEx += 4
- m.TargetScore = float32(math.Float32frombits(v))
+ m.TargetType = string(dAtA[iNdEx:postIndex])
+ iNdEx = postIndex
case 3:
+ if wireType != 1 {
+ return fmt.Errorf("proto: wrong wireType = %d for field TargetScore", wireType)
+ }
+ var v uint64
+ if (iNdEx + 8) > l {
+ return io.ErrUnexpectedEOF
+ }
+ v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:]))
+ iNdEx += 8
+ m.TargetScore = float64(math.Float64frombits(v))
+ case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field Feature", wireType)
}
@@ -3863,7 +3936,7 @@
}
m.Feature = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 4:
+ case 5:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field PicSmUrl", wireType)
}
@@ -3895,7 +3968,7 @@
}
m.PicSmUrl = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
- case 5:
+ case 6:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field TargetLocation", wireType)
}
@@ -4110,27 +4183,27 @@
}
switch fieldNum {
case 1:
- if wireType != 5 {
+ if wireType != 1 {
return fmt.Errorf("proto: wrong wireType = %d for field X", wireType)
}
- var v uint32
- if (iNdEx + 4) > l {
+ var v uint64
+ if (iNdEx + 8) > l {
return io.ErrUnexpectedEOF
}
- v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
- iNdEx += 4
- m.X = float32(math.Float32frombits(v))
+ v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:]))
+ iNdEx += 8
+ m.X = float64(math.Float64frombits(v))
case 2:
- if wireType != 5 {
+ if wireType != 1 {
return fmt.Errorf("proto: wrong wireType = %d for field Y", wireType)
}
- var v uint32
- if (iNdEx + 4) > l {
+ var v uint64
+ if (iNdEx + 8) > l {
return io.ErrUnexpectedEOF
}
- v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
- iNdEx += 4
- m.Y = float32(math.Float32frombits(v))
+ v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:]))
+ iNdEx += 8
+ m.Y = float64(math.Float64frombits(v))
default:
iNdEx = preIndex
skippy, err := skipAiocean(dAtA[iNdEx:])
@@ -4470,16 +4543,16 @@
m.TableName = string(dAtA[iNdEx:postIndex])
iNdEx = postIndex
case 3:
- if wireType != 5 {
+ if wireType != 1 {
return fmt.Errorf("proto: wrong wireType = %d for field CompareScore", wireType)
}
- var v uint32
- if (iNdEx + 4) > l {
+ var v uint64
+ if (iNdEx + 8) > l {
return io.ErrUnexpectedEOF
}
- v = uint32(encoding_binary.LittleEndian.Uint32(dAtA[iNdEx:]))
- iNdEx += 4
- m.CompareScore = float32(math.Float32frombits(v))
+ v = uint64(encoding_binary.LittleEndian.Uint64(dAtA[iNdEx:]))
+ iNdEx += 8
+ m.CompareScore = float64(math.Float64frombits(v))
case 4:
if wireType != 2 {
return fmt.Errorf("proto: wrong wireType = %d for field BwType", wireType)
--
Gitblit v1.8.0