From f234ed06140b4fe4e0044e66b8678cc802e15003 Mon Sep 17 00:00:00 2001
From: redkale <redkale@qq.com>
Date: Tue, 11 Jul 2023 11:21:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96CacheSource?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/META-INF/source-template.properties      |  6 +++---
 src/main/java/org/redkale/net/http/HttpMapping.java    |  1 +
 .../java/org/redkale/source/AbstractCacheSource.java   | 10 +++++-----
 .../java/org/redkale/source/CacheMemorySource.java     |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/main/java/META-INF/source-template.properties b/src/main/java/META-INF/source-template.properties
index 33c38ebc5..74496af4e 100644
--- a/src/main/java/META-INF/source-template.properties
+++ b/src/main/java/META-INF/source-template.properties
@@ -5,11 +5,11 @@ redkale.cachesource.usersession.type = org.redkalex.cache.redis.RedisCacheSource
 # \u6700\u5927\u8fde\u63a5\u6570
 redkale.cachesource.usersession.maxconns = 16
 # \u8282\u70b9\u5730\u5740
-redkale.cachesource.usersession.node[0].url = redis://127.0.0.1:6363
+redkale.cachesource.usersession.nodes = redis://127.0.0.1:6363
 # \u8282\u70b9\u5bc6\u7801
-redkale.cachesource.usersession.node[0].password = 12345678
+redkale.cachesource.usersession.password = 12345678
 # \u8282\u70b9db
-redkale.cachesource.usersession.node[0].db = 0
+redkale.cachesource.usersession.db = 0
 
 #\u7b80\u5316\u5199\u6cd5: \u53ef\u4ee5\u4e0d\u7528.node[0], \u5c06\u53c2\u6570\u90fd\u5408\u5e76\u5230url\u4e2d
 redkale.cachesource.usersession.url = redis://user:123456@127.0.0.1:6363?db=0
diff --git a/src/main/java/org/redkale/net/http/HttpMapping.java b/src/main/java/org/redkale/net/http/HttpMapping.java
index 43132674c..a275836af 100644
--- a/src/main/java/org/redkale/net/http/HttpMapping.java
+++ b/src/main/java/org/redkale/net/http/HttpMapping.java
@@ -99,6 +99,7 @@ public @interface HttpMapping {
 
     /**
      * 输出结果的数据类型集合，由于结果类型可能是泛型而注解的参数值不支持泛型，因此加入明细数据类型集合
+     * @see #resultRef() 
      *
      * @deprecated
      * @return Class[]
diff --git a/src/main/java/org/redkale/source/AbstractCacheSource.java b/src/main/java/org/redkale/source/AbstractCacheSource.java
index a54776a28..d6e83a36e 100644
--- a/src/main/java/org/redkale/source/AbstractCacheSource.java
+++ b/src/main/java/org/redkale/source/AbstractCacheSource.java
@@ -29,9 +29,6 @@ public abstract class AbstractCacheSource extends AbstractService implements Cac
     //@since 2.8.0  复用另一source资源
     public static final String CACHE_SOURCE_RESOURCE = "resource";
 
-    //@since 2.7.0
-    public static final String CACHE_SOURCE_URL = "url";
-
     //@since 2.7.0
     public static final String CACHE_SOURCE_DB = "db";
 
@@ -44,8 +41,11 @@ public abstract class AbstractCacheSource extends AbstractService implements Cac
     //@since 2.7.0
     public static final String CACHE_SOURCE_ENCODING = "encoding";
 
-    //@since 2.7.0
-    public static final String CACHE_SOURCE_NODE = "node";
+    //@since 2.8.0
+    public static final String CACHE_SOURCE_NODES = "nodes";
+
+    //@since 2.8.0
+    public static final String CACHE_SOURCE_TYPE = "type";
 
     //@since 2.7.0
     public static final String CACHE_SOURCE_MAXCONNS = "maxconns";
diff --git a/src/main/java/org/redkale/source/CacheMemorySource.java b/src/main/java/org/redkale/source/CacheMemorySource.java
index 73a97ea12..7300ed7e8 100644
--- a/src/main/java/org/redkale/source/CacheMemorySource.java
+++ b/src/main/java/org/redkale/source/CacheMemorySource.java
@@ -79,7 +79,7 @@ public final class CacheMemorySource extends AbstractCacheSource {
     }
 
     public static boolean acceptsConf(AnyValue config) {
-        return config.getValue(CACHE_SOURCE_URL).startsWith("memory:");
+        return config.getValue(CACHE_SOURCE_NODES).startsWith("memory:");
     }
 
     @Override