fiee/micro-bundle
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updata：解决冲突

Browse Source
This commit is contained in:
jiaji.H 2025-12-25 15:52:51 +08:00
commit a526c9e837
2 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pb/bundle.proto
View File

@ -1748,15 +1748,15 @@ message MetricsArtistAccountExportItem{
string userNum = 2; string userNum = 2;
string dmAccount = 3; string dmAccount = 3;
string dmNickname = 4; string dmNickname = 4;
string dmAuthStatus = 5; int32 dmAuthStatus = 5;
// string youtubeAccount = 3; 现在没有YouTube了 // string youtubeAccount = 3; 现在没有YouTube了
// string youtubeNickname = 4; // string youtubeNickname = 4;
string instagramAccount = 6; string instagramAccount = 6;
string instagramNickname = 7; string instagramNickname = 7;
string insAuthStatus = 8; int32 insAuthStatus = 8;
string tiktokAccount = 9; string tiktokAccount = 9;
string tiktokNickname = 10; string tiktokNickname = 10;
string tiktokAuthStatus = 11; int32 tiktokAuthStatus = 11;
} }

24
pb/bundle/bundle.pb.go
View File

@ -14777,15 +14777,15 @@ type MetricsArtistAccountExportItem struct {
UserNum string `protobuf:"bytes,2,opt,name=userNum,proto3" json:"userNum"` UserNum string `protobuf:"bytes,2,opt,name=userNum,proto3" json:"userNum"`
DmAccount string `protobuf:"bytes,3,opt,name=dmAccount,proto3" json:"dmAccount"` DmAccount string `protobuf:"bytes,3,opt,name=dmAccount,proto3" json:"dmAccount"`
DmNickname string `protobuf:"bytes,4,opt,name=dmNickname,proto3" json:"dmNickname"` DmNickname string `protobuf:"bytes,4,opt,name=dmNickname,proto3" json:"dmNickname"`
DmAuthStatus string `protobuf:"bytes,5,opt,name=dmAuthStatus,proto3" json:"dmAuthStatus"` DmAuthStatus int32 `protobuf:"varint,5,opt,name=dmAuthStatus,proto3" json:"dmAuthStatus"`
// string youtubeAccount = 3; 现在没有YouTube了 // string youtubeAccount = 3; 现在没有YouTube了
// string youtubeNickname = 4; // string youtubeNickname = 4;
InstagramAccount string `protobuf:"bytes,6,opt,name=instagramAccount,proto3" json:"instagramAccount"` InstagramAccount string `protobuf:"bytes,6,opt,name=instagramAccount,proto3" json:"instagramAccount"`
InstagramNickname string `protobuf:"bytes,7,opt,name=instagramNickname,proto3" json:"instagramNickname"` InstagramNickname string `protobuf:"bytes,7,opt,name=instagramNickname,proto3" json:"instagramNickname"`
InsAuthStatus string `protobuf:"bytes,8,opt,name=insAuthStatus,proto3" json:"insAuthStatus"` InsAuthStatus int32 `protobuf:"varint,8,opt,name=insAuthStatus,proto3" json:"insAuthStatus"`
TiktokAccount string `protobuf:"bytes,9,opt,name=tiktokAccount,proto3" json:"tiktokAccount"` TiktokAccount string `protobuf:"bytes,9,opt,name=tiktokAccount,proto3" json:"tiktokAccount"`
TiktokNickname string `protobuf:"bytes,10,opt,name=tiktokNickname,proto3" json:"tiktokNickname"` TiktokNickname string `protobuf:"bytes,10,opt,name=tiktokNickname,proto3" json:"tiktokNickname"`
TiktokAuthStatus string `protobuf:"bytes,11,opt,name=tiktokAuthStatus,proto3" json:"tiktokAuthStatus"` TiktokAuthStatus int32 `protobuf:"varint,11,opt,name=tiktokAuthStatus,proto3" json:"tiktokAuthStatus"`
} }
func (x *MetricsArtistAccountExportItem) Reset() { func (x *MetricsArtistAccountExportItem) Reset() {
@ -14848,11 +14848,11 @@ func (x *MetricsArtistAccountExportItem) GetDmNickname() string {
return "" return ""
} }
func (x *MetricsArtistAccountExportItem) GetDmAuthStatus() string { func (x *MetricsArtistAccountExportItem) GetDmAuthStatus() int32 {
if x != nil { if x != nil {
return x.DmAuthStatus return x.DmAuthStatus
} }
return "" return 0
} }
func (x *MetricsArtistAccountExportItem) GetInstagramAccount() string { func (x *MetricsArtistAccountExportItem) GetInstagramAccount() string {
@ -14869,11 +14869,11 @@ func (x *MetricsArtistAccountExportItem) GetInstagramNickname() string {
return "" return ""
} }
func (x *MetricsArtistAccountExportItem) GetInsAuthStatus() string { func (x *MetricsArtistAccountExportItem) GetInsAuthStatus() int32 {
if x != nil { if x != nil {
return x.InsAuthStatus return x.InsAuthStatus
} }
return "" return 0
} }
func (x *MetricsArtistAccountExportItem) GetTiktokAccount() string { func (x *MetricsArtistAccountExportItem) GetTiktokAccount() string {
@ -14890,11 +14890,11 @@ func (x *MetricsArtistAccountExportItem) GetTiktokNickname() string {
return "" return ""
} }
func (x *MetricsArtistAccountExportItem) GetTiktokAuthStatus() string { func (x *MetricsArtistAccountExportItem) GetTiktokAuthStatus() int32 {
if x != nil { if x != nil {
return x.TiktokAuthStatus return x.TiktokAuthStatus
} }
return "" return 0
} }
type MetricsVideoSubmitExportReq struct { type MetricsVideoSubmitExportReq struct {
@ -18176,7 +18176,7 @@ var file_pb_bundle_proto_rawDesc = []byte{
0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x6d, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04, 0x12, 0x1e, 0x0a, 0x0a, 0x64, 0x6d, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x04,
0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x6d, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x64, 0x6d, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65,
0x12, 0x22, 0x0a, 0x0c, 0x64, 0x6d, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x64, 0x6d, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73,
0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0c, 0x64, 0x6d, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x64, 0x6d, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74,
0x61, 0x74, 0x75, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x67, 0x72, 0x61, 0x61, 0x74, 0x75, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x67, 0x72, 0x61,
0x6d, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x6d, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x06, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10,
0x69, 0x6e, 0x73, 0x74, 0x61, 0x67, 0x72, 0x61, 0x6d, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x69, 0x6e, 0x73, 0x74, 0x61, 0x67, 0x72, 0x61, 0x6d, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74,
@ -18184,14 +18184,14 @@ var file_pb_bundle_proto_rawDesc = []byte{
0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x69, 0x6e, 0x73, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x69, 0x6e, 0x73,
0x74, 0x61, 0x67, 0x72, 0x61, 0x6d, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x24, 0x74, 0x61, 0x67, 0x72, 0x61, 0x6d, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12, 0x24,
0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x0a, 0x0d, 0x69, 0x6e, 0x73, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18,
0x08, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x69, 0x6e, 0x73, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0d, 0x69, 0x6e, 0x73, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74,
0x61, 0x74, 0x75, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x74, 0x69, 0x6b, 0x74, 0x6f, 0x6b, 0x41, 0x63, 0x61, 0x74, 0x75, 0x73, 0x12, 0x24, 0x0a, 0x0d, 0x74, 0x69, 0x6b, 0x74, 0x6f, 0x6b, 0x41, 0x63,
0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x69, 0x6b, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x74, 0x69, 0x6b,
0x74, 0x6f, 0x6b, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x74, 0x69, 0x74, 0x6f, 0x6b, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x26, 0x0a, 0x0e, 0x74, 0x69,
0x6b, 0x74, 0x6f, 0x6b, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x6b, 0x74, 0x6f, 0x6b, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01,
0x28, 0x09, 0x52, 0x0e, 0x74, 0x69, 0x6b, 0x74, 0x6f, 0x6b, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x28, 0x09, 0x52, 0x0e, 0x74, 0x69, 0x6b, 0x74, 0x6f, 0x6b, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61,
0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x74, 0x69, 0x6b, 0x74, 0x6f, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x6d, 0x65, 0x12, 0x2a, 0x0a, 0x10, 0x74, 0x69, 0x6b, 0x74, 0x6f, 0x6b, 0x41, 0x75, 0x74, 0x68,
0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x09, 0x52, 0x10, 0x74, 0x69, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x10, 0x74, 0x69,
0x6b, 0x74, 0x6f, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x33, 0x6b, 0x74, 0x6f, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x22, 0x33,
0x0a, 0x1b, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x64, 0x65, 0x6f, 0x53, 0x75, 0x0a, 0x1b, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x56, 0x69, 0x64, 0x65, 0x6f, 0x53, 0x75,
0x62, 0x6d, 0x69, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x62, 0x6d, 0x69, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a,