From 597c7c1e23d02fbb3af577a90cc95fe9d5551dd4 Mon Sep 17 00:00:00 2001
From: zeaslity <zeaslity@qq.com>
Date: Tue, 14 Nov 2023 17:24:07 +0800
Subject: [PATCH] [ Server ] [ Harbor ] - sync projects - 2

---
 .gitignore                                               | 2 +-
 agent-go/executor/HarborExecutor.go                      | 9 +++++----
 .../io/wdd/func/auto/service/HarborFuncScheduler.java    | 2 +-
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitignore b/.gitignore
index 6440b8d..0976d5a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -32,5 +32,5 @@ build/
 ### VS Code ###
 .vscode/
 /agent-go/output/
-/agent-go/vender/
+/agent-go/vendor/
 /agent-go/agent-go
diff --git a/agent-go/executor/HarborExecutor.go b/agent-go/executor/HarborExecutor.go
index dbd3a0f..95bed2f 100644
--- a/agent-go/executor/HarborExecutor.go
+++ b/agent-go/executor/HarborExecutor.go
@@ -224,10 +224,10 @@ func (hOp *HarborOperator) SyncProjectExec(funcArgs []string) (bool, []string) {
 		Deletion: false,
 		Override: true,
 		SrcRegistry: &model.Registry{
-			ID: 0, // 源 Harbor 实例的注册表 ID，通常为 0
+			Name: "cmii", // 源 Harbor 实例的注册表 ID，通常为 0
 		},
 		DestRegistry: &model.Registry{
-			ID: 1, // 目标 Harbor 实例的注册表 ID，需要根据实际情况设置
+			Name: "cmii", // 目标 Harbor 实例的注册表 ID，需要根据实际情况设置
 		},
 		DestNamespace: "", // 可以指定目标 Harbor 中的特定项目，如果为空，则使用源项目名称
 		Trigger: &model.ReplicationTrigger{
@@ -252,9 +252,10 @@ func (hOp *HarborOperator) SyncProjectExec(funcArgs []string) (bool, []string) {
 	err := sourceClient.NewReplicationPolicy(ctx, newPolicy.DestRegistry, newPolicy.SrcRegistry, newPolicy.Deletion, newPolicy.Override, newPolicy.Enabled, newPolicy.Filters, newPolicy.Trigger, newPolicy.DestNamespace, newPolicy.Name, newPolicy.Name)
 
 	if err != nil {
-		fmt.Printf("Error creating replication policy: %v\n", err)
+		syncErrorMessage := fmt.Sprintf("[Harbor Sync Project ] - Sync Project Failed !: %v\n", err)
+		log.Error(syncErrorMessage)
 		return false, []string{
-			"[Harbor Sync Project ] - Sync Project Failed !",
+			syncErrorMessage,
 		}
 	}
 
diff --git a/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java b/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java
index 8c3b901..2f1b492 100644
--- a/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java
+++ b/server/src/main/java/io/wdd/func/auto/service/HarborFuncScheduler.java
@@ -139,7 +139,7 @@ public class HarborFuncScheduler {
         ServerInfoPO masterNode = projectDeployContext.getMasterNode();
 
         ArrayList<String> syncHarborArgList = new ArrayList<>();
-        syncHarborArgList.add(HarborFunctionEnum.LIST_PROJECT.getOpName());
+        syncHarborArgList.add(HarborFunctionEnum.SYNC_PROJECT_BETWEEN_HARBOR.getOpName());
         syncHarborArgList.add(masterNode.getServerIpInV4());
 
         String sourceHarborHost = getIPv4Address();