Merge branch 'main' into wwq

api/cron/cron.pb.go

@@ -640,6 +640,16 @@ type ExecutionResult struct {
 	StatusDescription      string                 `protobuf:"bytes,110,opt,name=status_description,json=statusDescription,proto3" json:"status_description"`                  // 执行状态描述
 	ResultDescription      string                 `protobuf:"bytes,111,opt,name=result_description,json=resultDescription,proto3" json:"result_description"`                  // 执行结果描述
 	ContentTypeDescription string                 `protobuf:"bytes,115,opt,name=content_type_description,json=contentTypeDescription,proto3" json:"content_type_description"` // 内容类型描述
+	TIKTOKStatusDesc       string                 `protobuf:"bytes,121,opt,name=TIKTOKStatusDesc,proto3" json:"TIKTOKStatusDesc"`
+	YOUTUBEStatusDesc      string                 `protobuf:"bytes,122,opt,name=YOUTUBEStatusDesc,proto3" json:"YOUTUBEStatusDesc"`
+	INSStatusDesc          string                 `protobuf:"bytes,123,opt,name=INSStatusDesc,proto3" json:"INSStatusDesc"`
+	DMStatusDesc           string                 `protobuf:"bytes,124,opt,name=DMStatusDesc,proto3" json:"DMStatusDesc"`
+	BULESKYStatusDesc      string                 `protobuf:"bytes,125,opt,name=BULESKYStatusDesc,proto3" json:"BULESKYStatusDesc"`
+	TIKTOKResult           string                 `protobuf:"bytes,131,opt,name=TIKTOKResult,proto3" json:"TIKTOKResult"`
+	YOUTUBEResult          string                 `protobuf:"bytes,132,opt,name=YOUTUBEResult,proto3" json:"YOUTUBEResult"`
+	INSResult              string                 `protobuf:"bytes,133,opt,name=INSResult,proto3" json:"INSResult"`
+	DMResult               string                 `protobuf:"bytes,134,opt,name=DMResult,proto3" json:"DMResult"`
+	BULESKYResult          string                 `protobuf:"bytes,135,opt,name=BULESKYResult,proto3" json:"BULESKYResult"`
 	unknownFields          protoimpl.UnknownFields
 	sizeCache              protoimpl.SizeCache
 }
@@ -793,6 +803,76 @@ func (x *ExecutionResult) GetContentTypeDescription() string {
 	return ""
 }
 
