feat: fs客户端管理支持ip、版本的模糊查询 #2435

TencentBlueKing · Jul 30, 2024 · 9415bdf · 9415bdf
1 parent 8c8f83e
commit 9415bdf
Showing 1 changed file with 7 additions and 2 deletions.
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
@@ -34,6 +34,7 @@ package com.tencent.bkrepo.fs.server.service
 import com.tencent.bkrepo.common.api.exception.ErrorCodeException
 import com.tencent.bkrepo.common.api.message.CommonMessageCode
 import com.tencent.bkrepo.common.api.pojo.Page
+import com.tencent.bkrepo.common.api.util.EscapeUtils
 import com.tencent.bkrepo.common.metrics.push.custom.CustomMetricsExporter
 import com.tencent.bkrepo.common.metrics.push.custom.base.MetricsItem
 import com.tencent.bkrepo.common.metrics.push.custom.enums.DataModel
@@ -116,8 +117,8 @@ class ClientService(
         request.projectId?.let { criteria.and(TClient::projectId.name).isEqualTo(it) }
         request.repoName?.let { criteria.and(TClient::repoName.name).isEqualTo(it) }
         request.online?.let { criteria.and(TClient::online.name).isEqualTo(it) }
-        request.ip?.let { criteria.and(TClient::ip.name).regex(it) }
-        request.version?.let { criteria.and(TClient::version.name).regex(it) }
+        request.ip?.let { criteria.and(TClient::ip.name).regex(convertToRegex(it)) }
+        request.version?.let { criteria.and(TClient::version.name).regex(convertToRegex(it)) }
         val query = Query(criteria)
         val count = clientRepository.count(query)
         val data = clientRepository.find(query.with(pageRequest))
@@ -279,6 +280,10 @@ class ClientService(
         )
     }
 
+    private fun convertToRegex(value: String): String {
+        return EscapeUtils.escapeRegexExceptWildcard(value).replace("*", ".*")
+    }
+
     private fun TDailyClient.convert(): DailyClientDetail {
         return DailyClientDetail(
             id = id!!,