Updata：解决冲突

api/bundle/bundle.pb.go

@@ -15347,14 +15347,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"`
 }
 
 func (x *MetricsArtistAccountExportItem) Reset() {
@@ -15466,6 +15470,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
 	sizeCache     protoimpl.SizeCache
@@ -18972,7 +19018,7 @@ var file_pb_bundle_proto_rawDesc = []byte{
 	0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x26, 0x2e, 0x62, 0x75, 0x6e, 0x64, 0x6c, 0x65, 0x2e,
 	0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73, 0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x41, 0x63, 0x63,
 	0x6f, 0x75, 0x6e, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x04,
-	0x64, 0x61, 0x74, 0x61, 0x22, 0xb6, 0x03, 0x0a, 0x1e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73,
+	0x64, 0x61, 0x74, 0x61, 0x22, 0xb6, 0x05, 0x0a, 0x1e, 0x4d, 0x65, 0x74, 0x72, 0x69, 0x63, 0x73,
 	0x41, 0x72, 0x74, 0x69, 0x73, 0x74, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x45, 0x78, 0x70,
 	0x6f, 0x72, 0x74, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x1e, 0x0a, 0x0a, 0x61, 0x72, 0x74, 0x69, 0x73,
 	0x74, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0a, 0x61, 0x72, 0x74,
@@ -18999,7 +19045,23 @@ var file_pb_bundle_proto_rawDesc = []byte{
 	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, 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, 0x0a,
+	0x74, 0x6f, 0x6b, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x26, 0x0a,
+	0x0e, 0x79, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x65, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
+	0x0c, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x79, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x65, 0x41, 0x63,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x28, 0x0a, 0x0f, 0x79, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x65,
+	0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f,
+	0x79, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x65, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x2c, 0x0a, 0x11, 0x79, 0x6f, 0x75, 0x74, 0x75, 0x62, 0x65, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x79, 0x6f, 0x75, 0x74,
+	0x75, 0x62, 0x65, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x12, 0x26, 0x0a,
+	0x0e, 0x62, 0x6c, 0x75, 0x65, 0x73, 0x6b, 0x79, 0x41, 0x63, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18,
+	0x0f, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0e, 0x62, 0x6c, 0x75, 0x65, 0x73, 0x6b, 0x79, 0x41, 0x63,
+	0x63, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x28, 0x0a, 0x0f, 0x62, 0x6c, 0x75, 0x65, 0x73, 0x6b, 0x79,
+	0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x18, 0x10, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0f,
+	0x62, 0x6c, 0x75, 0x65, 0x73, 0x6b, 0x79, 0x4e, 0x69, 0x63, 0x6b, 0x6e, 0x61, 0x6d, 0x65, 0x12,
+	0x2c, 0x0a, 0x11, 0x62, 0x6c, 0x75, 0x65, 0x73, 0x6b, 0x79, 0x41, 0x75, 0x74, 0x68, 0x53, 0x74,
+	0x61, 0x74, 0x75, 0x73, 0x18, 0x11, 0x20, 0x01, 0x28, 0x05, 0x52, 0x11, 0x62, 0x6c, 0x75, 0x65,
+	0x73, 0x6b, 0x79, 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, 0x62,
 	0x6d, 0x69, 0x74, 0x45, 0x78, 0x70, 0x6f, 0x72, 0x74, 0x52, 0x65, 0x71, 0x12, 0x14, 0x0a, 0x05,
 	0x6d, 0x6f, 0x6e, 0x74, 0x68, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x6d, 0x6f, 0x6e,

pkg/service/bundle/bundleMetrics.go

@@ -171,7 +171,7 @@ func MetricsArtistAccountExport(ctx *gin.Context) {
 	utils.CheckDirPath("./runtime/"+fmt.Sprint(userInfo.ID), true)
 	sheet := "Sheet1"
 	f := excelize.NewFile()
-	headers := []string{"序号", "艺人", "用户编号", "DM账号名", "DM账号状态", "Instagram账号名", "Instagram账号状态", "TikTok账号名", "TikTok账号状态"}
+	headers := []string{"序号", "艺人", "用户编号", "DM账号名", "DM账号状态", "Instagram账号名", "Instagram账号状态", "TikTok账号名", "TikTok账号状态", "Bluesky账号名", "Bluesky账号状态", "Youtube账号名", "Youtube账号状态"}
 	for i, h := range headers {
 		col, _ := excelize.ColumnNumberToName(i + 1)
 		cell := col + "1"
@@ -206,6 +206,10 @@ func MetricsArtistAccountExport(ctx *gin.Context) {
 		_ = write(7, authStatus[it.InsAuthStatus])
 		_ = write(8, it.TiktokNickname)
 		_ = write(9, authStatus[it.TiktokAuthStatus])
+		_ = write(10, it.BlueskyNickname)
+		_ = write(11, authStatus[it.BlueskyAuthStatus])
+		_ = write(12, it.YoutubeNickname)
+		_ = write(13, authStatus[it.YoutubeAuthStatus])
 	}
 	// 可选：设置列宽，使表格更美观
 	_ = f.SetColWidth(sheet, "A", "AZ", 18)