Merge branch 'feature-userinfo-daiyb' into dev

This commit is contained in:
戴育兵 2025-12-16 13:49:50 +08:00
commit bd9df0a02b
3 changed files with 76 additions and 7 deletions

View File

@ -5461,6 +5461,8 @@ type ListPromptsReq struct {
Page int32 `protobuf:"varint,3,opt,name=page,proto3" json:"page"` // 页码
PageSize int32 `protobuf:"varint,4,opt,name=pageSize,proto3" json:"pageSize"` // 每页数量
Rand bool `protobuf:"varint,5,opt,name=rand,proto3" json:"rand"`
StartUseCount uint32 `protobuf:"varint,6,opt,name=startUseCount,proto3" json:"startUseCount"`
EndUseCount uint32 `protobuf:"varint,7,opt,name=endUseCount,proto3" json:"endUseCount"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
@ -5530,6 +5532,20 @@ func (x *ListPromptsReq) GetRand() bool {
return false
}
func (x *ListPromptsReq) GetStartUseCount() uint32 {
if x != nil {
return x.StartUseCount
}
return 0
}
func (x *ListPromptsReq) GetEndUseCount() uint32 {
if x != nil {
return x.EndUseCount
}
return 0
}
type PromptInfo struct {
state protoimpl.MessageState `protogen:"open.v1"`
PromptUuid string `protobuf:"bytes,1,opt,name=promptUuid,proto3" json:"promptUuid"` // 关键词UUID
@ -11223,8 +11239,13 @@ type WorkPlatformInfo struct {
CreatedAt int32 `protobuf:"varint,9,opt,name=createdAt,proto3" json:"createdAt"` // 创建时间
UpdatedAt int32 `protobuf:"varint,10,opt,name=updatedAt,proto3" json:"updatedAt"` // 更新时间
ArtistUuid string `protobuf:"bytes,11,opt,name=artistUuid,proto3" json:"artistUuid"` // 艺人UUID
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
// 关联自媒体账号字段通过artist_uuid关联cast_media_account表
PlatformUserName string `protobuf:"bytes,12,opt,name=platformUserName,proto3" json:"platformUserName"` // 平台用户名
PlatformUserID string `protobuf:"bytes,13,opt,name=platformUserID,proto3" json:"platformUserID"` // 平台用户ID
ArtistName string `protobuf:"bytes,14,opt,name=artistName,proto3" json:"artistName"` // 自媒体账号艺人名字
ArtistPhone string `protobuf:"bytes,15,opt,name=artistPhone,proto3" json:"artistPhone"` // 自媒体账号艺人手机号
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
}
func (x *WorkPlatformInfo) Reset() {
@ -11334,6 +11355,34 @@ func (x *WorkPlatformInfo) GetArtistUuid() string {
return ""
}
func (x *WorkPlatformInfo) GetPlatformUserName() string {
if x != nil {
return x.PlatformUserName
}
return ""
}
func (x *WorkPlatformInfo) GetPlatformUserID() string {
if x != nil {
return x.PlatformUserID
}
return ""
}
func (x *WorkPlatformInfo) GetArtistName() string {
if x != nil {
return x.ArtistName
}
return ""
}
func (x *WorkPlatformInfo) GetArtistPhone() string {
if x != nil {
return x.ArtistPhone
}
return ""
}
// 获取作品平台信息列表响应
type ListWorkPlatformInfoResp struct {
state protoimpl.MessageState `protogen:"open.v1"`
@ -12695,13 +12744,15 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
"promptUuid\x12\x16\n" +
"\x06prompt\x18\x02 \x01(\tR\x06prompt\x12.\n" +
"\bcategory\x18\x03 \x01(\x0e2\x12.Cast.CategoryENUMR\bcategory\x12\x1a\n" +
"\buseCount\x18\x04 \x01(\rR\buseCount\"\x9c\x01\n" +
"\buseCount\x18\x04 \x01(\rR\buseCount\"\xe4\x01\n" +
"\x0eListPromptsReq\x12\x16\n" +
"\x06prompt\x18\x01 \x01(\tR\x06prompt\x12.\n" +
"\bcategory\x18\x02 \x01(\x0e2\x12.Cast.CategoryENUMR\bcategory\x12\x12\n" +
"\x04page\x18\x03 \x01(\x05R\x04page\x12\x1a\n" +
"\bpageSize\x18\x04 \x01(\x05R\bpageSize\x12\x12\n" +
"\x04rand\x18\x05 \x01(\bR\x04rand\"\xfc\x01\n" +
"\x04rand\x18\x05 \x01(\bR\x04rand\x12$\n" +
"\rstartUseCount\x18\x06 \x01(\rR\rstartUseCount\x12 \n" +
"\vendUseCount\x18\a \x01(\rR\vendUseCount\"\xfc\x01\n" +
"\n" +
"PromptInfo\x12\x1e\n" +
"\n" +
@ -13403,7 +13454,7 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
"\vplatformIDs\x18\x01 \x03(\rR\vplatformIDs\x12.\n" +
"\x12publishMediaStatus\x18\x02 \x01(\x05R\x12publishMediaStatus\x12\x12\n" +
"\x04page\x18\x03 \x01(\x05R\x04page\x12\x1a\n" +
"\bpageSize\x18\x04 \x01(\x05R\bpageSize\"\xf2\x02\n" +
"\bpageSize\x18\x04 \x01(\x05R\bpageSize\"\x88\x04\n" +
"\x10WorkPlatformInfo\x12\x12\n" +
"\x04uuid\x18\x01 \x01(\tR\x04uuid\x12\x1a\n" +
"\bworkUuid\x18\x02 \x01(\tR\bworkUuid\x12 \n" +
@ -13420,7 +13471,13 @@ const file_pb_fiee_cast_proto_rawDesc = "" +
" \x01(\x05R\tupdatedAt\x12\x1e\n" +
"\n" +
"artistUuid\x18\v \x01(\tR\n" +
"artistUuid\"\\\n" +
"artistUuid\x12*\n" +
"\x10platformUserName\x18\f \x01(\tR\x10platformUserName\x12&\n" +
"\x0eplatformUserID\x18\r \x01(\tR\x0eplatformUserID\x12\x1e\n" +
"\n" +
"artistName\x18\x0e \x01(\tR\n" +
"artistName\x12 \n" +
"\vartistPhone\x18\x0f \x01(\tR\vartistPhone\"\\\n" +
"\x18ListWorkPlatformInfoResp\x12*\n" +
"\x04data\x18\x01 \x03(\v2\x16.Cast.WorkPlatformInfoR\x04data\x12\x14\n" +
"\x05count\x18\x02 \x01(\x03R\x05count*G\n" +

View File

@ -8844,6 +8844,10 @@ func (m *ListPromptsReq) validate(all bool) error {
// no validation rules for Rand
// no validation rules for StartUseCount
// no validation rules for EndUseCount
if len(errors) > 0 {
return ListPromptsReqMultiError(errors)
}
@ -17210,6 +17214,14 @@ func (m *WorkPlatformInfo) validate(all bool) error {
// no validation rules for ArtistUuid
// no validation rules for PlatformUserName
// no validation rules for PlatformUserID
// no validation rules for ArtistName
// no validation rules for ArtistPhone
if len(errors) > 0 {
return WorkPlatformInfoMultiError(errors)
}

View File

@ -1016,7 +1016,7 @@ func ImportWorkBatch(ctx *gin.Context) {
for i := 8; i <= 18; i++ {
if len(row) > i {
if utils.CleanString(row[i]) != "" {
ok, _err := check.ImageCheckUrlValid(row[i])
ok, _err := check.SecurityFile(row[i])
if _err != nil {
temp.Remark = _err.Error()
req.ImageWorks = append(req.ImageWorks, temp)