Merge branch 'feature-four-daiyb' into dev

api/cast/cast.pb.go

@@ -346,55 +346,55 @@ func (ConfirmFailENUM) EnumDescriptor() ([]byte, []int) {
 	return file_pb_fiee_cast_proto_rawDescGZIP(), []int{5}
 }
 
-type RePublishTypeENUM int32
+type PublishSourceENUM int32
 
 const (
-	RePublishTypeENUM_RePublishType_UNKNOW          RePublishTypeENUM = 0 // 手动
-	RePublishTypeENUM_RePublishType_SCHEDULED_RETRY RePublishTypeENUM = 1 // 定时任务补发
-	RePublishTypeENUM_RePublishType_SCHEDULED       RePublishTypeENUM = 2 // 定时任务
-	RePublishTypeENUM_RePublishType_MANUAL          RePublishTypeENUM = 3 // 手动
+	PublishSourceENUM_RePublishType_UNKNOW          PublishSourceENUM = 0 // 未知
+	PublishSourceENUM_RePublishType_MANUAL          PublishSourceENUM = 1 // 手动
+	PublishSourceENUM_RePublishType_SCHEDULED       PublishSourceENUM = 2 // 定时任务
+	PublishSourceENUM_RePublishType_SCHEDULED_RETRY PublishSourceENUM = 3 // 定时任务补发
 )
 
