From 5797fbb43ecfd24c37174fd0b379961a0396a6f2 Mon Sep 17 00:00:00 2001
From: lmk <1095689763@qq.com>
Date: Thu, 9 Apr 2026 10:48:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 scheduler/run_account_report_task.go       | 11 +++++------
 scheduler/run_sync_task_log_task.go        | 10 +++++-----
 {sync => syncdata}/account_report_sync.go  |  2 +-
 {sync => syncdata}/account_report_types.go |  2 +-
 {sync => syncdata}/base_report_sync.go     |  2 +-
 {sync => syncdata}/data_converter.go       |  2 +-
 {sync => syncdata}/http_client.go          |  2 +-
 {sync => syncdata}/mock_generator.go       |  2 +-
 {sync => syncdata}/quick_sync.go           |  2 +-
 {sync => syncdata}/sync_service.go         |  2 +-
 {sync => syncdata}/sync_test.go            |  2 +-
 11 files changed, 19 insertions(+), 20 deletions(-)
 rename {sync => syncdata}/account_report_sync.go (99%)
 rename {sync => syncdata}/account_report_types.go (99%)
 rename {sync => syncdata}/base_report_sync.go (99%)
 rename {sync => syncdata}/data_converter.go (99%)
 rename {sync => syncdata}/http_client.go (98%)
 rename {sync => syncdata}/mock_generator.go (99%)
 rename {sync => syncdata}/quick_sync.go (98%)
 rename {sync => syncdata}/sync_service.go (99%)
 rename {sync => syncdata}/sync_test.go (99%)

