Merge branch 'main' into feat-cjy-tag

This commit is contained in:
cjy 2026-01-04 11:44:37 +08:00
commit 81d99cbc91
4 changed files with 8 additions and 3 deletions

View File

@ -33,7 +33,8 @@ func InitTasks() error {
err = cm.AddTask("refreshWorkAnalysisApprovalStatus", "0 */1 * * * *", RefreshWorkAnalysisApprovalStatusTask) err = cm.AddTask("refreshWorkAnalysisApprovalStatus", "0 */1 * * * *", RefreshWorkAnalysisApprovalStatusTask)
// 每天 00:30 和 12:30 执行 Ayrshare 指标采集任务 // 每天 00:30 和 12:30 执行 Ayrshare 指标采集任务
err = cm.AddTask("ayrshareMetricsCollector", "0 30 0,12 * * *", AyrshareMetricsCollectorTask) // err = cm.AddTask("ayrshareMetricsCollector", "0 30 0,12 * * *", AyrshareMetricsCollectorTask)
err = cm.AddTask("ayrshareMetricsCollector", "0 30 0 * * *", AyrshareMetricsCollectorTask)
if err != nil { if err != nil {
log.Printf("添加定时任务失败: %v", err) log.Printf("添加定时任务失败: %v", err)
} }

View File

@ -277,6 +277,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
var TotalPrice float32 var TotalPrice float32
var expirationDay string var expirationDay string
numMap := make(map[string]int32) numMap := make(map[string]int32)
numMap["1500.00"] = 0
numMap["3150.00"] = 3 numMap["3150.00"] = 3
numMap["4200.00"] = 5 numMap["4200.00"] = 5
numMap["5600.00"] = 8 numMap["5600.00"] = 8
@ -289,6 +290,7 @@ func AutoCreateUserAndOrder(c *gin.Context) {
numMap["18300.00"] = 40 numMap["18300.00"] = 40
numMap["26700.00"] = 60 numMap["26700.00"] = 60
incrMap := make(map[string]float32) incrMap := make(map[string]float32)
incrMap["1500.00"] = 0
incrMap["3150.00"] = 1650 incrMap["3150.00"] = 1650
incrMap["4200.00"] = 2700 incrMap["4200.00"] = 2700
incrMap["5600.00"] = 4100 incrMap["5600.00"] = 4100

View File

@ -780,8 +780,9 @@ func executeAyrshareMetricsCollector() {
zap.L().Info("Ayrshare 指标采集任务执行完成") zap.L().Info("Ayrshare 指标采集任务执行完成")
fmt.Printf("[%s] [INFO] Ayrshare 指标采集任务执行完成\n", time.Now().Format("2006-01-02 15:04:05")) fmt.Printf("[%s] [INFO] Ayrshare 指标采集任务执行完成\n", time.Now().Format("2006-01-02 15:04:05"))
// 暂停重试
// 第三步:重试失败的记录(使用并发处理) // 第三步:重试失败的记录(使用并发处理)
retryFailedMetricsForAyrshareConcurrent(ctx, dateCN) // retryFailedMetricsForAyrshareConcurrent(ctx, dateCN)
// 第四步:根据作品数据计算并更新账号日级指标 // 第四步:根据作品数据计算并更新账号日级指标
zap.L().Info("开始计算账号日级指标") zap.L().Info("开始计算账号日级指标")

View File

@ -520,7 +520,8 @@ func PostAS(workUuid string) error {
needPlatformIDs := workDetail.NeedPlatformIDs needPlatformIDs := workDetail.NeedPlatformIDs
if len(needPlatformIDs) == 0 { if len(needPlatformIDs) == 0 {
zap.L().Error("Publish WorkDetail failed 作品无发布平台", zap.String("workUuid", workUuid)) zap.L().Error("Publish WorkDetail failed 作品无发布平台", zap.String("workUuid", workUuid))
return errors.New("作品无发布平台") return nil
//return errors.New("作品无发布平台")
} }
zap.L().Info("post 2", zap.Any("workUuid", workUuid)) zap.L().Info("post 2", zap.Any("workUuid", workUuid))
var mediaUrls []string var mediaUrls []string