From cac8da9b4d681386caf79b631e4da41af8a6d5f3 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Tue, 26 Dec 2023 09:47:07 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/org/redkale/cache/Cached.java        | 5 +----
 src/main/java/org/redkale/lock/LockManager.java    | 2 ++
 src/main/java/org/redkale/lock/Locked.java         | 5 +----
 src/main/java/org/redkale/lock/spi/DynForLock.java | 3 +++
 src/main/java/org/redkale/mq/Messaged.java         | 2 +-
 src/main/java/org/redkale/schedule/Scheduled.java  | 3 ++-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/org/redkale/cache/Cached.java b/src/main/java/org/redkale/cache/Cached.java
index 52e103ae3..0db3e2d00 100644
--- a/src/main/java/org/redkale/cache/Cached.java
+++ b/src/main/java/org/redkale/cache/Cached.java
@@ -5,7 +5,6 @@ package org.redkale.cache;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
@@ -13,17 +12,15 @@ import java.util.concurrent.TimeUnit;
 import org.redkale.service.LoadMode;
 
 /**
- * //TODO 待实现
  *
  * 标记在Service的缓存接口, 方法有以下限制: <br>
  * 1、方法返回类型不能是void/CompletableFuture&#60;Void&#62;
  * 2、方法返回类型必须可json序列化
  * 3、方法必须是protected/public
- * 4、方法不能是final
+ * 4、方法不能是final/static
  *
  * @since 2.8.0
  */
-@Inherited
 @Documented
 @Target(METHOD)
 @Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/lock/LockManager.java b/src/main/java/org/redkale/lock/LockManager.java
index 8d8543810..ba82fc32f 100644
--- a/src/main/java/org/redkale/lock/LockManager.java
+++ b/src/main/java/org/redkale/lock/LockManager.java
@@ -4,6 +4,8 @@
 package org.redkale.lock;
 
 /**
+ * //TODO 待实现
+ *
  * 锁管理器
  *
  * <p>
diff --git a/src/main/java/org/redkale/lock/Locked.java b/src/main/java/org/redkale/lock/Locked.java
index d9d558911..52eeeb5b2 100644
--- a/src/main/java/org/redkale/lock/Locked.java
+++ b/src/main/java/org/redkale/lock/Locked.java
@@ -5,7 +5,6 @@ package org.redkale.lock;
 
 import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.METHOD;
-import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
@@ -15,9 +14,8 @@ import org.redkale.service.LoadMode;
  * //TODO 待实现
  *
  * 标记在Service的锁接口, 方法有以下限制: <br>
- * 1、方法返回类型不能是void/CompletableFuture&#60;Void&#62;
  * 2、方法必须是protected/public
- * 3、方法不能是final
+ * 3、方法不能是final/static
  *
  * <p>
  * 详情见: https://redkale.org
@@ -26,7 +24,6 @@ import org.redkale.service.LoadMode;
  *
  * @since 2.8.0
  */
-@Inherited
 @Documented
 @Target(METHOD)
 @Retention(RUNTIME)
diff --git a/src/main/java/org/redkale/lock/spi/DynForLock.java b/src/main/java/org/redkale/lock/spi/DynForLock.java
index 5021b5bdc..e8467d4da 100644
--- a/src/main/java/org/redkale/lock/spi/DynForLock.java
+++ b/src/main/java/org/redkale/lock/spi/DynForLock.java
@@ -9,6 +9,7 @@ import java.lang.annotation.Inherited;
 import java.lang.annotation.Retention;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.annotation.Target;
+import org.redkale.service.LoadMode;
 
 /**
  * {@link org.redkale.lock.Locked}注解的动态扩展版，会多一个字段信息
@@ -25,4 +26,6 @@ import java.lang.annotation.Target;
 public @interface DynForLock {
 
     String dynField();
+
+    LoadMode mode() default LoadMode.ANY;
 }
diff --git a/src/main/java/org/redkale/mq/Messaged.java b/src/main/java/org/redkale/mq/Messaged.java
index d981ed08d..4e12dbfd8 100644
--- a/src/main/java/org/redkale/mq/Messaged.java
+++ b/src/main/java/org/redkale/mq/Messaged.java
@@ -14,7 +14,7 @@ import org.redkale.service.LoadMode;
 /**
  * MQ资源注解, 只能标记在Service类方法上
  * 1、方法必须是protected/public
- * 2、方法不能是final
+ * 2、方法不能是final/static
  *
  * <p>
  * 详情见: https://redkale.org
diff --git a/src/main/java/org/redkale/schedule/Scheduled.java b/src/main/java/org/redkale/schedule/Scheduled.java
index f8250dd52..8199a2390 100644
--- a/src/main/java/org/redkale/schedule/Scheduled.java
+++ b/src/main/java/org/redkale/schedule/Scheduled.java
@@ -8,7 +8,7 @@ import java.util.concurrent.TimeUnit;
 import org.redkale.service.LoadMode;
 
 /**
- * 定时任务标记，只能作用于Service的无参数或者单一ScheduleEvent参数的方法上, 功能类似Spring里的Scheduled注解
+ * 定时任务标记，只能作用于Service的无参数或者单一ScheduleEvent参数的菲static方法上, 功能类似Spring里的Scheduled注解
  *
  *
  * <p>
@@ -18,6 +18,7 @@ import org.redkale.service.LoadMode;
  *
  * @since 2.8.0
  */
+@Documented
 @Target({ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Scheduled {