fiee/fonchain-fiee
10
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

解决冲突

Browse Source
This commit is contained in:
JNG 2026-01-12 18:19:21 +08:00
parent 44dd68fd84
commit e295a58a43
1 changed files with 68 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
api/bundle/bundle.pb.go
View File

@ -14576,14 +14576,18 @@ type MetricsArtistAccountExportItem struct {
DmAccount string `protobuf:"bytes,3,opt,name=dmAccount,proto3" json:"dmAccount"`
DmNickname string `protobuf:"bytes,4,opt,name=dmNickname,proto3" json:"dmNickname"`
DmAuthStatus int32 `protobuf:"varint,5,opt,name=dmAuthStatus,proto3" json:"dmAuthStatus"`
// string youtubeAccount = 3; 现在没有YouTube了
// string youtubeNickname = 4;
InstagramAccount string `protobuf:"bytes,6,opt,name=instagramAccount,proto3" json:"instagramAccount"`
InstagramNickname string `protobuf:"bytes,7,opt,name=instagramNickname,proto3" json:"instagramNickname"`
InsAuthStatus int32 `protobuf:"varint,8,opt,name=insAuthStatus,proto3" json:"insAuthStatus"`
TiktokAccount string `protobuf:"bytes,9,opt,name=tiktokAccount,proto3" json:"tiktokAccount"`
TiktokNickname string `protobuf:"bytes,10,opt,name=tiktokNickname,proto3" json:"tiktokNickname"`
TiktokAuthStatus int32 `protobuf:"varint,11,opt,name=tiktokAuthStatus,proto3" json:"tiktokAuthStatus"`
YoutubeAccount string `protobuf:"bytes,12,opt,name=youtubeAccount,proto3" json:"youtubeAccount"`
YoutubeNickname string `protobuf:"bytes,13,opt,name=youtubeNickname,proto3" json:"youtubeNickname"`
YoutubeAuthStatus int32 `protobuf:"varint,14,opt,name=youtubeAuthStatus,proto3" json:"youtubeAuthStatus"`
BlueskyAccount string `protobuf:"bytes,15,opt,name=blueskyAccount,proto3" json:"blueskyAccount"`
BlueskyNickname string `protobuf:"bytes,16,opt,name=blueskyNickname,proto3" json:"blueskyNickname"`
BlueskyAuthStatus int32 `protobuf:"varint,17,opt,name=blueskyAuthStatus,proto3" json:"blueskyAuthStatus"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -14695,6 +14699,48 @@ func (x *MetricsArtistAccountExportItem) GetTiktokAuthStatus() int32 {
return 0
}
func (x *MetricsArtistAccountExportItem) GetYoutubeAccount() string {
if x != nil {
return x.YoutubeAccount
}
return ""
}
func (x *MetricsArtistAccountExportItem) GetYoutubeNickname() string {
if x != nil {
return x.YoutubeNickname
}
return ""
}
func (x *MetricsArtistAccountExportItem) GetYoutubeAuthStatus() int32 {
if x != nil {
return x.YoutubeAuthStatus
}
return 0
}
func (x *MetricsArtistAccountExportItem) GetBlueskyAccount() string {
if x != nil {
return x.BlueskyAccount
}
return ""
}
func (x *MetricsArtistAccountExportItem) GetBlueskyNickname() string {
if x != nil {
return x.BlueskyNickname
}
return ""
}
func (x *MetricsArtistAccountExportItem) GetBlueskyAuthStatus() int32 {
if x != nil {
return x.BlueskyAuthStatus
}
return 0
}
type MetricsVideoSubmitExportReq struct {
state protoimpl.MessageState `protogen:"open.v1"`
Month string `protobuf:"bytes,1,opt,name=month,proto3" json:"month"`
@ -16385,7 +16431,7 @@ const file_pb_bundle_proto_rawDesc = "" +
"\x1dMetricsArtistAccountExportReq\x12\x14\n" +
"\x05month\x18\x01 \x01(\tR\x05month\"\\\n" +
"\x1eMetricsArtistAccountExportResp\x12:\n" +
"\x04data\x18\x01 \x03(\v2&.bundle.MetricsArtistAccountExportItemR\x04data\"\xb6\x03\n" +
"\x04data\x18\x01 \x03(\v2&.bundle.MetricsArtistAccountExportItemR\x04data\"\xb6\x05\n" +
"\x1eMetricsArtistAccountExportItem\x12\x1e\n" +
"\n" +
"artistName\x18\x01 \x01(\tR\n" +
@ -16402,7 +16448,13 @@ const file_pb_bundle_proto_rawDesc = "" +
"\rtiktokAccount\x18\t \x01(\tR\rtiktokAccount\x12&\n" +
"\x0etiktokNickname\x18\n" +
" \x01(\tR\x0etiktokNickname\x12*\n" +
"\x10tiktokAuthStatus\x18\v \x01(\x05R\x10tiktokAuthStatus\"3\n" +
"\x10tiktokAuthStatus\x18\v \x01(\x05R\x10tiktokAuthStatus\x12&\n" +
"\x0eyoutubeAccount\x18\f \x01(\tR\x0eyoutubeAccount\x12(\n" +
"\x0fyoutubeNickname\x18\r \x01(\tR\x0fyoutubeNickname\x12,\n" +
"\x11youtubeAuthStatus\x18\x0e \x01(\x05R\x11youtubeAuthStatus\x12&\n" +
"\x0eblueskyAccount\x18\x0f \x01(\tR\x0eblueskyAccount\x12(\n" +
"\x0fblueskyNickname\x18\x10 \x01(\tR\x0fblueskyNickname\x12,\n" +
"\x11blueskyAuthStatus\x18\x11 \x01(\x05R\x11blueskyAuthStatus\"3\n" +
"\x1bMetricsVideoSubmitExportReq\x12\x14\n" +
"\x05month\x18\x01 \x01(\tR\x05month\"X\n" +
"\x1cMetricsVideoSubmitExportResp\x128\n" +