Merge pull request #10 from lannoy0523/issue_2655

Issue 2655
TencentBlueKing · Oct 24, 2024 · baf4e91 · baf4e91
2 parents bea9449 + 93db9ee
commit baf4e91
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/...encent/bkrepo/common/ratelimiter/service/bandwidth/DownloadBandwidthRateLimiterService.kt b/...encent/bkrepo/common/ratelimiter/service/bandwidth/DownloadBandwidthRateLimiterService.kt
@@ -48,7 +48,13 @@ class DownloadBandwidthRateLimiterService(
     rateLimiterMetrics: RateLimiterMetrics,
     redisTemplate: RedisTemplate<String, String>? = null,
     rateLimiterConfigService: RateLimiterConfigService
-) : UploadBandwidthRateLimiterService(taskScheduler, rateLimiterProperties, rateLimiterMetrics, redisTemplate, rateLimiterConfigService) {
+) : UploadBandwidthRateLimiterService(
+    taskScheduler,
+    rateLimiterProperties,
+    rateLimiterMetrics,
+    redisTemplate,
+    rateLimiterConfigService
+) {
 
     override fun getLimitDimensions(): List<String> {
         return listOf(

diff --git a/...in/com/tencent/bkrepo/common/ratelimiter/service/usage/DownloadUsageRateLimiterService.kt b/...in/com/tencent/bkrepo/common/ratelimiter/service/usage/DownloadUsageRateLimiterService.kt
@@ -49,7 +49,13 @@ class DownloadUsageRateLimiterService(
     rateLimiterMetrics: RateLimiterMetrics,
     redisTemplate: RedisTemplate<String, String>? = null,
     rateLimiterConfigService: RateLimiterConfigService
-) : UploadUsageRateLimiterService(taskScheduler, rateLimiterProperties, rateLimiterMetrics, redisTemplate, rateLimiterConfigService) {
+) : UploadUsageRateLimiterService(
+    taskScheduler,
+    rateLimiterProperties,
+    rateLimiterMetrics,
+    redisTemplate,
+    rateLimiterConfigService
+) {
 
     override fun getApplyPermits(request: HttpServletRequest, applyPermits: Long?): Long {
         if (applyPermits == null) {

diff --git a/...ta/biz-opdata/src/main/kotlin/com/tencent/bkrepo/opdata/controller/RateLimitController.kt b/...ta/biz-opdata/src/main/kotlin/com/tencent/bkrepo/opdata/controller/RateLimitController.kt
@@ -43,7 +43,7 @@ class RateLimitController(
         }
         rateLimiterConfigService.getById(request.id!!).let {
             if (it != null &&
-                (!it.resource.equals(request.resource) || !it.limitDimension.equals(request.limitDimension)) &&
+                updateCheckResource(it, request) &&
                 rateLimiterConfigService.checkExist(request)
             ) {
                 throw ErrorCodeException(
@@ -56,6 +56,10 @@ class RateLimitController(
         return ResponseBuilder.success()
     }
 
+    private fun updateCheckResource(tRateLimit: TRateLimit, request: RateLimitCreatOrUpdateRequest): Boolean {
+        return (tRateLimit.resource != request.resource || tRateLimit.limitDimension != request.limitDimension)
+    }
+
     // 新增
     @PostMapping("/create")
     fun create(@RequestBody request:RateLimitCreatOrUpdateRequest): Response<Void> {