From 139cf444ecaa48a894f16e9229a417c59c511133 Mon Sep 17 00:00:00 2001 From: zengwei-cogiot Date: Tue, 12 Sep 2023 09:44:19 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=A1=B9=E7=9B=AE=E7=9B=AE?= =?UTF-8?q?=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../abin/mallchat/common/FrequencyControlConstant.java | 6 +++--- .../mallchat-frequency-control}/.gitignore | 0 .../mallchat-frequency-control}/pom.xml | 9 +++++---- .../frequencycontrol/FrequencyControlApplication.java | 0 .../frequencycontrol/annotation/FrequencyControl.java | 2 +- .../annotation/FrequencyControlContainer.java | 0 .../frequencycontrol/aspect/FrequencyControlAspect.java | 6 +++--- .../abin/frequencycontrol/domain/dto/FixedWindowDTO.java | 0 .../frequencycontrol/domain/dto/FrequencyControlDTO.java | 0 .../abin/frequencycontrol/domain/dto/RequestInfo.java | 0 .../frequencycontrol/domain/dto/SlidingWindowDTO.java | 0 .../abin/frequencycontrol/domain/dto/TokenBucketDTO.java | 0 .../frequencycontrol/domain/vo/response/ApiResult.java | 0 .../domain/vo/response/PageBaseResp.java | 0 .../frequencycontrol/exception/BusinessErrorEnum.java | 0 .../frequencycontrol/exception/BusinessException.java | 0 .../abin/frequencycontrol/exception/CommonErrorEnum.java | 0 .../com/abin/frequencycontrol/exception/ErrorEnum.java | 0 .../exception/FrequencyControlException.java | 0 .../abin/frequencycontrol/exception/HttpErrorEnum.java | 0 .../frequencycontrol/mannager/TokenBucketManager.java | 0 .../AbstractFrequencyControlService.java | 0 .../FrequencyControlStrategyFactory.java | 0 .../service/frequencycontrol/FrequencyControlUtil.java | 0 .../frequencycontrol/GenericMethodWithGenericClass.java | 0 .../strategy/SlidingWindowFrequencyController.java | 2 +- .../strategy/TokenBucketFrequencyController.java | 2 +- .../TotalCountWithInFixTimeFrequencyController.java | 2 +- .../java/com/abin/frequencycontrol/util/AssertUtil.java | 0 .../com/abin/frequencycontrol/util/RequestHolder.java | 0 30 files changed, 15 insertions(+), 14 deletions(-) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/.gitignore (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/pom.xml (83%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/FrequencyControlApplication.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControl.java (97%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControlContainer.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/aspect/FrequencyControlAspect.java (97%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/domain/dto/FixedWindowDTO.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/domain/dto/FrequencyControlDTO.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/domain/dto/RequestInfo.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/domain/dto/SlidingWindowDTO.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/domain/dto/TokenBucketDTO.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/domain/vo/response/ApiResult.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/domain/vo/response/PageBaseResp.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/exception/BusinessErrorEnum.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/exception/BusinessException.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/exception/CommonErrorEnum.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/exception/ErrorEnum.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/exception/FrequencyControlException.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/exception/HttpErrorEnum.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/mannager/TokenBucketManager.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/AbstractFrequencyControlService.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/FrequencyControlStrategyFactory.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/FrequencyControlUtil.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/GenericMethodWithGenericClass.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/SlidingWindowFrequencyController.java (97%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TokenBucketFrequencyController.java (96%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TotalCountWithInFixTimeFrequencyController.java (98%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/util/AssertUtil.java (100%) rename {frequency-control => mallchat-tools/mallchat-frequency-control}/src/main/java/com/abin/frequencycontrol/util/RequestHolder.java (100%) diff --git a/mallchat-tools/mallchat-common-starter/src/main/java/com/abin/mallchat/common/FrequencyControlConstant.java b/mallchat-tools/mallchat-common-starter/src/main/java/com/abin/mallchat/common/FrequencyControlConstant.java index c07e5f4..09c1c9c 100644 --- a/mallchat-tools/mallchat-common-starter/src/main/java/com/abin/mallchat/common/FrequencyControlConstant.java +++ b/mallchat-tools/mallchat-common-starter/src/main/java/com/abin/mallchat/common/FrequencyControlConstant.java @@ -2,9 +2,9 @@ package com.abin.mallchat.common; public interface FrequencyControlConstant { - String TOTAL_COUNT_WITH_IN_FIX_TIME_FREQUENCY_CONTROLLER = "TotalCountWithInFixTime"; + String TOTAL_COUNT_WITH_IN_FIX_TIME = "TotalCountWithInFixTime"; - String SLIDING_WINDOW_FREQUENCY_CONTROLLER = "SlidingWindow"; + String SLIDING_WINDOW = "SlidingWindow"; - String TOKEN_BUCKET_FREQUENCY_CONTROLLER = "TokenBucket"; + String TOKEN_BUCKET = "TokenBucket"; } diff --git a/frequency-control/.gitignore b/mallchat-tools/mallchat-frequency-control/.gitignore similarity index 100% rename from frequency-control/.gitignore rename to mallchat-tools/mallchat-frequency-control/.gitignore diff --git a/frequency-control/pom.xml b/mallchat-tools/mallchat-frequency-control/pom.xml similarity index 83% rename from frequency-control/pom.xml rename to mallchat-tools/mallchat-frequency-control/pom.xml index 8eb7060..d7c6e85 100644 --- a/frequency-control/pom.xml +++ b/mallchat-tools/mallchat-frequency-control/pom.xml @@ -1,14 +1,15 @@ - + - mallchat + mallchat-tools com.abin.mallchat 1.0-SNAPSHOT 4.0.0 - frequency-control + mallchat-frequency-control diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/FrequencyControlApplication.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/FrequencyControlApplication.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/FrequencyControlApplication.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/FrequencyControlApplication.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControl.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControl.java similarity index 97% rename from frequency-control/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControl.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControl.java index ba6591d..135a750 100644 --- a/frequency-control/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControl.java +++ b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControl.java @@ -16,7 +16,7 @@ public @interface FrequencyControl { /** * 策略 */ - String strategy() default FrequencyControlConstant.TOTAL_COUNT_WITH_IN_FIX_TIME_FREQUENCY_CONTROLLER; + String strategy() default FrequencyControlConstant.TOTAL_COUNT_WITH_IN_FIX_TIME; /** * 窗口大小，默认 5 个 period diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControlContainer.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControlContainer.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControlContainer.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/annotation/FrequencyControlContainer.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/aspect/FrequencyControlAspect.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/aspect/FrequencyControlAspect.java similarity index 97% rename from frequency-control/src/main/java/com/abin/frequencycontrol/aspect/FrequencyControlAspect.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/aspect/FrequencyControlAspect.java index 7e77740..d17fc2b 100644 --- a/frequency-control/src/main/java/com/abin/frequencycontrol/aspect/FrequencyControlAspect.java +++ b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/aspect/FrequencyControlAspect.java @@ -37,7 +37,7 @@ public class FrequencyControlAspect { Method method = ((MethodSignature) joinPoint.getSignature()).getMethod(); FrequencyControl[] annotationsByType = method.getAnnotationsByType(FrequencyControl.class); Map keyMap = new HashMap<>(); - String strategy = FrequencyControlConstant.TOTAL_COUNT_WITH_IN_FIX_TIME_FREQUENCY_CONTROLLER; + String strategy = FrequencyControlConstant.TOTAL_COUNT_WITH_IN_FIX_TIME; for (int i = 0; i < annotationsByType.length; i++) { // 获取频控注解 FrequencyControl frequencyControl = annotationsByType[i]; @@ -57,12 +57,12 @@ public class FrequencyControlAspect { strategy = frequencyControl.strategy(); } // 将注解的参数转换为编程式调用需要的参数 - if (FrequencyControlConstant.TOTAL_COUNT_WITH_IN_FIX_TIME_FREQUENCY_CONTROLLER.equals(strategy)) { + if (FrequencyControlConstant.TOTAL_COUNT_WITH_IN_FIX_TIME.equals(strategy)) { // 调用编程式注解 固定窗口 List frequencyControlDTOS = keyMap.entrySet().stream().map(entrySet -> buildFixedWindowDTO(entrySet.getKey(), entrySet.getValue())).collect(Collectors.toList()); return FrequencyControlUtil.executeWithFrequencyControlList(strategy, frequencyControlDTOS, joinPoint::proceed); - } else if (FrequencyControlConstant.TOKEN_BUCKET_FREQUENCY_CONTROLLER.equals(strategy)) { + } else if (FrequencyControlConstant.TOKEN_BUCKET.equals(strategy)) { // 调用编程式注解 令牌桶 List frequencyControlDTOS = keyMap.entrySet().stream().map(entrySet -> buildTokenBucketDTO(entrySet.getKey(), entrySet.getValue())).collect(Collectors.toList()); return FrequencyControlUtil.executeWithFrequencyControlList(strategy, frequencyControlDTOS, joinPoint::proceed); diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/FixedWindowDTO.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/FixedWindowDTO.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/FixedWindowDTO.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/FixedWindowDTO.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/FrequencyControlDTO.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/FrequencyControlDTO.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/FrequencyControlDTO.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/FrequencyControlDTO.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/RequestInfo.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/RequestInfo.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/RequestInfo.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/RequestInfo.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/SlidingWindowDTO.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/SlidingWindowDTO.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/SlidingWindowDTO.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/SlidingWindowDTO.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/TokenBucketDTO.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/TokenBucketDTO.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/TokenBucketDTO.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/dto/TokenBucketDTO.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/domain/vo/response/ApiResult.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/vo/response/ApiResult.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/domain/vo/response/ApiResult.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/vo/response/ApiResult.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/domain/vo/response/PageBaseResp.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/vo/response/PageBaseResp.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/domain/vo/response/PageBaseResp.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/domain/vo/response/PageBaseResp.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/exception/BusinessErrorEnum.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/BusinessErrorEnum.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/exception/BusinessErrorEnum.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/BusinessErrorEnum.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/exception/BusinessException.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/BusinessException.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/exception/BusinessException.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/BusinessException.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/exception/CommonErrorEnum.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/CommonErrorEnum.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/exception/CommonErrorEnum.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/CommonErrorEnum.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/exception/ErrorEnum.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/ErrorEnum.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/exception/ErrorEnum.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/ErrorEnum.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/exception/FrequencyControlException.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/FrequencyControlException.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/exception/FrequencyControlException.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/FrequencyControlException.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/exception/HttpErrorEnum.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/HttpErrorEnum.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/exception/HttpErrorEnum.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/exception/HttpErrorEnum.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/mannager/TokenBucketManager.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/mannager/TokenBucketManager.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/mannager/TokenBucketManager.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/mannager/TokenBucketManager.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/AbstractFrequencyControlService.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/AbstractFrequencyControlService.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/AbstractFrequencyControlService.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/AbstractFrequencyControlService.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/FrequencyControlStrategyFactory.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/FrequencyControlStrategyFactory.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/FrequencyControlStrategyFactory.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/FrequencyControlStrategyFactory.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/FrequencyControlUtil.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/FrequencyControlUtil.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/FrequencyControlUtil.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/FrequencyControlUtil.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/GenericMethodWithGenericClass.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/GenericMethodWithGenericClass.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/GenericMethodWithGenericClass.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/GenericMethodWithGenericClass.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/SlidingWindowFrequencyController.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/SlidingWindowFrequencyController.java similarity index 97% rename from frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/SlidingWindowFrequencyController.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/SlidingWindowFrequencyController.java index be82e40..63a59ed 100644 --- a/frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/SlidingWindowFrequencyController.java +++ b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/SlidingWindowFrequencyController.java @@ -58,7 +58,7 @@ public class SlidingWindowFrequencyController extends AbstractFrequencyControlSe @Override protected String getStrategyName() { - return FrequencyControlConstant.SLIDING_WINDOW_FREQUENCY_CONTROLLER; + return FrequencyControlConstant.SLIDING_WINDOW; } } diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TokenBucketFrequencyController.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TokenBucketFrequencyController.java similarity index 96% rename from frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TokenBucketFrequencyController.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TokenBucketFrequencyController.java index 8b9b6f4..a65fd40 100644 --- a/frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TokenBucketFrequencyController.java +++ b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TokenBucketFrequencyController.java @@ -49,6 +49,6 @@ public class TokenBucketFrequencyController extends AbstractFrequencyControlServ @Override protected String getStrategyName() { - return FrequencyControlConstant.TOKEN_BUCKET_FREQUENCY_CONTROLLER; + return FrequencyControlConstant.TOKEN_BUCKET; } } diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TotalCountWithInFixTimeFrequencyController.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TotalCountWithInFixTimeFrequencyController.java similarity index 98% rename from frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TotalCountWithInFixTimeFrequencyController.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TotalCountWithInFixTimeFrequencyController.java index 652e994..d25f142 100644 --- a/frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TotalCountWithInFixTimeFrequencyController.java +++ b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/service/frequencycontrol/strategy/TotalCountWithInFixTimeFrequencyController.java @@ -58,6 +58,6 @@ public class TotalCountWithInFixTimeFrequencyController extends AbstractFrequenc @Override protected String getStrategyName() { - return FrequencyControlConstant.TOTAL_COUNT_WITH_IN_FIX_TIME_FREQUENCY_CONTROLLER; + return FrequencyControlConstant.TOTAL_COUNT_WITH_IN_FIX_TIME; } } diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/util/AssertUtil.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/util/AssertUtil.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/util/AssertUtil.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/util/AssertUtil.java diff --git a/frequency-control/src/main/java/com/abin/frequencycontrol/util/RequestHolder.java b/mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/util/RequestHolder.java similarity index 100% rename from frequency-control/src/main/java/com/abin/frequencycontrol/util/RequestHolder.java rename to mallchat-tools/mallchat-frequency-control/src/main/java/com/abin/frequencycontrol/util/RequestHolder.java