+func (x *ExecutionResult) GetTIKTOKStatusDesc() string {
+	if x != nil {
+		return x.TIKTOKStatusDesc
+	}
+	return ""
+}
+
+func (x *ExecutionResult) GetYOUTUBEStatusDesc() string {
+	if x != nil {
+		return x.YOUTUBEStatusDesc
+	}
+	return ""
+}
+
+func (x *ExecutionResult) GetINSStatusDesc() string {
+	if x != nil {
+		return x.INSStatusDesc
+	}
+	return ""
+}
+
+func (x *ExecutionResult) GetDMStatusDesc() string {
+	if x != nil {
+		return x.DMStatusDesc
+	}
+	return ""
+}
+
+func (x *ExecutionResult) GetBULESKYStatusDesc() string {
+	if x != nil {
+		return x.BULESKYStatusDesc
+	}
+	return ""
+}
+
+func (x *ExecutionResult) GetTIKTOKResult() string {
+	if x != nil {
+		return x.TIKTOKResult
+	}
+	return ""
+}
+
+func (x *ExecutionResult) GetYOUTUBEResult() string {
+	if x != nil {
+		return x.YOUTUBEResult
+	}
+	return ""
+}
+
+func (x *ExecutionResult) GetINSResult() string {
+	if x != nil {
+		return x.INSResult
+	}
+	return ""
+}
+
+func (x *ExecutionResult) GetDMResult() string {
+	if x != nil {
+		return x.DMResult
+	}
+	return ""
+}
+
+func (x *ExecutionResult) GetBULESKYResult() string {
+	if x != nil {
+		return x.BULESKYResult
+	}
+	return ""
+}
+
 type CreateScheduleTaskRequest struct {
 	state            protoimpl.MessageState `protogen:"open.v1"`
 	TaskTitle        string                 `protobuf:"bytes,1,opt,name=task_title,json=taskTitle,proto3" json:"task_title"`                        // 任务标题
@@ -2059,7 +2139,7 @@ const file_pb_cron_proto_rawDesc = "" +
 	"\n" +
 	"task_title\x18\x0e \x01(\tR\ttaskTitle\x12!\n" +
 	"\fcontent_type\x18\x0f \x01(\x05R\vcontentType\x12\x0e\n" +
-	"\x02id\x18\x10 \x01(\x04R\x02id\"\xc8\x04\n" +
+	"\x02id\x18\x10 \x01(\x04R\x02id\"\xc9\a\n" +
 	"\x0fExecutionResult\x12!\n" +
 	"\fexecution_id\x18\x01 \x01(\x05R\vexecutionId\x12\x17\n" +
 	"\atask_id\x18\x02 \x01(\x05R\x06taskId\x12\x1b\n" +
@@ -2083,7 +2163,17 @@ const file_pb_cron_proto_rawDesc = "" +
 	"work_title\x18\x10 \x01(\tR\tworkTitle\x12-\n" +
 	"\x12status_description\x18n \x01(\tR\x11statusDescription\x12-\n" +
 	"\x12result_description\x18o \x01(\tR\x11resultDescription\x128\n" +
-	"\x18content_type_description\x18s \x01(\tR\x16contentTypeDescription\"\x83\x03\n" +
+	"\x18content_type_description\x18s \x01(\tR\x16contentTypeDescription\x12*\n" +
+	"\x10TIKTOKStatusDesc\x18y \x01(\tR\x10TIKTOKStatusDesc\x12,\n" +
+	"\x11YOUTUBEStatusDesc\x18z \x01(\tR\x11YOUTUBEStatusDesc\x12$\n" +
+	"\rINSStatusDesc\x18{ \x01(\tR\rINSStatusDesc\x12\"\n" +
+	"\fDMStatusDesc\x18| \x01(\tR\fDMStatusDesc\x12,\n" +
+	"\x11BULESKYStatusDesc\x18} \x01(\tR\x11BULESKYStatusDesc\x12#\n" +
+	"\fTIKTOKResult\x18\x83\x01 \x01(\tR\fTIKTOKResult\x12%\n" +
+	"\rYOUTUBEResult\x18\x84\x01 \x01(\tR\rYOUTUBEResult\x12\x1d\n" +
+	"\tINSResult\x18\x85\x01 \x01(\tR\tINSResult\x12\x1b\n" +
+	"\bDMResult\x18\x86\x01 \x01(\tR\bDMResult\x12%\n" +
+	"\rBULESKYResult\x18\x87\x01 \x01(\tR\rBULESKYResult\"\x83\x03\n" +
 	"\x19CreateScheduleTaskRequest\x12\x1d\n" +
 	"\n" +
 	"task_title\x18\x01 \x01(\tR\ttaskTitle\x12 \n" +

pkg/service/cron/cron.go

@@ -131,7 +131,7 @@ func ExportExcelExecutionResult(c *gin.Context) {
 	}
 
 	titleList := []string{
-		"任务标题", "艺人编号", "艺人姓名", "内容类型", "内容标题", "执行结果", "原因",
+		"任务标题", "艺人编号", "艺人姓名", "内容类型", "内容标题", "执行结果", "原因", "TIKTOK", "YOUTUBE", "INS", "DM", "BULESKY",
 	}
 	var dataList []interface{}
 	for _, task := range res.Data {
@@ -143,6 +143,11 @@ func ExportExcelExecutionResult(c *gin.Context) {
 			task.WorkTitle,
 			task.ResultDescription,
 			task.ResultDesc,
+			task.TIKTOKStatusDesc,
+			task.YOUTUBEStatusDesc,
+			task.INSStatusDesc,
+			task.DMStatusDesc,
+			task.BULESKYStatusDesc,
 		}
 		dataList = append(dataList, &data)
 	}

pkg/service/import/imageContentProcessor.go

@@ -1,6 +1,7 @@
 package imports
 
 import (
+	"bytes"
 	"context"
 	"errors"
 	"fmt"
@@ -8,6 +9,9 @@ import (
 	apiCast "fonchain-fiee/api/cast"
 	"fonchain-fiee/pkg/config"
 	"fonchain-fiee/pkg/service"
+	"image"
+	"image/draw"
+	"image/jpeg"
 	"io"
 	"log"
 	"math/rand"
@@ -571,21 +575,17 @@ func downloadAndUploadToBucket(imageURL string) (string, error) {
 		return "", fmt.Errorf("创建临时目录失败: %v", err)
 	}
 	defer os.RemoveAll(tempDir) // 程序结束时清理整个目录
+
+	// 生成唯一文件名
 	rand.Seed(time.Now().UnixNano())
-	fileName := fmt.Sprintf("%d%04d.jpg", time.Now().Unix(), rand.Intn(10000))
+	timestamp := time.Now().Unix()
+	randomNum := rand.Intn(10000)
+	fileName := fmt.Sprintf("%d%04d.jpg", timestamp, randomNum)
+
 	// 构建文件路径
 	imgPath := filepath.Join(tempDir, fileName)
 
-	// 创建文件
-	file, err := os.Create(imgPath)
-	if err != nil {
-		return "", fmt.Errorf("创建文件失败: %v", err)
-	}
-	defer file.Close()
-
-	log.Printf("文件创建在: %s", imgPath)
-
-	// 下载图片到文件
+	// 下载图片
 	resp, err := http.Get(imageURL)
 	if err != nil {
 		return "", fmt.Errorf("下载图片失败: %v", err)
@@ -596,50 +596,62 @@ func downloadAndUploadToBucket(imageURL string) (string, error) {
 		return "", fmt.Errorf("下载失败，状态码: %d", resp.StatusCode)
 	}
 
-	// 复制到文件
-	_, err = io.Copy(file, resp.Body)
+	// 读取图片数据
+	imgData, err := io.ReadAll(resp.Body)
 	if err != nil {
-		return "", fmt.Errorf("保存文件失败: %v", err)
+		return "", fmt.Errorf("读取图片数据失败: %v", err)
 	}
 
-	file.Sync()
-
-	fileBytes, err := os.ReadFile(imgPath)
+	// 检测图片格式并转换为JPG
+	jpgData, err := convertToJPG(imgData)
 	if err != nil {
-		return "", fmt.Errorf("读取本地文件失败: %v", err)
+		return "", fmt.Errorf("转换图片格式失败: %v", err)
 	}
 
+	// 保存转换后的JPG文件
+	if err := os.WriteFile(imgPath, jpgData, 0644); err != nil {
+		return "", fmt.Errorf("保存JPG文件失败: %v", err)
+	}
+
+	// 上传到对象存储
 	BOSClient, err := objstorage.NewOSS(
 		os.Getenv(config.ConfigData.Oss.AccessKeyId),
 		os.Getenv(config.ConfigData.Oss.AccessKeySecret),
 		os.Getenv(config.ConfigData.Oss.Endpoint),
 	)
-	if BOSClient == nil {
-		return "", fmt.Errorf("上传文件失败: %v", err)
+	if err != nil {
+		return "", fmt.Errorf("创建OSS客户端失败: %v", err)
 	}
-	_, err = BOSClient.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), fileName, fileBytes)
+	if BOSClient == nil {
+		return "", fmt.Errorf("OSS客户端为空")
+	}
+
+	_, err = BOSClient.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), fileName, jpgData)
 	if err != nil {
 		return "", fmt.Errorf("上传文件失败: %v", err)
 	}
-	url := fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), fileName)
-	//上传到桶
-	//BOSClient, err := objstorage.NewOSS(
-	//	config.ConfigData.Oss.AccessKeyId,
-	//	config.ConfigData.Oss.AccessKeySecret,
-	//	config.ConfigData.Oss.Endpoint,
-	//)
 	//if BOSClient == nil {
