From e204b60ac4a817158e902de9824b15f8d9478f82 Mon Sep 17 00:00:00 2001 From: redkale Date: Thu, 7 Dec 2023 15:26:08 +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/annotation/Resource.java | 4 ++-- src/main/java/org/redkale/service/Service.java | 2 +- src/main/java/org/redkale/util/ResourceFactory.java | 4 ++-- src/test/java/org/redkale/test/util/ResourceLoaderTest.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/redkale/annotation/Resource.java b/src/main/java/org/redkale/annotation/Resource.java index d729ded16..d252ddc18 100644 --- a/src/main/java/org/redkale/annotation/Resource.java +++ b/src/main/java/org/redkale/annotation/Resource.java @@ -39,8 +39,8 @@ public @interface Resource { * 资源名称
*
      * name规则:
-     * 1: "#"有特殊含义, 表示资源本身,"#"不能单独使用
-     * 2: "@name"、"@type"有特殊含义
+     * 1: "@"有特殊含义, 表示资源本身,"@"不能单独使用
+     * 2: "#name"、"#type"有特殊含义
      * 3: 只能是字母、数字、(短横)-、(下划线)_、点(.)的组合
      * 
* diff --git a/src/main/java/org/redkale/service/Service.java b/src/main/java/org/redkale/service/Service.java index b9431dc32..19de888c1 100644 --- a/src/main/java/org/redkale/service/Service.java +++ b/src/main/java/org/redkale/service/Service.java @@ -9,7 +9,7 @@ import org.redkale.util.AnyValue; /** * 所有Service的实现类不得声明为final, 允许远程模式的public方法都不能声明为final。
- * 注意: "#"是一个很特殊的Service.name值 。 被标记为@Resource(name = "#") 的Service的资源名与所属父Service的资源名一致。
+ * 注意: "@"是一个很特殊的Service.name值 。 被标记为@Resource(name = "@") 的Service的资源名与所属父Service的资源名一致。
* *
  * Service的资源类型
diff --git a/src/main/java/org/redkale/util/ResourceFactory.java b/src/main/java/org/redkale/util/ResourceFactory.java
index f7b9d162b..936a8e7c0 100644
--- a/src/main/java/org/redkale/util/ResourceFactory.java
+++ b/src/main/java/org/redkale/util/ResourceFactory.java
@@ -124,8 +124,8 @@ public final class ResourceFactory {
      * 检查资源名是否合法
      * 
      * name规则:
-     *    1: "#"有特殊含义, 表示资源本身,"#"不能单独使用
-     *    2: "@name"、"@type"有特殊含义
+     *    1: "@"有特殊含义, 表示资源本身,"@"不能单独使用
+     *    2: "#name"、"#type"有特殊含义
      *    3: 只能是字母、数字、(短横)-、(下划线)_、点(.)的组合
      * 
* diff --git a/src/test/java/org/redkale/test/util/ResourceLoaderTest.java b/src/test/java/org/redkale/test/util/ResourceLoaderTest.java index 1af3352ed..6d0863c1b 100644 --- a/src/test/java/org/redkale/test/util/ResourceLoaderTest.java +++ b/src/test/java/org/redkale/test/util/ResourceLoaderTest.java @@ -46,10 +46,10 @@ public class ResourceLoaderTest { public static class Bean { - @Resource(name = "#.id") + @Resource(name = "@.id") public int id; - @Resource(name = "#.name") + @Resource(name = "@.name") public String name; public Bean() {