feat: fs客户端心跳支持上报ip #2862

TencentBlueKing · Dec 17, 2024 · ad4a584 · ad4a584
1 parent 293578f
commit ad4a584
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...oot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/request/ClientCreateRequest.kt b/...oot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/request/ClientCreateRequest.kt
@@ -41,4 +41,5 @@ data class ClientCreateRequest(
     val version: String,
     val os: String,
     val arch: String,
+    val ip: String?,
 )
diff --git a/...d/fs/boot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/service/ClientService.kt b/...d/fs/boot-fs-server/src/main/kotlin/com/tencent/bkrepo/fs/server/service/ClientService.kt
@@ -67,7 +67,7 @@ class ClientService(
 
     suspend fun createClient(request: ClientCreateRequest): ClientDetail {
         with(request) {
-            val ip = ReactiveRequestContextHolder.getClientAddress()
+            val ip = if (this.ip.isNullOrBlank()) ReactiveRequestContextHolder.getClientAddress() else this.ip
             val query = Query(
                 Criteria.where(TClient::projectId.name).isEqualTo(projectId)
                     .and(TClient::repoName.name).isEqualTo(repoName)
@@ -277,7 +277,8 @@ class ClientService(
             mountPoint = client.mountPoint,
             version = client.version,
             os = client.os,
-            arch = client.arch
+            arch = client.arch,
+            ip = client.ip
         )
     }