pkg/service/import/imageContentProcessor.go

@@ -381,9 +381,6 @@ func (p *BatchProcessor) UpdateTaskStatuses(taskId string) (err error) {
 		//生成标题
 		title, content, err := p.generateTitleAndContent(p.tasks[taskId].Data)
 		if err != nil {
-			p.tasks[taskId].Status = TaskFailed
-			p.inProgress[taskId] = true
-			p.tasks[taskId].EndTime = time.Now()
 			return fmt.Errorf("生成标题和内容失败: %v", err)
 		}
 		p.tasks[taskId].Title = title
@@ -397,9 +394,6 @@ func (p *BatchProcessor) UpdateTaskStatuses(taskId string) (err error) {
 			GeneratePhotoUrl: []string{p.tasks[taskId].Data.PhotoUrl},
 		}); err != nil {
 			p.tasks[taskId].Error = err
-			p.tasks[taskId].Status = TaskFailed
-			p.inProgress[taskId] = true
-			p.tasks[taskId].EndTime = time.Now()
 		}
 		p.tasks[taskId].Status = TaskSuccessful
 		p.inProgress[taskId] = true
@@ -420,7 +414,7 @@ func (p *BatchProcessor) UpdateTaskStatuses(taskId string) (err error) {
 				title, content, err := p.generateTitleAndContent(p.tasks[taskId].Data)
 				if err != nil {
 					zap.L().Debug("生成标题失败")
-					localTask.Status = TaskFailed
+					localTask.Status = TaskSuccessful
 					p.tasks[getTaskDetailRes.Output.TaskID].Error = err
 					p.inProgress[getTaskDetailRes.Output.TaskID] = true
 					p.tasks[getTaskDetailRes.Output.TaskID].EndTime = time.Now()
@@ -428,6 +422,7 @@ func (p *BatchProcessor) UpdateTaskStatuses(taskId string) (err error) {
 				}
 				p.tasks[taskId].Title = title
 				p.tasks[taskId].Content = content
+				localTask.Status = TaskSuccessful
 
 				// 直接下载并上传到桶
 				localTask.EndTime = time.Now()
@@ -438,7 +433,7 @@ func (p *BatchProcessor) UpdateTaskStatuses(taskId string) (err error) {
 				uploadedURLs, err := downloadAndUploadImages(urls)
 				if err != nil {
 					zap.L().Debug("图片上传失败")
-					localTask.Status = TaskFailed
+					localTask.Status = TaskSuccessful
 					p.tasks[getTaskDetailRes.Output.TaskID].Error = err
 					p.inProgress[getTaskDetailRes.Output.TaskID] = true
 					p.tasks[getTaskDetailRes.Output.TaskID].EndTime = time.Now()
@@ -456,12 +451,11 @@ func (p *BatchProcessor) UpdateTaskStatuses(taskId string) (err error) {
 					Content:          p.tasks[getTaskDetailRes.Output.TaskID].Content,
 					GeneratePhotoUrl: uploadedURLs,
 				}); err != nil {
-					localTask.Status = TaskFailed
 					p.tasks[getTaskDetailRes.Output.TaskID].Error = err
+					localTask.Status = TaskSuccessful
 					p.inProgress[getTaskDetailRes.Output.TaskID] = true
 					p.tasks[getTaskDetailRes.Output.TaskID].EndTime = time.Now()
 				}
-				localTask.Status = TaskSuccessful
 				p.inProgress[getTaskDetailRes.Output.TaskID] = true
 				p.tasks[getTaskDetailRes.Output.TaskID].EndTime = time.Now()
 
@@ -554,15 +548,15 @@ func downloadAndUploadToBucket(imageURL string) (string, error) {
 
 	// 上传到桶
 	BOSClient, err := objstorage.NewOSS(
-		os.Getenv(config.ConfigData.Oss.AccessKeyId),
+		config.ConfigData.Oss.AccessKeyId,
-		os.Getenv(config.ConfigData.Oss.AccessKeySecret),
+		config.ConfigData.Oss.AccessKeySecret,
-		os.Getenv(config.ConfigData.Oss.Endpoint),
+		config.ConfigData.Oss.Endpoint,
 	)
-	_, err = BOSClient.PutObjectFromBytes(os.Getenv(config.ConfigData.Oss.BucketName), fileName, fileBytes)
+	_, err = BOSClient.PutObjectFromBytes(config.ConfigData.Oss.BucketName, fileName, fileBytes)
 	if err != nil {
 		return "", fmt.Errorf("上传文件失败: %v", err)
 	}
-	url := fmt.Sprintf("%s/%s", os.Getenv(config.ConfigData.Oss.CdnHost), fileName)
+	url := fmt.Sprintf("%s/%s", config.ConfigData.Oss.CdnHost, fileName)
 
 	return url, nil
 }