resolve conflict

AlinsRan · AlinsRan · commit eaf63ab4a4db · 2025-08-12T17:09:48.000+08:00
diff --git a/internal/provider/api7ee/provider.go b/internal/provider/api7ee/provider.go
@@ -66,7 +66,7 @@ func New(updater status.Updater, readier readiness.ReadinessManager, opts ...pro
 		o.BackendMode = ProviderTypeAPI7EE
 	}
 
-	cli, err := adcclient.New(o.BackendMode)
+	cli, err := adcclient.New(o.BackendMode, o.SyncTimeout)
 	if err != nil {
 		return nil, err
 	}
diff --git a/internal/provider/apisix/provider.go b/internal/provider/apisix/provider.go
@@ -68,7 +68,7 @@ func New(updater status.Updater, readier readiness.ReadinessManager, opts ...pro
 		o.BackendMode = ProviderTypeAPISIX
 	}
 
-	cli, err := adcclient.New(o.BackendMode)
+	cli, err := adcclient.New(o.BackendMode, o.SyncTimeout)
 	if err != nil {
 		return nil, err
 	}

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ func New(updater status.Updater, readier readiness.ReadinessManager, opts ...pro`
`66`	`66`	`o.BackendMode = ProviderTypeAPI7EE`
`67`	`67`	`}`
`68`	`68`
`69`		`- cli, err := adcclient.New(o.BackendMode)`
	`69`	`+ cli, err := adcclient.New(o.BackendMode, o.SyncTimeout)`
`70`	`70`	`if err != nil {`
`71`	`71`	`return nil, err`
`72`	`72`	`}`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ func New(updater status.Updater, readier readiness.ReadinessManager, opts ...pro`
`68`	`68`	`o.BackendMode = ProviderTypeAPISIX`
`69`	`69`	`}`
`70`	`70`
`71`		`- cli, err := adcclient.New(o.BackendMode)`
	`71`	`+ cli, err := adcclient.New(o.BackendMode, o.SyncTimeout)`
`72`	`72`	`if err != nil {`
`73`	`73`	`return nil, err`
`74`	`74`	`}`