org.dromara
ruoyi-common-translation
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java
index f8adf7ded..71cf3b618 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/RedisRateLimiterController.java
@@ -1,8 +1,8 @@
package org.dromara.demo.controller;
import org.dromara.common.core.domain.R;
-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 lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java
index f31c54074..ee4900709 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestDemoController.java
@@ -8,7 +8,7 @@ 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.web.core.BaseController;
-import org.dromara.common.idempotent.annotation.RepeatSubmit;
+import org.dromara.common.redis.annotation.RepeatSubmit;
import org.dromara.common.mybatis.core.page.PageQuery;
import org.dromara.common.mybatis.core.page.TableDataInfo;
import org.dromara.common.excel.core.ExcelResult;
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java
index 64243b77c..8458dc8ba 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestExcelController.java
@@ -1,6 +1,5 @@
package org.dromara.demo.controller;
-import cn.dev33.satoken.annotation.SaIgnore;
import cn.hutool.core.collection.CollUtil;
import jakarta.servlet.http.HttpServletResponse;
import lombok.AllArgsConstructor;
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java
index 5c552055f..1677abce0 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/TestTreeController.java
@@ -7,7 +7,7 @@ import org.dromara.common.core.validate.EditGroup;
import org.dromara.common.core.validate.QueryGroup;
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-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java
deleted file mode 100644
index a3051b24b..000000000
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/BoundedQueueController.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package org.dromara.demo.controller.queue;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.redis.utils.QueueUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-/**
- * 有界队列 演示案例
- *
- * 轻量级队列 重量级数据量 请使用 MQ
- *
- * 集群测试通过 同一个数据只会被消费一次 做好事务补偿
- * 集群测试流程 在其中一台发送数据 两端分别调用获取接口 一次获取一条
- *
- * @author Lion Li
- * @version 3.6.0
- * @deprecated redisson 新版本已经将队列功能标记删除 一些技术问题无法解决 建议搭建MQ使用
- */
-@Deprecated
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/demo/queue/bounded")
-public class BoundedQueueController {
-
-
- /**
- * 添加队列数据
- *
- * @param queueName 队列名
- * @param capacity 容量
- */
- @GetMapping("/add")
- public R add(String queueName, int capacity) {
- // 用完了一定要销毁 否则会一直存在
- boolean b = QueueUtils.destroyBoundedQueue(queueName);
- log.info("通道: {} , 删除: {}", queueName, b);
- // 初始化设置一次即可
- if (QueueUtils.trySetBoundedQueueCapacity(queueName, capacity)) {
- log.info("通道: {} , 设置容量: {}", queueName, capacity);
- } else {
- log.info("通道: {} , 设置容量失败", queueName);
- return R.fail("操作失败");
- }
- for (int i = 0; i < 11; i++) {
- String data = "data-" + i;
- boolean flag = QueueUtils.addBoundedQueueObject(queueName, data);
- if (flag == false) {
- log.info("通道: {} , 发送数据: {} 失败, 通道已满", queueName, data);
- } else {
- log.info("通道: {} , 发送数据: {}", queueName, data);
- }
- }
- return R.ok("操作成功");
- }
-
- /**
- * 删除队列数据
- *
- * @param queueName 队列名
- */
- @GetMapping("/remove")
- public R remove(String queueName) {
- String data = "data-" + 5;
- if (QueueUtils.removeBoundedQueueObject(queueName, data)) {
- log.info("通道: {} , 删除数据: {}", queueName, data);
- } else {
- return R.fail("操作失败");
- }
- return R.ok("操作成功");
- }
-
- /**
- * 获取队列数据
- *
- * @param queueName 队列名
- */
- @GetMapping("/get")
- public R get(String queueName) {
- String data;
- do {
- data = QueueUtils.getBoundedQueueObject(queueName);
- log.info("通道: {} , 获取数据: {}", queueName, data);
- } while (data != null);
- return R.ok("操作成功");
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java
deleted file mode 100644
index 7c494e27f..000000000
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/DelayedQueueController.java
+++ /dev/null
@@ -1,97 +0,0 @@
-package org.dromara.demo.controller.queue;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.dromara.common.core.domain.R;
-import org.dromara.common.redis.utils.QueueUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.TimeUnit;
-
-/**
- * 延迟队列 演示案例
- *
- * 轻量级队列 重量级数据量 请使用 MQ
- * 例如: 创建订单30分钟后过期处理
- *
- * 集群测试通过 同一个数据只会被消费一次 做好事务补偿
- * 集群测试流程 两台集群分别开启订阅 在其中一台发送数据 观察接收消息的规律
- *
- * @author Lion Li
- * @version 3.6.0
- * @deprecated redisson 新版本已经将队列功能标记删除 一些技术问题无法解决 建议搭建MQ使用
- */
-@Deprecated
-@Slf4j
-@RequiredArgsConstructor
-@RestController
-@RequestMapping("/demo/queue/delayed")
-public class DelayedQueueController {
-
- /**
- * 订阅队列
- *
- * @param queueName 队列名
- */
- @GetMapping("/subscribe")
- public R subscribe(String queueName) {
- log.info("通道: {} 监听中......", queueName);
- // 项目初始化设置一次即可
- QueueUtils.subscribeBlockingQueue(queueName, (String orderNum) -> {
- // 观察接收时间
- log.info("通道: {}, 收到数据: {}", queueName, orderNum);
- return CompletableFuture.runAsync(() -> {
- // 异步处理数据逻辑 不要在上方处理业务逻辑
- log.info("数据处理: {}", orderNum);
- });
- }, true);
- return R.ok("操作成功");
- }
-
- /**
- * 添加队列数据
- *
- * @param queueName 队列名
- * @param orderNum 订单号
- * @param time 延迟时间(秒)
- */
- @GetMapping("/add")
- public R add(String queueName, String orderNum, Long time) {
- QueueUtils.addDelayedQueueObject(queueName, orderNum, time, TimeUnit.SECONDS);
- // 观察发送时间
- log.info("通道: {} , 发送数据: {}", queueName, orderNum);
- return R.ok("操作成功");
- }
-
- /**
- * 删除队列数据
- *
- * @param queueName 队列名
- * @param orderNum 订单号
- */
- @GetMapping("/remove")
- public R remove(String queueName, String orderNum) {
- if (QueueUtils.removeDelayedQueueObject(queueName, orderNum)) {
- log.info("通道: {} , 删除数据: {}", queueName, orderNum);
- } else {
- return R.fail("操作失败");
- }
- return R.ok("操作成功");
- }
-
- /**
- * 销毁队列
- *
- * @param queueName 队列名
- */
- @GetMapping("/destroy")
- public R destroy(String queueName) {
- // 用完了一定要销毁 否则会一直存在
- QueueUtils.destroyDelayedQueue(queueName);
- return R.ok("操作成功");
- }
-
-}
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java
index 43862a6df..e2449b518 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityDemo.java
@@ -8,9 +8,7 @@ import lombok.NoArgsConstructor;
*
* @author Lion Li
* @version 3.6.0
- * @deprecated redisson 新版本已经将队列功能标记删除 一些技术问题无法解决 建议搭建MQ使用
*/
-@Deprecated
@Data
@NoArgsConstructor
public class PriorityDemo implements Comparable {
diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java
index 2f2b7378d..02c739650 100644
--- a/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java
+++ b/ruoyi-modules/ruoyi-demo/src/main/java/org/dromara/demo/controller/queue/PriorityQueueController.java
@@ -19,9 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
*
* @author Lion Li
* @version 3.6.0
- * @deprecated redisson 新版本已经将队列功能标记删除 一些技术问题无法解决 建议搭建MQ使用
*/
-@Deprecated
@Slf4j
@RequiredArgsConstructor
@RestController
diff --git a/ruoyi-modules/ruoyi-generator/pom.xml b/ruoyi-modules/ruoyi-generator/pom.xml
index b93b8371e..49060292f 100644
--- a/ruoyi-modules/ruoyi-generator/pom.xml
+++ b/ruoyi-modules/ruoyi-generator/pom.xml
@@ -42,11 +42,6 @@
ruoyi-common-log
-