diff --git a/ruoyi-auth/pom.xml b/ruoyi-auth/pom.xml index 37a6c73f8..e4699de26 100644 --- a/ruoyi-auth/pom.xml +++ b/ruoyi-auth/pom.xml @@ -55,7 +55,7 @@ org.dromara - ruoyi-common-ratelimiter + ruoyi-common-redis diff --git a/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java b/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java index bf95fb239..7676a6cde 100644 --- a/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java +++ b/ruoyi-auth/src/main/java/org/dromara/auth/controller/CaptchaController.java @@ -14,8 +14,8 @@ import org.dromara.common.core.constant.GlobalConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; +import org.dromara.common.redis.annotation.RateLimiter; +import org.dromara.common.redis.enums.LimitType; import org.dromara.common.redis.utils.RedisUtils; import org.springframework.expression.Expression; import org.springframework.expression.ExpressionParser; diff --git a/ruoyi-common/pom.xml b/ruoyi-common/pom.xml index 7eb53dc53..6c4edab50 100644 --- a/ruoyi-common/pom.xml +++ b/ruoyi-common/pom.xml @@ -26,8 +26,6 @@ ruoyi-common-seata ruoyi-common-loadbalancer ruoyi-common-oss - ruoyi-common-ratelimiter - ruoyi-common-idempotent ruoyi-common-mail ruoyi-common-sms ruoyi-common-logstash diff --git a/ruoyi-common/ruoyi-common-bom/pom.xml b/ruoyi-common/ruoyi-common-bom/pom.xml index 8d76cedfc..6bf007bf7 100644 --- a/ruoyi-common/ruoyi-common-bom/pom.xml +++ b/ruoyi-common/ruoyi-common-bom/pom.xml @@ -124,20 +124,6 @@ ${revision} - - - org.dromara - ruoyi-common-ratelimiter - ${revision} - - - - - org.dromara - ruoyi-common-idempotent - ${revision} - - org.dromara diff --git a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java index f2d6461e0..adcc3fa50 100644 --- a/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java +++ b/ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/utils/StringUtils.java @@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.lang.Validator; import cn.hutool.core.util.StrUtil; +import org.apache.commons.lang3.Strings; import org.springframework.util.AntPathMatcher; import java.nio.charset.Charset; @@ -333,7 +334,7 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { public static boolean startWithAnyIgnoreCase(CharSequence str, CharSequence... prefixs) { // 判断是否是以指定字符串开头 for (CharSequence prefix : prefixs) { - if (StringUtils.startsWithIgnoreCase(str, prefix)) { + if (Strings.CI.startsWith(str, prefix)) { return true; } } @@ -361,7 +362,6 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { return input; } } - /** * 将可迭代对象中的元素使用逗号拼接成字符串 * @@ -382,4 +382,169 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils { return StringUtils.join(array, SEPARATOR); } + /** + * 判断两个字符串是否相等 + * + * @param cs1 字符串1 + * @param cs2 字符串2 + * @return 是否相等 + */ + public static boolean equals(final CharSequence cs1, final CharSequence cs2) { + return Strings.CS.equals(cs1, cs2); + } + + /** + * 判断字符串是否在指定的字符串列表中 + * + * @param string 字符串 + * @param searchStrings 字符串列表 + * @return 是否在列表中 + */ + public static boolean equalsAny(final CharSequence string, final CharSequence... searchStrings) { + return Strings.CS.equalsAny(string, searchStrings); + } + + /** + * 忽略大小写判断字符串是否在指定的字符串列表中 + * + * @param string 字符串 + * @param searchStrings 字符串列表 + * @return 是否在列表中 + */ + public static boolean equalsAnyIgnoreCase(final CharSequence string, final CharSequence... searchStrings) { + return Strings.CI.equalsAny(string, searchStrings); + } + + /** + * 忽略大小写判断两个字符串是否相等 + * + * @param cs1 字符串1 + * @param cs2 字符串2 + * @return 是否相等 + */ + public static boolean equalsIgnoreCase(final CharSequence cs1, final CharSequence cs2) { + return Strings.CI.equals(cs1, cs2); + } + + /** + * 检查指定的字符序列中是否包含另一个字符序列。 + * + * @param seq 要检查的字符序列，不能为null + * @param searchSeq 要搜索的字符序列，不能为null + * @return 如果seq中包含searchSeq，则返回true；否则返回false + */ + public static boolean contains(final CharSequence seq, final CharSequence searchSeq) { + return Strings.CS.contains(seq, searchSeq); + } + + /** + * 忽略大小写检查指定字符序列中是否包含另一个字符序列。 + * + * @param seq 要检查的字符序列 + * @param searchSeq 要搜索的字符序列 + * @return 如果包含则返回 true，否则返回 false + */ + public static boolean containsIgnoreCase(final CharSequence seq, final CharSequence searchSeq) { + return Strings.CI.contains(seq, searchSeq); + } + + /** + * 检查 CharSequence 是否以指定前缀开头。 + * + * @param str 要检查的字符序列 + * @param prefix 要查找的前缀 + * @return 如果以指定前缀开头则返回 true，否则返回 false + */ + public static boolean startsWith(final CharSequence str, final CharSequence prefix) { + return Strings.CS.startsWith(str, prefix); + } + + /** + * 忽略大小写检查 CharSequence 是否以指定前缀开头。 + * + * @param str 要检查的字符序列 + * @param prefix 要查找的前缀 + * @return 如果以指定前缀开头则返回 true，否则返回 false + */ + public static boolean startsWithIgnoreCase(final CharSequence str, final CharSequence prefix) { + return Strings.CI.startsWith(str, prefix); + } + + /** + * 忽略大小写检查 CharSequence 是否以指定后缀结尾。 + * + * @param str 要检查的字符序列 + * @param suffix 要查找的后缀 + * @return 如果以指定后缀结尾则返回 true，否则返回 false + */ + public static boolean endsWithIgnoreCase(final CharSequence str, final CharSequence suffix) { + return Strings.CI.endsWith(str, suffix); + } + + /** + * 返回指定字符序列首次出现的位置。 + * + * @param seq 源字符序列 + * @param searchSeq 待查找字符序列 + * @return 首次出现的位置，不存在时返回 -1 + */ + public static int indexOf(final CharSequence seq, final CharSequence searchSeq) { + if (seq == null || searchSeq == null) { + return -1; + } + return seq.toString().indexOf(searchSeq.toString()); + } + + /** + * 移除字符串中的指定字符序列。 + * + * @param str 要处理的字符串，不能为null + * @param remove 要移除的字符序列，不能为null + * @return 处理后的字符串 + */ + public static String remove(final String str, final String remove) { + return Strings.CS.remove(str, remove); + } + + /** + * 如果字符串以指定前缀开头，则移除该前缀。 + * + * @param str 要处理的字符串 + * @param remove 要移除的前缀 + * @return 处理后的字符串 + */ + public static String removeStart(final String str, final String remove) { + if (isEmpty(str) || isEmpty(remove)) { + return str; + } + return startsWith(str, remove) ? str.substring(remove.length()) : str; + } + + /** + * 替换字符串中的目标子串。 + * + * @param text 原始字符串 + * @param searchString 需要替换的子串 + * @param replacement 替换后的子串 + * @return 替换后的字符串 + */ + public static String replace(final String text, final String searchString, final String replacement) { + if (text == null || isEmpty(searchString) || replacement == null) { + return text; + } + return text.replace(searchString, replacement); + } + + + /** + * 检查字符串是否包含任意一个指定的字符序列 + * + * @param cs 要检查的字符串 + * @param searchCharSequences 需要查找的字符序列数组 + * @return 如果包含任意一个字符序列返回 true，否则返回 false + */ + public static boolean containsAny(final CharSequence cs, final CharSequence... searchCharSequences) { + return Strings.CS.containsAny(cs, searchCharSequences); + } + } diff --git a/ruoyi-common/ruoyi-common-idempotent/pom.xml b/ruoyi-common/ruoyi-common-idempotent/pom.xml deleted file mode 100644 index 64418b42d..000000000 --- a/ruoyi-common/ruoyi-common-idempotent/pom.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-idempotent - - - ruoyi-common-idempotent 幂等功能 - - - - - org.dromara - ruoyi-common-json - - - - org.dromara - ruoyi-common-redis - - - - cn.hutool - hutool-crypto - - - - cn.dev33 - sa-token-core - - - - - diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index fc57da7a4..000000000 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.idempotent.config.IdempotentAutoConfiguration diff --git a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml b/ruoyi-common/ruoyi-common-ratelimiter/pom.xml deleted file mode 100644 index bbde94098..000000000 --- a/ruoyi-common/ruoyi-common-ratelimiter/pom.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - org.dromara - ruoyi-common - ${revision} - - 4.0.0 - - ruoyi-common-ratelimiter - - - ruoyi-common-ratelimiter 限流功能 - - - - - org.dromara - ruoyi-common-core - - - - org.dromara - ruoyi-common-redis - - - - diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 3b9543295..000000000 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.dromara.common.ratelimiter.config.RateLimiterConfig diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json b/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json deleted file mode 100644 index 64a0e1be0..000000000 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/resources/spel-extension.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "org.dromara.common.ratelimiter.annotation.RateLimiter@key": { - "method": { - "parameters": true - } - } -} diff --git a/ruoyi-common/ruoyi-common-redis/pom.xml b/ruoyi-common/ruoyi-common-redis/pom.xml index b42603fa1..f8a5a477f 100644 --- a/ruoyi-common/ruoyi-common-redis/pom.xml +++ b/ruoyi-common/ruoyi-common-redis/pom.xml @@ -22,6 +22,11 @@ ruoyi-common-core + + org.dromara + ruoyi-common-json + + org.redisson @@ -49,6 +54,16 @@ jackson-databind + + cn.hutool + hutool-crypto + + + + cn.dev33 + sa-token-core + + org.apache.fory diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/annotation/RateLimiter.java similarity index 89% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/annotation/RateLimiter.java index 79272d41e..bfa55ff88 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/annotation/RateLimiter.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/annotation/RateLimiter.java @@ -1,6 +1,6 @@ -package org.dromara.common.ratelimiter.annotation; +package org.dromara.common.redis.annotation; -import org.dromara.common.ratelimiter.enums.LimitType; +import org.dromara.common.redis.enums.LimitType; import java.lang.annotation.*; diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/annotation/RepeatSubmit.java similarity index 91% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/annotation/RepeatSubmit.java index 42ae802f4..c7fc9a1ad 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/annotation/RepeatSubmit.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/annotation/RepeatSubmit.java @@ -1,4 +1,4 @@ -package org.dromara.common.idempotent.annotation; +package org.dromara.common.redis.annotation; import java.lang.annotation.*; import java.util.concurrent.TimeUnit; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RateLimiterAspect.java similarity index 96% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RateLimiterAspect.java index 2d6d82ea3..81fd9876f 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/aspectj/RateLimiterAspect.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RateLimiterAspect.java @@ -1,4 +1,4 @@ -package org.dromara.common.ratelimiter.aspectj; +package org.dromara.common.redis.aspectj; import lombok.extern.slf4j.Slf4j; import org.aspectj.lang.JoinPoint; @@ -11,8 +11,8 @@ import org.dromara.common.core.utils.MessageUtils; import org.dromara.common.core.utils.ServletUtils; import org.dromara.common.core.utils.SpringUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.ratelimiter.annotation.RateLimiter; -import org.dromara.common.ratelimiter.enums.LimitType; +import org.dromara.common.redis.annotation.RateLimiter; +import org.dromara.common.redis.enums.LimitType; import org.dromara.common.redis.utils.RedisUtils; import org.redisson.api.RateType; import org.springframework.context.expression.BeanFactoryResolver; diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RepeatSubmitAspect.java similarity index 97% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RepeatSubmitAspect.java index 2afc85af3..cb4252c47 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/aspectj/RepeatSubmitAspect.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/aspectj/RepeatSubmitAspect.java @@ -1,4 +1,4 @@ -package org.dromara.common.idempotent.aspectj; +package org.dromara.common.redis.aspectj; import cn.dev33.satoken.SaManager; import cn.hutool.core.util.ArrayUtil; @@ -17,8 +17,8 @@ import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.MessageUtils; import org.dromara.common.core.utils.ServletUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; import org.dromara.common.json.utils.JsonUtils; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.redis.utils.RedisUtils; import org.springframework.validation.BindingResult; import org.springframework.web.multipart.MultipartFile; diff --git a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentAutoConfiguration.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/IdempotentAutoConfiguration.java similarity index 68% rename from ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentAutoConfiguration.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/IdempotentAutoConfiguration.java index e8b785c2b..795547d38 100644 --- a/ruoyi-common/ruoyi-common-idempotent/src/main/java/org/dromara/common/idempotent/config/IdempotentAutoConfiguration.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/IdempotentAutoConfiguration.java @@ -1,7 +1,6 @@ -package org.dromara.common.idempotent.config; +package org.dromara.common.redis.config; -import org.dromara.common.idempotent.aspectj.RepeatSubmitAspect; -import org.dromara.common.redis.config.RedisConfiguration; +import org.dromara.common.redis.aspectj.RepeatSubmitAspect; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RateLimiterConfig.java similarity index 66% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RateLimiterConfig.java index 4b7e5b7f4..9273fb672 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/config/RateLimiterConfig.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/config/RateLimiterConfig.java @@ -1,9 +1,8 @@ -package org.dromara.common.ratelimiter.config; +package org.dromara.common.redis.config; -import org.dromara.common.ratelimiter.aspectj.RateLimiterAspect; +import org.dromara.common.redis.aspectj.RateLimiterAspect; import org.springframework.boot.autoconfigure.AutoConfiguration; import org.springframework.context.annotation.Bean; -import org.springframework.data.redis.connection.RedisConfiguration; /** * @author guangxin diff --git a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/enums/LimitType.java similarity index 85% rename from ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java rename to ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/enums/LimitType.java index b7f059fd5..a911a3396 100644 --- a/ruoyi-common/ruoyi-common-ratelimiter/src/main/java/org/dromara/common/ratelimiter/enums/LimitType.java +++ b/ruoyi-common/ruoyi-common-redis/src/main/java/org/dromara/common/redis/enums/LimitType.java @@ -1,4 +1,4 @@ -package org.dromara.common.ratelimiter.enums; +package org.dromara.common.redis.enums; /** * 限流类型 diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 506a81fc3..afdf91ed2 100644 --- a/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/ruoyi-common/ruoyi-common-redis/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,4 @@ org.dromara.common.redis.config.RedisConfiguration org.dromara.common.redis.config.CacheConfiguration +org.dromara.common.redis.config.IdempotentAutoConfiguration +org.dromara.common.redis.config.RateLimiterConfig diff --git a/ruoyi-common/ruoyi-common-redis/src/main/resources/spel-extension.json b/ruoyi-common/ruoyi-common-redis/src/main/resources/spel-extension.json new file mode 100644 index 000000000..15801539d --- /dev/null +++ b/ruoyi-common/ruoyi-common-redis/src/main/resources/spel-extension.json @@ -0,0 +1,7 @@ +{ + "org.dromara.common.redis.annotation.RateLimiter@key": { + "method": { + "parameters": true + } + } +} diff --git a/ruoyi-example/ruoyi-demo/pom.xml b/ruoyi-example/ruoyi-demo/pom.xml index fe6429115..de6726d74 100644 --- a/ruoyi-example/ruoyi-demo/pom.xml +++ b/ruoyi-example/ruoyi-demo/pom.xml @@ -54,7 +54,7 @@ org.dromara - ruoyi-common-idempotent + ruoyi-common-redis diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java index d0c302516..2b5e285eb 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java @@ -10,7 +10,7 @@ import org.dromara.common.core.validate.QueryGroup; import org.dromara.common.web.core.BaseController; import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java index 178a4b8b2..70ad5428a 100644 --- a/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java +++ b/ruoyi-example/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java @@ -6,7 +6,7 @@ import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.web.core.BaseController; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.demo.domain.bo.TestTreeBo; diff --git a/ruoyi-modules/ruoyi-gen/pom.xml b/ruoyi-modules/ruoyi-gen/pom.xml index a3ebbdc90..b6ccc99e9 100644 --- a/ruoyi-modules/ruoyi-gen/pom.xml +++ b/ruoyi-modules/ruoyi-gen/pom.xml @@ -36,7 +36,7 @@ org.dromara - ruoyi-common-idempotent + ruoyi-common-redis diff --git a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java index ca2731592..91281e088 100644 --- a/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java +++ b/ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/controller/GenController.java @@ -7,7 +7,7 @@ import com.baomidou.lock.annotation.Lock4j; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-resource/pom.xml b/ruoyi-modules/ruoyi-resource/pom.xml index cd825ec2f..501a7f60d 100644 --- a/ruoyi-modules/ruoyi-resource/pom.xml +++ b/ruoyi-modules/ruoyi-resource/pom.xml @@ -49,7 +49,7 @@ org.dromara - ruoyi-common-idempotent + ruoyi-common-redis @@ -57,11 +57,6 @@ ruoyi-common-oss - - org.dromara - ruoyi-common-ratelimiter - - org.dromara ruoyi-common-mail diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java index 01c72776d..8463195f1 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysEmailController.java @@ -9,7 +9,7 @@ import org.dromara.common.core.constant.GlobalConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.exception.ServiceException; import org.dromara.common.core.utils.SpringUtils; -import org.dromara.common.ratelimiter.annotation.RateLimiter; +import org.dromara.common.redis.annotation.RateLimiter; import org.dromara.common.web.core.BaseController; import org.dromara.common.mail.config.properties.MailProperties; import org.dromara.common.mail.utils.MailUtils; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java index 268cc8222..00e246be3 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysOssConfigController.java @@ -8,7 +8,7 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.core.validate.QueryGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysSmsController.java b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysSmsController.java index f5ae8f4e8..52e227c8d 100644 --- a/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysSmsController.java +++ b/ruoyi-modules/ruoyi-resource/src/main/java/org/dromara/resource/controller/SysSmsController.java @@ -8,7 +8,7 @@ import lombok.extern.slf4j.Slf4j; import org.dromara.common.core.constant.Constants; import org.dromara.common.core.constant.GlobalConstants; import org.dromara.common.core.domain.R; -import org.dromara.common.ratelimiter.annotation.RateLimiter; +import org.dromara.common.redis.annotation.RateLimiter; import org.dromara.common.redis.utils.RedisUtils; import org.dromara.common.web.core.BaseController; import org.dromara.sms4j.api.SmsBlend; diff --git a/ruoyi-modules/ruoyi-system/pom.xml b/ruoyi-modules/ruoyi-system/pom.xml index 8c7755959..8740073a8 100644 --- a/ruoyi-modules/ruoyi-system/pom.xml +++ b/ruoyi-modules/ruoyi-system/pom.xml @@ -60,7 +60,7 @@ org.dromara - ruoyi-common-idempotent + ruoyi-common-redis diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java index ad8f986a7..163f18492 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysLogininforController.java @@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.CacheConstants; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java index b8d3283ee..d2710386a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/monitor/SysUserOnlineController.java @@ -9,7 +9,7 @@ import org.dromara.common.core.constant.CacheConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StreamUtils; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java index f6bb52f0f..7f43bd1b5 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysClientController.java @@ -9,7 +9,7 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java index a8406802e..c63bd4305 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysConfigController.java @@ -3,7 +3,7 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java index c88aa6d30..59c6ab63e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDeptController.java @@ -6,7 +6,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java index f9b5448c2..ae5b46e29 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictDataController.java @@ -4,7 +4,7 @@ import cn.dev33.satoken.annotation.SaCheckPermission; import cn.hutool.core.util.ObjectUtil; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java index e5cb61f4c..c8e8b798e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysDictTypeController.java @@ -3,7 +3,7 @@ package org.dromara.system.controller.system; import cn.dev33.satoken.annotation.SaCheckPermission; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.common.excel.utils.ExcelUtil; import org.dromara.common.log.annotation.Log; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java index c74680d22..4aee86c5b 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysMenuController.java @@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.satoken.utils.LoginHelper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java index c7a3e6dae..ec7557796 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysNoticeController.java @@ -5,7 +5,7 @@ import lombok.RequiredArgsConstructor; import org.apache.dubbo.config.annotation.DubboReference; import org.dromara.common.core.domain.R; import org.dromara.common.core.service.DictService; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.web.core.BaseController; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java index f1b240c7c..95b890d72 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysPostController.java @@ -6,7 +6,7 @@ import cn.hutool.core.util.ObjectUtil; import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java index 28bb3d285..d6e792ea9 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysProfileController.java @@ -11,7 +11,7 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StringUtils; import org.dromara.common.core.utils.file.MimeTypeUtils; import org.dromara.common.encrypt.annotation.ApiEncrypt; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.helper.DataPermissionHelper; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java index 3a1cfa77e..feb37f4b3 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysRoleController.java @@ -6,7 +6,7 @@ import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java index d886c146b..39a566694 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java @@ -15,7 +15,7 @@ import org.dromara.common.core.utils.StringUtils; import org.dromara.common.encrypt.annotation.ApiEncrypt; import org.dromara.common.excel.core.ExcelResult; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-workflow/pom.xml b/ruoyi-modules/ruoyi-workflow/pom.xml index 169f4e2c0..3c22b3fae 100644 --- a/ruoyi-modules/ruoyi-workflow/pom.xml +++ b/ruoyi-modules/ruoyi-workflow/pom.xml @@ -41,7 +41,7 @@ org.dromara - ruoyi-common-idempotent + ruoyi-common-redis org.dromara diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java index 498b85341..ce04e4ebb 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwCategoryController.java @@ -9,7 +9,7 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.web.core.BaseController; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java index 481e05cdd..3780407fe 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwDefinitionController.java @@ -3,7 +3,7 @@ package org.dromara.workflow.controller; import jakarta.servlet.http.HttpServletResponse; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java index 743067bfa..c6a8685c4 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwInstanceController.java @@ -4,7 +4,7 @@ import cn.hutool.core.convert.Convert; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.utils.StreamUtils; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java index a9e56ab02..4af651467 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwSpelController.java @@ -7,7 +7,7 @@ import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java index 587784faa..0208e4571 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/FlwTaskController.java @@ -3,7 +3,7 @@ package org.dromara.workflow.controller; import lombok.RequiredArgsConstructor; import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery; diff --git a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java index 2812240c9..7918fde42 100644 --- a/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java +++ b/ruoyi-modules/ruoyi-workflow/src/main/java/org/dromara/workflow/controller/TestLeaveController.java @@ -9,7 +9,7 @@ import org.dromara.common.core.domain.R; import org.dromara.common.core.validate.AddGroup; import org.dromara.common.core.validate.EditGroup; import org.dromara.common.excel.utils.ExcelUtil; -import org.dromara.common.idempotent.annotation.RepeatSubmit; +import org.dromara.common.redis.annotation.RepeatSubmit; import org.dromara.common.log.annotation.Log; import org.dromara.common.log.enums.BusinessType; import org.dromara.common.mybatis.core.page.PageQuery;