-// Enum value maps for RePublishTypeENUM.
+// Enum value maps for PublishSourceENUM.
 var (
-	RePublishTypeENUM_name = map[int32]string{
+	PublishSourceENUM_name = map[int32]string{
 		0: "RePublishType_UNKNOW",
-		1: "RePublishType_SCHEDULED_RETRY",
+		1: "RePublishType_MANUAL",
 		2: "RePublishType_SCHEDULED",
-		3: "RePublishType_MANUAL",
+		3: "RePublishType_SCHEDULED_RETRY",
 	}
-	RePublishTypeENUM_value = map[string]int32{
+	PublishSourceENUM_value = map[string]int32{
 		"RePublishType_UNKNOW":          0,
-		"RePublishType_SCHEDULED_RETRY": 1,
+		"RePublishType_MANUAL":          1,
 		"RePublishType_SCHEDULED":       2,
-		"RePublishType_MANUAL":          3,
+		"RePublishType_SCHEDULED_RETRY": 3,
 	}
 )
 
-func (x RePublishTypeENUM) Enum() *RePublishTypeENUM {
-	p := new(RePublishTypeENUM)
+func (x PublishSourceENUM) Enum() *PublishSourceENUM {
+	p := new(PublishSourceENUM)
 	*p = x
 	return p
 }
 
-func (x RePublishTypeENUM) String() string {
+func (x PublishSourceENUM) String() string {
 	return protoimpl.X.EnumStringOf(x.Descriptor(), protoreflect.EnumNumber(x))
 }
 
-func (RePublishTypeENUM) Descriptor() protoreflect.EnumDescriptor {
+func (PublishSourceENUM) Descriptor() protoreflect.EnumDescriptor {
 	return file_pb_fiee_cast_proto_enumTypes[6].Descriptor()
 }
 
-func (RePublishTypeENUM) Type() protoreflect.EnumType {
+func (PublishSourceENUM) Type() protoreflect.EnumType {
 	return &file_pb_fiee_cast_proto_enumTypes[6]
 }
 
-func (x RePublishTypeENUM) Number() protoreflect.EnumNumber {
+func (x PublishSourceENUM) Number() protoreflect.EnumNumber {
 	return protoreflect.EnumNumber(x)
 }
 
-// Deprecated: Use RePublishTypeENUM.Descriptor instead.
-func (RePublishTypeENUM) EnumDescriptor() ([]byte, []int) {
+// Deprecated: Use PublishSourceENUM.Descriptor instead.
+func (PublishSourceENUM) EnumDescriptor() ([]byte, []int) {
 	return file_pb_fiee_cast_proto_rawDescGZIP(), []int{6}
 }
 
@@ -3110,7 +3110,7 @@ func (x *MediaWorksResp) GetData() []*MediaWorksResp_Info {
 type PublishReq struct {
 	state         protoimpl.MessageState `protogen:"open.v1"`
 	WorkUuids     []string               `protobuf:"bytes,1,rep,name=workUuids,proto3" json:"workUuids"`
-	RePublishType RePublishTypeENUM      `protobuf:"varint,4,opt,name=rePublishType,proto3,enum=Cast.RePublishTypeENUM" json:"rePublishType"`
+	PublishSource PublishSourceENUM      `protobuf:"varint,4,opt,name=publishSource,proto3,enum=Cast.PublishSourceENUM" json:"publishSource"`
 	unknownFields protoimpl.UnknownFields
 	sizeCache     protoimpl.SizeCache
 }
@@ -3152,11 +3152,11 @@ func (x *PublishReq) GetWorkUuids() []string {
 	return nil
 }
 
-func (x *PublishReq) GetRePublishType() RePublishTypeENUM {
+func (x *PublishReq) GetPublishSource() PublishSourceENUM {
 	if x != nil {
-		return x.RePublishType
+		return x.PublishSource
 	}
-	return RePublishTypeENUM_RePublishType_UNKNOW
+	return PublishSourceENUM_RePublishType_UNKNOW
 }
 
 type PublishResp struct {
@@ -3208,7 +3208,7 @@ type RePublishReq struct {
 	WorkUuids         []string               `protobuf:"bytes,1,rep,name=workUuids,proto3" json:"workUuids"`
 	MediaAccountUuids []string               `protobuf:"bytes,2,rep,name=mediaAccountUuids,proto3" json:"mediaAccountUuids"`
 	PlatformIDs       []PlatformIDENUM       `protobuf:"varint,3,rep,packed,name=platformIDs,proto3,enum=Cast.PlatformIDENUM" json:"platformIDs"`
-	RePublishType     RePublishTypeENUM      `protobuf:"varint,4,opt,name=rePublishType,proto3,enum=Cast.RePublishTypeENUM" json:"rePublishType"`
+	PublishSource     PublishSourceENUM      `protobuf:"varint,4,opt,name=publishSource,proto3,enum=Cast.PublishSourceENUM" json:"publishSource"`
 	unknownFields     protoimpl.UnknownFields
 	sizeCache         protoimpl.SizeCache
 }
@@ -3264,11 +3264,11 @@ func (x *RePublishReq) GetPlatformIDs() []PlatformIDENUM {
 	return nil
 }
 
-func (x *RePublishReq) GetRePublishType() RePublishTypeENUM {
+func (x *RePublishReq) GetPublishSource() PublishSourceENUM {
 	if x != nil {
-		return x.RePublishType
+		return x.PublishSource
 	}
-	return RePublishTypeENUM_RePublishType_UNKNOW
+	return PublishSourceENUM_RePublishType_UNKNOW
 }
 
 type RePublishResp struct {
@@ -17731,7 +17731,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\n" +
 	"PublishReq\x12\x1c\n" +
 	"\tworkUuids\x18\x01 \x03(\tR\tworkUuids\x12=\n" +
-	"\rrePublishType\x18\x04 \x01(\x0e2\x17.Cast.RePublishTypeENUMR\rrePublishType\"\x85\x01\n" +
+	"\rpublishSource\x18\x04 \x01(\x0e2\x17.Cast.PublishSourceENUMR\rpublishSource\"\x85\x01\n" +
 	"\vPublishResp\x12*\n" +
 	"\x04data\x18\x01 \x03(\v2\x16.Cast.PublishResp.InfoR\x04data\x1aJ\n" +
 	"\x04Info\x12\x1e\n" +
@@ -17743,7 +17743,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\tworkUuids\x18\x01 \x03(\tR\tworkUuids\x12,\n" +
 	"\x11mediaAccountUuids\x18\x02 \x03(\tR\x11mediaAccountUuids\x126\n" +
 	"\vplatformIDs\x18\x03 \x03(\x0e2\x14.Cast.PlatformIDENUMR\vplatformIDs\x12=\n" +
-	"\rrePublishType\x18\x04 \x01(\x0e2\x17.Cast.RePublishTypeENUMR\rrePublishType\"M\n" +
+	"\rpublishSource\x18\x04 \x01(\x0e2\x17.Cast.PublishSourceENUMR\rpublishSource\"M\n" +
 	"\rRePublishResp\x12\x1e\n" +
 	"\n" +
 	"artistUuid\x18\x01 \x01(\tR\n" +
@@ -19271,11 +19271,11 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
 	"\x12ConfirmFailENUM_NO\x10\x00\x12\x1d\n" +
 	"\x19ConfirmFailENUM_NOTENOUGH\x10\x01\x12\x1b\n" +
 	"\x17ConfirmFailENUM_EXPIRED\x10\x02*\x87\x01\n" +
-	"\x11RePublishTypeENUM\x12\x18\n" +
-	"\x14RePublishType_UNKNOW\x10\x00\x12!\n" +
-	"\x1dRePublishType_SCHEDULED_RETRY\x10\x01\x12\x1b\n" +
-	"\x17RePublishType_SCHEDULED\x10\x02\x12\x18\n" +
-	"\x14RePublishType_MANUAL\x10\x03*Y\n" +
+	"\x11PublishSourceENUM\x12\x18\n" +
+	"\x14RePublishType_UNKNOW\x10\x00\x12\x18\n" +
+	"\x14RePublishType_MANUAL\x10\x01\x12\x1b\n" +
+	"\x17RePublishType_SCHEDULED\x10\x02\x12!\n" +
+	"\x1dRePublishType_SCHEDULED_RETRY\x10\x03*Y\n" +
 	"\fCategoryENUM\x12\x14\n" +
 	"\x10UNKNOWN_CATEGORY\x10\x00\x12\t\n" +
 	"\x05TITLE\x10\x01\x12\v\n" +
@@ -19397,7 +19397,7 @@ var file_pb_fiee_cast_proto_goTypes = []any{
 	(AutoPublishENUM)(0),                           // 3: Cast.AutoPublishENUM
 	(PublishStatusENUM)(0),                         // 4: Cast.PublishStatusENUM
 	(ConfirmFailENUM)(0),                           // 5: Cast.ConfirmFailENUM
-	(RePublishTypeENUM)(0),                         // 6: Cast.RePublishTypeENUM
+	(PublishSourceENUM)(0),                         // 6: Cast.PublishSourceENUM
 	(CategoryENUM)(0),                              // 7: Cast.CategoryENUM
 	(*AsInfo)(nil),                                 // 8: Cast.AsInfo
 	(*MediaUserListReq)(nil),                       // 9: Cast.MediaUserListReq
@@ -19644,10 +19644,10 @@ var file_pb_fiee_cast_proto_depIdxs = []int32{
 	5,   // 33: Cast.UpdateStatusReq.confirmFailType:type_name -> Cast.ConfirmFailENUM
 	207, // 34: Cast.MediaAccountsResp.data:type_name -> Cast.MediaAccountsResp.Info
 	208, // 35: Cast.MediaWorksResp.data:type_name -> Cast.MediaWorksResp.Info
-	6,   // 36: Cast.PublishReq.rePublishType:type_name -> Cast.RePublishTypeENUM
+	6,   // 36: Cast.PublishReq.publishSource:type_name -> Cast.PublishSourceENUM
 	209, // 37: Cast.PublishResp.data:type_name -> Cast.PublishResp.Info
 	0,   // 38: Cast.RePublishReq.platformIDs:type_name -> Cast.PlatformIDENUM
-	6,   // 39: Cast.RePublishReq.rePublishType:type_name -> Cast.RePublishTypeENUM
+	6,   // 39: Cast.RePublishReq.publishSource:type_name -> Cast.PublishSourceENUM
 	49,  // 40: Cast.WorkInfoResp.platformInfoData:type_name -> Cast.PlatformInfo
 	4,   // 41: Cast.WorkInfoResp.publishStatus:type_name -> Cast.PublishStatusENUM
 	210, // 42: Cast.WorkListPublishedResp.data:type_name -> Cast.WorkListPublishedResp.Info

api/cast/cast.pb.validate.go

@@ -3943,7 +3943,7 @@ func (m *PublishReq) validate(all bool) error {
 
 	var errors []error
 
-	// no validation rules for RePublishType
+	// no validation rules for PublishSource
 
 	if len(errors) > 0 {
 		return PublishReqMultiError(errors)
@@ -4177,7 +4177,7 @@ func (m *RePublishReq) validate(all bool) error {
 
 	var errors []error
 
-	// no validation rules for RePublishType
+	// no validation rules for PublishSource
 
 	if len(errors) > 0 {
 		return RePublishReqMultiError(errors)

pkg/service/cast/work.go

@@ -956,6 +956,9 @@ func RePublish(ctx *gin.Context) {
 		service.Error(ctx, err)
 		return
 	}
+	if req.PublishSource == cast.PublishSourceENUM_RePublishType_UNKNOW {
+		req.PublishSource = cast.PublishSourceENUM_RePublishType_MANUAL
+	}
 	newCtx := NewCtxWithUserInfo(ctx)
 	/*	workInfoResp, err = service.CastProvider.WorkInfo(context.Background(), &cast.WorkInfoReq{
 			WorkUuid: req.WorkUuid,
@@ -1017,7 +1020,6 @@ func RePublish(ctx *gin.Context) {
 			}
 		}
 	}
-	req.RePublishType = cast.RePublishTypeENUM_RePublishType_SCHEDULED
 	resp, err = service.CastProvider.RePublish(newCtx, req)
 	if err != nil {
 		service.Error(ctx, err)