-	//	return "", fmt.Errorf("上传文件失败: %v", err)
-	//}
-	//_, err = BOSClient.PutObjectFromBytes(config.ConfigData.Oss.BucketName, fileName, fileBytes)
-	//if err != nil {
-	//	return "", fmt.Errorf("上传文件失败: %v", err)
-	//}
-	//url := fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, fileName)
 
+	// 返回CDN URL
+	url := fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), fileName)
 	return url, nil
 }
 
+//上传到桶
+//BOSClient, err := objstorage.NewOSS(
+//	config.ConfigData.Oss.AccessKeyId,
+//	config.ConfigData.Oss.AccessKeySecret,
+//	config.ConfigData.Oss.Endpoint,
+//)
+//if BOSClient == nil {
+//	return "", fmt.Errorf("上传文件失败: %v", err)
+//}
+//_, err = BOSClient.PutObjectFromBytes(config.ConfigData.Oss.BucketName, fileName, fileBytes)
+//if err != nil {
+//	return "", fmt.Errorf("上传文件失败: %v", err)
+//}
+//url := fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, fileName)
+
 func (p *BatchProcessor) generateTitleAndContent(req *excelData) (string, string, error) {
 	if req.PhotoUrl != "" {
 		title, content, err := NewAiGenerator().GenerateTitleAndContentFromImage(
@@ -679,7 +691,7 @@ func (p *BatchProcessor) generateImage(req *excelData) (string, error) {
 	prompt += "\n要求不能出现:低质量、残缺、人物正脸、多余的手指、乱码字符和文字、比例不良，场景以国内场景为主"
 
 	if req.PhotoDpi == "" {
-		req.PhotoDpi = "720*1280"
+		req.PhotoDpi = "1024*1024"
 
 	}
 	result, err := NewAiGenerator().TextToImage(
@@ -693,6 +705,33 @@ func (p *BatchProcessor) generateImage(req *excelData) (string, error) {
 	return result.Output.TaskID, nil
 }
 
+// convertToJPG 将图片数据转换为JPG格式
+func convertToJPG(imgData []byte) ([]byte, error) {
+	// 使用标准库解码
+	img, format, err := image.Decode(bytes.NewReader(imgData))
+	if err != nil {
+		return nil, fmt.Errorf("解码图片失败: %v", err)
+	}
+
+	log.Printf("检测到图片格式: %s, 尺寸: %dx%d", format, img.Bounds().Dx(), img.Bounds().Dy())
+
+	// 创建新的RGBA图片
+	bounds := img.Bounds()
+	rgba := image.NewRGBA(bounds)
+
+	// 绘制到RGBA
+	draw.Draw(rgba, bounds, img, bounds.Min, draw.Src)
+
+	// 编码为JPG
+	var buf bytes.Buffer
+	opts := &jpeg.Options{Quality: 90} // 设置质量为90%
+	if err := jpeg.Encode(&buf, rgba, opts); err != nil {
+		return nil, fmt.Errorf("编码JPG失败: %v", err)
+	}
+
+	return buf.Bytes(), nil
+}
+
 //func (p *BatchProcessor) StartPolling() {
 //	go func() {
 //		ticker := time.NewTicker(p.pollInterval) // 1秒间隔

pkg/service/import/imageContentPublish.go

@@ -58,6 +58,7 @@ func publishImage(req publishImageReq) (err error) {
 
 	//---------------------------------------------------发布
 	_, err = service.CastProvider.UpdateWorkImage(context.Background(), &apiCast.UpdateWorkImageReq{
+		ArtistSubNum:      list.UserList[0].SubNum,
 		Title:             req.Title,
 		Content:           req.Content,
 		Images:            req.GeneratePhotoUrl,