From fccc81f599803971c4e404855ddb54051fbc04b7 Mon Sep 17 00:00:00 2001
From: yaoxuwan <yaoxuwan@tencent.com>
Date: Thu, 28 Apr 2022 21:05:51 +0800
Subject: [PATCH] =?UTF-8?q?bug:=20=E6=9E=84=E5=BB=BA=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E4=B8=AD=E6=B2=A1=E6=9C=89=E6=B5=81=E6=B0=B4=E7=BA=BF=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90=E5=90=8E=E4=B8=8A=E4=BC=A0=E7=9A=84=E6=9E=84=E4=BB=B6?=
 =?UTF-8?q?=20#6538?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../common/common-archive-tencent/build.gradle.kts       | 4 ++--
 .../tencent/devops/common/archive/client/BkRepoClient.kt | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/backend/ci/ext/tencent/common/common-archive-tencent/build.gradle.kts b/src/backend/ci/ext/tencent/common/common-archive-tencent/build.gradle.kts
index dca2a569b89..bfb624b009e 100644
--- a/src/backend/ci/ext/tencent/common/common-archive-tencent/build.gradle.kts
+++ b/src/backend/ci/ext/tencent/common/common-archive-tencent/build.gradle.kts
@@ -29,6 +29,6 @@ dependencies {
     api(project(":core:common:common-web"))
     api(project(":core:common:common-service"))
     api("com.google.code.gson:gson")
-    api("com.tencent.bkrepo:api-generic")
-    api("com.tencent.bkrepo:api-repository")
+    api("com.tencent.bk.repo:api-generic")
+    api("com.tencent.bk.repo:api-repository")
 }
diff --git a/src/backend/ci/ext/tencent/common/common-archive-tencent/src/main/kotlin/com/tencent/devops/common/archive/client/BkRepoClient.kt b/src/backend/ci/ext/tencent/common/common-archive-tencent/src/main/kotlin/com/tencent/devops/common/archive/client/BkRepoClient.kt
index b7e3714acb1..8da58e206d0 100644
--- a/src/backend/ci/ext/tencent/common/common-archive-tencent/src/main/kotlin/com/tencent/devops/common/archive/client/BkRepoClient.kt
+++ b/src/backend/ci/ext/tencent/common/common-archive-tencent/src/main/kotlin/com/tencent/devops/common/archive/client/BkRepoClient.kt
@@ -45,8 +45,7 @@ import com.tencent.bkrepo.repository.pojo.metadata.UserMetadataSaveRequest
 import com.tencent.bkrepo.repository.pojo.node.NodeDetail
 import com.tencent.bkrepo.repository.pojo.node.NodeInfo
 import com.tencent.bkrepo.repository.pojo.node.NodeSizeInfo
-import com.tencent.bkrepo.repository.pojo.node.user.UserNodeCopyRequest
-import com.tencent.bkrepo.repository.pojo.node.user.UserNodeMoveRequest
+import com.tencent.bkrepo.repository.pojo.node.user.UserNodeMoveCopyRequest
 import com.tencent.bkrepo.repository.pojo.node.user.UserNodeRenameRequest
 import com.tencent.bkrepo.repository.pojo.project.UserProjectCreateRequest
 import com.tencent.bkrepo.repository.pojo.repo.RepoCreateRequest
@@ -528,13 +527,12 @@ class BkRepoClient constructor(
                     " toPath: $toPath"
         )
         val url = "${getGatewaytUrl()}/bkrepo/api/service/repository/api/node/move"
-        val requestData = UserNodeMoveRequest(
+        val requestData = UserNodeMoveCopyRequest(
             srcProjectId = projectId,
             srcRepoName = repoName,
             srcFullPath = fromPath,
             destProjectId = projectId,
             destRepoName = repoName,
-            destPath = toPath,
             destFullPath = toPath,
             overwrite = true
         )
@@ -573,14 +571,13 @@ class BkRepoClient constructor(
                     " toProject: $toProject, toRepo: $toRepo, toPath: $toPath"
         )
         val url = "${getGatewaytUrl()}/bkrepo/api/service/repository/api/node/copy"
-        val requestData = UserNodeCopyRequest(
+        val requestData = UserNodeMoveCopyRequest(
             srcProjectId = fromProject,
             srcRepoName = fromRepo,
             srcFullPath = fromPath,
             destProjectId = toProject,
             destRepoName = toRepo,
             destFullPath = toPath,
-            destPath = toPath,
             overwrite = true
         )
         val request = Request.Builder()