diff --git a/scheduler/run_account_report_task.go b/scheduler/run_account_report_task.go
index e3fa2e8..5fe867c 100644
--- a/scheduler/run_account_report_task.go
+++ b/scheduler/run_account_report_task.go
@@ -1,12 +1,11 @@
 package main
 
 import (
+	"cid/syncdata"
 	"context"
 	"fmt"
 	"time"
 
-	"cid/sync"
-
 	"gitea.com/red-future/common/beans"
 	_ "github.com/gogf/gf/contrib/drivers/pgsql/v2"
 
@@ -16,27 +15,27 @@ import (
 
 func main() {
 	ctx := gctx.New()
-	syncService := sync.NewSyncService()
+	syncService := syncdata.NewSyncService()
 	ctx = context.WithValue(ctx, "user", &beans.User{UserName: "admin"})
 
 	now := time.Now()
 	lastHourEnd := time.Date(now.Year(), now.Month(), now.Day(), now.Hour(), 0, 0, 0, now.Location())
 	lastHourStart := lastHourEnd.Add(-1 * time.Hour)
 
-	req := &sync.AccountReportRequest{
+	req := &syncdata.AccountReportRequest{
 		AdvertiserID:  10001,
 		StartTime:     lastHourStart.UnixMilli(),
 		EndTime:       lastHourEnd.UnixMilli(),
 		SelectColumns: []string{"impression", "click", "cost", "t0GMV"},
 		GroupType:     1,
 		QueryVersion:  1,
-		PageInfo: &sync.PageInfo{
+		PageInfo: &syncdata.PageInfo{
 			CurrentPage: 1,
 			PageSize:    10,
 		},
 	}
 
-	config := sync.ConcurrentSyncConfig{
+	config := syncdata.ConcurrentSyncConfig{
 		MaxConcurrency: 5,
 		UseMock:        true,
 		MaxRetries:     3,
diff --git a/scheduler/run_sync_task_log_task.go b/scheduler/run_sync_task_log_task.go
index 6c4d067..1906638 100644
--- a/scheduler/run_sync_task_log_task.go
+++ b/scheduler/run_sync_task_log_task.go
@@ -3,7 +3,7 @@ package main
 import (
 	dao "cid/dao/copydata"
 	taskDto "cid/model/dto/copydata"
-	"cid/sync"
+	"cid/syncdata"
 	"context"
 	"fmt"
 	"strings"
@@ -17,13 +17,13 @@ import (
 
 // CompensationScheduler 补偿调度器，负责扫描和补偿失败的分页同步任务
 type CompensationScheduler struct {
-	syncService *sync.SyncService
+	syncService *syncdata.SyncService
 }
 
 // NewCompensationScheduler 创建补偿调度器实例
 func NewCompensationScheduler() *CompensationScheduler {
 	return &CompensationScheduler{
-		syncService: sync.NewSyncService(),
+		syncService: syncdata.NewSyncService(),
 	}
 }
 
@@ -130,14 +130,14 @@ func (s *CompensationScheduler) compensatePageTask(ctx context.Context, pageTask
 
 	pageSize := s.extractPageSize(pageTask)
 
-	req := &sync.AccountReportRequest{
+	req := &syncdata.AccountReportRequest{
 		AdvertiserID:  pageTask.AdvertiserID,
 		StartTime:     startTime.UnixMilli(),
 		EndTime:       endTime.UnixMilli(),
 		SelectColumns: []string{"impression", "click", "cost", "t0GMV"},
 		GroupType:     1,
 		QueryVersion:  1,
-		PageInfo: &sync.PageInfo{
+		PageInfo: &syncdata.PageInfo{
 			CurrentPage: pageNumber,
 			PageSize:    pageSize,
 		},
diff --git a/sync/account_report_sync.go b/syncdata/account_report_sync.go
similarity index 99%
rename from sync/account_report_sync.go
rename to syncdata/account_report_sync.go
index 879bde4..229a59f 100644
--- a/sync/account_report_sync.go
+++ b/syncdata/account_report_sync.go
@@ -1,4 +1,4 @@
-package sync
+package syncdata
 
 import (
 	dto "cid/model/dto/copydata"
diff --git a/sync/account_report_types.go b/syncdata/account_report_types.go
similarity index 99%
rename from sync/account_report_types.go
rename to syncdata/account_report_types.go
index 68b87f1..a536cd1 100644
--- a/sync/account_report_types.go
+++ b/syncdata/account_report_types.go
@@ -1,4 +1,4 @@
-package sync
+package syncdata
 
 type AccountReportRequest struct {
 	AdvertiserID  int64               `json:"advertiser_id"`
diff --git a/sync/base_report_sync.go b/syncdata/base_report_sync.go
similarity index 99%
rename from sync/base_report_sync.go
rename to syncdata/base_report_sync.go
index 5234ddb..b09f687 100644
--- a/sync/base_report_sync.go
+++ b/syncdata/base_report_sync.go
@@ -1,4 +1,4 @@
-package sync
+package syncdata
 
 import (
 	"context"
diff --git a/sync/data_converter.go b/syncdata/data_converter.go
similarity index 99%
rename from sync/data_converter.go
rename to syncdata/data_converter.go
index 1d06cd8..6792f8d 100644
--- a/sync/data_converter.go
+++ b/syncdata/data_converter.go
@@ -1,4 +1,4 @@
-package sync
+package syncdata
 
 import (
 	"cid/model/dto/copydata"
diff --git a/sync/http_client.go b/syncdata/http_client.go
similarity index 98%
rename from sync/http_client.go
rename to syncdata/http_client.go
index ffa0626..7a85b89 100644
--- a/sync/http_client.go
+++ b/syncdata/http_client.go
@@ -1,4 +1,4 @@
-package sync
+package syncdata
 
 import (
 	"bytes"
diff --git a/sync/mock_generator.go b/syncdata/mock_generator.go
similarity index 99%
rename from sync/mock_generator.go
rename to syncdata/mock_generator.go
index e3cea5d..f70fdbd 100644
--- a/sync/mock_generator.go
+++ b/syncdata/mock_generator.go
@@ -1,4 +1,4 @@
-package sync
+package syncdata
 
 import (
 	"math/rand"
diff --git a/sync/quick_sync.go b/syncdata/quick_sync.go
similarity index 98%
rename from sync/quick_sync.go
rename to syncdata/quick_sync.go
index 1f3d786..e0cf0b0 100644
--- a/sync/quick_sync.go
+++ b/syncdata/quick_sync.go
@@ -1,4 +1,4 @@
-package sync
+package syncdata
 
 import (
 	"context"
diff --git a/sync/sync_service.go b/syncdata/sync_service.go
similarity index 99%
rename from sync/sync_service.go
rename to syncdata/sync_service.go
index 8765b36..b1832b5 100644
--- a/sync/sync_service.go
+++ b/syncdata/sync_service.go
@@ -1,4 +1,4 @@
-package sync
+package syncdata
 
 import (
 	dao "cid/dao/copydata"
diff --git a/sync/sync_test.go b/syncdata/sync_test.go
similarity index 99%
rename from sync/sync_test.go
rename to syncdata/sync_test.go
index 4d592c8..6beaf71 100644
--- a/sync/sync_test.go
+++ b/syncdata/sync_test.go
@@ -1,4 +1,4 @@
-package sync
+package syncdata
 
 import (
 	"fmt"