Redkale 2.0.0.beta1 结束

README.md

@@ -19,8 +19,6 @@
 </p>
 
 
-&nbsp;&nbsp;&nbsp;编译RedKale 1.8.x版本需要在源码工程中的编译器选项中加入： <b>-XDignore.symbol.file=true</b>
-
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<h5>详情请访问:&nbsp;&nbsp;&nbsp;&nbsp;<a href='https://redkale.org' target='_blank'>https://redkale.org</a></h5>
 
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<h5>基本文档:&nbsp;&nbsp;&nbsp;&nbsp;<a href='https://redkale.org/articles.html' target='_blank'>https://redkale.org/articles.html</a></h5>

conf/application.xml

@@ -15,7 +15,7 @@
         </request>
         
         <response>
-            <defcookie domain="" path=""/>
+            <defcookie domain="" path="/"/>
             <addheader name="Access-Control-Allow-Origin" value="request.headers.Origin" /> 
             <setheader name="Access-Control-Allow-Credentials" value="true"/> 
         </response>

conf/persistence.xml

@@ -24,7 +24,7 @@
     <persistence-unit name="user.write" transaction-type="RESOURCE_LOCAL">
         <shared-cache-mode>ALL</shared-cache-mode>
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/user?autoReconnect=true&amp;characterEncoding=utf8"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/center?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true"/>
             <property name="javax.persistence.jdbc.user" value="root"/>
             <property name="javax.persistence.jdbc.password" value="1234"/>
         </properties>

my/pom.xml

@@ -67,7 +67,6 @@
                     <encoding>UTF-8</encoding>
                     <compilerArguments>
                         <verbose />
-                        <bootclasspath>${java.home}/lib/rt.jar</bootclasspath>
                     </compilerArguments>
                 </configuration>    
             </plugin>
@@ -114,7 +113,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.0.0</version>
                 <executions>
                     <execution>
                         <goals>

src/META-INF/persistence-template.xml

@@ -9,7 +9,7 @@
             -->
             <property name="javax.persistence.datasource" value="org.redkale.source.DataJdbcSource"/>
             <!-- 
-                是否开启缓存(标记为@Cacheable的Entity类)，值目前只支持两种： ALL: 所有开启缓存。 NONE: 关闭所有缓存
+                是否开启缓存(标记为@Cacheable的Entity类)，值目前只支持两种： ALL: 所有开启缓存。 NONE: 关闭所有缓存， 非NONE字样统一视为ALL
             -->
             <property name="javax.persistence.cachemode" value="ALL"/>
             

src/org/redkale/boot/ApiDocsService.java

@@ -196,7 +196,7 @@ public final class ApiDocsService {
         final FileOutputStream out = new FileOutputStream(new File(app.getHome(), "apidoc.json"));
         out.write(json.getBytes("UTF-8"));
         out.close();
-        File doctemplate = new File(app.getConf(), "apidoc-template.html");
+        File doctemplate = new File(app.getConfPath(), "apidoc-template.html");
         InputStream in = null;
         if (doctemplate.isFile() && doctemplate.canRead()) {
             in = new FileInputStream(doctemplate);

src/org/redkale/boot/Application.java

@@ -135,7 +135,7 @@ public final class Application {
 
     //--------------------------------------------------------------------------------------------    
     //是否用于main方法运行
-    private final boolean singletonrun;
+    final boolean singletonrun;
 
     //根WatchFactory
     //private final WatchFactory watchFactory = WatchFactory.root();
@@ -143,7 +143,7 @@ public final class Application {
     private final File home;
 
     //配置文件目录
-    private final File conf;
+    private final File confPath;
 
     //日志
     private final Logger logger;
@@ -181,9 +181,9 @@ public final class Application {
             this.home = root.getCanonicalFile();
             String confsubpath = System.getProperty(RESNAME_APP_CONF, "conf");
             if (confsubpath.charAt(0) == '/' || confsubpath.indexOf(':') > 0) {
-                this.conf = new File(confsubpath).getCanonicalFile();
+                this.confPath = new File(confsubpath).getCanonicalFile();
             } else {
-                this.conf = new File(this.home, confsubpath).getCanonicalFile();
+                this.confPath = new File(this.home, confsubpath).getCanonicalFile();
             }
         } catch (IOException e) {
             throw new RuntimeException(e);
@@ -209,7 +209,7 @@ public final class Application {
             System.setProperty(RESNAME_APP_NODE, node);
         }
         //以下是初始化日志配置
-        final File logconf = new File(conf, "logging.properties");
+        final File logconf = new File(confPath, "logging.properties");
         if (logconf.isFile() && logconf.canRead()) {
             try {
                 final String rootpath = root.getCanonicalPath().replace('\\', '/');
@@ -375,8 +375,8 @@ public final class Application {
         return home;
     }
 
-    public File getConf() {
+    public File getConfPath() {
-        return conf;
+        return confPath;
     }
 
     public long getStartTime() {
@@ -398,9 +398,9 @@ public final class Application {
         System.setProperty("convert.bson.writer.buffer.defsize", "4096");
         System.setProperty("convert.json.writer.buffer.defsize", "4096");
 
-        File persist = new File(this.conf, "persistence.xml");
+        File persist = new File(this.confPath, "persistence.xml");
         final String homepath = this.home.getCanonicalPath();
-        final String confpath = this.conf.getCanonicalPath();
+        final String confpath = this.confPath.getCanonicalPath();
         if (persist.isFile()) System.setProperty(DataSources.DATASOURCE_CONFPATH, persist.getCanonicalPath());
         String pidstr = "";
         try { //JDK 9+
@@ -425,7 +425,7 @@ public final class Application {
                 if (dfloads != null) {
                     for (String dfload : dfloads.split(";")) {
                         if (dfload.trim().isEmpty()) continue;
-                        final File df = (dfload.indexOf('/') < 0) ? new File(conf, "/" + dfload) : new File(dfload);
+                        final File df = (dfload.indexOf('/') < 0) ? new File(confPath, "/" + dfload) : new File(dfload);
                         if (df.isFile()) {
                             Properties ps = new Properties();
                             InputStream in = new FileInputStream(df);
@@ -467,7 +467,7 @@ public final class Application {
                 try {
                     Resource res = field.getAnnotation(Resource.class);
                     if (res == null) return;
-                    if (Sncp.isRemote((Service) src)) return; //远程模式不得注入 
+                    if (src instanceof Service && Sncp.isRemote((Service) src)) return; //远程模式不得注入 
                     Class type = field.getType();
                     if (type == Application.class) {
                         field.set(src, application);
@@ -559,8 +559,8 @@ public final class Application {
 
     public void restoreConfig() throws IOException {
         synchronized (this) {
-            File confFile = new File(this.conf, "application.xml");
+            File confFile = new File(this.confPath, "application.xml");
-            confFile.renameTo(new File(this.conf, "application_" + String.format("%1$tY%1$tm%1$td%1$tH%1$tM%1$tS", System.currentTimeMillis()) + ".xml"));
+            confFile.renameTo(new File(this.confPath, "application_" + String.format("%1$tY%1$tm%1$td%1$tH%1$tM%1$tS", System.currentTimeMillis()) + ".xml"));
             final PrintStream ps = new PrintStream(new FileOutputStream(confFile));
             ps.append(config.toXML("application"));
             ps.close();
@@ -812,13 +812,22 @@ public final class Application {
         sercdl.await();
     }
 
-    public static <T extends Service> T singleton(Class<T> serviceClass) throws Exception {
+    public static <T extends Service> T singleton(Class<T> serviceClass, Class<? extends Service>... extServiceClasses) throws Exception {
-        return singleton("", serviceClass);
+        return singleton("", serviceClass, extServiceClasses);
     }
 
-    public static <T extends Service> T singleton(String name, Class<T> serviceClass) throws Exception {
+    public static <T extends Service> T singleton(String name, Class<T> serviceClass, Class<? extends Service>... extServiceClasses) throws Exception {
         if (serviceClass == null) throw new IllegalArgumentException("serviceClass is null");
         final Application application = Application.create(true);
+        System.setProperty("red" + "kale-singleton-serviceclass", serviceClass.getName());
+        if (extServiceClasses != null && extServiceClasses.length > 0) {
+            StringBuilder sb = new StringBuilder();
+            for (Class clazz : extServiceClasses) {
+                if (sb.length() > 0) sb.append(',');
+                sb.append(clazz.getName());
+            }
+            System.setProperty("red" + "kale-singleton-extserviceclasses", sb.toString());
+        }
         application.init();
         application.start();
         for (NodeServer server : application.servers) {
@@ -878,7 +887,7 @@ public final class Application {
         return null;
     }
 
-    private void shutdown() throws Exception {
+    public void shutdown() throws Exception {
         for (ApplicationListener listener : this.listeners) {
             try {
                 listener.preShutdown(this);

src/org/redkale/boot/ClassFilter.java

@@ -11,6 +11,7 @@ import java.lang.reflect.Modifier;
 import java.net.*;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.function.Predicate;
 import java.util.jar.*;
 import java.util.logging.*;
 import java.util.regex.*;
@@ -36,6 +37,8 @@ public final class ClassFilter<T> {
 
     private final Set<FilterEntry<T>> expectEntrys = new HashSet<>(); //准备符合条件的结果
 
+    private Predicate<String> expectPredicate;
+
     private boolean refused; //是否拒绝所有数据,设置true，则其他规则失效,都是拒绝.
 
     private Class superClass; //符合的父类型。不为空时，扫描结果的class必须是superClass的子类
@@ -196,7 +199,7 @@ public final class ClassFilter<T> {
             }
 
             AutoLoad auto = (AutoLoad) clazz.getAnnotation(AutoLoad.class);
-            if (autoscan && auto != null && !auto.value()) { //自动扫描且被标记为@AutoLoad(false)的
+            if ((expectPredicate != null && expectPredicate.test(clazzname)) || (autoscan && auto != null && !auto.value())) { //自动扫描且被标记为@AutoLoad(false)的
                 expectEntrys.add(new FilterEntry(clazz, autoscan, true, property));
             } else {
                 entrys.add(new FilterEntry(clazz, autoscan, false, property));
@@ -204,7 +207,7 @@ public final class ClassFilter<T> {
         } catch (Throwable cfe) {
             if (finest && !clazzname.startsWith("sun.") && !clazzname.startsWith("javax.")
                 && !clazzname.startsWith("com.sun.") && !clazzname.startsWith("jdk.") && !clazzname.startsWith("META-INF")
-                && (!(cfe instanceof NoClassDefFoundError) || ((NoClassDefFoundError) cfe).getMessage().startsWith("java.lang.NoClassDefFoundError: java"))) {
+                && (!(cfe instanceof NoClassDefFoundError) || (cfe instanceof UnsupportedClassVersionError) || ((NoClassDefFoundError) cfe).getMessage().startsWith("java.lang.NoClassDefFoundError: java"))) {
                 logger.log(Level.FINEST, ClassFilter.class.getSimpleName() + " filter error for class: " + clazzname + (url == null ? "" : (" in " + url)), cfe);
             }
         }
@@ -347,6 +350,14 @@ public final class ClassFilter<T> {
         this.refused = refused;
     }
 
+    public Predicate<String> getExpectPredicate() {
+        return expectPredicate;
+    }
+
+    public void setExpectPredicate(Predicate<String> predicate) {
+        this.expectPredicate = predicate;
+    }
+
     public Set<String> getPrivilegeIncludes() {
         return privilegeIncludes;
     }

src/org/redkale/boot/NodeHttpServer.java

@@ -192,7 +192,7 @@ public class NodeHttpServer extends NodeServer {
         }
         int max = 0;
         if (ss != null && sb != null) {
-            Collections.sort(ss, (AbstractMap.SimpleEntry<String, String[]> o1, AbstractMap.SimpleEntry<String, String[]> o2) -> o1.getKey().compareTo(o2.getKey()));
+            ss.sort((AbstractMap.SimpleEntry<String, String[]> o1, AbstractMap.SimpleEntry<String, String[]> o2) -> o1.getKey().compareTo(o2.getKey()));
             for (AbstractMap.SimpleEntry<String, String[]> as : ss) {
                 if (as.getKey().length() > max) max = as.getKey().length();
             }
@@ -340,7 +340,7 @@ public class NodeHttpServer extends NodeServer {
         }
         //输出信息
         if (ss != null && !ss.isEmpty() && sb != null) {
-            Collections.sort(ss, (AbstractMap.SimpleEntry<String, String[]> o1, AbstractMap.SimpleEntry<String, String[]> o2) -> o1.getKey().compareTo(o2.getKey()));
+            ss.sort((AbstractMap.SimpleEntry<String, String[]> o1, AbstractMap.SimpleEntry<String, String[]> o2) -> o1.getKey().compareTo(o2.getKey()));
             int max = 0;
             for (AbstractMap.SimpleEntry<String, String[]> as : ss) {
                 if (as.getKey().length() > max) max = as.getKey().length();

src/org/redkale/boot/NodeServer.java

@@ -12,6 +12,7 @@ import java.lang.reflect.*;
 import java.net.*;
 import java.nio.file.*;
 import java.util.*;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.logging.*;
@@ -153,6 +154,20 @@ public abstract class NodeServer {
         }
 
         ClassFilter<Service> serviceFilter = createServiceClassFilter();
+        if (application.singletonrun) { //singleton模式下只加载指定的Service
+            final String ssc = System.getProperty("red" + "kale-singleton-serviceclass");
+            final String extssc = System.getProperty("red" + "kale-singleton-extserviceclasses");
+            if (ssc != null) {
+                final List<String> sscList = new ArrayList<>();
+                sscList.add(ssc);
+                if (extssc != null && !extssc.isEmpty()) {
+                    for (String s : extssc.split(",")) {
+                        if (!s.isEmpty()) sscList.add(s);
+                    }
+                }
+                serviceFilter.setExpectPredicate(c -> !sscList.contains(c));
+            }
+        }
         ClassFilter<Filter> filterFilter = createFilterClassFilter();
         ClassFilter<Servlet> servletFilter = createServletClassFilter();
         ClassFilter otherFilter = createOtherClassFilter();
@@ -161,9 +176,10 @@ public abstract class NodeServer {
         long e = System.currentTimeMillis() - s;
         logger.info(this.getClass().getSimpleName() + " load filter class in " + e + " ms");
         loadService(serviceFilter, otherFilter); //必须在servlet之前
-        loadFilter(filterFilter, otherFilter);
+        if (!application.singletonrun) { //非singleton模式下才加载Filter、Servlet
-        loadServlet(servletFilter, otherFilter);
+            loadFilter(filterFilter, otherFilter);
-
+            loadServlet(servletFilter, otherFilter);
+        }
         if (this.interceptor != null) this.resourceFactory.inject(this.interceptor);
     }
 
@@ -177,19 +193,27 @@ public abstract class NodeServer {
         final ResourceFactory appResFactory = application.getResourceFactory();
         final TransportFactory appSncpTranFactory = application.getSncpTransportFactory();
         final AnyValue resources = application.config.getAnyValue("resources");
-        final Map<String, AnyValue> cacheResource = new HashMap<>();
+        final Map<String, SimpleEntry<Class, AnyValue>> cacheResource = new HashMap<>();
-        final Map<String, AnyValue> dataResources = new HashMap<>();
+        final Map<String, SimpleEntry<Class, AnyValue>> dataResources = new HashMap<>();
         if (resources != null) {
             for (AnyValue sourceConf : resources.getAnyValues("source")) {
                 try {
                     Class type = serverClassLoader.loadClass(sourceConf.getValue("value"));
-                    if (type == DataSource.class) type = DataJdbcSource.class;
+                    if (type == DataSource.class) {
+                        type = DataMemorySource.class;
+                        for (AnyValue itemConf : sourceConf.getAnyValues("property")) {
+                            if (itemConf.getValue("name", "").contains(DataSources.JDBC_URL)) {
+                                type = DataJdbcSource.class;
+                                break;
+                            }
+                        }
+                    }
                     if (!Service.class.isAssignableFrom(type)) {
                         logger.log(Level.SEVERE, "load application source resource, but not Service error: " + sourceConf);
                     } else if (CacheSource.class.isAssignableFrom(type)) {
-                        cacheResource.put(sourceConf.getValue("name", ""), sourceConf);
+                        cacheResource.put(sourceConf.getValue("name", ""), new SimpleEntry(type, sourceConf));
                     } else if (DataSource.class.isAssignableFrom(type)) {
-                        dataResources.put(sourceConf.getValue("name", ""), sourceConf);
+                        dataResources.put(sourceConf.getValue("name", ""), new SimpleEntry(type, sourceConf));
                     } else {
                         logger.log(Level.SEVERE, "load application source resource, but not CacheSource error: " + sourceConf);
                     }
@@ -226,26 +250,31 @@ public abstract class NodeServer {
             try {
                 if (field.getAnnotation(Resource.class) == null) return;
                 if ((src instanceof Service) && Sncp.isRemote((Service) src)) return; //远程模式不得注入 DataSource
-                AnyValue sourceConf = dataResources.get(resourceName);
+                SimpleEntry<Class, AnyValue> resEntry = dataResources.get(resourceName);
+                AnyValue sourceConf = resEntry == null ? null : resEntry.getValue();
                 DataSource source = null;
                 boolean needinit = true;
                 if (sourceConf != null) {
-                    final Class sourceType = serverClassLoader.loadClass(sourceConf.getValue("value"));
+                    final Class sourceType = resEntry.getKey();
-                    boolean can = false;
+                    if (sourceType == DataJdbcSource.class) {
-                    for (Constructor cr : sourceType.getConstructors()) {
+                        source = DataSources.createDataSource(resourceName, sourceConf);
-                        if (cr.getParameterCount() == 0) {
+                    } else {
-                            can = true;
+                        boolean can = false;
-                            break;
+                        for (Constructor cr : sourceType.getConstructors()) {
+                            if (cr.getParameterCount() == 0) {
+                                can = true;
+                                break;
+                            }
+                        }
+                        if (DataSource.class.isAssignableFrom(sourceType) && can) { // 必须有空构造函数
+                            final Service srcService = (Service) src;
+                            SncpClient client = Sncp.getSncpClient(srcService);
+                            final InetSocketAddress sncpAddr = client == null ? null : client.getClientAddress();
+                            final Set<String> groups = new HashSet<>();
+                            if (client != null && client.getSameGroup() != null) groups.add(client.getSameGroup());
+                            if (client != null && client.getDiffGroups() != null) groups.addAll(client.getDiffGroups());
+                            source = (DataSource) Sncp.createLocalService(serverClassLoader, resourceName, sourceType, appResFactory, appSncpTranFactory, sncpAddr, groups, Sncp.getConf(srcService));
                         }
-                    }
-                    if (DataSource.class.isAssignableFrom(sourceType) && can) { // 必须有空构造函数
-                        final Service srcService = (Service) src;
-                        SncpClient client = Sncp.getSncpClient(srcService);
-                        final InetSocketAddress sncpAddr = client == null ? null : client.getClientAddress();
-                        final Set<String> groups = new HashSet<>();
-                        if (client != null && client.getSameGroup() != null) groups.add(client.getSameGroup());
-                        if (client != null && client.getDiffGroups() != null) groups.addAll(client.getDiffGroups());
-                        source = (DataSource) Sncp.createLocalService(serverClassLoader, resourceName, sourceType, appResFactory, appSncpTranFactory, sncpAddr, groups, Sncp.getConf(srcService));
                     }
                 }
                 if (source == null) {
@@ -284,6 +313,7 @@ public abstract class NodeServer {
             public void load(ResourceFactory rf, final Object src, final String resourceName, Field field, final Object attachment) {
                 try {
                     if (field.getAnnotation(Resource.class) == null) return;
+                    if (!(src instanceof Service)) throw new RuntimeException("CacheSource must be inject in Service, cannot " + src);
                     if ((src instanceof Service) && Sncp.isRemote((Service) src)) return; //远程模式不需要注入 CacheSource 
                     final Service srcService = (Service) src;
                     SncpClient client = Sncp.getSncpClient(srcService);
@@ -292,8 +322,12 @@ public abstract class NodeServer {
                     if (client != null && client.getSameGroup() != null) groups.add(client.getSameGroup());
                     if (client != null && client.getDiffGroups() != null) groups.addAll(client.getDiffGroups());
 
-                    AnyValue sourceConf = cacheResource.get(resourceName);
+                    SimpleEntry<Class, AnyValue> resEntry = cacheResource.get(resourceName);
-                    if (sourceConf == null) sourceConf = dataResources.get(resourceName);
+                    AnyValue sourceConf = resEntry == null ? null : resEntry.getValue();
+                    if (sourceConf == null) {
+                        SimpleEntry<Class, AnyValue> resEntry2 = dataResources.get(resourceName);
+                        sourceConf = resEntry2 == null ? null : resEntry2.getValue();
+                    }
                     final Class sourceType = sourceConf == null ? CacheMemorySource.class : serverClassLoader.loadClass(sourceConf.getValue("value"));
                     Object source = null;
                     if (CacheSource.class.isAssignableFrom(sourceType)) { // CacheSource
@@ -464,7 +498,7 @@ public abstract class NodeServer {
         }
         //----------------- init -----------------
         List<Service> swlist = new ArrayList<>(localServices);
-        Collections.sort(swlist, (o1, o2) -> {
+        swlist.sort((o1, o2) -> {
             Priority p1 = o1.getClass().getAnnotation(Priority.class);
             Priority p2 = o2.getClass().getAnnotation(Priority.class);
             int v = (p2 == null ? 0 : p2.value()) - (p1 == null ? 0 : p1.value());

src/org/redkale/boot/NodeSncpServer.java

@@ -32,7 +32,7 @@ public class NodeSncpServer extends NodeServer {
     private NodeSncpServer(Application application, AnyValue serconf) {
         super(application, createServer(application, serconf));
         this.sncpServer = (SncpServer) this.server;
-        this.consumer = sncpServer == null ? null : x -> sncpServer.addSncpServlet(x);
+        this.consumer = sncpServer == null || application.singletonrun ? null : x -> sncpServer.addSncpServlet(x); //singleton模式下不生成SncpServlet
     }
 
     public static NodeServer createNodeServer(Application application, AnyValue serconf) {

src/org/redkale/boot/watch/ServerWatchService.java

@@ -5,7 +5,10 @@
  */
 package org.redkale.boot.watch;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.util.*;
+import java.util.stream.Stream;
 import javax.annotation.Resource;
 import org.redkale.boot.*;
 import org.redkale.net.Server;
@@ -23,18 +26,16 @@ public class ServerWatchService extends AbstractWatchService {
     @Comment("不存在的Server节点")
     public static final int RET_SERVER_NOT_EXISTS = 1602_0001;
 
+    @Comment("更改Server监听地址端口失败")
+    public static final int RET_SERVER_CHANGEPORT_ERROR = 1602_0002;
+
     @Resource
     protected Application application;
 
     @RestMapping(name = "info", comment = "单个Server信息查询")
-    public RetResult info(@RestParam(name = "#port:") int port) {
+    public RetResult info(@RestParam(name = "#port:") final int port) {
-        NodeServer node = null;
+        Stream<NodeServer> stream = application.getNodeServers().stream();
-        for (NodeServer ns : application.getNodeServers()) {
+        NodeServer node = stream.filter(ns -> ns.getServer().getSocketAddress().getPort() == port).findFirst().orElse(null);
-            if (ns.getServer().getSocketAddress().getPort() == port) {
-                node = ns;
-                break;
-            }
-        }
         if (node == null) return new RetResult(RET_SERVER_NOT_EXISTS, "Server(port=" + port + ") not found");
         return new RetResult(formatToMap(node));
     }
@@ -49,6 +50,25 @@ public class ServerWatchService extends AbstractWatchService {
         return new RetResult(rs);
     }
 
+    @RestMapping(name = "changeaddress", comment = "更改Server的监听地址和端口")
+    public RetResult changeAddress(@RestParam(name = "#port:") final int oldport,
+        @RestParam(name = "#newhost:") final String newhost, @RestParam(name = "#newport:") final int newport) {
+        if (oldport < 1) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param `oldport`");
+        if (newport < 1) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param `newport`");
+        Stream<NodeServer> stream = application.getNodeServers().stream();
+        NodeServer node = stream.filter(ns -> ns.getServer().getSocketAddress().getPort() == oldport).findFirst().orElse(null);
+        if (node == null) return new RetResult(RET_SERVER_NOT_EXISTS, "Server(port=" + oldport + ") not found");
+        final Server server = node.getServer();
+        InetSocketAddress newAddr = new InetSocketAddress(newhost == null || newhost.isEmpty() ? server.getSocketAddress().getHostString() : newhost, newport);
+        try {
+            server.changeAddress(newAddr);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return new RetResult(RET_SERVER_CHANGEPORT_ERROR, "changeaddress error");
+        }
+        return RetResult.success();
+    }
+
     private Map<String, Object> formatToMap(NodeServer node) {
         Server server = node.getServer();
         Map<String, Object> rs = new LinkedHashMap<>();

src/org/redkale/boot/watch/ServiceWatchService.java

@@ -170,25 +170,29 @@ public class ServiceWatchService extends AbstractWatchService {
     }
 
     @RestMapping(name = "load", auth = false, comment = "动态增加Service")
-    public RetResult loadService(String type, @RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameReg = "\\.jar$") byte[] jar) {
+    public RetResult loadService(@RestParam(name = "type", comment = "Service的类名") String type,
+        @RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameReg = "\\.jar$") byte[] jar) {
         //待开发
         return RetResult.success();
     }
 
     @RestMapping(name = "reload", auth = false, comment = "重新加载Service")
-    public RetResult reloadService(String name, String type) {
+    public RetResult reloadService(@RestParam(name = "name", comment = "Service的资源名") String name,
+        @RestParam(name = "type", comment = "Service的类名") String type) {
         //待开发
         return RetResult.success();
     }
 
     @RestMapping(name = "stop", auth = false, comment = "动态停止Service")
-    public RetResult stopService(String name, String type) {
+    public RetResult stopService(@RestParam(name = "name", comment = "Service的资源名") String name,
+        @RestParam(name = "type", comment = "Service的类名") String type) {
         //待开发
         return RetResult.success();
     }
 
     @RestMapping(name = "find", auth = false, comment = "查找Service")
-    public RetResult find(String name, String type) {
+    public RetResult find(@RestParam(name = "name", comment = "Service的资源名") String name,
+        @RestParam(name = "type", comment = "Service的类名") String type) {
         //待开发
         return RetResult.success();
     }

src/org/redkale/boot/watch/SourceWatchService.java

@@ -5,9 +5,9 @@
  */
 package org.redkale.boot.watch;
 
-import java.io.IOException;
+import java.io.*;
 import java.lang.reflect.Method;
-import java.util.Properties;
+import java.util.*;
 import javax.annotation.Resource;
 import org.redkale.boot.Application;
 import org.redkale.net.http.*;
@@ -16,6 +16,7 @@ import org.redkale.source.*;
 import org.redkale.util.*;
 
 /**
+ * WATCH服务, 操作DataSource源
  *
  * @author zhangjx
  */
@@ -31,13 +32,25 @@ public class SourceWatchService extends AbstractWatchService {
     @Comment("PoolSource调用change方法失败")
     public static final int RET_SOURCE_METHOD_INVOKE_NOT_EXISTS = 1605_0003;
 
+    @Resource(name = "APP_HOME")
+    protected File home;
+
     @Resource
     protected Application application;
 
     @RestMapping(name = "change", auth = false, comment = "动态更改DataSource的配置")
     public RetResult addNode(@RestParam(name = "name", comment = "DataSource的标识") final String name,
-        @RestParam(name = "properties", comment = "配置") final Properties properties) throws IOException {
+        @RestParam(name = "properties", comment = "配置") Properties properties,
+        @RestParam(name = "xmlpath", comment = "配置文件路径") String xmlpath) throws IOException {
         if (name == null) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param (name)");
+        if (properties == null && xmlpath != null) {
+            File f = new File(xmlpath);
+            if (!f.isFile()) f = new File(home, xmlpath);
+            if (!f.isFile()) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found file (" + xmlpath + ")");
+            FileInputStream in = new FileInputStream(f);
+            Map<String, Properties> map = DataSources.loadPersistenceXml(in);
+            properties = map.get(name);
+        }
         if (properties == null) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param (properties)");
         DataSource source = null;
         for (DataSource s : application.getDataSources()) {
@@ -76,4 +89,34 @@ public class SourceWatchService extends AbstractWatchService {
             return new RetResult(RET_SOURCE_METHOD_INVOKE_NOT_EXISTS, "poolsource invoke method('change') error");
         }
     }
+
+    @RestMapping(name = "test1", auth = false, comment = "预留")
+    public RetResult test1() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test2", auth = false, comment = "预留")
+    public RetResult test2() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test3", auth = false, comment = "预留")
+    public RetResult test3() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test4", auth = false, comment = "预留")
+    public RetResult test4() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test5", auth = false, comment = "预留")
+    public RetResult test5() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test6", auth = false, comment = "预留")
+    public RetResult test6() {
+        return RetResult.success();
+    }
 }

src/org/redkale/convert/AnyDecoder.java

@@ -0,0 +1,64 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.convert;
+
+import java.lang.reflect.Type;
+import java.util.*;
+import org.redkale.util.*;
+import org.redkale.convert.Reader.ValueType;
+import static org.redkale.convert.Reader.ValueType.MAP;
+
+/**
+ * 对不明类型的对象进行反序列化。 <br>
+ * <b>注意: 目前只支持文本格式</b> <br>
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+public class AnyDecoder implements Decodeable<Reader, Object> {
+
+    private static final Type collectionObjectType = new TypeToken<Collection<Object>>() {
+    }.getType();
+
+    private static final Type mapObjectType = new TypeToken<Map<String, Object>>() {
+    }.getType();
+
+    private static final Creator<ArrayList> collectionCreator = Creator.create(ArrayList.class);
+
+    private static final Creator<HashMap> mapCreator = Creator.create(HashMap.class);
+
+    protected final Decodeable<Reader, String> stringDecoder;
+
+    protected final CollectionDecoder collectionDecoder;
+
+    protected final MapDecoder mapDecoder;
+
+    public AnyDecoder(final ConvertFactory factory) {
+        this.stringDecoder = factory.loadDecoder(String.class);
+        this.collectionDecoder = new CollectionDecoder(factory, collectionObjectType, Object.class, collectionCreator, this);
+        this.mapDecoder = new MapDecoder(factory, mapObjectType, String.class, Object.class, mapCreator, stringDecoder, this);
+    }
+
+    @Override
+    public Object convertFrom(Reader in) {
+        ValueType vt = in.readType();
+        if (vt == null) return null;
+        switch (vt) {
+            case ARRAY:
+                return this.collectionDecoder.convertFrom(in);
+            case MAP:
+                return this.mapDecoder.convertFrom(in);
+        }
+        return this.stringDecoder.convertFrom(in);
+    }
+
+    @Override
+    public Type getType() {
+        return void.class;
+    }
+
+}

src/org/redkale/convert/ArrayDecoder.java

@@ -28,9 +28,9 @@ public class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
 
     protected final Class componentClass;
 
-    protected final Decodeable<Reader, T> decoder;
+    protected final Decodeable<Reader, T> componentDecoder;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -51,7 +51,7 @@ public class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
                 this.componentClass = (Class) this.componentType;
             }
             factory.register(type, this);
-            this.decoder = factory.loadDecoder(this.componentType);
+            this.componentDecoder = factory.loadDecoder(this.componentType);
         } finally {
             inited = true;
             synchronized (lock) {
@@ -66,14 +66,15 @@ public class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
     }
 
     public T[] convertFrom(Reader in, DeMember member) {
-        int len = in.readArrayB(member, decoder);
+        byte[] typevals = new byte[1];
+        int len = in.readArrayB(member, typevals, componentDecoder);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {
-            contentLength = in.readMemberContentLength(member, decoder);
+            contentLength = in.readMemberContentLength(member, componentDecoder);
             len = Reader.SIGN_NOLENGTH;
         }
-        if (this.decoder == null) {
+        if (this.componentDecoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -84,7 +85,7 @@ public class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
                 }
             }
         }
-        final Decodeable<Reader, T> localdecoder = this.decoder;
+        final Decodeable<Reader, T> localdecoder = getComponentDecoder(this.componentDecoder, typevals);
         final List<T> result = new ArrayList();
         boolean first = true;
         if (len == Reader.SIGN_NOLENGTH) {
@@ -92,7 +93,7 @@ public class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
             while (hasNext(in, member, startPosition, contentLength, first)) {
                 Reader itemReader = getItemReader(in, member, first);
                 if (itemReader == null) break;
-                result.add(readMemberValue(itemReader, member, first));
+                result.add(readMemberValue(itemReader, member, localdecoder, first));
                 first = false;
             }
         } else {
@@ -109,17 +110,21 @@ public class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
         return in.hasNext(startPosition, contentLength);
     }
 
+    protected Decodeable<Reader, T> getComponentDecoder(Decodeable<Reader, T> decoder, byte[] typevals) {
+        return decoder;
+    }
+
     protected Reader getItemReader(Reader in, DeMember member, boolean first) {
         return in;
     }
 
-    protected T readMemberValue(Reader in, DeMember member, boolean first) {
+    protected T readMemberValue(Reader in, DeMember member, Decodeable<Reader, T> decoder, boolean first) {
-        return this.decoder.convertFrom(in);
+        return decoder.convertFrom(in);
     }
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName() + "{componentType:" + this.componentType + ", decoder:" + this.decoder + "}";
+        return this.getClass().getSimpleName() + "{componentType:" + this.componentType + ", decoder:" + this.componentDecoder + "}";
     }
 
     @Override
@@ -131,8 +136,8 @@ public class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
         return componentType;
     }
 
-    public Decodeable<Reader, T> getDecoder() {
+    public Decodeable<Reader, T> getComponentDecoder() {
-        return decoder;
+        return componentDecoder;
     }
 
 }

src/org/redkale/convert/ArrayEncoder.java

@@ -27,9 +27,9 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
 
     protected final Encodeable anyEncoder;
 
-    protected final Encodeable<Writer, Object> encoder;
+    protected final Encodeable<Writer, Object> componentEncoder;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -45,7 +45,7 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
                 throw new ConvertException("(" + type + ") is not a array type");
             }
             factory.register(type, this);
-            this.encoder = factory.loadEncoder(this.componentType);
+            this.componentEncoder = factory.loadEncoder(this.componentType);
             this.anyEncoder = factory.getAnyEncoder();
         } finally {
             inited = true;
@@ -66,11 +66,11 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
             return;
         }
         if (value.length == 0) {
-            out.writeArrayB(0, encoder, value);
+            out.writeArrayB(0, componentEncoder, value);
             out.writeArrayE();
             return;
         }
-        if (this.encoder == null) {
+        if (this.componentEncoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -81,12 +81,12 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
                 }
             }
         }
-        if (out.writeArrayB(value.length, encoder, value) < 0) {
+        if (out.writeArrayB(value.length, componentEncoder, value) < 0) {
             final Type comp = this.componentType;
             boolean first = true;
             for (Object v : value) {
                 if (!first) out.writeArrayMark();
-                writeMemberValue(out, member, ((v != null && (v.getClass() == comp || out.specify() == comp)) ? encoder : anyEncoder), v, first);
+                writeMemberValue(out, member, ((v != null && (v.getClass() == comp || out.specify() == comp)) ? componentEncoder : anyEncoder), v, first);
                 if (first) first = false;
             }
         }
@@ -99,7 +99,7 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName() + "{componentType:" + this.componentType + ", encoder:" + this.encoder + "}";
+        return this.getClass().getSimpleName() + "{componentType:" + this.componentType + ", encoder:" + this.componentEncoder + "}";
     }
 
     @Override
@@ -111,8 +111,8 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
         return componentType;
     }
 
-    public Encodeable<Writer, Object> getEncoder() {
+    public Encodeable<Writer, Object> getComponentEncoder() {
-        return encoder;
+        return componentEncoder;
     }
 
 }

src/org/redkale/convert/CollectionDecoder.java

@@ -8,7 +8,7 @@ package org.redkale.convert;
 import org.redkale.util.Creator;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * Collection的反序列化操作类  <br>
@@ -29,9 +29,9 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
 
     protected Creator<Collection<T>> creator;
 
-    protected final Decodeable<Reader, T> decoder;
+    protected final Decodeable<Reader, T> componentDecoder;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -43,12 +43,12 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
                 this.componentType = pt.getActualTypeArguments()[0];
                 this.creator = factory.loadCreator((Class) pt.getRawType());
                 factory.register(type, this);
-                this.decoder = factory.loadDecoder(this.componentType);
+                this.componentDecoder = factory.loadDecoder(this.componentType);
             } else if (factory.isReversible()) {
                 this.componentType = Object.class;
                 this.creator = factory.loadCreator(type instanceof Class ? (Class) type : Collection.class);
                 factory.register(type, this);
-                this.decoder = factory.loadDecoder(this.componentType);
+                this.componentDecoder = factory.loadDecoder(this.componentType);
             } else {
                 throw new ConvertException("CollectionDecoder not support the type (" + type + ")");
             }
@@ -60,20 +60,32 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
         }
     }
 
+    //仅供类似JsonAnyDecoder这种动态创建使用， 不得调用 factory.register
+    public CollectionDecoder(final ConvertFactory factory, Type type, Type componentType,
+        Creator<Collection<T>> creator, final Decodeable<Reader, T> componentDecoder) {
+        Objects.requireNonNull(componentDecoder);
+        this.type = type;
+        this.componentType = componentType;
+        this.creator = creator;
+        this.componentDecoder = componentDecoder;
+        this.inited = true;
+    }
+
     @Override
     public Collection<T> convertFrom(Reader in) {
         return convertFrom(in, null);
     }
 
     public Collection<T> convertFrom(Reader in, DeMember member) {
-        int len = in.readArrayB(member, decoder);
+        byte[] typevals = new byte[1];
+        int len = in.readArrayB(member, typevals, componentDecoder);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {
-            contentLength = in.readMemberContentLength(member, decoder);
+            contentLength = in.readMemberContentLength(member, componentDecoder);
             len = Reader.SIGN_NOLENGTH;
         }
-        if (this.decoder == null) {
+        if (this.componentDecoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -84,7 +96,7 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
                 }
             }
         }
-        final Decodeable<Reader, T> localdecoder = this.decoder;
+        final Decodeable<Reader, T> localdecoder = getComponentDecoder(this.componentDecoder, typevals);
         final Collection<T> result = this.creator.create();
         boolean first = true;
         if (len == Reader.SIGN_NOLENGTH) {
@@ -92,7 +104,7 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
             while (hasNext(in, member, startPosition, contentLength, first)) {
                 Reader itemReader = getItemReader(in, member, first);
                 if (itemReader == null) break;
-                result.add(readMemberValue(itemReader, member, first));
+                result.add(readMemberValue(itemReader, member, localdecoder, first));
                 first = false;
             }
         } else {
@@ -108,12 +120,16 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
         return in.hasNext(startPosition, contentLength);
     }
 
+    protected Decodeable<Reader, T> getComponentDecoder(Decodeable<Reader, T> decoder, byte[] typevals) {
+        return decoder;
+    }
+
     protected Reader getItemReader(Reader in, DeMember member, boolean first) {
         return in;
     }
 
-    protected T readMemberValue(Reader in, DeMember member, boolean first) {
+    protected T readMemberValue(Reader in, DeMember member, Decodeable<Reader, T> decoder, boolean first) {
-        return this.decoder.convertFrom(in);
+        return decoder.convertFrom(in);
     }
 
     @Override
@@ -125,8 +141,8 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
         return componentType;
     }
 
-    public Decodeable<Reader, T> getDecoder() {
+    public Decodeable<Reader, T> getComponentDecoder() {
-        return decoder;
+        return componentDecoder;
     }
 
 }

src/org/redkale/convert/CollectionEncoder.java

@@ -23,9 +23,9 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
 
     protected final Type type;
 
-    protected final Encodeable<Writer, Object> encoder;
+    protected final Encodeable<Writer, Object> componentEncoder;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -35,12 +35,12 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
             if (type instanceof ParameterizedType) {
                 Type t = ((ParameterizedType) type).getActualTypeArguments()[0];
                 if (t instanceof TypeVariable) {
-                    this.encoder = factory.getAnyEncoder();
+                    this.componentEncoder = factory.getAnyEncoder();
                 } else {
-                    this.encoder = factory.loadEncoder(t);
+                    this.componentEncoder = factory.loadEncoder(t);
                 }
             } else {
-                this.encoder = factory.getAnyEncoder();
+                this.componentEncoder = factory.getAnyEncoder();
             }
         } finally {
             inited = true;
@@ -61,11 +61,11 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
             return;
         }
         if (value.isEmpty()) {
-            out.writeArrayB(0, encoder, value);
+            out.writeArrayB(0, componentEncoder, value);
             out.writeArrayE();
             return;
         }
-        if (this.encoder == null) {
+        if (this.componentEncoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -76,7 +76,7 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
                 }
             }
         }
-        if (out.writeArrayB(value.size(), encoder, value) < 0) {
+        if (out.writeArrayB(value.size(), componentEncoder, value) < 0) {
             boolean first = true;
             for (Object v : value) {
                 if (!first) out.writeArrayMark();
@@ -88,7 +88,7 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
     }
 
     protected void writeValue(Writer out, EnMember member, Object value) {
-        encoder.convertTo(out, value);
+        componentEncoder.convertTo(out, value);
     }
 
     @Override
@@ -96,8 +96,11 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
         return type;
     }
 
-    public Encodeable<Writer, Object> getEncoder() {
+    public Encodeable<Writer, Object> getComponentEncoder() {
-        return encoder;
+        return componentEncoder;
     }
 
+    public Type getComponentType() {
+        return componentEncoder == null ? null : componentEncoder.getType();
+    }
 }

src/org/redkale/convert/Convert.java

@@ -33,6 +33,8 @@ public abstract class Convert<R extends Reader, W extends Writer> {
 
     public abstract boolean isBinary();
 
+    public abstract <T> T convertFrom(final Type type, final byte[] bytes);
+
     public abstract <T> T convertFrom(final Type type, final ByteBuffer... buffers);
 
     public abstract <T> T convertFrom(final Type type, final ConvertMask mask, final ByteBuffer... buffers);

src/org/redkale/convert/ConvertColumnEntry.java

@@ -89,4 +89,9 @@ public final class ConvertColumnEntry {
         this.index = index;
     }
 
+    @Override
+    public String toString() {
+        return "ConvertColumnEntry{" + "index=" + index + ", name=" + name + ", ignore=" + ignore + ", convertType=" + convertType + '}';
+    }
+
 }

src/org/redkale/convert/ConvertFactory.java

@@ -91,8 +91,10 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
 
             this.register(Number.class, NumberSimpledCoder.instance);
             this.register(String.class, StringSimpledCoder.instance);
+            this.register(StringConvertWrapper.class, StringConvertWrapperSimpledCoder.instance);
             this.register(CharSequence.class, CharSequenceSimpledCoder.instance);
             this.register(java.util.Date.class, DateSimpledCoder.instance);
+            this.register(java.time.Duration.class, DurationSimpledCoder.instance);
             this.register(AtomicInteger.class, AtomicIntegerSimpledCoder.instance);
             this.register(AtomicLong.class, AtomicLongSimpledCoder.instance);
             this.register(BigInteger.class, BigIntegerSimpledCoder.instance);
@@ -219,15 +221,10 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
         return false;
     }
 
-    public ConvertColumnEntry findRef(AccessibleObject element) {
+    public ConvertColumnEntry findRef(Class clazz, AccessibleObject element) {
         if (element == null) return null;
         ConvertColumnEntry en = this.columnEntrys.get(element);
-        Set<String> onlyColumns = null;
+        Set<String> onlyColumns = ignoreAlls.get(clazz);
-        if (element instanceof Method) {
-            onlyColumns = ignoreAlls.get(((Method) element).getDeclaringClass());
-        } else if (element instanceof Field) {
-            onlyColumns = ignoreAlls.get(((Field) element).getDeclaringClass());
-        }
         if (en != null && onlyColumns == null) return en;
         final ConvertType ct = this.getConvertType();
         ConvertColumn[] ccs = element.getAnnotationsByType(ConvertColumn.class);
@@ -254,8 +251,8 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
         }
         for (ConvertColumn ref : ccs) {
             if (ref.type().contains(ct)) {
+                String realName = ref.name().isEmpty() ? fieldName : ref.name();
                 if (onlyColumns != null && fieldName != null) {
-                    String realName = ref.name().isEmpty() ? fieldName : ref.name();
                     if (!onlyColumns.contains(realName)) return new ConvertColumnEntry(realName, true);
                 }
                 ConvertColumnEntry entry = new ConvertColumnEntry(ref);
@@ -263,7 +260,10 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
                     entry.setIgnore(false);
                     return entry;
                 }
-                if (skipIgnores.isEmpty()) return entry;
+                if (skipIgnores.isEmpty()) {
+                    if (onlyColumns != null && realName != null && onlyColumns.contains(realName)) entry.setIgnore(false);
+                    return entry;
+                }
                 if (skipIgnores.contains(((Member) element).getDeclaringClass())) entry.setIgnore(false);
                 return entry;
             }
@@ -406,12 +406,27 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
         }
     }
 
+    public final void registerIgnoreAll(final Class type, Collection<String> excludeColumns) {
+        Set<String> set = ignoreAlls.get(type);
+        if (set == null) {
+            ignoreAlls.put(type, new HashSet<>(excludeColumns));
+        } else {
+            set.addAll(new ArrayList(excludeColumns));
+        }
+    }
+
     public final void register(final Class type, boolean ignore, String... columns) {
         for (String column : columns) {
             register(type, column, new ConvertColumnEntry(column, ignore));
         }
     }
 
+    public final void register(final Class type, boolean ignore, Collection<String> columns) {
+        for (String column : columns) {
+            register(type, column, new ConvertColumnEntry(column, ignore));
+        }
+    }
+
     public final boolean register(final Class type, String column, String alias) {
         return register(type, column, new ConvertColumnEntry(alias));
     }
@@ -604,6 +619,7 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
             decoder = od;
         } else if (!clazz.getName().startsWith("java.")
             || java.net.HttpCookie.class == clazz
+            || java.util.AbstractMap.SimpleEntry.class == clazz
             || clazz.getName().startsWith("java.awt.geom.Point2D")) {
             Decodeable simpleCoder = null;
             for (final Method method : clazz.getDeclaredMethods()) {
@@ -687,7 +703,7 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
             encoder = new OptionalCoder(this, type);
         } else if (clazz == Object.class) {
             return (Encodeable<W, E>) this.anyEncoder;
-        } else if (!clazz.getName().startsWith("java.") || java.net.HttpCookie.class == clazz) {
+        } else if (!clazz.getName().startsWith("java.") || java.net.HttpCookie.class == clazz || java.util.AbstractMap.SimpleEntry.class == clazz) {
             Encodeable simpleCoder = null;
             for (final Method method : clazz.getDeclaredMethods()) {
                 if (!Modifier.isStatic(method.getModifiers())) continue;

src/org/redkale/convert/MapDecoder.java

@@ -8,7 +8,7 @@ package org.redkale.convert;
 import org.redkale.util.Creator;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.Map;
+import java.util.*;
 
 /**
  * Map的反序列化操作类 <br>
@@ -35,7 +35,7 @@ public class MapDecoder<K, V> implements Decodeable<Reader, Map<K, V>> {
 
     protected final Decodeable<Reader, V> valueDecoder;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -74,6 +74,20 @@ public class MapDecoder<K, V> implements Decodeable<Reader, Map<K, V>> {
         }
     }
 
+    //仅供类似JsonAnyDecoder这种动态创建使用， 不得调用 factory.register
+    public MapDecoder(final ConvertFactory factory, Type type, Type keyType, Type valueType,
+        Creator<Map<K, V>> creator, final Decodeable<Reader, K> keyDecoder, Decodeable<Reader, V> valueDecoder) {
+        Objects.requireNonNull(keyDecoder);
+        Objects.requireNonNull(valueDecoder);
+        this.type = type;
+        this.keyType = keyType;
+        this.valueType = valueType;
+        this.creator = creator;
+        this.keyDecoder = keyDecoder;
+        this.valueDecoder = valueDecoder;
+        this.inited = true;
+    }
+
     @Override
     public Map<K, V> convertFrom(Reader in) {
         return convertFrom(in, null);
@@ -91,7 +105,8 @@ public class MapDecoder<K, V> implements Decodeable<Reader, Map<K, V>> {
                 }
             }
         }
-        int len = in.readMapB(member, this.keyDecoder);
+        byte[] typevals = new byte[2];
+        int len = in.readMapB(member, typevals, this.keyDecoder, this.valueDecoder);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {
@@ -100,22 +115,24 @@ public class MapDecoder<K, V> implements Decodeable<Reader, Map<K, V>> {
         }
         final Map<K, V> result = this.creator.create();
         boolean first = true;
+        Decodeable<Reader, K> kdecoder = getKeyDecoder(this.keyDecoder, typevals);
+        Decodeable<Reader, V> vdecoder = getValueDecoder(this.valueDecoder, typevals);
         if (len == Reader.SIGN_NOLENGTH) {
             int startPosition = in.position();
             while (hasNext(in, member, startPosition, contentLength, first)) {
                 Reader entryReader = getEntryReader(in, member, first);
                 if (entryReader == null) break;
-                K key = readKeyMember(entryReader, member, first);
+                K key = readKeyMember(entryReader, member, kdecoder, first);
                 entryReader.readBlank();
-                V value = readValueMember(entryReader, member, first);
+                V value = readValueMember(entryReader, member, vdecoder, first);
                 result.put(key, value);
                 first = false;
             }
         } else {
             for (int i = 0; i < len; i++) {
-                K key = readKeyMember(in, member, first);
+                K key = readKeyMember(in, member, kdecoder, first);
                 in.readBlank();
-                V value = readValueMember(in, member, first);
+                V value = readValueMember(in, member, vdecoder, first);
                 result.put(key, value);
                 first = false;
             }
@@ -128,16 +145,24 @@ public class MapDecoder<K, V> implements Decodeable<Reader, Map<K, V>> {
         return in.hasNext(startPosition, contentLength);
     }
 
+    protected Decodeable<Reader, K> getKeyDecoder(Decodeable<Reader, K> decoder, byte[] typevals) {
+        return decoder;
+    }
+
+    protected Decodeable<Reader, V> getValueDecoder(Decodeable<Reader, V> decoder, byte[] typevals) {
+        return decoder;
+    }
+
     protected Reader getEntryReader(Reader in, DeMember member, boolean first) {
         return in;
     }
 
-    protected K readKeyMember(Reader in, DeMember member, boolean first) {
+    protected K readKeyMember(Reader in, DeMember member, Decodeable<Reader, K> decoder, boolean first) {
-        return keyDecoder.convertFrom(in);
+        return decoder.convertFrom(in);
     }
 
-    protected V readValueMember(Reader in, DeMember member, boolean first) {
+    protected V readValueMember(Reader in, DeMember member, Decodeable<Reader, V> decoder, boolean first) {
-        return valueDecoder.convertFrom(in);
+        return decoder.convertFrom(in);
     }
 
     @Override

src/org/redkale/convert/MapEncoder.java

@@ -24,11 +24,11 @@ public class MapEncoder<K, V> implements Encodeable<Writer, Map<K, V>> {
 
     protected final Type type;
 
-    protected final Encodeable<Writer, K> keyencoder;
+    protected final Encodeable<Writer, K> keyEncoder;
 
-    protected final Encodeable<Writer, V> valencoder;
+    protected final Encodeable<Writer, V> valueEncoder;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -37,11 +37,11 @@ public class MapEncoder<K, V> implements Encodeable<Writer, Map<K, V>> {
         try {
             if (type instanceof ParameterizedType) {
                 final Type[] pt = ((ParameterizedType) type).getActualTypeArguments();
-                this.keyencoder = factory.loadEncoder(pt[0]);
+                this.keyEncoder = factory.loadEncoder(pt[0]);
-                this.valencoder = factory.loadEncoder(pt[1]);
+                this.valueEncoder = factory.loadEncoder(pt[1]);
             } else {
-                this.keyencoder = factory.getAnyEncoder();
+                this.keyEncoder = factory.getAnyEncoder();
-                this.valencoder = factory.getAnyEncoder();
+                this.valueEncoder = factory.getAnyEncoder();
             }
         } finally {
             inited = true;
@@ -63,7 +63,7 @@ public class MapEncoder<K, V> implements Encodeable<Writer, Map<K, V>> {
             return;
         }
 
-        if (this.keyencoder == null || this.valencoder == null) {
+        if (this.keyEncoder == null || this.valueEncoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -74,21 +74,21 @@ public class MapEncoder<K, V> implements Encodeable<Writer, Map<K, V>> {
                 }
             }
         }
-        if (out.writeMapB(values.size(), (Encodeable) keyencoder, (Encodeable) valencoder, value) < 0) {
+        if (out.writeMapB(values.size(), (Encodeable) keyEncoder, (Encodeable) valueEncoder, value) < 0) {
             boolean first = true;
             for (Map.Entry<K, V> en : values.entrySet()) {
                 if (!first) out.writeArrayMark();
-                writeMemberValue(out, member, en.getKey(), en.getValue(),first);
+                writeMemberValue(out, member, en.getKey(), en.getValue(), first);
                 if (first) first = false;
             }
         }
         out.writeMapE();
     }
 
-    protected void writeMemberValue(Writer out, EnMember member, K key, V value,boolean first) {
+    protected void writeMemberValue(Writer out, EnMember member, K key, V value, boolean first) {
-        keyencoder.convertTo(out, key);
+        keyEncoder.convertTo(out, key);
         out.writeMapMark();
-        valencoder.convertTo(out, value);
+        valueEncoder.convertTo(out, value);
     }
 
     @Override
@@ -96,12 +96,20 @@ public class MapEncoder<K, V> implements Encodeable<Writer, Map<K, V>> {
         return type;
     }
 
-    public Encodeable<Writer, K> getKeyencoder() {
+    public Type getKeyType() {
-        return keyencoder;
+        return keyEncoder == null ? null : keyEncoder.getType();
     }
 
-    public Encodeable<Writer, V> getValencoder() {
+    public Type getValueType() {
-        return valencoder;
+        return valueEncoder == null ? null : valueEncoder.getType();
+    }
+
+    public Encodeable<Writer, K> getKeyEncoder() {
+        return keyEncoder;
+    }
+
+    public Encodeable<Writer, V> getValueEncoder() {
+        return valueEncoder;
     }
 
 }

src/org/redkale/convert/ObjectDecoder.java

@@ -35,7 +35,7 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
 
     protected ConvertFactory factory;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -61,7 +61,10 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
     public void init(final ConvertFactory factory) {
         this.factory = factory;
         try {
-            if (type == Object.class) return;
+            if (type == Object.class) {
+                this.creatorConstructorMembers = null;
+                return;
+            }
 
             Class clazz = null;
             if (type instanceof ParameterizedType) {
@@ -91,7 +94,7 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
                 for (final Field field : clazz.getFields()) {
                     if (Modifier.isStatic(field.getModifiers())) continue;
                     if (factory.isConvertDisabled(field)) continue;
-                    ref = factory.findRef(field);
+                    ref = factory.findRef(clazz, field);
                     if (ref != null && ref.ignore()) continue;
                     Decodeable<R, ?> fieldCoder = factory.findFieldCoder(clazz, field.getName());
                     if (fieldCoder == null) {
@@ -120,7 +123,7 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
                             continue;
                         }
                     }
-                    ref = factory.findRef(method);
+                    ref = factory.findRef(clazz, method);
                     if (ref != null && ref.ignore()) continue;
 
                     Decodeable<R, ?> fieldCoder = factory.findFieldCoder(clazz, ConvertFactory.readGetSetFieldName(method));
@@ -229,7 +232,7 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
             }
         }
         if (this.creatorConstructorMembers == null) {  //空构造函数
-            final T result = this.creator.create();
+            final T result = this.creator == null ? null : this.creator.create();
             boolean first = true;
             while (hasNext(in, first)) {
                 DeMember member = in.readFieldName(members);
@@ -270,6 +273,7 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
                 first = false;
             }
             in.readObjectE(typeClass);
+            if (this.creator == null) return null;
             final T result = this.creator.create(constructorParams);
             for (int i = 0; i < oc; i++) {
                 ((Attribute) otherParams[i][0]).set(result, otherParams[i][1]);

src/org/redkale/convert/ObjectEncoder.java

@@ -32,7 +32,7 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
 
     protected ConvertFactory factory;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -75,7 +75,7 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
                 for (final Field field : clazz.getFields()) {
                     if (Modifier.isStatic(field.getModifiers())) continue;
                     if (factory.isConvertDisabled(field)) continue;
-                    ref = factory.findRef(field);
+                    ref = factory.findRef(clazz, field);
                     if (ref != null && ref.ignore()) continue;
                     Encodeable<W, ?> fieldCoder = factory.findFieldCoder(clazz, field.getName());
                     if (fieldCoder == null) {
@@ -104,7 +104,7 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
                             continue;
                         }
                     }
-                    ref = factory.findRef(method);
+                    ref = factory.findRef(clazz, method);
                     if (ref != null && ref.ignore()) continue;
                     Encodeable<W, ?> fieldCoder = factory.findFieldCoder(clazz, ConvertFactory.readGetSetFieldName(method));
                     if (fieldCoder == null) {
@@ -253,24 +253,24 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
     static Attribute createAttribute(final ConvertFactory factory, Class clazz, final Field field, final Method getter, final Method setter) {
         String fieldalias;
         if (field != null) { // public field
-            ConvertColumnEntry ref = factory.findRef(field);
+            ConvertColumnEntry ref = factory.findRef(clazz, field);
             fieldalias = ref == null || ref.name().isEmpty() ? field.getName() : ref.name();
         } else if (getter != null) {
-            ConvertColumnEntry ref = factory.findRef(getter);
+            ConvertColumnEntry ref = factory.findRef(clazz, getter);
             String mfieldname = ConvertFactory.readGetSetFieldName(getter);
             if (ref == null) {
                 try {
-                    ref = factory.findRef(clazz.getDeclaredField(mfieldname));
+                    ref = factory.findRef(clazz, clazz.getDeclaredField(mfieldname));
                 } catch (Exception e) {
                 }
             }
             fieldalias = ref == null || ref.name().isEmpty() ? mfieldname : ref.name();
         } else { // setter != null
-            ConvertColumnEntry ref = factory.findRef(setter);
+            ConvertColumnEntry ref = factory.findRef(clazz, setter);
             String mfieldname = ConvertFactory.readGetSetFieldName(setter);
             if (ref == null) {
                 try {
-                    ref = factory.findRef(clazz.getDeclaredField(mfieldname));
+                    ref = factory.findRef(clazz, clazz.getDeclaredField(mfieldname));
                 } catch (Exception e) {
                 }
             }

src/org/redkale/convert/OptionalCoder.java

@@ -30,7 +30,7 @@ public class OptionalCoder<R extends Reader, W extends Writer, T> extends Simple
 
     protected final Encodeable<Writer, T> encoder;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
     private final Object lock = new Object();
 

src/org/redkale/convert/Reader.java

@@ -15,6 +15,10 @@ package org.redkale.convert;
  */
 public abstract class Reader {
 
+    public static enum ValueType {
+        STRING, ARRAY, MAP;
+    }
+
     //当前对象字段名的游标
     protected int fieldIndex;
 
@@ -73,6 +77,13 @@ public abstract class Reader {
      */
     public abstract void readBlank();
 
+    /**
+     * 读取下个值的类型
+     *
+     * @return ValueType
+     */
+    public abstract ValueType readType();
+
     /**
      * 读取对象的类名， 返回 null 表示对象为null， 返回空字符串表示当前class与返回的class一致，返回非空字符串表示class是当前class的子类。
      *
@@ -95,12 +106,13 @@ public abstract class Reader {
     /**
      * 读取数组的开头并返回数组的长度
      *
-     * @param member  DeMember
+     * @param member           DeMember
-     * @param decoder Decodeable
+     * @param typevals         byte[]
+     * @param componentDecoder Decodeable
      *
      * @return 返回数组的长度
      */
-    public abstract int readArrayB(DeMember member, Decodeable decoder);
+    public abstract int readArrayB(DeMember member, byte[] typevals, Decodeable componentDecoder);
 
     /**
      * 读取数组的尾端
@@ -111,12 +123,14 @@ public abstract class Reader {
     /**
      * 读取map的开头并返回map的size
      *
-     * @param member     DeMember
+     * @param member       DeMember
-     * @param keydecoder Decodeable
+     * @param typevals     byte[]
+     * @param keyDecoder   Decodeable
+     * @param valueDecoder Decodeable
      *
      * @return 返回map的size
      */
-    public abstract int readMapB(DeMember member, Decodeable keydecoder);
+    public abstract int readMapB(DeMember member, byte[] typevals, Decodeable keyDecoder, Decodeable valueDecoder);
 
     /**
      * 读取数组的尾端

src/org/redkale/convert/StreamDecoder.java

@@ -30,9 +30,9 @@ public class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
 
     protected Creator<Stream<T>> creator;
 
-    protected final Decodeable<Reader, T> decoder;
+    protected final Decodeable<Reader, T> componentDecoder;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -44,7 +44,7 @@ public class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
                 this.componentType = pt.getActualTypeArguments()[0];
                 this.creator = factory.loadCreator((Class) pt.getRawType());
                 factory.register(type, this);
-                this.decoder = factory.loadDecoder(this.componentType);
+                this.componentDecoder = factory.loadDecoder(this.componentType);
             } else {
                 throw new ConvertException("StreamDecoder not support the type (" + type + ")");
             }
@@ -62,14 +62,15 @@ public class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
     }
 
     public Stream<T> convertFrom(Reader in, DeMember member) {
-        int len = in.readArrayB(member, this.decoder);
+        byte[] typevals = new byte[1];
+        int len = in.readArrayB(member, typevals, this.componentDecoder);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {
-            contentLength = in.readMemberContentLength(member, this.decoder);
+            contentLength = in.readMemberContentLength(member, this.componentDecoder);
             len = Reader.SIGN_NOLENGTH;
         }
-        if (this.decoder == null) {
+        if (this.componentDecoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -80,7 +81,7 @@ public class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
                 }
             }
         }
-        final Decodeable<Reader, T> localdecoder = this.decoder;
+        final Decodeable<Reader, T> localdecoder = getComponentDecoder(this.componentDecoder, typevals);
         final List<T> result = new ArrayList();
         boolean first = true;
         if (len == Reader.SIGN_NOLENGTH) {
@@ -88,7 +89,7 @@ public class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
             while (hasNext(in, member, startPosition, contentLength, first)) {
                 Reader itemReader = getItemReader(in, member, first);
                 if (itemReader == null) break;
-                result.add(readMemberValue(itemReader, member, first));
+                result.add(readMemberValue(itemReader, member, localdecoder, first));
                 first = false;
             }
         } else {
@@ -104,12 +105,16 @@ public class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
         return in.hasNext(startPosition, contentLength);
     }
 
+    protected Decodeable<Reader, T> getComponentDecoder(Decodeable<Reader, T> decoder, byte[] typevals) {
+        return decoder;
+    }
+
     protected Reader getItemReader(Reader in, DeMember member, boolean first) {
         return in;
     }
 
-    protected T readMemberValue(Reader in, DeMember member, boolean first) {
+    protected T readMemberValue(Reader in, DeMember member, Decodeable<Reader, T> decoder, boolean first) {
-        return this.decoder.convertFrom(in);
+        return decoder.convertFrom(in);
     }
 
     @Override
@@ -121,8 +126,8 @@ public class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
         return componentType;
     }
 
-    public Decodeable<Reader, T> getDecoder() {
+    public Decodeable<Reader, T> getComponentDecoder() {
-        return decoder;
+        return componentDecoder;
     }
 
 }

src/org/redkale/convert/StreamEncoder.java

@@ -23,9 +23,9 @@ public class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
 
     protected final Type type;
 
-    protected final Encodeable<Writer, Object> encoder;
+    protected final Encodeable<Writer, Object> componentEncoder;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -35,12 +35,12 @@ public class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
             if (type instanceof ParameterizedType) {
                 Type t = ((ParameterizedType) type).getActualTypeArguments()[0];
                 if (t instanceof TypeVariable) {
-                    this.encoder = factory.getAnyEncoder();
+                    this.componentEncoder = factory.getAnyEncoder();
                 } else {
-                    this.encoder = factory.loadEncoder(t);
+                    this.componentEncoder = factory.loadEncoder(t);
                 }
             } else {
-                this.encoder = factory.getAnyEncoder();
+                this.componentEncoder = factory.getAnyEncoder();
             }
         } finally {
             inited = true;
@@ -62,11 +62,11 @@ public class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
         }
         Object[] array = value.toArray();
         if (array.length == 0) {
-            out.writeArrayB(0, encoder, array);
+            out.writeArrayB(0, componentEncoder, array);
             out.writeArrayE();
             return;
         }
-        if (this.encoder == null) {
+        if (this.componentEncoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -77,7 +77,7 @@ public class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
                 }
             }
         }
-        if (out.writeArrayB(array.length, encoder, array) < 0) {
+        if (out.writeArrayB(array.length, componentEncoder, array) < 0) {
             boolean first = true;
             for (Object v : array) {
                 if (!first) out.writeArrayMark();
@@ -89,7 +89,7 @@ public class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
     }
 
     protected void writeMemberValue(Writer out, EnMember member, Object value, boolean first) {
-        encoder.convertTo(out, value);
+        componentEncoder.convertTo(out, value);
     }
 
     @Override
@@ -97,8 +97,11 @@ public class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
         return type;
     }
 
-    public Encodeable<Writer, Object> getEncoder() {
+    public Encodeable<Writer, Object> getComponentEncoder() {
-        return encoder;
+        return componentEncoder;
     }
 
+    public Type getComponentType() {
+        return componentEncoder == null ? null : componentEncoder.getType();
+    }
 }

src/org/redkale/convert/StringConvertWrapper.java

@@ -0,0 +1,63 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.convert;
+
+import org.redkale.convert.json.JsonConvert;
+
+/**
+ * 序列化去掉引号的String对象。
+ * <blockquote><pre>
+ * 场景: JavaBean  bean = ... ;
+ *        Map map = new HashMap();
+ *        map.put("bean", a);
+ *        records.add(map);
+ *        records需要在后期序列化写入库。 但是在这期间bean的内部字段值可能就变化了，会导致入库时并不是records.add的快照信息。
+ *        所以需要使用StringConvertWrapper：
+ *        Map map = new HashMap();
+ *        map.put("bean", new StringConvertWrapper(bean.toString()));
+ *        records.add(map);
+ *        这样既可以保持快照又不会在bean的值上面多一层引号。
+ * </pre></blockquote>
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+public class StringConvertWrapper {
+
+    protected String value;
+
+    public StringConvertWrapper() {
+    }
+
+    public StringConvertWrapper(String value) {
+        this.value = value;
+    }
+
+    public static StringConvertWrapper create(Object value) {
+        return create(JsonConvert.root(), value);
+    }
+
+    public static StringConvertWrapper create(TextConvert convert, Object value) {
+        if (value == null) return new StringConvertWrapper(null);
+        if (value instanceof String) return new StringConvertWrapper((String) value);
+        return new StringConvertWrapper(convert.convertTo(value));
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return value;
+    }
+
+}

src/org/redkale/convert/Writer.java

@@ -129,13 +129,13 @@ public abstract class Writer {
     /**
      * 输出一个数组前的操作
      *
-     * @param size    数组长度
+     * @param size             数组长度
-     * @param encoder Encodeable
+     * @param componentEncoder Encodeable
-     * @param obj     对象
+     * @param obj              对象, 不一定是数组、Collection对象，也可能是伪Collection对象
      *
      * @return 返回-1表示还没有写入对象内容，大于-1表示已写入对象内容，返回对象内容大小
      */
-    public abstract int writeArrayB(int size, Encodeable<Writer, Object> encoder, Object obj);
+    public abstract int writeArrayB(int size, Encodeable<Writer, Object> componentEncoder, Object obj);
 
     /**
      * 输出数组元素间的间隔符
@@ -155,7 +155,7 @@ public abstract class Writer {
      * @param size         map大小
      * @param keyEncoder   Encodeable
      * @param valueEncoder Encodeable
-     * @param obj          对象
+     * @param obj          对象, 不一定是Map对象，也可能是伪Map对象
      *
      * @return 返回-1表示还没有写入对象内容，大于-1表示已写入对象内容，返回对象内容大小
      */
@@ -256,4 +256,11 @@ public abstract class Writer {
      * @param value String值
      */
     public abstract void writeString(String value);
+
+    /**
+     * 写入一个StringConvertWrapper值
+     *
+     * @param value StringConvertWrapper值
+     */
+    public abstract void writeWrapper(StringConvertWrapper value);
 }

src/org/redkale/convert/bson/BsonByteBufferReader.java

@@ -8,6 +8,7 @@ package org.redkale.convert.bson;
 import java.nio.*;
 import org.redkale.convert.*;
 import static org.redkale.convert.Reader.SIGN_NULL;
+import org.redkale.convert.ext.ByteSimpledCoder;
 import org.redkale.util.*;
 
 /**
@@ -48,18 +49,38 @@ public class BsonByteBufferReader extends BsonReader {
         return mask == null ? currentBuffer.get(currentBuffer.position()) : mask.unmask(currentBuffer.get(currentBuffer.position()));
     }
 
-    /**
-     * 判断下一个非空白字节是否为[
-     *
-     * @param member  DeMember
-     * @param decoder Decodeable
-     * @return 数组长度或 SIGN_NULL
-     */
     @Override
-    public final int readArrayB(DeMember member, Decodeable decoder) {
+    public int readMapB(DeMember member, byte[] typevals, Decodeable keyDecoder, Decodeable valueDecoder) {
         short bt = readShort();
         if (bt == Reader.SIGN_NULL) return bt;
         short lt = readShort();
+        byte kt = readByte();
+        byte vt = readByte();
+        if (typevals != null) {
+            typevals[0] = kt;
+            typevals[1] = vt;
+        }
+        return (bt & 0xffff) << 16 | (lt & 0xffff);
+    }
+
+    /**
+     * 判断下一个非空白字节是否为[
+     *
+     * @param member           DeMember
+     * @param typevals         byte[]
+     * @param componentDecoder Decodeable
+     *
+     * @return 数组长度或 SIGN_NULL
+     */
+    @Override
+    public final int readArrayB(DeMember member, byte[] typevals, Decodeable componentDecoder) {
+        short bt = readShort();
+        if (bt == Reader.SIGN_NULL) return bt;
+        short lt = readShort();
+        if (componentDecoder != null && componentDecoder != ByteSimpledCoder.instance) {
+            byte comval = readByte();
+            if (typevals != null) typevals[0] = comval;
+        }
         return (bt & 0xffff) << 16 | (lt & 0xffff);
     }
 //------------------------------------------------------------

src/org/redkale/convert/bson/BsonFactory.java

@@ -6,8 +6,12 @@
 package org.redkale.convert.bson;
 
 import java.io.Serializable;
+import java.lang.reflect.Type;
+import java.util.*;
+import java.util.stream.Stream;
 import org.redkale.convert.*;
-import org.redkale.util.AnyValue;
+import org.redkale.convert.ext.*;
+import org.redkale.util.*;
 
 /**
  * BSON的ConvertFactory
@@ -26,6 +30,16 @@ public final class BsonFactory extends ConvertFactory<BsonReader, BsonWriter> {
 
     static final Encodeable objectEncoder = instance.loadEncoder(Object.class);
 
+    static final Decodeable skipArrayDecoder = new SkipArrayDecoder(instance, Object[].class);
+
+    static final Decodeable skipCollectionDecoder = new SkipCollectionDecoder(instance, new TypeToken<Collection<Object>>() {
+    }.getType());
+
+    static final Decodeable skipStreamDecoder = new SkipStreamDecoder(instance, new TypeToken<Stream<Object>>() {
+    }.getType());
+
+    static final Decodeable skipMapDecoder = new SkipMapDecoder(instance, Map.class);
+
     static {
         instance.register(Serializable.class, objectDecoder);
         instance.register(Serializable.class, objectEncoder);
@@ -89,4 +103,110 @@ public final class BsonFactory extends ConvertFactory<BsonReader, BsonWriter> {
         return true;
     }
 
+    protected static byte typeEnum(final Type type) {
+        return typeEnum(TypeToken.typeToClass(type));
+    }
+
+    protected static byte typeEnum(final Class type) {
+        Objects.requireNonNull(type);
+        byte typeval = 127;  //字段的类型值
+        if (type == boolean.class || type == Boolean.class) {
+            typeval = 11;
+        } else if (type == byte.class || type == Byte.class) {
+            typeval = 12;
+        } else if (type == short.class || type == Short.class) {
+            typeval = 13;
+        } else if (type == char.class || type == Character.class) {
+            typeval = 14;
+        } else if (type == int.class || type == Integer.class) {
+            typeval = 15;
+        } else if (type == long.class || type == Long.class) {
+            typeval = 16;
+        } else if (type == float.class || type == Float.class) {
+            typeval = 17;
+        } else if (type == double.class || type == Double.class) {
+            typeval = 18;
+        } else if (type == String.class) {
+            typeval = 19;
+        } else if (type == boolean[].class || type == Boolean[].class) {
+            typeval = 21;
+        } else if (type == byte[].class || type == Byte[].class) {
+            typeval = 22;
+        } else if (type == short[].class || type == Short[].class) {
+            typeval = 23;
+        } else if (type == char[].class || type == Character[].class) {
+            typeval = 24;
+        } else if (type == int[].class || type == Integer[].class) {
+            typeval = 25;
+        } else if (type == long[].class || type == Long[].class) {
+            typeval = 26;
+        } else if (type == float[].class || type == Float[].class) {
+            typeval = 27;
+        } else if (type == double[].class || type == Double[].class) {
+            typeval = 28;
+        } else if (type == String[].class) {
+            typeval = 29;
+        } else if (type.isArray()) {
+            typeval = 81;
+        } else if (Collection.class.isAssignableFrom(type)) {
+            typeval = 82;
+        } else if (Stream.class.isAssignableFrom(type)) {
+            typeval = 83;
+        } else if (Map.class.isAssignableFrom(type)) {
+            typeval = 84;
+        }
+        return typeval;
+    }
+
+    protected static Decodeable typeEnum(final byte typeval) {
+        switch (typeval) {
+            case 11:
+                return BoolSimpledCoder.instance;
+            case 12:
+                return ByteSimpledCoder.instance;
+            case 13:
+                return ShortSimpledCoder.instance;
+            case 14:
+                return CharSimpledCoder.instance;
+            case 15:
+                return IntSimpledCoder.instance;
+            case 16:
+                return LongSimpledCoder.instance;
+            case 17:
+                return FloatSimpledCoder.instance;
+            case 18:
+                return DoubleSimpledCoder.instance;
+            case 19:
+                return StringSimpledCoder.instance;
+            case 21:
+                return BoolArraySimpledCoder.instance;
+            case 22:
+                return ByteArraySimpledCoder.instance;
+            case 23:
+                return ShortArraySimpledCoder.instance;
+            case 24:
+                return CharArraySimpledCoder.instance;
+            case 25:
+                return IntArraySimpledCoder.instance;
+            case 26:
+                return LongArraySimpledCoder.instance;
+            case 27:
+                return FloatArraySimpledCoder.instance;
+            case 28:
+                return DoubleArraySimpledCoder.instance;
+            case 29:
+                return StringArraySimpledCoder.instance;
+            case 81:
+                return skipArrayDecoder;
+            case 82:
+                return skipCollectionDecoder;
+            case 83:
+                return skipStreamDecoder;
+            case 84:
+                return skipMapDecoder;
+            case 127:
+                return BsonFactory.objectDecoder;
+        }
+        return null;
+    }
 }

src/org/redkale/convert/bson/BsonReader.java

@@ -93,53 +93,27 @@ public class BsonReader extends Reader {
         final byte val = this.typeval;
         this.typeval = 0;
         switch (val) {
-            case 1: readBoolean();
+            case 11: readBoolean();
                 break;
-            case 2: readByte();
+            case 12: readByte();
                 break;
-            case 3: readShort();
+            case 13: readShort();
                 break;
-            case 4: readChar();
+            case 14: readChar();
                 break;
-            case 5: readInt();
+            case 15: readInt();
                 break;
-            case 6: readLong();
+            case 16: readLong();
                 break;
-            case 7: readFloat();
+            case 17: readFloat();
                 break;
-            case 8: readDouble();
+            case 18: readDouble();
                 break;
-            case 9: readString();
+            case 19: readString();
                 break;
-            case 101:
+            default:
-                BoolArraySimpledCoder.instance.convertFrom(this);
+                Decodeable decoder = BsonFactory.typeEnum(val);
-                break;
+                if (decoder != null) decoder.convertFrom(this);
-            case 102:
-                ByteArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 103:
-                ShortArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 104:
-                CharArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 105:
-                IntArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 106:
-                LongArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 107:
-                FloatArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 108:
-                DoubleArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 109:
-                StringArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 127:
-                BsonFactory.objectDecoder.convertFrom(this);
                 break;
         }
     }
@@ -171,8 +145,17 @@ public class BsonReader extends Reader {
     }
 
     @Override
-    public final int readMapB(DeMember member, Decodeable keydecoder) {
+    public int readMapB(DeMember member, byte[] typevals, Decodeable keyDecoder, Decodeable valueDecoder) {
-        return readArrayB(member, keydecoder);
+        short bt = readShort();
+        if (bt == Reader.SIGN_NULL) return bt;
+        int rs = (bt & 0xffff) << 16 | ((content[++this.position] & 0xff) << 8) | (content[++this.position] & 0xff);
+        byte kt = readByte();
+        byte vt = readByte();
+        if (typevals != null) {
+            typevals[0] = kt;
+            typevals[1] = vt;
+        }
+        return rs;
     }
 
     @Override
@@ -185,10 +168,15 @@ public class BsonReader extends Reader {
      * @return 数组长度或SIGN_NULL
      */
     @Override
-    public int readArrayB(DeMember member, Decodeable decoder) {
+    public int readArrayB(DeMember member, byte[] typevals, Decodeable componentDecoder) { //componentDecoder可能为null
         short bt = readShort();
         if (bt == Reader.SIGN_NULL) return bt;
-        return (bt & 0xffff) << 16 | ((content[++this.position] & 0xff) << 8) | (content[++this.position] & 0xff);
+        int rs = (bt & 0xffff) << 16 | ((content[++this.position] & 0xff) << 8) | (content[++this.position] & 0xff);
+        if (componentDecoder != null && componentDecoder != ByteSimpledCoder.instance) {
+            byte comval = readByte();
+            if (typevals != null) typevals[0] = comval;
+        }
+        return rs;
     }
 
     @Override
@@ -263,7 +251,7 @@ public class BsonReader extends Reader {
 
     @Override
     public final byte[] readByteArray() {
-        int len = readArrayB(null, null);
+        int len = readArrayB(null, null, null);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {
@@ -358,4 +346,9 @@ public class BsonReader extends Reader {
         return value;
     }
 
+    @Override
+    public ValueType readType() {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
 }

src/org/redkale/convert/bson/BsonWriter.java

@@ -7,6 +7,7 @@ package org.redkale.convert.bson;
 
 import java.nio.ByteBuffer;
 import org.redkale.convert.*;
+import org.redkale.convert.ext.ByteSimpledCoder;
 import org.redkale.util.*;
 
 /**
@@ -201,46 +202,7 @@ public class BsonWriter extends Writer {
         Attribute attribute = member.getAttribute();
         writeByte(BsonReader.SIGN_HASNEXT);
         writeSmallString(attribute.field());
-        byte typeval = 127;  //字段的类型值
+        writeByte(BsonFactory.typeEnum(attribute.type()));
-        final Class type = attribute.type();
-        if (type == boolean.class || type == Boolean.class) {
-            typeval = 1;
-        } else if (type == byte.class || type == Byte.class) {
-            typeval = 2;
-        } else if (type == short.class || type == Short.class) {
-            typeval = 3;
-        } else if (type == char.class || type == Character.class) {
-            typeval = 4;
-        } else if (type == int.class || type == Integer.class) {
-            typeval = 5;
-        } else if (type == long.class || type == Long.class) {
-            typeval = 6;
-        } else if (type == float.class || type == Float.class) {
-            typeval = 7;
-        } else if (type == double.class || type == Double.class) {
-            typeval = 8;
-        } else if (type == String.class) {
-            typeval = 9;
-        } else if (type == boolean[].class || type == Boolean[].class) {
-            typeval = 101;
-        } else if (type == byte[].class || type == Byte[].class) {
-            typeval = 102;
-        } else if (type == short[].class || type == Short[].class) {
-            typeval = 103;
-        } else if (type == char[].class || type == Character[].class) {
-            typeval = 104;
-        } else if (type == int[].class || type == Integer[].class) {
-            typeval = 105;
-        } else if (type == long[].class || type == Long[].class) {
-            typeval = 106;
-        } else if (type == float[].class || type == Float[].class) {
-            typeval = 107;
-        } else if (type == double[].class || type == Double[].class) {
-            typeval = 108;
-        } else if (type == String[].class) {
-            typeval = 109;
-        }
-        writeByte(typeval);
     }
 
     /**
@@ -279,14 +241,22 @@ public class BsonWriter extends Writer {
         writeTo(bytes);
     }
 
+    @Override
+    public final void writeWrapper(StringConvertWrapper value) {
+        this.writeString(value == null ? null : value.getValue());
+    }
+
     @Override
     public final void writeNull() {
         writeShort(Reader.SIGN_NULL);
     }
 
     @Override
-    public final int writeArrayB(int size, Encodeable<Writer, Object> encoder, Object obj) {
+    public final int writeArrayB(int size, Encodeable<Writer, Object> componentEncoder, Object obj) {
         writeInt(size);
+        if (componentEncoder != null && componentEncoder != ByteSimpledCoder.instance) {
+            writeByte(BsonFactory.typeEnum(componentEncoder.getType()));
+        }
         return -1;
     }
 
@@ -300,7 +270,9 @@ public class BsonWriter extends Writer {
 
     @Override
     public int writeMapB(int size, Encodeable<Writer, Object> keyEncoder, Encodeable<Writer, Object> valueEncoder, Object obj) {
-        writeArrayB(size, valueEncoder, obj);
+        writeInt(size);
+        writeByte(BsonFactory.typeEnum(keyEncoder.getType()));
+        writeByte(BsonFactory.typeEnum(valueEncoder.getType()));
         return -1;
     }
 

src/org/redkale/convert/bson/SkipArrayDecoder.java

@@ -0,0 +1,33 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.convert.bson;
+
+import java.lang.reflect.Type;
+import org.redkale.convert.*;
+
+/**
+ * 数组的反序列化操作类  <br>
+ * 对象数组的反序列化，不包含int[]、long[]这样的primitive class数组。  <br>
+ * 支持一定程度的泛型。  <br>
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @param <T> 反解析的数组元素类型
+ */
+public class SkipArrayDecoder<T> extends ArrayDecoder<T> {
+
+    public SkipArrayDecoder(final ConvertFactory factory, final Type type) {
+        super(factory, type);
+    }
+
+    @Override
+    protected Decodeable<Reader, T> getComponentDecoder(Decodeable<Reader, T> decoder, byte[] typevals) {
+        if (typevals != null) return BsonFactory.typeEnum(typevals[0]);
+        return decoder;
+    }
+}

src/org/redkale/convert/bson/SkipCollectionDecoder.java

@@ -0,0 +1,32 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.convert.bson;
+
+import java.lang.reflect.Type;
+import org.redkale.convert.*;
+
+/**
+ * Collection的反序列化操作类  <br>
+ * 支持一定程度的泛型。  <br>
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @param <T> 反解析的集合元素类型
+ */
+public class SkipCollectionDecoder<T> extends CollectionDecoder<T> {
+
+    public SkipCollectionDecoder(final ConvertFactory factory, final Type type) {
+        super(factory, type);
+    }
+
+    @Override
+    protected Decodeable<Reader, T> getComponentDecoder(Decodeable<Reader, T> decoder, byte[] typevals) {
+        if (typevals != null) return BsonFactory.typeEnum(typevals[0]);
+        return decoder;
+    }
+}

src/org/redkale/convert/bson/SkipMapDecoder.java

@@ -0,0 +1,38 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.convert.bson;
+
+import java.lang.reflect.Type;
+import org.redkale.convert.*;
+
+/**
+ * Map的反序列化操作类 <br>
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @param <K> Map key的数据类型
+ * @param <V> Map value的数据类型
+ */
+public class SkipMapDecoder<K, V> extends MapDecoder<K, V> {
+
+    public SkipMapDecoder(final ConvertFactory factory, final Type type) {
+        super(factory, type);
+    }
+
+    @Override
+    protected Decodeable<Reader, K> getKeyDecoder(Decodeable<Reader, K> decoder, byte[] typevals) {
+        if (typevals != null) return BsonFactory.typeEnum(typevals[0]);
+        return decoder;
+    }
+
+    @Override
+    protected Decodeable<Reader, V> getValueDecoder(Decodeable<Reader, V> decoder, byte[] typevals) {
+        if (typevals != null) return BsonFactory.typeEnum(typevals[1]);
+        return decoder;
+    }
+}

src/org/redkale/convert/bson/SkipStreamDecoder.java

@@ -0,0 +1,32 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.convert.bson;
+
+import java.lang.reflect.Type;
+import org.redkale.convert.*;
+
+/**
+ * Stream的反序列化操作类  <br>
+ * 支持一定程度的泛型。  <br>
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @param <T> 反解析的集合元素类型
+ */
+public class SkipStreamDecoder<T> extends StreamDecoder<T> {
+
+    public SkipStreamDecoder(final ConvertFactory factory, final Type type) {
+        super(factory, type);
+    }
+
+    @Override
+    protected Decodeable<Reader, T> getComponentDecoder(Decodeable<Reader, T> decoder, byte[] typevals) {
+        if (typevals != null) return BsonFactory.typeEnum(typevals[0]);
+        return decoder;
+    }
+}

src/org/redkale/convert/ext/BoolArraySimpledCoder.java

@@ -42,7 +42,7 @@ public final class BoolArraySimpledCoder<R extends Reader, W extends Writer> ext
 
     @Override
     public boolean[] convertFrom(R in) {
-        int len = in.readArrayB(null, BoolSimpledCoder.instance);
+        int len = in.readArrayB(null, null, BoolSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/ext/ByteBufferSimpledCoder.java

@@ -43,7 +43,7 @@ public final class ByteBufferSimpledCoder<R extends Reader, W extends Writer> ex
 
     @Override
     public ByteBuffer convertFrom(R in) {
-        int len = in.readArrayB(null, ByteSimpledCoder.instance);
+        int len = in.readArrayB(null, null, ByteSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/ext/CharArraySimpledCoder.java

@@ -42,7 +42,7 @@ public final class CharArraySimpledCoder<R extends Reader, W extends Writer> ext
 
     @Override
     public char[] convertFrom(R in) {
-        int len = in.readArrayB(null, CharSimpledCoder.instance);
+        int len = in.readArrayB(null, null, CharSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/ext/DoubleArraySimpledCoder.java

@@ -43,7 +43,7 @@ public final class DoubleArraySimpledCoder<R extends Reader, W extends Writer> e
 
     @Override
     public double[] convertFrom(R in) {
-        int len = in.readArrayB(null, DoubleSimpledCoder.instance);
+        int len = in.readArrayB(null, null, DoubleSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/ext/DurationSimpledCoder.java

@@ -0,0 +1,41 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.convert.ext;
+
+import java.time.Duration;
+import org.redkale.convert.*;
+
+/**
+ * Duration 的SimpledCoder实现
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @param <R> Reader输入的子类型
+ * @param <W> Writer输出的子类型
+ */
+public class DurationSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, Duration> {
+
+    public static final DurationSimpledCoder instance = new DurationSimpledCoder();
+
+    @Override
+    public void convertTo(W out, Duration value) {
+        if (value == null) {
+            out.writeNull();
+        } else {
+            out.writeLong(value.toNanos());
+        }
+    }
+
+    @Override
+    public Duration convertFrom(R in) {
+        String value = in.readSmallString();
+        if (value == null) return null;
+        return Duration.ofNanos(Long.parseLong(value));
+    }
+
+}

src/org/redkale/convert/ext/FloatArraySimpledCoder.java

@@ -42,7 +42,7 @@ public final class FloatArraySimpledCoder<R extends Reader, W extends Writer> ex
 
     @Override
     public float[] convertFrom(R in) {
-        int len = in.readArrayB(null, FloatSimpledCoder.instance);
+        int len = in.readArrayB(null, null, FloatSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/ext/IntArraySimpledCoder.java

@@ -43,7 +43,7 @@ public final class IntArraySimpledCoder<R extends Reader, W extends Writer> exte
 
     @Override
     public int[] convertFrom(R in) {
-        int len = in.readArrayB(null, IntSimpledCoder.instance);
+        int len = in.readArrayB(null, null, IntSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/ext/LongArraySimpledCoder.java

@@ -43,7 +43,7 @@ public final class LongArraySimpledCoder<R extends Reader, W extends Writer> ext
 
     @Override
     public long[] convertFrom(R in) {
-        int len = in.readArrayB(null, LongSimpledCoder.instance);
+        int len = in.readArrayB(null, null, LongSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/ext/ShortArraySimpledCoder.java

@@ -42,7 +42,7 @@ public final class ShortArraySimpledCoder<R extends Reader, W extends Writer> ex
 
     @Override
     public short[] convertFrom(R in) {
-        int len = in.readArrayB(null, ShortSimpledCoder.instance);
+        int len = in.readArrayB(null, null, ShortSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/ext/StringArraySimpledCoder.java

@@ -44,7 +44,7 @@ public final class StringArraySimpledCoder<R extends Reader, W extends Writer> e
     }
 
     public String[] convertFrom(R in, DeMember member) {
-        int len = in.readArrayB(member, StringSimpledCoder.instance);
+        int len = in.readArrayB(member, null, StringSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/ext/StringConvertWrapperSimpledCoder.java

@@ -0,0 +1,34 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.convert.ext;
+
+import org.redkale.convert.*;
+
+/**
+ * String 的SimpledCoder实现
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @param <R> Reader输入的子类型
+ * @param <W> Writer输出的子类型
+ */
+public final class StringConvertWrapperSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, StringConvertWrapper> {
+
+    public static final StringConvertWrapperSimpledCoder instance = new StringConvertWrapperSimpledCoder();
+
+    @Override
+    public void convertTo(W out, StringConvertWrapper value) {
+        out.writeWrapper(value);
+    }
+
+    @Override
+    public StringConvertWrapper convertFrom(R in) {
+        return new StringConvertWrapper(in.readString());
+    }
+
+}

src/org/redkale/convert/json/JsonByteBufferReader.java

@@ -139,13 +139,14 @@ public class JsonByteBufferReader extends JsonReader {
     /**
      * 判断下一个非空白字符是否为[
      *
-     * @param member  DeMember
+     * @param member   DeMember
-     * @param decoder Decodeable
+     * @param typevals byte[]
+     * @param decoder  Decodeable
      *
      * @return SIGN_NOLENGTH 或 SIGN_NULL
      */
     @Override
-    public final int readArrayB(DeMember member, Decodeable decoder) {
+    public final int readArrayB(DeMember member, byte[] typevals, Decodeable decoder) {
         char ch = nextGoodChar();
         if (ch == '[' || ch == '{') return SIGN_NOLENGTH;
         if (ch == 'n' && nextChar() == 'u' && nextChar() == 'l' && nextChar() == 'l') return SIGN_NULL;

src/org/redkale/convert/json/JsonConvert.java

@@ -85,6 +85,11 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     }
 
     //------------------------------ convertFrom -----------------------------------------------------------
+    public <T> T convertFrom(final Type type, final byte[] bytes) {
+        if (bytes == null) return null;
+        return convertFrom(type, new String(bytes, StandardCharsets.UTF_8));
+    }
+
     public <T> T convertFrom(final Type type, final String text) {
         if (text == null) return null;
         return convertFrom(type, Utility.charArray(text));
@@ -128,6 +133,52 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
         return rs;
     }
 
+    //返回非null的值是由String、ArrayList、HashMap任意组合的对象
+    public <V> V convertFrom(final String text) {
+        if (text == null) return null;
+        return (V) convertFrom(Utility.charArray(text));
+    }
+
+    //返回非null的值是由String、ArrayList、HashMap任意组合的对象
+    public <V> V convertFrom(final char[] text) {
+        if (text == null) return null;
+        return (V) convertFrom(text, 0, text.length);
+    }
+
+    //返回非null的值是由String、ArrayList、HashMap任意组合的对象
+    public <V> V convertFrom(final char[] text, final int start, final int len) {
+        if (text == null) return null;
+        final JsonReader in = readerPool.get();
+        in.setText(text, start, len);
+        Object rs = new AnyDecoder(factory).convertFrom(in);
+        readerPool.accept(in);
+        return (V) rs;
+    }
+
+    //返回非null的值是由String、ArrayList、HashMap任意组合的对象
+    public <V> V convertFrom(final InputStream in) {
+        if (in == null) return null;
+        return (V) new AnyDecoder(factory).convertFrom(new JsonStreamReader(in));
+    }
+
+    //返回非null的值是由String、ArrayList、HashMap任意组合的对象
+    public <V> V convertFrom(final ByteBuffer... buffers) {
+        if (buffers == null || buffers.length == 0) return null;
+        return (V) new AnyDecoder(factory).convertFrom(new JsonByteBufferReader((ConvertMask) null, buffers));
+    }
+
+    //返回非null的值是由String、ArrayList、HashMap任意组合的对象
+    public <V> V convertFrom(final ConvertMask mask, final ByteBuffer... buffers) {
+        if (buffers == null || buffers.length == 0) return null;
+        return (V) new AnyDecoder(factory).convertFrom(new JsonByteBufferReader(mask, buffers));
+    }
+
+    //返回非null的值是由String、ArrayList、HashMap任意组合的对象
+    public <V> V convertFrom(final JsonReader reader) {
+        if (reader == null) return null;
+        return (V) new AnyDecoder(factory).convertFrom(reader);
+    }
+
     //------------------------------ convertTo -----------------------------------------------------------
     @Override
     public String convertTo(final Object value) {

src/org/redkale/convert/json/JsonReader.java

@@ -158,6 +158,21 @@ public class JsonReader extends Reader {
         this.position--;
     }
 
+    @Override
+    public final ValueType readType() {
+        char ch = nextGoodChar();
+        if (ch == '{') {
+            backChar(ch);
+            return ValueType.MAP;
+        }
+        if (ch == '[') {
+            backChar(ch);
+            return ValueType.ARRAY;
+        }
+        backChar(ch);
+        return ValueType.STRING;
+    }
+
     /**
      * 判断下一个非空白字符是否为{
      *
@@ -168,6 +183,7 @@ public class JsonReader extends Reader {
     @Override
     public String readObjectB(final Class clazz) {
         this.fieldIndex = 0; //必须要重置为0
+        if (this.text.length == 0) return null;
         char ch = this.text[++this.position];
         if (ch == '{') return "";
         if (ch <= ' ') {
@@ -189,14 +205,16 @@ public class JsonReader extends Reader {
     /**
      * 判断下一个非空白字符是否为{
      *
-     * @param member     DeMember
+     * @param member       DeMember
-     * @param keydecoder Decodeable
+     * @param typevals     byte[]
+     * @param keyDecoder   Decodeable
+     * @param valuedecoder Decodeable
      *
      * @return SIGN_NOLENGTH 或 SIGN_NULL
      */
     @Override
-    public final int readMapB(DeMember member, Decodeable keydecoder) {
+    public final int readMapB(DeMember member, byte[] typevals, Decodeable keyDecoder, Decodeable valuedecoder) {
-        return readArrayB(member, keydecoder);
+        return readArrayB(member, typevals, keyDecoder);
     }
 
     @Override
@@ -206,13 +224,15 @@ public class JsonReader extends Reader {
     /**
      * 判断下一个非空白字符是否为[
      *
-     * @param member  DeMember
+     * @param member           DeMember
-     * @param decoder Decodeable
+     * @param typevals         byte[]
+     * @param componentDecoder Decodeable
      *
      * @return SIGN_NOLENGTH 或 SIGN_NULL
      */
     @Override
-    public int readArrayB(DeMember member, Decodeable decoder) {
+    public int readArrayB(DeMember member, byte[] typevals, Decodeable componentDecoder) {
+        if (this.text.length == 0) return SIGN_NULL;
         char ch = this.text[++this.position];
         if (ch == '[') return SIGN_NOLENGTH;
         if (ch == '{') return SIGN_NOLENGTH;
@@ -333,7 +353,7 @@ public class JsonReader extends Reader {
             }
             this.position = currpos - 1;
             if (len == 4 && text0[start] == 'n' && text0[start + 1] == 'u' && text0[start + 2] == 'l' && text0[start + 3] == 'l') return null;
-            return new String(text0, start, len);
+            return new String(text0, start, len == eof ? (len + 1) : len);
         }
     }
 
@@ -474,7 +494,7 @@ public class JsonReader extends Reader {
 
     @Override
     public final byte[] readByteArray() {
-        int len = readArrayB(null, null);
+        int len = readArrayB(null, null, null);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/json/JsonWriter.java

@@ -319,6 +319,11 @@ public class JsonWriter extends Writer {
         writeTo(false, String.valueOf(value));
     }
 
+    @Override
+    public final void writeWrapper(StringConvertWrapper value) {
+        writeTo(false, String.valueOf(value));
+    }
+
     @Override
     public final boolean needWriteClassName() {
         return false;
@@ -346,7 +351,7 @@ public class JsonWriter extends Writer {
     }
 
     @Override
-    public final int writeArrayB(int size, Encodeable<Writer, Object> encoder, Object obj) {
+    public final int writeArrayB(int size, Encodeable<Writer, Object> componentEncoder, Object obj) {
         writeTo('[');
         return -1;
     }

src/org/redkale/net/AsyncConnection.java

@@ -7,13 +7,14 @@ package org.redkale.net;
 
 import java.io.IOException;
 import java.net.*;
-import java.nio.ByteBuffer;
+import java.nio.*;
 import java.nio.channels.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
-import java.util.function.Consumer;
+import java.util.function.*;
 import javax.net.ssl.SSLContext;
+import org.redkale.util.ObjectPool;
 
 /**
  *
@@ -22,7 +23,7 @@ import javax.net.ssl.SSLContext;
  *
  * @author zhangjx
  */
-public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCloseable {
+public abstract class AsyncConnection implements ReadableByteChannel, WritableByteChannel, AutoCloseable {
 
     protected SSLContext sslContext;
 
@@ -34,6 +35,12 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl
 
     protected volatile long writetime;
 
+    protected final Supplier<ByteBuffer> bufferSupplier;
+
+    protected final Consumer<ByteBuffer> bufferConsumer;
+
+    protected ByteBuffer readBuffer;
+
     //在线数
     protected AtomicLong livingCounter;
 
@@ -45,6 +52,22 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl
     //关联的事件数， 小于1表示没有事件
     protected final AtomicInteger eventing = new AtomicInteger();
 
+    protected AsyncConnection(Context context) {
+        this(context.getBufferSupplier(), context.getBufferConsumer(), context.getSSLContext());
+    }
+
+    protected AsyncConnection(ObjectPool<ByteBuffer> bufferPool, SSLContext sslContext) {
+        this(bufferPool, bufferPool, sslContext);
+    }
+
+    protected AsyncConnection(Supplier<ByteBuffer> bufferSupplier, Consumer<ByteBuffer> bufferConsumer, SSLContext sslContext) {
+        Objects.requireNonNull(bufferSupplier);
+        Objects.requireNonNull(bufferConsumer);
+        this.bufferSupplier = bufferSupplier;
+        this.bufferConsumer = bufferConsumer;
+        this.sslContext = sslContext;
+    }
+
     public final long getLastReadTime() {
         return readtime;
     }
@@ -61,6 +84,9 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl
         return eventing.decrementAndGet();
     }
 
+    @Override
+    public abstract boolean isOpen();
+
     public abstract boolean isTCP();
 
     public abstract boolean shutdownInput();
@@ -84,17 +110,15 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl
     public abstract void setWriteTimeoutSeconds(int writeTimeoutSeconds);
 
     @Override
-    public abstract Future<Integer> read(ByteBuffer dst);
+    public abstract int read(ByteBuffer dst) throws IOException;
+
+    public abstract void read(CompletionHandler<Integer, ByteBuffer> handler);
+
+    public abstract void read(long timeout, TimeUnit unit, CompletionHandler<Integer, ByteBuffer> handler);
 
     @Override
-    public abstract <A> void read(ByteBuffer dst, A attachment, CompletionHandler<Integer, ? super A> handler);
+    public abstract int write(ByteBuffer src) throws IOException;
 
-    public abstract <A> void read(ByteBuffer dst, long timeout, TimeUnit unit, A attachment, CompletionHandler<Integer, ? super A> handler);
-
-    @Override
-    public abstract Future<Integer> write(ByteBuffer src);
-
-    @Override
     public abstract <A> void write(ByteBuffer src, A attachment, CompletionHandler<Integer, ? super A> handler);
 
     public final <A> void write(ByteBuffer[] srcs, A attachment, CompletionHandler<Integer, ? super A> handler) {
@@ -103,6 +127,36 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl
 
     public abstract <A> void write(ByteBuffer[] srcs, int offset, int length, A attachment, CompletionHandler<Integer, ? super A> handler);
 
+    public void setReadBuffer(Buffer buffer) {
+        if (this.readBuffer != null) throw new RuntimeException("repeat AsyncConnection.setReadBuffer");
+        this.readBuffer = (ByteBuffer) buffer;
+    }
+
+    public ByteBuffer pollReadBuffer() {
+        ByteBuffer rs = this.readBuffer;
+        if (rs != null) {
+            this.readBuffer = null;
+            return rs;
+        }
+        return bufferSupplier.get();
+    }
+
+    public void offerBuffer(Buffer buffer) {
+        if (buffer == null) return;
+        bufferConsumer.accept((ByteBuffer) buffer);
+    }
+
+    public void offerBuffer(Buffer... buffers) {
+        if (buffers == null) return;
+        for (Buffer buffer : buffers) {
+            bufferConsumer.accept((ByteBuffer) buffer);
+        }
+    }
+
+    public ByteBuffer pollWriteBuffer() {
+        return bufferSupplier.get();
+    }
+
     public void dispose() {//同close， 只是去掉throws IOException
         try {
             this.close();
@@ -125,11 +179,15 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl
             livingCounter.decrementAndGet();
             livingCounter = null;
         }
-        if (beforeCloseListener != null)
+        if (beforeCloseListener != null) {
             try {
                 beforeCloseListener.accept(this);
             } catch (Exception io) {
             }
+        }
+        if (this.readBuffer != null) {
+            bufferConsumer.accept(this.readBuffer);
+        }
         if (attributes == null) return;
         try {
             for (Object obj : attributes.values()) {
@@ -174,6 +232,7 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl
     /**
      * 创建TCP协议客户端连接
      *
+     * @param bufferPool          ByteBuffer对象池
      * @param address             连接点子
      * @param group               连接AsynchronousChannelGroup
      * @param readTimeoutSeconds  读取超时秒数
@@ -181,14 +240,31 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl
      *
      * @return 连接CompletableFuture
      */
-    public static CompletableFuture<AsyncConnection> createTCP(final AsynchronousChannelGroup group, final SocketAddress address,
+    public static CompletableFuture<AsyncConnection> createTCP(final ObjectPool<ByteBuffer> bufferPool, final AsynchronousChannelGroup group,
-        final int readTimeoutSeconds, final int writeTimeoutSeconds) {
+        final SocketAddress address, final int readTimeoutSeconds, final int writeTimeoutSeconds) {
-        return createTCP(group, null, address, readTimeoutSeconds, writeTimeoutSeconds);
+        return createTCP(bufferPool, group, null, address, readTimeoutSeconds, writeTimeoutSeconds);
     }
 
     /**
      * 创建TCP协议客户端连接
      *
+     * @param context             Context
+     * @param address             连接点子
+     * @param group               连接AsynchronousChannelGroup
+     * @param readTimeoutSeconds  读取超时秒数
+     * @param writeTimeoutSeconds 写入超时秒数
+     *
+     * @return 连接CompletableFuture
+     */
+    public static CompletableFuture<AsyncConnection> createTCP(final Context context, final AsynchronousChannelGroup group,
+        final SocketAddress address, final int readTimeoutSeconds, final int writeTimeoutSeconds) {
+        return createTCP(context.getBufferSupplier(), context.getBufferConsumer(), group, context.getSSLContext(), address, readTimeoutSeconds, writeTimeoutSeconds);
+    }
+
+    /**
+     * 创建TCP协议客户端连接
+     *
+     * @param bufferPool          ByteBuffer对象池
      * @param address             连接点子
      * @param sslContext          SSLContext
      * @param group               连接AsynchronousChannelGroup
@@ -197,7 +273,25 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl
      *
      * @return 连接CompletableFuture
      */
-    public static CompletableFuture<AsyncConnection> createTCP(final AsynchronousChannelGroup group, final SSLContext sslContext,
+    public static CompletableFuture<AsyncConnection> createTCP(final ObjectPool<ByteBuffer> bufferPool, final AsynchronousChannelGroup group, final SSLContext sslContext,
+        final SocketAddress address, final int readTimeoutSeconds, final int writeTimeoutSeconds) {
+        return createTCP(bufferPool, bufferPool, group, sslContext, address, readTimeoutSeconds, writeTimeoutSeconds);
+    }
+
+    /**
+     * 创建TCP协议客户端连接
+     *
+     * @param bufferSupplier      ByteBuffer生产器
+     * @param bufferConsumer      ByteBuffer回收器
+     * @param address             连接点子
+     * @param sslContext          SSLContext
+     * @param group               连接AsynchronousChannelGroup
+     * @param readTimeoutSeconds  读取超时秒数
+     * @param writeTimeoutSeconds 写入超时秒数
+     *
+     * @return 连接CompletableFuture
+     */
+    public static CompletableFuture<AsyncConnection> createTCP(final Supplier<ByteBuffer> bufferSupplier, Consumer<ByteBuffer> bufferConsumer, final AsynchronousChannelGroup group, final SSLContext sslContext,
         final SocketAddress address, final int readTimeoutSeconds, final int writeTimeoutSeconds) {
         final CompletableFuture<AsyncConnection> future = new CompletableFuture<>();
         try {
@@ -211,7 +305,7 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl
             channel.connect(address, null, new CompletionHandler<Void, Void>() {
                 @Override
                 public void completed(Void result, Void attachment) {
-                    future.complete(create(channel, sslContext, address, readTimeoutSeconds, writeTimeoutSeconds));
+                    future.complete(new TcpAioAsyncConnection(bufferSupplier, bufferConsumer, channel, sslContext, address, readTimeoutSeconds, writeTimeoutSeconds, null, null));
                 }
 
                 @Override
@@ -225,80 +319,109 @@ public abstract class AsyncConnection implements AsynchronousByteChannel, AutoCl
         return future;
     }
 
-    /**
+//    public static AsyncConnection create(final Socket socket) {
-     * 通常用于 ssl socket
+//        return create(socket, null, 0, 0);
-     *
+//    }
-     * @param socket Socket对象
+//    public static AsyncConnection create(final Socket socket, final SocketAddress addr0, final int readTimeoutSecond0, final int writeTimeoutSecond0) {
-     *
+//        return new TcpBioAsyncConnection(socket, addr0, readTimeoutSecond0, writeTimeoutSecond0, null, null);
-     * @return 连接对象
+//    }
-     */
+//
-    public static AsyncConnection create(final Socket socket) {
+//    public static AsyncConnection create(final Socket socket, final SocketAddress addr0, final int readTimeoutSecond0,
-        return create(socket, null, 0, 0);
+//        final int writeTimeoutSecond0, final AtomicLong livingCounter, final AtomicLong closedCounter) {
-    }
+//        return new TcpBioAsyncConnection(socket, addr0, readTimeoutSecond0, writeTimeoutSecond0, livingCounter, closedCounter);
-
+//    }
-    public static AsyncConnection create(final Socket socket, final SocketAddress addr0, final int readTimeoutSecond0, final int writeTimeoutSecond0) {
+//
-        return new TcpBioAsyncConnection(socket, addr0, readTimeoutSecond0, writeTimeoutSecond0, null, null);
+//    public static AsyncConnection create(final SocketChannel ch, SocketAddress addr, final Selector selector,
-    }
+//        final int readTimeoutSeconds0, final int writeTimeoutSeconds0) {
-
+//        return new TcpNioAsyncConnection(ch, addr, selector, readTimeoutSeconds0, writeTimeoutSeconds0, null, null);
-    public static AsyncConnection create(final Socket socket, final SocketAddress addr0, final int readTimeoutSecond0,
+//    }
-        final int writeTimeoutSecond0, final AtomicLong livingCounter, final AtomicLong closedCounter) {
+//
-        return new TcpBioAsyncConnection(socket, addr0, readTimeoutSecond0, writeTimeoutSecond0, livingCounter, closedCounter);
+//    public static AsyncConnection create(final SocketChannel ch, final SocketAddress addr0, final Selector selector, final Context context) {
-    }
+//        return new TcpNioAsyncConnection(ch, addr0, selector, context.readTimeoutSeconds, context.writeTimeoutSeconds, null, null);
-
+//    }
-    public static AsyncConnection create(final SocketChannel ch, SocketAddress addr, final Selector selector,
+//
+//    public static AsyncConnection create(final SocketChannel ch, SocketAddress addr, final Selector selector,
+//        final int readTimeoutSeconds0, final int writeTimeoutSeconds0,
+//        final AtomicLong livingCounter, final AtomicLong closedCounter) {
+//        return new TcpNioAsyncConnection(ch, addr, selector, readTimeoutSeconds0, writeTimeoutSeconds0, livingCounter, closedCounter);
+//    }
+    public static AsyncConnection create(final ObjectPool<ByteBuffer> bufferPool, final DatagramChannel ch,
+        SocketAddress addr, final boolean client0,
         final int readTimeoutSeconds0, final int writeTimeoutSeconds0) {
-        return new TcpNioAsyncConnection(ch, addr, selector, readTimeoutSeconds0, writeTimeoutSeconds0, null, null);
+        return new UdpBioAsyncConnection(bufferPool, bufferPool, ch, null, addr, client0, readTimeoutSeconds0, writeTimeoutSeconds0, null, null);
     }
 
-    public static AsyncConnection create(final SocketChannel ch, final SocketAddress addr0, final Selector selector, final Context context) {
+    public static AsyncConnection create(final ObjectPool<ByteBuffer> bufferPool, final DatagramChannel ch,
-        return new TcpNioAsyncConnection(ch, addr0, selector, context.readTimeoutSeconds, context.writeTimeoutSeconds, null, null);
+        SocketAddress addr, final boolean client0,
-    }
-
-    public static AsyncConnection create(final SocketChannel ch, SocketAddress addr, final Selector selector,
         final int readTimeoutSeconds0, final int writeTimeoutSeconds0,
         final AtomicLong livingCounter, final AtomicLong closedCounter) {
-        return new TcpNioAsyncConnection(ch, addr, selector, readTimeoutSeconds0, writeTimeoutSeconds0, livingCounter, closedCounter);
+        return new UdpBioAsyncConnection(bufferPool, bufferPool, ch, null, addr, client0, readTimeoutSeconds0, writeTimeoutSeconds0, livingCounter, closedCounter);
     }
 
-    public static AsyncConnection create(final DatagramChannel ch, SocketAddress addr,
+    public static AsyncConnection create(final ObjectPool<ByteBuffer> bufferPool, final DatagramChannel ch, SSLContext sslContext,
-        final boolean client0, final int readTimeoutSeconds0, final int writeTimeoutSeconds0) {
+        SocketAddress addr, final boolean client0,
-        return new UdpBioAsyncConnection(ch, addr, client0, readTimeoutSeconds0, writeTimeoutSeconds0, null, null);
+        final int readTimeoutSeconds0, final int writeTimeoutSeconds0) {
+        return new UdpBioAsyncConnection(bufferPool, bufferPool, ch, sslContext, addr, client0, readTimeoutSeconds0, writeTimeoutSeconds0, null, null);
     }
 
-    public static AsyncConnection create(final DatagramChannel ch, SocketAddress addr,
+    public static AsyncConnection create(final ObjectPool<ByteBuffer> bufferPool, final DatagramChannel ch, SSLContext sslContext,
-        final boolean client0, final int readTimeoutSeconds0, final int writeTimeoutSeconds0,
+        SocketAddress addr, final boolean client0,
+        final int readTimeoutSeconds0, final int writeTimeoutSeconds0,
         final AtomicLong livingCounter, final AtomicLong closedCounter) {
-        return new UdpBioAsyncConnection(ch, addr, client0, readTimeoutSeconds0, writeTimeoutSeconds0, livingCounter, closedCounter);
+        return new UdpBioAsyncConnection(bufferPool, bufferPool, ch, sslContext, addr, client0, readTimeoutSeconds0, writeTimeoutSeconds0, livingCounter, closedCounter);
     }
 
-    public static AsyncConnection create(final AsynchronousSocketChannel ch) {
+    public static AsyncConnection create(final Context context, final AsynchronousSocketChannel ch) {
-        return create(ch, null, 0, 0);
+        return create(context, ch, (SocketAddress) null, 0, 0);
     }
 
-    public static AsyncConnection create(final AsynchronousSocketChannel ch, final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds) {
+    public static AsyncConnection create(final Context context, final AsynchronousSocketChannel ch,
-        return new TcpAioAsyncConnection(ch, null, addr0, readTimeoutSeconds, writeTimeoutSeconds, null, null);
+        final SocketAddress addr0, final AtomicLong livingCounter, final AtomicLong closedCounter) {
+        return new TcpAioAsyncConnection(context.getBufferSupplier(), context.getBufferConsumer(), ch, context.sslContext, addr0, context.readTimeoutSeconds, context.writeTimeoutSeconds, livingCounter, closedCounter);
     }
 
-    public static AsyncConnection create(final AsynchronousSocketChannel ch, SSLContext sslContext, final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds) {
+    public static AsyncConnection create(final Context context, final AsynchronousSocketChannel ch,
-        return new TcpAioAsyncConnection(ch, sslContext, addr0, readTimeoutSeconds, writeTimeoutSeconds, null, null);
+        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds) {
+        return new TcpAioAsyncConnection(context.getBufferSupplier(), context.getBufferConsumer(), ch, null, addr0, readTimeoutSeconds, writeTimeoutSeconds, null, null);
     }
 
-    public static AsyncConnection create(final AsynchronousSocketChannel ch, final SocketAddress addr0, final Context context) {
+    public static AsyncConnection create(final Context context, final AsynchronousSocketChannel ch, SSLContext sslContext,
-        return new TcpAioAsyncConnection(ch, context.sslContext, addr0, context.readTimeoutSeconds, context.writeTimeoutSeconds, null, null);
+        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds) {
+        return new TcpAioAsyncConnection(context.getBufferSupplier(), context.getBufferConsumer(), ch, sslContext, addr0, readTimeoutSeconds, writeTimeoutSeconds, null, null);
     }
 
-    public static AsyncConnection create(final AsynchronousSocketChannel ch, final SocketAddress addr0, final int readTimeoutSeconds,
+    public static AsyncConnection create(final Context context, final AsynchronousSocketChannel ch,
-        final int writeTimeoutSeconds, final AtomicLong livingCounter, final AtomicLong closedCounter) {
+        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds, final AtomicLong livingCounter, final AtomicLong closedCounter) {
-        return new TcpAioAsyncConnection(ch, null, addr0, readTimeoutSeconds, writeTimeoutSeconds, livingCounter, closedCounter);
+        return new TcpAioAsyncConnection(context.getBufferSupplier(), context.getBufferConsumer(), ch, null, addr0, readTimeoutSeconds, writeTimeoutSeconds, livingCounter, closedCounter);
     }
 
-    public static AsyncConnection create(final AsynchronousSocketChannel ch, SSLContext sslContext, final SocketAddress addr0, final int readTimeoutSeconds,
+    public static AsyncConnection create(final Context context, final AsynchronousSocketChannel ch, SSLContext sslContext,
-        final int writeTimeoutSeconds, final AtomicLong livingCounter, final AtomicLong closedCounter) {
+        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds, final AtomicLong livingCounter, final AtomicLong closedCounter) {
-        return new TcpAioAsyncConnection(ch, sslContext, addr0, readTimeoutSeconds, writeTimeoutSeconds, livingCounter, closedCounter);
+        return new TcpAioAsyncConnection(context.getBufferSupplier(), context.getBufferConsumer(), ch, sslContext, addr0, readTimeoutSeconds, writeTimeoutSeconds, livingCounter, closedCounter);
     }
 
-    public static AsyncConnection create(final AsynchronousSocketChannel ch, final SocketAddress addr0,
+    public static AsyncConnection create(final ObjectPool<ByteBuffer> bufferPool, final AsynchronousSocketChannel ch) {
-        final Context context, final AtomicLong livingCounter, final AtomicLong closedCounter) {
+        return create(bufferPool, ch, null, 0, 0);
-        return new TcpAioAsyncConnection(ch, context.sslContext, addr0, context.readTimeoutSeconds, context.writeTimeoutSeconds, livingCounter, closedCounter);
     }
+
+    public static AsyncConnection create(final ObjectPool<ByteBuffer> bufferPool, final AsynchronousSocketChannel ch,
+        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds) {
+        return new TcpAioAsyncConnection(bufferPool, bufferPool, ch, null, addr0, readTimeoutSeconds, writeTimeoutSeconds, null, null);
+    }
+
+    public static AsyncConnection create(final ObjectPool<ByteBuffer> bufferPool, final AsynchronousSocketChannel ch, SSLContext sslContext,
+        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds) {
+        return new TcpAioAsyncConnection(bufferPool, bufferPool, ch, sslContext, addr0, readTimeoutSeconds, writeTimeoutSeconds, null, null);
+    }
+
+    public static AsyncConnection create(final ObjectPool<ByteBuffer> bufferPool, final AsynchronousSocketChannel ch,
+        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds, final AtomicLong livingCounter, final AtomicLong closedCounter) {
+        return new TcpAioAsyncConnection(bufferPool, bufferPool, ch, null, addr0, readTimeoutSeconds, writeTimeoutSeconds, livingCounter, closedCounter);
+    }
+
+    public static AsyncConnection create(final ObjectPool<ByteBuffer> bufferPool, final AsynchronousSocketChannel ch, SSLContext sslContext,
+        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds, final AtomicLong livingCounter, final AtomicLong closedCounter) {
+        return new TcpAioAsyncConnection(bufferPool, bufferPool, ch, sslContext, addr0, readTimeoutSeconds, writeTimeoutSeconds, livingCounter, closedCounter);
+    }
+
 }

src/org/redkale/net/Context.java

@@ -8,6 +8,7 @@ package org.redkale.net;
 import java.net.*;
 import java.nio.*;
 import java.nio.charset.*;
+import java.util.Collection;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.logging.*;
@@ -47,27 +48,6 @@ public class Context {
     //服务的根Servlet
     protected final PrepareServlet prepare;
 
-    //服务的监听地址
-    private final InetSocketAddress address;
-
-    //字符集
-    protected final Charset charset;
-
-    //最大连接数, 为0表示没限制
-    protected final int maxconns;
-
-    //请求内容的大小上限, 默认64K
-    protected final int maxbody;
-
-    //keep alive IO读取的超时时间
-    protected final int aliveTimeoutSeconds;
-
-    //IO读取的超时时间
-    protected final int readTimeoutSeconds;
-
-    //IO写入的超时时间
-    protected final int writeTimeoutSeconds;
-
     //日志Logger
     protected final Logger logger;
 
@@ -80,6 +60,27 @@ public class Context {
     //依赖注入工厂类
     protected final ResourceFactory resourceFactory;
 
+    //最大连接数, 为0表示没限制
+    protected int maxconns;
+
+    //请求内容的大小上限, 默认64K
+    protected int maxbody;
+
+    //keep alive IO读取的超时时间
+    protected int aliveTimeoutSeconds;
+
+    //IO读取的超时时间
+    protected int readTimeoutSeconds;
+
+    //IO写入的超时时间
+    protected int writeTimeoutSeconds;
+
+    //服务的监听地址
+    protected InetSocketAddress address;
+
+    //字符集
+    protected Charset charset;
+
     public Context(ContextConfig config) {
         this(config.serverStartTime, config.logger, config.executor, config.sslContext,
             config.bufferCapacity, config.bufferPool, config.responsePool, config.maxconns, config.maxbody,
@@ -147,6 +148,14 @@ public class Context {
         executor.execute(r);
     }
 
+    public int getCorePoolSize() {
+        return executor.getCorePoolSize();
+    }
+
+    public ThreadFactory getThreadFactory() {
+        return executor.getThreadFactory();
+    }
+
     public int getBufferCapacity() {
         return bufferCapacity;
     }
@@ -155,7 +164,7 @@ public class Context {
         return bufferPool;
     }
 
-    protected Consumer<ByteBuffer> getBufferConsumer() {
+    public Consumer<ByteBuffer> getBufferConsumer() {
         return bufferPool;
     }
 
@@ -163,11 +172,18 @@ public class Context {
         return bufferPool.get();
     }
 
-    protected void offerBuffer(ByteBuffer buffer) {
+    public void offerBuffer(ByteBuffer buffer) {
         bufferPool.accept(buffer);
     }
 
-    protected void offerBuffer(ByteBuffer... buffers) {
+    public void offerBuffer(ByteBuffer... buffers) {
+        if (buffers == null) return;
+        for (ByteBuffer buffer : buffers) {
+            bufferPool.accept(buffer);
+        }
+    }
+
+    public void offerBuffer(Collection<ByteBuffer> buffers) {
         if (buffers == null) return;
         for (ByteBuffer buffer : buffers) {
             bufferPool.accept(buffer);

src/org/redkale/net/PrepareRunner.java

@@ -9,6 +9,7 @@ import java.io.IOException;
 import java.nio.*;
 import java.nio.channels.*;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.logging.*;
 import org.redkale.util.*;
 
@@ -41,26 +42,24 @@ public class PrepareRunner implements Runnable {
     @Override
     public void run() {
         final boolean keepalive = response != null;
-        final PrepareServlet prepare = context.prepare;
         final ObjectPool<? extends Response> responsePool = context.responsePool;
         if (data != null) { //BIO模式的UDP连接创建AsyncConnection时已经获取到ByteBuffer数据了
             if (response == null) response = responsePool.get();
             try {
                 response.init(channel);
-                prepare.prepare(data, response.request, response);
+                codec(data, response);
             } catch (Throwable t) {
-                context.logger.log(Level.WARNING, "prepare servlet abort, forece to close channel ", t);
+                context.logger.log(Level.WARNING, "prepare servlet abort, force to close channel ", t);
                 response.finish(true);
             }
             return;
         }
         if (response == null) response = responsePool.get();
-        final ByteBuffer buffer = response.request.pollReadBuffer();
         try {
-            channel.read(buffer, keepalive ? context.getAliveTimeoutSeconds() : 0, TimeUnit.SECONDS, null,
+            channel.read(keepalive ? context.getAliveTimeoutSeconds() : context.getReadTimeoutSeconds(), TimeUnit.SECONDS,
-                new CompletionHandler<Integer, Void>() {
+                new CompletionHandler<Integer, ByteBuffer>() {
                 @Override
-                public void completed(Integer count, Void attachment1) {
+                public void completed(Integer count, ByteBuffer buffer) {
                     if (count < 1) {
                         response.request.offerReadBuffer(buffer);
                         channel.dispose();// response.init(channel); 在调用之前异常
@@ -75,39 +74,90 @@ public class PrepareRunner implements Runnable {
 //                        System.println(new String(bs));
 //                    }
                     buffer.flip();
-                    response.init(channel);
                     try {
-                        prepare.prepare(buffer, response.request, response);
+                        response.init(channel);
+                        codec(buffer, response);
                     } catch (Throwable t) {  //此处不可  context.offerBuffer(buffer); 以免prepare.prepare内部异常导致重复 offerBuffer
-                        context.logger.log(Level.WARNING, "prepare servlet abort, forece to close channel ", t);
+                        context.logger.log(Level.WARNING, "prepare servlet abort, force to close channel ", t);
                         response.finish(true);
                     }
                 }
 
                 @Override
-                public void failed(Throwable exc, Void attachment2) {
+                public void failed(Throwable exc, ByteBuffer buffer) {
                     response.request.offerReadBuffer(buffer);
                     channel.dispose();// response.init(channel); 在调用之前异常
                     response.removeChannel();
                     response.finish(true);
                     if (exc != null && context.logger.isLoggable(Level.FINEST)) {
-                        context.logger.log(Level.FINEST, "Servlet Handler read channel erroneous, forece to close channel ", exc);
+                        context.logger.log(Level.FINEST, "Servlet Handler read channel erroneous, force to close channel ", exc);
                     }
                 }
             });
         } catch (Exception te) {
-            response.request.offerReadBuffer(buffer);
             channel.dispose();// response.init(channel); 在调用之前异常
             response.removeChannel();
             response.finish(true);
             if (te != null && context.logger.isLoggable(Level.FINEST)) {
-                context.logger.log(Level.FINEST, "Servlet read channel erroneous, forece to close channel ", te);
+                context.logger.log(Level.FINEST, "Servlet read channel erroneous, force to close channel ", te);
             }
         }
     }
 
-    protected void prepare(ByteBuffer buffer, Request request, Response response) throws IOException {
+    protected void codec(final ByteBuffer buffer, final Response response) throws IOException {
-        context.prepare.prepare(buffer, request, response);
+        final Request request = response.request;
+        final PrepareServlet preparer = context.prepare;
+        preparer.executeCounter.incrementAndGet();
+        final int rs = request.readHeader(buffer);
+        if (rs < 0) {  //表示数据格式不正确
+            channel.offerBuffer(buffer);
+            if (rs != Integer.MIN_VALUE) preparer.illRequestCounter.incrementAndGet();
+            response.finish(true);
+        } else if (rs == 0) {
+            if (buffer.hasRemaining()) {
+                request.setMoredata(buffer);
+            } else {
+                response.request.offerReadBuffer(buffer);
+            }
+            preparer.prepare(request, response);
+        } else {
+            buffer.clear();
+            channel.setReadBuffer(buffer);
+            final AtomicInteger ai = new AtomicInteger(rs);
+            channel.read(new CompletionHandler<Integer, ByteBuffer>() {
+
+                @Override
+                public void completed(Integer result, ByteBuffer attachment) {
+                    attachment.flip();
+                    ai.addAndGet(-request.readBody(attachment));
+                    if (ai.get() > 0) {
+                        attachment.clear();
+                        channel.setReadBuffer(attachment);
+                        channel.read(this);
+                    } else {
+                        if (attachment.hasRemaining()) {
+                            request.setMoredata(attachment);
+                        } else {
+                            response.request.offerReadBuffer(attachment);
+                        }
+                        try {
+                            preparer.prepare(request, response);
+                        } catch (Throwable t) {  //此处不可  context.offerBuffer(buffer); 以免preparer.prepare内部异常导致重复 offerBuffer
+                            context.logger.log(Level.WARNING, "prepare servlet abort, force to close channel ", t);
+                            response.finish(true);
+                        }
+                    }
+                }
+
+                @Override
+                public void failed(Throwable exc, ByteBuffer attachment) {
+                    preparer.illRequestCounter.incrementAndGet();
+                    response.request.offerReadBuffer(attachment);
+                    response.finish(true);
+                    if (exc != null) request.context.logger.log(Level.FINER, "Servlet read channel erroneous, force to close channel ", exc);
+                }
+            });
+        }
     }
 
     protected void initResponse(Response response, AsyncConnection channel) {

src/org/redkale/net/PrepareServlet.java

@@ -6,12 +6,9 @@
 package org.redkale.net;
 
 import java.io.*;
-import java.nio.*;
-import java.nio.channels.*;
 import java.util.*;
 import java.util.concurrent.atomic.*;
 import java.util.function.Predicate;
-import java.util.logging.*;
 import org.redkale.util.*;
 
 /**
@@ -210,63 +207,11 @@ public abstract class PrepareServlet<K extends Serializable, C extends Context,
     @SuppressWarnings("unchecked")
     public abstract void addServlet(S servlet, Object attachment, AnyValue conf, K... mappings);
 
-    public void prepare(final ByteBuffer buffer, final R request, final P response) throws IOException {
+    public final void prepare(final R request, final P response) throws IOException {
-        executeCounter.incrementAndGet();
+        request.prepare();
-        final int rs = request.readHeader(buffer);
+        response.filter = this.headFilter;
-        if (rs < 0) {
+        response.servlet = this;
-            request.offerReadBuffer(buffer);
+        response.nextEvent();
-            if (rs != Integer.MIN_VALUE) illRequestCounter.incrementAndGet();
-            response.finish(true);
-        } else if (rs == 0) {
-            if (buffer.hasRemaining()) {
-                request.setMoredata(buffer);
-            } else {
-                request.offerReadBuffer(buffer);
-            }
-            request.prepare();
-            response.filter = this.headFilter;
-            response.servlet = this;
-            response.nextEvent();
-        } else {
-            buffer.clear();
-            final AtomicInteger ai = new AtomicInteger(rs);
-            request.channel.read(buffer, buffer, new CompletionHandler<Integer, ByteBuffer>() {
-
-                @Override
-                public void completed(Integer result, ByteBuffer attachment) {
-                    buffer.flip();
-                    ai.addAndGet(-request.readBody(buffer));
-                    if (ai.get() > 0) {
-                        buffer.clear();
-                        request.channel.read(buffer, buffer, this);
-                    } else {
-                        if (buffer.hasRemaining()) {
-                            request.setMoredata(buffer);
-                        } else {
-                            request.offerReadBuffer(buffer);
-                        }
-                        request.prepare();
-                        try {
-                            response.filter = PrepareServlet.this.headFilter;
-                            response.servlet = PrepareServlet.this;
-                            response.nextEvent();
-                        } catch (Exception e) {
-                            illRequestCounter.incrementAndGet();
-                            response.finish(true);
-                            request.context.logger.log(Level.WARNING, "prepare servlet abort, forece to close channel ", e);
-                        }
-                    }
-                }
-
-                @Override
-                public void failed(Throwable exc, ByteBuffer attachment) {
-                    illRequestCounter.incrementAndGet();
-                    request.offerReadBuffer(buffer);
-                    response.finish(true);
-                    if (exc != null) request.context.logger.log(Level.FINER, "Servlet read channel erroneous, forece to close channel ", exc);
-                }
-            });
-        }
     }
 
     protected AnyValue getServletConf(Servlet servlet) {

src/org/redkale/net/ProtocolServer.java

@@ -73,13 +73,13 @@ public abstract class ProtocolServer {
             } else if ("aio".equalsIgnoreCase(netimpl)) {
                 return new TcpAioProtocolServer(context);
             } else if ("nio".equalsIgnoreCase(netimpl)) {
-                return new TcpNioProtocolServer(context);
+                return null;//  return new TcpNioProtocolServer(context);
             }
         } else if ("UDP".equalsIgnoreCase(protocol)) {
             if (netimpl == null || netimpl.isEmpty()) {
-                return new UdpBioProtocolServer(context);
+                return null;// return new UdpBioProtocolServer(context);
             } else if ("bio".equalsIgnoreCase(netimpl)) {
-                return new UdpBioProtocolServer(context);
+                return null;// return new UdpBioProtocolServer(context);
             }
         } else if (netimpl == null || netimpl.isEmpty()) {
             throw new RuntimeException("ProtocolServer not support protocol " + protocol);

src/org/redkale/net/Response.java

@@ -34,7 +34,7 @@ public abstract class Response<C extends Context, R extends Request<C>> {
 
     protected ByteBuffer writeBodyBuffer;
 
-    private boolean inited = true;
+    private volatile boolean inited = true;
 
     protected Object output; //输出的结果对象
 

src/org/redkale/net/Server.java

@@ -12,8 +12,9 @@ import java.text.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.logging.Logger;
+import java.util.logging.*;
 import javax.net.ssl.SSLContext;
+import org.redkale.net.Filter;
 import org.redkale.util.*;
 
 /**
@@ -287,6 +288,74 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
             + ", started in " + (System.currentTimeMillis() - context.getServerStartTime()) + " ms");
     }
 
+    public void changeAddress(final InetSocketAddress addr) throws IOException {
+        long s = System.currentTimeMillis();
+        Objects.requireNonNull(addr);
+        final InetSocketAddress oldAddress = context.address;
+        final ProtocolServer oldServerChannel = this.serverChannel;
+        context.address = addr;
+        ProtocolServer newServerChannel = null;
+        try {
+            newServerChannel = ProtocolServer.create(this.protocol, context, this.serverClassLoader, config == null ? null : config.getValue("netimpl"));
+            newServerChannel.open(config);
+            newServerChannel.bind(addr, backlog);
+            newServerChannel.accept();
+        } catch (IOException e) {
+            context.address = oldAddress;
+            throw e;
+        }
+        this.address = context.address;
+        this.serverChannel = newServerChannel;
+        final String threadName = "[" + Thread.currentThread().getName() + "] ";
+        logger.info(threadName + this.getClass().getSimpleName() + ("TCP".equalsIgnoreCase(protocol) ? "" : ("." + protocol))
+            + " change address listen: " + address + ", started in " + (System.currentTimeMillis() - s) + " ms");
+        if (oldServerChannel != null) {
+            new Thread() {
+
+                @Override
+                public void run() {
+                    try {
+                        Thread.sleep(10_000);
+                        oldServerChannel.close();
+                    } catch (Exception e) {
+                        logger.log(Level.WARNING, "Server.changeInetSocketAddress(addr=" + addr + ") error", e);
+                    }
+                }
+            }.start();
+        }
+    }
+
+    public void changeMaxconns(final int newmaxconns) {
+        this.maxconns = newmaxconns;
+        if (this.context != null) this.context.maxconns = newmaxconns;
+        if (this.serverChannel != null) this.serverChannel.maxconns = newmaxconns;
+    }
+
+    public void changeCharset(final Charset newcharset) {
+        this.charset = newcharset;
+        if (this.context != null) this.context.charset = newcharset;
+    }
+
+    public void changeMaxbody(final int newmaxbody) {
+        this.maxbody = newmaxbody;
+        if (this.context != null) this.context.maxbody = newmaxbody;
+    }
+
+    public void changeReadTimeoutSeconds(final int newReadTimeoutSeconds) {
+        this.readTimeoutSeconds = newReadTimeoutSeconds;
+        if (this.context != null) this.context.readTimeoutSeconds = newReadTimeoutSeconds;
+    }
+
+    public void changeWriteTimeoutSeconds(final int newWriteTimeoutSeconds) {
+        this.writeTimeoutSeconds = newWriteTimeoutSeconds;
+        if (this.context != null) this.context.writeTimeoutSeconds = newWriteTimeoutSeconds;
+    }
+
+    public void changeAliveTimeoutSeconds(final int newAliveTimeoutSeconds) {
+        this.aliveTimeoutSeconds = newAliveTimeoutSeconds;
+        if (this.context != null) this.context.aliveTimeoutSeconds = newAliveTimeoutSeconds;
+    }
+
     protected abstract C createContext();
 
     public void shutdown() throws IOException {
@@ -412,7 +481,7 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
             classLoader.addURL(url);
         }
         List<URL> list = new ArrayList<>(set);
-        Collections.sort(list, (URL o1, URL o2) -> o1.getFile().compareTo(o2.getFile()));
+        list.sort((URL o1, URL o2) -> o1.getFile().compareTo(o2.getFile()));
         return list.toArray(new URL[list.size()]);
     }
 

src/org/redkale/net/TcpAioAsyncConnection.java

@@ -12,6 +12,7 @@ import java.nio.channels.*;
 import java.util.Set;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.*;
 import javax.net.ssl.SSLContext;
 
 /**
@@ -35,11 +36,12 @@ public class TcpAioAsyncConnection extends AsyncConnection {
 
     private BlockingQueue<WriteEntry> writeQueue;
 
-    public TcpAioAsyncConnection(final AsynchronousSocketChannel ch, SSLContext sslContext,
+    public TcpAioAsyncConnection(Supplier<ByteBuffer> bufferSupplier, Consumer<ByteBuffer> bufferConsumer,
-        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds,
+        final AsynchronousSocketChannel ch, final SSLContext sslContext, final SocketAddress addr0,
+        final int readTimeoutSeconds, final int writeTimeoutSeconds,
         final AtomicLong livingCounter, final AtomicLong closedCounter) {
+        super(bufferSupplier, bufferConsumer, sslContext);
         this.channel = ch;
-        this.sslContext = sslContext;
         this.readTimeoutSeconds = readTimeoutSeconds;
         this.writeTimeoutSeconds = writeTimeoutSeconds;
         SocketAddress addr = addr0;
@@ -91,24 +93,38 @@ public class TcpAioAsyncConnection extends AsyncConnection {
     }
 
     @Override
-    public <A> void read(ByteBuffer dst, A attachment, CompletionHandler<Integer, ? super A> handler) {
+    public void read(CompletionHandler<Integer, ByteBuffer> handler) {
         this.readtime = System.currentTimeMillis();
+        ByteBuffer dst = pollReadBuffer();
         if (readTimeoutSeconds > 0) {
-            channel.read(dst, readTimeoutSeconds, TimeUnit.SECONDS, attachment, handler);
+            channel.read(dst, readTimeoutSeconds, TimeUnit.SECONDS, dst, handler);
         } else {
-            channel.read(dst, attachment, handler);
+            channel.read(dst, dst, handler);
         }
     }
 
     @Override
-    public <A> void read(ByteBuffer dst, long timeout, TimeUnit unit, A attachment, CompletionHandler<Integer, ? super A> handler) {
+    public void read(long timeout, TimeUnit unit, CompletionHandler<Integer, ByteBuffer> handler) {
         this.readtime = System.currentTimeMillis();
-        channel.read(dst, timeout < 0 ? 0 : timeout, unit, attachment, handler);
+        ByteBuffer dst = pollReadBuffer();
+        channel.read(dst, timeout < 0 ? 0 : timeout, unit, dst, handler);
     }
 
-    private <A> void nextWrite(A attachment) {
+    private <A> void nextWrite(Throwable exc, A attachment) {
         BlockingQueue<WriteEntry> queue = this.writeQueue;
+        if (queue != null && exc != null && !isOpen()) {
+            WriteEntry entry;
+            while ((entry = queue.poll()) != null) {
+                try {
+                    entry.writeHandler.failed(exc, entry.writeAttachment);
+                } catch (Throwable e) {
+                    e.printStackTrace(System.err);
+                }
+            }
+            return;
+        }
         WriteEntry entry = queue == null ? null : queue.poll();
+
         if (entry != null) {
             try {
                 if (entry.writeOneBuffer == null) {
@@ -223,13 +239,21 @@ public class TcpAioAsyncConnection extends AsyncConnection {
     }
 
     @Override
-    public final Future<Integer> read(ByteBuffer dst) {
+    public final int read(ByteBuffer dst) throws IOException {
-        return channel.read(dst);
+        try {
+            return channel.read(dst).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException(e);
+        }
     }
 
     @Override
-    public final Future<Integer> write(ByteBuffer src) {
+    public final int write(ByteBuffer src) throws IOException {
-        return channel.write(src);
+        try {
+            return channel.write(src).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException(e);
+        }
     }
 
     @Override
@@ -300,18 +324,27 @@ public class TcpAioAsyncConnection extends AsyncConnection {
                     failed(e, attachment);
                     return;
                 }
-                nextWrite(attachment);
+                try {
-                writeHandler.completed(writeCount, attachment);
+                    writeHandler.completed(writeCount, attachment);
+                } finally {
+                    nextWrite(null, attachment);
+                }
             } else {
-                nextWrite(attachment);
+                try {
-                writeHandler.completed(result.intValue(), attachment);
+                    writeHandler.completed(result.intValue(), attachment);
+                } finally {
+                    nextWrite(null, attachment);
+                }
             }
         }
 
         @Override
         public void failed(Throwable exc, A attachment) {
-            nextWrite(attachment);
+            try {
-            writeHandler.failed(exc, attachment);
+                writeHandler.failed(exc, attachment);
+            } finally {
+                nextWrite(exc, attachment);
+            }
         }
 
     }
@@ -338,14 +371,21 @@ public class TcpAioAsyncConnection extends AsyncConnection {
                 failed(e, attachment);
                 return;
             }
-            nextWrite(attachment);
+            try {
-            writeHandler.completed(result, attachment);
+                writeHandler.completed(result, attachment);
+            } finally {
+                nextWrite(null, attachment);
+            }
+
         }
 
         @Override
         public void failed(Throwable exc, A attachment) {
-            nextWrite(attachment);
+            try {
-            writeHandler.failed(exc, attachment);
+                writeHandler.failed(exc, attachment);
+            } finally {
+                nextWrite(exc, attachment);
+            }
         }
 
     }

src/org/redkale/net/TcpAioProtocolServer.java

@@ -92,13 +92,13 @@ public class TcpAioProtocolServer extends ProtocolServer {
                     channel.setOption(StandardSocketOptions.SO_REUSEADDR, true);
                     channel.setOption(StandardSocketOptions.SO_RCVBUF, 16 * 1024);
                     channel.setOption(StandardSocketOptions.SO_SNDBUF, 16 * 1024);
-                } catch (IOException e) {
+
-                    context.logger.log(Level.INFO, channel + " setOption error", e);
+                    AsyncConnection conn = new TcpAioAsyncConnection(context.getBufferSupplier(), context.getBufferConsumer(), channel,
+                        context.getSSLContext(), null, context.readTimeoutSeconds, context.writeTimeoutSeconds, livingCounter, closedCounter);
+                    context.runAsync(new PrepareRunner(context, conn, null, null));
+                } catch (Throwable e) {
+                    context.logger.log(Level.INFO, channel + " accept error", e);
                 }
-                AsyncConnection conn = new TcpAioAsyncConnection(channel, context.sslContext, null, context.readTimeoutSeconds, context.writeTimeoutSeconds, null, null);
-                conn.livingCounter = livingCounter;
-                conn.closedCounter = closedCounter;
-                context.runAsync(new PrepareRunner(context, conn, null, null));
             }
 
             @Override

src/org/redkale/net/TcpBioAsyncConnection.java

@@ -1,240 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkale.net;
-
-import java.io.IOException;
-import java.net.*;
-import java.nio.ByteBuffer;
-import java.nio.channels.*;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- *
- * <p>
- * 详情见: https://redkale.org
- *
- * @author zhangjx
- */
-public class TcpBioAsyncConnection extends AsyncConnection {
-
-    static final Set<SocketOption<?>> defaultOptions = defaultOptions();
-
-    private static Set<SocketOption<?>> defaultOptions() {
-        HashSet<SocketOption<?>> set = new HashSet<>(5);
-        set.add(StandardSocketOptions.SO_SNDBUF);
-        set.add(StandardSocketOptions.SO_RCVBUF);
-        set.add(StandardSocketOptions.SO_KEEPALIVE);
-        set.add(StandardSocketOptions.SO_REUSEADDR);
-        set.add(StandardSocketOptions.TCP_NODELAY);
-        return Collections.unmodifiableSet(set);
-    }
-
-    private int readTimeoutSeconds;
-
-    private int writeTimeoutSeconds;
-
-    private final Socket socket;
-
-    private final ReadableByteChannel readChannel;
-
-    private final WritableByteChannel writeChannel;
-
-    private final SocketAddress remoteAddress;
-
-    public TcpBioAsyncConnection(final Socket socket, final SocketAddress addr0, final int readTimeoutSeconds0, final int writeTimeoutSeconds0,
-        final AtomicLong livingCounter, final AtomicLong closedCounter) {
-        this.socket = socket;
-        ReadableByteChannel rc = null;
-        WritableByteChannel wc = null;
-        try {
-            socket.setSoTimeout(Math.max(readTimeoutSeconds0, writeTimeoutSeconds0));
-            rc = Channels.newChannel(socket.getInputStream());
-            wc = Channels.newChannel(socket.getOutputStream());
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        this.readChannel = rc;
-        this.writeChannel = wc;
-        this.readTimeoutSeconds = readTimeoutSeconds0;
-        this.writeTimeoutSeconds = writeTimeoutSeconds0;
-        SocketAddress addr = addr0;
-        if (addr == null) {
-            try {
-                addr = socket.getRemoteSocketAddress();
-            } catch (Exception e) {
-                //do nothing
-            }
-        }
-        this.remoteAddress = addr;
-        this.livingCounter = livingCounter;
-        this.closedCounter = closedCounter;
-    }
-
-    @Override
-    public boolean isTCP() {
-        return true;
-    }
-
-    @Override
-    public SocketAddress getRemoteAddress() {
-        return remoteAddress;
-    }
-
-    @Override
-    public SocketAddress getLocalAddress() {
-        return socket.getLocalSocketAddress();
-    }
-
-    @Override
-    public int getReadTimeoutSeconds() {
-        return readTimeoutSeconds;
-    }
-
-    @Override
-    public int getWriteTimeoutSeconds() {
-        return writeTimeoutSeconds;
-    }
-
-    @Override
-    public void setReadTimeoutSeconds(int readTimeoutSeconds) {
-        this.readTimeoutSeconds = readTimeoutSeconds;
-    }
-
-    @Override
-    public void setWriteTimeoutSeconds(int writeTimeoutSeconds) {
-        this.writeTimeoutSeconds = writeTimeoutSeconds;
-    }
-
-    @Override
-    public boolean shutdownInput() {
-        try {
-            this.socket.shutdownInput();
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public boolean shutdownOutput() {
-        try {
-            this.socket.shutdownOutput();
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public <T> boolean setOption(SocketOption<T> name, T value) {
-        try {
-            if (StandardSocketOptions.SO_REUSEADDR == name) {
-                this.socket.setReuseAddress((Boolean) value);
-                return true;
-            }
-            if (StandardSocketOptions.SO_KEEPALIVE == name) {
-                this.socket.setKeepAlive((Boolean) value);
-                return true;
-            }
-            if (StandardSocketOptions.TCP_NODELAY == name) {
-                this.socket.setTcpNoDelay((Boolean) value);
-                return true;
-            }
-            if (StandardSocketOptions.SO_RCVBUF == name) {
-                this.socket.setReceiveBufferSize((Integer) value);
-                return true;
-            }
-            if (StandardSocketOptions.SO_SNDBUF == name) {
-                this.socket.setSendBufferSize((Integer) value);
-                return true;
-            }
-        } catch (IOException e) {
-            return false;
-        }
-        return false;
-    }
-
-    @Override
-    public Set<SocketOption<?>> supportedOptions() {
-        return defaultOptions;
-    }
-
-    @Override
-    public <A> void write(ByteBuffer[] srcs, int offset, int length, A attachment, CompletionHandler<Integer, ? super A> handler) {
-        try {
-            int rs = 0;
-            for (int i = offset; i < offset + length; i++) {
-                rs += writeChannel.write(srcs[i]);
-            }
-            this.writetime = System.currentTimeMillis();
-            if (handler != null) handler.completed(rs, attachment);
-        } catch (IOException e) {
-            if (handler != null) handler.failed(e, attachment);
-        }
-    }
-
-    @Override
-    public <A> void read(ByteBuffer dst, A attachment, CompletionHandler<Integer, ? super A> handler) {
-        try {
-            int rs = readChannel.read(dst);
-            this.readtime = System.currentTimeMillis();
-            if (handler != null) handler.completed(rs, attachment);
-        } catch (IOException e) {
-            if (handler != null) handler.failed(e, attachment);
-        }
-    }
-
-    @Override
-    public <A> void read(ByteBuffer dst, long timeout, TimeUnit unit, A attachment, CompletionHandler<Integer, ? super A> handler) {
-        read(dst, attachment, handler);
-    }
-
-    @Override
-    public Future<Integer> read(ByteBuffer dst) {
-        try {
-            int rs = readChannel.read(dst);
-            this.readtime = System.currentTimeMillis();
-            return CompletableFuture.completedFuture(rs);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public <A> void write(ByteBuffer src, A attachment, CompletionHandler<Integer, ? super A> handler) {
-        try {
-            int rs = writeChannel.write(src);
-            this.writetime = System.currentTimeMillis();
-            if (handler != null) handler.completed(rs, attachment);
-        } catch (IOException e) {
-            if (handler != null) handler.failed(e, attachment);
-        }
-    }
-
-    @Override
-    public Future<Integer> write(ByteBuffer src) {
-        try {
-            int rs = writeChannel.write(src);
-            this.writetime = System.currentTimeMillis();
-            return CompletableFuture.completedFuture(rs);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        super.close();
-        this.socket.close();
-    }
-
-    @Override
-    public boolean isOpen() {
-        return !socket.isClosed();
-    }
-}

src/org/redkale/net/TcpNioAsyncConnection.java

@@ -1,366 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkale.net;
-
-import java.io.IOException;
-import java.net.*;
-import java.nio.ByteBuffer;
-import java.nio.channels.*;
-import java.util.Set;
-import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicLong;
-
-/**
- *
- * <p>
- * 详情见: https://redkale.org
- *
- * @author zhangjx
- */
-public class TcpNioAsyncConnection extends AsyncConnection {
-
-    protected int readTimeoutSeconds;
-
-    protected int writeTimeoutSeconds;
-
-    protected final Selector selector;
-
-    protected SelectionKey key;
-
-    protected final SocketChannel channel;
-
-    protected final SocketAddress remoteAddress;
-
-    ByteBuffer readBuffer;
-
-    Object readAttachment;
-
-    CompletionHandler readHandler;
-
-    ByteBuffer writeOneBuffer;
-
-    ByteBuffer[] writeBuffers;
-
-    int writingCount;
-
-    int writeOffset;
-
-    int writeLength;
-
-    Object writeAttachment;
-
-    CompletionHandler writeHandler;
-
-    public TcpNioAsyncConnection(final SocketChannel ch, SocketAddress addr0,
-        final Selector selector,
-        final int readTimeoutSeconds0, final int writeTimeoutSeconds0,
-        final AtomicLong livingCounter, final AtomicLong closedCounter) {
-        this.channel = ch;
-        this.selector = selector;
-        this.readTimeoutSeconds = readTimeoutSeconds0;
-        this.writeTimeoutSeconds = writeTimeoutSeconds0;
-        SocketAddress addr = addr0;
-        if (addr == null) {
-            try {
-                addr = ch.getRemoteAddress();
-            } catch (Exception e) {
-                //do nothing
-            }
-        }
-        this.remoteAddress = addr;
-        this.livingCounter = livingCounter;
-        this.closedCounter = closedCounter;
-    }
-
-    @Override
-    public void setReadTimeoutSeconds(int readTimeoutSeconds) {
-        this.readTimeoutSeconds = readTimeoutSeconds;
-    }
-
-    @Override
-    public void setWriteTimeoutSeconds(int writeTimeoutSeconds) {
-        this.writeTimeoutSeconds = writeTimeoutSeconds;
-    }
-
-    @Override
-    public int getReadTimeoutSeconds() {
-        return this.readTimeoutSeconds;
-    }
-
-    @Override
-    public int getWriteTimeoutSeconds() {
-        return this.writeTimeoutSeconds;
-    }
-
-    @Override
-    public final SocketAddress getRemoteAddress() {
-        return remoteAddress;
-    }
-
-    @Override
-    public SocketAddress getLocalAddress() {
-        try {
-            return channel.getLocalAddress();
-        } catch (IOException e) {
-            return null;
-        }
-    }
-
-    @Override
-    public boolean shutdownInput() {
-        try {
-            this.channel.shutdownInput();
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public boolean shutdownOutput() {
-        try {
-            this.channel.shutdownOutput();
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public <T> boolean setOption(SocketOption<T> name, T value) {
-        try {
-            this.channel.setOption(name, value);
-            return true;
-        } catch (IOException e) {
-            return false;
-        }
-    }
-
-    @Override
-    public Set<SocketOption<?>> supportedOptions() {
-        return this.channel.supportedOptions();
-    }
-
-    CompletionHandler removeReadHandler() {
-        CompletionHandler handler = this.readHandler;
-        this.readHandler = null;
-        return handler;
-    }
-
-    ByteBuffer removeReadBuffer() {
-        ByteBuffer buffer = this.readBuffer;
-        this.readBuffer = null;
-        return buffer;
-    }
-
-    Object removeReadAttachment() {
-        Object attach = this.readAttachment;
-        this.readAttachment = null;
-        return attach;
-    }
-
-    void completeRead(int rs) {
-        Object attach = this.readAttachment;
-        CompletionHandler handler = this.readHandler;
-        this.readBuffer = null;
-        this.readAttachment = null;
-        this.readHandler = null;
-        handler.completed(rs, attach);
-    }
-
-    void faileRead(Throwable t) {
-        Object attach = this.readAttachment;
-        CompletionHandler handler = this.readHandler;
-        this.readBuffer = null;
-        this.readAttachment = null;
-        this.readHandler = null;
-        handler.failed(t, attach);
-    }
-
-    CompletionHandler removeWriteHandler() {
-        CompletionHandler handler = this.writeHandler;
-        this.writeHandler = null;
-        return handler;
-    }
-
-    ByteBuffer removeWriteOneBuffer() {
-        ByteBuffer buffer = this.writeOneBuffer;
-        this.writeOneBuffer = null;
-        return buffer;
-    }
-
-    ByteBuffer[] removeWriteBuffers() {
-        ByteBuffer[] buffers = this.writeBuffers;
-        this.writeBuffers = null;
-        return buffers;
-    }
-
-    int removeWritingCount() {
-        int rs = this.writingCount;
-        this.writingCount = 0;
-        return rs;
-    }
-
-    int removeWriteOffset() {
-        int rs = this.writeOffset;
-        this.writeOffset = 0;
-        return rs;
-    }
-
-    int removeWriteLength() {
-        int rs = this.writeLength;
-        this.writeLength = 0;
-        return rs;
-    }
-
-    Object removeWriteAttachment() {
-        Object attach = this.writeAttachment;
-        this.writeAttachment = null;
-        return attach;
-    }
-
-    void completeWrite(int rs) {
-        Object attach = this.writeAttachment;
-        CompletionHandler handler = this.writeHandler;
-        this.writeOneBuffer = null;
-        this.writeBuffers = null;
-        this.writeOffset = 0;
-        this.writeLength = 0;
-        this.writeAttachment = null;
-        this.writeHandler = null;
-        handler.completed(rs, attach);
-    }
-
-    void faileWrite(Throwable t) {
-        Object attach = this.writeAttachment;
-        CompletionHandler handler = this.writeHandler;
-        this.writeOneBuffer = null;
-        this.writeBuffers = null;
-        this.writeOffset = 0;
-        this.writeLength = 0;
-        this.writeAttachment = null;
-        this.writeHandler = null;
-        handler.failed(t, attach);
-    }
-
-    @Override
-    public <A> void read(ByteBuffer dst, A attachment, CompletionHandler<Integer, ? super A> handler) {
-        if (this.readHandler != null) throw new RuntimeException("pending read");
-        try {
-            this.readBuffer = dst;
-            this.readAttachment = attachment;
-            this.readHandler = handler;
-            if (key == null) {
-                key = channel.register(selector, SelectionKey.OP_READ);
-                key.attach(this);
-            } else {
-                key.interestOps(SelectionKey.OP_READ);
-            }
-            selector.wakeup();
-        } catch (Exception e) {
-            faileRead(e);
-        }
-    }
-
-    @Override
-    public <A> void read(ByteBuffer dst, long timeout, TimeUnit unit, A attachment, CompletionHandler<Integer, ? super A> handler) {
-        read(dst, attachment, handler);
-    }
-
-    @Override
-    public Future<Integer> read(ByteBuffer dst) {
-        CompletableFuture future = new CompletableFuture();
-        read(dst, null, new CompletionHandler<Integer, Void>() {
-            @Override
-            public void completed(Integer result, Void attachment) {
-                future.complete(result);
-            }
-
-            @Override
-            public void failed(Throwable exc, Void attachment) {
-                future.completeExceptionally(exc);
-            }
-        });
-        return future;
-    }
-
-    @Override
-    public <A> void write(ByteBuffer[] srcs, int offset, int length, A attachment, CompletionHandler<Integer, ? super A> handler) {
-        if (this.writeHandler != null) throw new RuntimeException("pending write");
-        try {
-            this.writeBuffers = srcs;
-            this.writeOffset = offset;
-            this.writeLength = length;
-            this.writingCount = 0;
-            this.writeAttachment = attachment;
-            this.writeHandler = handler;
-            if (key == null) {
-                key = channel.register(selector, SelectionKey.OP_WRITE);
-                key.attach(this);
-            } else {
-                key.interestOps(SelectionKey.OP_WRITE);
-            }
-            selector.wakeup();
-        } catch (Exception e) {
-            faileWrite(e);
-        }
-    }
-
-    @Override
-    public <A> void write(ByteBuffer src, A attachment, CompletionHandler<Integer, ? super A> handler) {
-        if (this.writeHandler != null) throw new RuntimeException("pending write");
-        try {
-            this.writeOneBuffer = src;
-            this.writingCount = 0;
-            this.writeAttachment = attachment;
-            this.writeHandler = handler;
-            if (key == null) {
-                key = channel.register(selector, SelectionKey.OP_WRITE);
-                key.attach(this);
-            } else {
-                key.interestOps(SelectionKey.OP_WRITE);
-            }
-            selector.wakeup();
-        } catch (Exception e) {
-            faileWrite(e);
-        }
-    }
-
-    @Override
-    public Future<Integer> write(ByteBuffer src) {
-        CompletableFuture future = new CompletableFuture();
-        write(src, null, new CompletionHandler<Integer, Void>() {
-            @Override
-            public void completed(Integer result, Void attachment) {
-                future.complete(result);
-            }
-
-            @Override
-            public void failed(Throwable exc, Void attachment) {
-                future.completeExceptionally(exc);
-            }
-        });
-        return future;
-    }
-
-    @Override
-    public final void close() throws IOException {
-        super.close();
-        channel.close();
-        key.cancel();
-    }
-
-    @Override
-    public final boolean isOpen() {
-        return channel.isOpen();
-    }
-
-    @Override
-    public final boolean isTCP() {
-        return true;
-    }
-
-}

src/org/redkale/net/TcpNioProtocolServer.java

@@ -1,370 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package org.redkale.net;
-
-import java.io.IOException;
-import java.net.*;
-import java.nio.ByteBuffer;
-import java.nio.channels.*;
-import java.util.*;
-import java.util.concurrent.*;
-import org.redkale.util.AnyValue;
-
-/**
- * 协议底层Server
- *
- * <p>
- * 详情见: https://redkale.org
- *
- * @author zhangjx
- */
-public class TcpNioProtocolServer extends ProtocolServer {
-
-    private Selector acceptSelector;
-
-    private ServerSocketChannel serverChannel;
-
-    private NioThreadWorker[] workers;
-
-    private NioThreadWorker currWorker;
-
-    private boolean running;
-
-    public TcpNioProtocolServer(Context context) {
-        super(context);
-    }
-
-    @Override
-    public void open(AnyValue config) throws IOException {
-        acceptSelector = Selector.open();
-        this.serverChannel = ServerSocketChannel.open();
-        serverChannel.configureBlocking(false);
-        ServerSocket socket = serverChannel.socket();
-        socket.setReceiveBufferSize(16 * 1024);
-        socket.setReuseAddress(true);
-
-        final Set<SocketOption<?>> options = this.serverChannel.supportedOptions();
-        if (options.contains(StandardSocketOptions.TCP_NODELAY)) {
-            this.serverChannel.setOption(StandardSocketOptions.TCP_NODELAY, true);
-        }
-        if (options.contains(StandardSocketOptions.SO_KEEPALIVE)) {
-            this.serverChannel.setOption(StandardSocketOptions.SO_KEEPALIVE, true);
-        }
-        if (options.contains(StandardSocketOptions.SO_REUSEADDR)) {
-            this.serverChannel.setOption(StandardSocketOptions.SO_REUSEADDR, true);
-        }
-        if (options.contains(StandardSocketOptions.SO_RCVBUF)) {
-            this.serverChannel.setOption(StandardSocketOptions.SO_RCVBUF, 16 * 1024);
-        }
-        if (options.contains(StandardSocketOptions.SO_SNDBUF)) {
-            this.serverChannel.setOption(StandardSocketOptions.SO_SNDBUF, 16 * 1024);
-        }
-    }
-
-    @Override
-    public void bind(SocketAddress local, int backlog) throws IOException {
-        this.serverChannel.bind(local, backlog);
-    }
-
-    @Override
-    public <T> Set<SocketOption<?>> supportedOptions() {
-        return this.serverChannel.supportedOptions();
-    }
-
-    @Override
-    public <T> void setOption(SocketOption<T> name, T value) throws IOException {
-        this.serverChannel.setOption(name, value);
-    }
-
-    @Override
-    public void accept() throws IOException {
-        this.serverChannel.register(acceptSelector, SelectionKey.OP_ACCEPT);
-        this.running = true;
-        this.workers = new NioThreadWorker[Runtime.getRuntime().availableProcessors()];
-        final CountDownLatch wkcdl = new CountDownLatch(workers.length);
-        for (int i = 0; i < workers.length; i++) {
-            workers[i] = new NioThreadWorker(wkcdl, i + 1, workers.length);
-            workers[i].setDaemon(true);
-            workers[i].start();
-        }
-        for (int i = 0; i < workers.length - 1; i++) { //构成环形
-            workers[i].next = workers[i + 1];
-        }
-        workers[workers.length - 1].next = workers[0];
-        currWorker = workers[0];
-        try {
-            wkcdl.await(3, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            throw new IOException(e);
-        }
-        final CountDownLatch cdl = new CountDownLatch(1);
-        new Thread() {
-            @Override
-            public void run() {
-                cdl.countDown();
-                while (running) {
-                    try {
-                        acceptSelector.select();
-                        Set<SelectionKey> selectedKeys = acceptSelector.selectedKeys();
-                        synchronized (selectedKeys) {
-                            Iterator<?> iter = selectedKeys.iterator();
-                            while (iter.hasNext()) {
-                                SelectionKey key = (SelectionKey) iter.next();
-                                iter.remove();
-                                if (key.isAcceptable()) {
-                                    try {
-                                        SocketChannel channel = ((ServerSocketChannel) key.channel()).accept();
-                                        createCounter.incrementAndGet();
-                                        livingCounter.incrementAndGet();
-                                        currWorker.addChannel(channel);
-                                        currWorker = currWorker.next;
-                                    } catch (IOException io) {
-                                        io.printStackTrace();
-                                    }
-                                }
-                            }
-                        }
-                    } catch (Throwable t) {
-                        t.printStackTrace();
-                    }
-                }
-            }
-        }.start();
-        try {
-            cdl.await(3, TimeUnit.SECONDS);
-        } catch (Exception e) {
-            throw new IOException(e);
-        }
-    }
-
-    @Override
-    public void close() throws IOException {
-        if (!this.running) return;
-        serverChannel.close();
-        acceptSelector.close();
-        for (NioThreadWorker worker : workers) {
-            worker.interrupt();
-        }
-        this.running = false;
-    }
-
-    class NioThreadWorker extends Thread {
-
-        final Selector selector;
-
-        final CountDownLatch cdl;
-
-        private final Queue<TcpNioAsyncConnection> connected;
-
-        private final CopyOnWriteArrayList<TcpNioAsyncConnection> done;
-
-        protected volatile Thread ownerThread;
-
-        NioThreadWorker next;
-
-        public NioThreadWorker(final CountDownLatch cdl, int idx, int count) {
-            this.cdl = cdl;
-            String idxstr = "000000" + idx;
-            this.setName("NioThreadWorker:" + context.getServerAddress().getPort() + "-" + idxstr.substring(idxstr.length() - ("" + count).length()));
-            try {
-                this.selector = Selector.open();
-            } catch (IOException e) {
-                throw new RuntimeException(e);
-            }
-            this.connected = new ArrayBlockingQueue<>(1000000);
-            this.done = new CopyOnWriteArrayList<>();
-        }
-
-        public boolean addChannel(SocketChannel channel) throws IOException {
-            TcpNioAsyncConnection conn = new TcpNioAsyncConnection(channel, null, selector, context.readTimeoutSeconds, context.writeTimeoutSeconds, null, null);
-            return connected.add(conn);
-        }
-
-        protected void processConnected() {
-            TcpNioAsyncConnection schannel;
-            try {
-                while ((schannel = connected.poll()) != null) {
-                    SocketChannel channel = schannel.channel;
-                    channel.configureBlocking(false);
-                    channel.setOption(StandardSocketOptions.TCP_NODELAY, true);
-                    channel.setOption(StandardSocketOptions.SO_KEEPALIVE, true);
-                    channel.setOption(StandardSocketOptions.SO_REUSEADDR, true);
-                    channel.setOption(StandardSocketOptions.SO_RCVBUF, 16 * 1024);
-                    channel.setOption(StandardSocketOptions.SO_SNDBUF, 16 * 1024);
-                    channel.register(selector, SelectionKey.OP_READ).attach(schannel);
-                }
-            } catch (IOException e) {
-                // do nothing
-            }
-            synchronized (done) {
-                for (TcpNioAsyncConnection conn : done) {
-                    if (conn.key != null && conn.key.isValid()) {
-                        conn.key.interestOps(SelectionKey.OP_WRITE);
-                    }
-                }
-                done.clear();
-            }
-        }
-
-        public boolean isSameThread() {
-            return this.ownerThread == Thread.currentThread();
-        }
-
-        @Override
-        public void run() {
-            this.ownerThread = Thread.currentThread();
-            if (cdl != null) cdl.countDown();
-            while (running) {
-                processConnected();
-                try {
-                    selector.select(50);
-                } catch (IOException e) {
-                    e.printStackTrace();
-                }
-                try {
-                    Set<SelectionKey> selectedKeys = selector.selectedKeys();
-                    synchronized (selectedKeys) {
-                        Iterator<?> iter = selectedKeys.iterator();
-                        while (iter.hasNext()) {
-                            SelectionKey key = (SelectionKey) iter.next();
-                            iter.remove();
-                            processKey(key);
-                        }
-                    }
-                } catch (Exception e) {
-                    e.printStackTrace();
-                }
-            }
-        }
-
-        private void processKey(SelectionKey key) {
-            if (key == null || !key.isValid()) return;
-            SocketChannel socket = (SocketChannel) key.channel();
-            TcpNioAsyncConnection conn = (TcpNioAsyncConnection) key.attachment();
-            if (!socket.isOpen()) {
-                if (conn == null) {
-                    key.cancel();
-                } else {
-                    conn.dispose();
-                }
-                return;
-            }
-            if (conn == null) return;
-            if (key.isReadable()) {
-                if (conn.readHandler != null) readOP(key, socket, conn);
-            } else if (key.isWritable()) {
-                if (conn.writeHandler != null) writeOP(key, socket, conn);
-            }
-        }
-
-        private void closeOP(SelectionKey key) {
-            if (key == null) return;
-            TcpNioAsyncConnection conn = (TcpNioAsyncConnection) key.attachment();
-            try {
-                if (key.isValid()) {
-                    SocketChannel socketChannel = (SocketChannel) key.channel();
-                    socketChannel.close();
-                    key.attach(null);
-                    key.cancel();
-                }
-            } catch (IOException e) {
-            }
-            conn.dispose();
-        }
-
-        private void readOP(SelectionKey key, SocketChannel socket, TcpNioAsyncConnection conn) {
-            final CompletionHandler handler = conn.removeReadHandler();
-            final ByteBuffer buffer = conn.removeReadBuffer();
-            final Object attach = conn.removeReadAttachment();
-            //System.out.println(conn + "------readbuf:" + buffer + "-------handler:" + handler);
-            if (handler == null || buffer == null) return;
-            try {
-                final int rs = socket.read(buffer);
-                {  //测试
-                    buffer.flip();
-                    byte[] bs = new byte[buffer.remaining()];
-                    buffer.get(bs);
-                    //System.out.println(conn + "------readbuf:" + buffer + "-------handler:" + handler + "-------读内容: " + new String(bs));
-                }
-                //System.out.println(conn + "------readbuf:" + buffer + "-------handler:" + handler + "-------read: " + rs);
-                context.runAsync(() -> {
-                    try {
-                        handler.completed(rs, attach);
-                    } catch (Throwable e) {
-                        handler.failed(e, attach);
-                    }
-                });
-            } catch (Throwable t) {
-                context.runAsync(() -> handler.failed(t, attach));
-            }
-        }
-
-        private void writeOP(SelectionKey key, SocketChannel socket, TcpNioAsyncConnection conn) {
-            final CompletionHandler handler = conn.writeHandler;
-            final ByteBuffer oneBuffer = conn.removeWriteOneBuffer();
-            final ByteBuffer[] buffers = conn.removeWriteBuffers();
-            final Object attach = conn.removeWriteAttachment();
-            final int writingCount = conn.removeWritingCount();
-            final int writeOffset = conn.removeWriteOffset();
-            final int writeLength = conn.removeWriteLength();
-            if (handler == null || (oneBuffer == null && buffers == null)) return;
-            //System.out.println(conn + "------buffers:" + Arrays.toString(buffers) + "---onebuf:" + oneBuffer + "-------handler:" + handler);
-            try {
-                int rs = 0;
-                if (oneBuffer == null) {
-                    int offset = writeOffset;
-                    int length = writeLength;
-                    rs = (int) socket.write(buffers, offset, length);
-                    boolean over = true;
-                    int end = offset + length;
-                    for (int i = offset; i < end; i++) {
-                        if (buffers[i].hasRemaining()) {
-                            over = false;
-                            length -= i - offset;
-                            offset = i;
-                        }
-                    }
-                    if (!over) {
-                        conn.writingCount += rs;
-                        conn.writeHandler = handler;
-                        conn.writeAttachment = attach;
-                        conn.writeBuffers = buffers;
-                        conn.writeOffset = offset;
-                        conn.writeLength = length;
-                        key.interestOps(SelectionKey.OP_READ + SelectionKey.OP_WRITE);
-                        key.selector().wakeup();
-                        return;
-                    }
-                } else {
-                    rs = socket.write(oneBuffer);
-                    if (oneBuffer.hasRemaining()) {
-                        conn.writingCount += rs;
-                        conn.writeHandler = handler;
-                        conn.writeAttachment = attach;
-                        conn.writeOneBuffer = oneBuffer;
-                        key.interestOps(SelectionKey.OP_READ + SelectionKey.OP_WRITE);
-                        key.selector().wakeup();
-                        return;
-                    }
-                }
-                conn.removeWriteHandler();
-                key.interestOps(SelectionKey.OP_READ); //OP_CONNECT
-                final int rs0 = rs + writingCount;
-                //System.out.println(conn + "------buffers:" + Arrays.toString(buffers) + "---onebuf:" + oneBuffer + "-------handler:" + handler + "-------write: " + rs);
-                context.runAsync(() -> {
-                    try {
-                        handler.completed(rs0, attach);
-                    } catch (Throwable e) {
-                        handler.failed(e, attach);
-                    }
-                });
-            } catch (Throwable t) {
-                context.runAsync(() -> handler.failed(t, attach));
-            }
-        }
-
-    }
-}

src/org/redkale/net/Transport.java

@@ -215,12 +215,12 @@ public final class Transport {
                 DatagramChannel channel = DatagramChannel.open();
                 channel.configureBlocking(true);
                 channel.connect(udpaddr);
-                return CompletableFuture.completedFuture(AsyncConnection.create(channel, udpaddr, true, factory.readTimeoutSeconds, factory.writeTimeoutSeconds));
+                return CompletableFuture.completedFuture(AsyncConnection.create(bufferPool, channel, sslContext, udpaddr, true, factory.readTimeoutSeconds, factory.writeTimeoutSeconds));
             }
             if (!rand) { //指定地址
                 TransportNode node = findTransportNode(addr);
                 if (node == null) {
-                    return AsyncConnection.createTCP(group, sslContext, addr, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
+                    return AsyncConnection.createTCP(bufferPool, group, sslContext, addr, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
                 }
                 final BlockingQueue<AsyncConnection> queue = node.conns;
                 if (!queue.isEmpty()) {
@@ -233,7 +233,7 @@ public final class Transport {
                         }
                     }
                 }
-                return AsyncConnection.createTCP(group, sslContext, addr, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
+                return AsyncConnection.createTCP(bufferPool, group, sslContext, addr, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
             }
 
             //---------------------随机取地址------------------------
@@ -266,7 +266,7 @@ public final class Transport {
                     @Override
                     public void completed(Void result, TransportNode attachment) {
                         attachment.disabletime = 0;
-                        AsyncConnection asyncConn = AsyncConnection.create(channel, attachment.address, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
+                        AsyncConnection asyncConn = AsyncConnection.create(bufferPool, channel, attachment.address, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
                         if (future.isDone()) {
                             if (!attachment.conns.offer(asyncConn)) asyncConn.dispose();
                         } else {
@@ -319,7 +319,7 @@ public final class Transport {
                 public void completed(Void result, TransportNode attachment) {
                     try {
                         attachment.disabletime = 0;
-                        AsyncConnection asyncConn = AsyncConnection.create(channel, attachment.address, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
+                        AsyncConnection asyncConn = AsyncConnection.create(bufferPool, channel, attachment.address, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
                         if (future.isDone()) {
                             if (!attachment.conns.offer(asyncConn)) asyncConn.dispose();
                         } else {
@@ -371,18 +371,19 @@ public final class Transport {
                 @Override
                 public void completed(Integer result, ByteBuffer attachment) {
                     buffer.clear();
-                    conn.read(buffer, buffer, new CompletionHandler<Integer, ByteBuffer>() {
+                    conn.setReadBuffer(buffer);
+                    conn.read(new CompletionHandler<Integer, ByteBuffer>() {
 
                         @Override
                         public void completed(Integer result, ByteBuffer attachment) {
                             if (handler != null) handler.completed(result, att);
-                            offerBuffer(buffer);
+                            conn.offerBuffer(attachment);
                             offerConnection(false, conn);
                         }
 
                         @Override
                         public void failed(Throwable exc, ByteBuffer attachment) {
-                            offerBuffer(buffer);
+                            conn.offerBuffer(attachment);
                             offerConnection(true, conn);
                         }
                     });
@@ -391,7 +392,7 @@ public final class Transport {
 
                 @Override
                 public void failed(Throwable exc, ByteBuffer attachment) {
-                    offerBuffer(buffer);
+                    conn.offerBuffer(attachment);
                     offerConnection(true, conn);
                 }
             });

src/org/redkale/net/TransportFactory.java

@@ -393,33 +393,34 @@ public class TransportFactory {
                         final BlockingQueue<AsyncConnection> localqueue = queue;
                         localconn.write(sendBuffer, sendBuffer, new CompletionHandler<Integer, ByteBuffer>() {
                             @Override
-                            public void completed(Integer result, ByteBuffer buffer) {
+                            public void completed(Integer result, ByteBuffer wbuffer) {
-                                if (buffer.hasRemaining()) {
+                                if (wbuffer.hasRemaining()) {
-                                    localconn.write(buffer, buffer, this);
+                                    localconn.write(wbuffer, wbuffer, this);
                                     return;
                                 }
-                                ByteBuffer pongBuffer = bufferPool.get();
+                                localconn.read(new CompletionHandler<Integer, ByteBuffer>() {
-                                localconn.read(pongBuffer, pongBuffer, new CompletionHandler<Integer, ByteBuffer>() {
                                     int counter = 0;
 
                                     @Override
-                                    public void completed(Integer result, ByteBuffer attachment) {
+                                    public void completed(Integer result, ByteBuffer pongBuffer) {
                                         if (counter > 3) {
-                                            bufferPool.accept(attachment);
+                                            localconn.offerBuffer(pongBuffer);
                                             localconn.dispose();
                                             return;
                                         }
-                                        if (pongLength > 0 && attachment.position() < pongLength) {
+                                        if (pongLength > 0 && pongBuffer.position() < pongLength) {
                                             counter++;
-                                            localconn.read(pongBuffer, pongBuffer, this);
+                                            localconn.setReadBuffer(pongBuffer);
+                                            localconn.read(this);
                                             return;
                                         }
-                                        bufferPool.accept(attachment);
+                                        localconn.offerBuffer(pongBuffer);
                                         localqueue.offer(localconn);
                                     }
 
                                     @Override
-                                    public void failed(Throwable exc, ByteBuffer attachment) {
+                                    public void failed(Throwable exc, ByteBuffer pongBuffer) {
+                                        localconn.offerBuffer(pongBuffer);
                                         localconn.dispose();
                                     }
                                 });

src/org/redkale/net/UdpBioAsyncConnection.java

@@ -12,6 +12,8 @@ import java.nio.channels.*;
 import java.util.Set;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.*;
+import javax.net.ssl.SSLContext;
 
 /**
  *
@@ -32,9 +34,11 @@ public class UdpBioAsyncConnection extends AsyncConnection {
 
     private final boolean client;
 
-    public UdpBioAsyncConnection(final DatagramChannel ch, SocketAddress addr0,
+    public UdpBioAsyncConnection(Supplier<ByteBuffer> bufferSupplier, Consumer<ByteBuffer> bufferConsumer,
-        final boolean client0, final int readTimeoutSeconds0, final int writeTimeoutSeconds0,
+        final DatagramChannel ch, final SSLContext sslContext, SocketAddress addr0, final boolean client0,
+        final int readTimeoutSeconds0, final int writeTimeoutSeconds0,
         final AtomicLong livingCounter, final AtomicLong closedCounter) {
+        super(bufferSupplier, bufferConsumer, sslContext);
         this.channel = ch;
         this.client = client0;
         this.readTimeoutSeconds = readTimeoutSeconds0;
@@ -127,30 +131,27 @@ public class UdpBioAsyncConnection extends AsyncConnection {
     }
 
     @Override
-    public <A> void read(ByteBuffer dst, A attachment, CompletionHandler<Integer, ? super A> handler) {
+    public void read(CompletionHandler<Integer, ByteBuffer> handler) {
+        ByteBuffer dst = pollReadBuffer();
         try {
             int rs = channel.read(dst);
             this.readtime = System.currentTimeMillis();
-            if (handler != null) handler.completed(rs, attachment);
+            if (handler != null) handler.completed(rs, dst);
         } catch (IOException e) {
-            if (handler != null) handler.failed(e, attachment);
+            if (handler != null) handler.failed(e, dst);
         }
     }
 
     @Override
-    public <A> void read(ByteBuffer dst, long timeout, TimeUnit unit, A attachment, CompletionHandler<Integer, ? super A> handler) {
+    public void read(long timeout, TimeUnit unit, CompletionHandler<Integer, ByteBuffer> handler) {
-        read(dst, attachment, handler);
+        read(handler);
     }
 
     @Override
-    public Future<Integer> read(ByteBuffer dst) {
+    public int read(ByteBuffer dst) throws IOException {
-        try {
+        int rs = channel.read(dst);
-            int rs = channel.read(dst);
+        this.readtime = System.currentTimeMillis();
-            this.readtime = System.currentTimeMillis();
+        return rs;
-            return CompletableFuture.completedFuture(rs);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
     }
 
     @Override
@@ -165,14 +166,10 @@ public class UdpBioAsyncConnection extends AsyncConnection {
     }
 
     @Override
-    public Future<Integer> write(ByteBuffer src) {
+    public int write(ByteBuffer src) throws IOException {
-        try {
+        int rs = channel.send(src, remoteAddress);
-            int rs = channel.send(src, remoteAddress);
+        this.writetime = System.currentTimeMillis();
-            this.writetime = System.currentTimeMillis();
+        return rs;
-            return CompletableFuture.completedFuture(rs);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
     }
 
     @Override

src/org/redkale/net/UdpBioProtocolServer.java

@@ -85,7 +85,8 @@ public class UdpBioProtocolServer extends ProtocolServer {
                     try {
                         SocketAddress address = serchannel.receive(buffer);
                         buffer.flip();
-                        AsyncConnection conn = new UdpBioAsyncConnection(serchannel, address, false, readTimeoutSeconds, writeTimeoutSeconds, null, null);
+                        AsyncConnection conn = new UdpBioAsyncConnection(context.getBufferSupplier(), context.getBufferConsumer(), serchannel,
+                            context.getSSLContext(), address, false, readTimeoutSeconds, writeTimeoutSeconds, null, null);
                         context.runAsync(new PrepareRunner(context, conn, buffer, null));
                     } catch (Exception e) {
                         context.offerBuffer(buffer);

src/org/redkale/net/WorkThread.java

@@ -17,6 +17,8 @@ import java.util.concurrent.*;
  */
 public class WorkThread extends Thread {
 
+    protected Thread localThread;
+
     private final ExecutorService executor;
 
     public WorkThread(ExecutorService executor, Runnable runner) {
@@ -32,4 +34,19 @@ public class WorkThread extends Thread {
     public ExecutorService getExecutor() {
         return executor;
     }
+
+    @Override
+    public void run() {
+        this.localThread = Thread.currentThread();
+        super.run();
+    }
+
+    public boolean inSameThread() {
+        return this.localThread == Thread.currentThread();
+    }
+
+    public boolean inSameThread(Thread thread) {
+        return this.localThread == thread;
+    }
+
 }

src/org/redkale/net/http/HttpContext.java

@@ -5,12 +5,10 @@
  */
 package org.redkale.net.http;
 
-import java.nio.ByteBuffer;
 import org.redkale.asm.MethodDebugVisitor;
 import java.nio.channels.CompletionHandler;
 import java.security.*;
 import java.util.concurrent.*;
-import java.util.function.*;
 import org.redkale.asm.*;
 import static org.redkale.asm.Opcodes.*;
 import org.redkale.net.*;
@@ -49,21 +47,6 @@ public class HttpContext extends Context {
         return responsePool;
     }
 
-    @Override
-    protected Consumer<ByteBuffer> getBufferConsumer() {
-        return super.getBufferConsumer();
-    }
-
-    @Override
-    protected void offerBuffer(ByteBuffer buffer) {
-        super.offerBuffer(buffer);
-    }
-
-    @Override
-    protected void offerBuffer(ByteBuffer... buffers) {
-        super.offerBuffer(buffers);
-    }
-
     @SuppressWarnings("unchecked")
     protected <H extends CompletionHandler> Creator<H> loadAsyncHandlerCreator(Class<H> handlerClass) {
         Creator<H> creator = asyncHandlerCreators.get(handlerClass);

src/org/redkale/net/http/HttpPrepareServlet.java

@@ -152,7 +152,7 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
             if (forbidURIMaps != null && forbidURIMaps.containsKey(urlreg)) return false;
             if (forbidURIMaps == null) forbidURIMaps = new HashMap<>();
             String mapping = urlreg;
-            if (Utility.contains(mapping, '.', '*', '{', '[', '(', '|', '^', '$', '+', '?', '\\')) { //是否是正则表达式))
+            if (Utility.contains(mapping, '*', '{', '[', '(', '|', '^', '$', '+', '?', '\\')) { //是否是正则表达式))
                 if (mapping.endsWith("/*")) {
                     mapping = mapping.substring(0, mapping.length() - 1) + ".*";
                 } else {
@@ -254,7 +254,7 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
                         logger.log(Level.WARNING, "init HttpRender(" + renderType + ") error", e);
                     }
                 }
-                Collections.sort(renders, (o1, o2) -> o1.getType().isAssignableFrom(o2.getType()) ? 1 : -1);
+                renders.sort((o1, o2) -> o1.getType().isAssignableFrom(o2.getType()) ? 1 : -1);
             }
         }
     }
@@ -311,7 +311,7 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
             }
             servlet.execute(request, response);
         } catch (Exception e) {
-            request.getContext().getLogger().log(Level.WARNING, "Servlet occur, forece to close channel. request = " + request, e);
+            request.getContext().getLogger().log(Level.WARNING, "Servlet occur, force to close channel. request = " + request, e);
             response.finish(500, null);
         }
     }

src/org/redkale/net/http/HttpResourceServlet.java

@@ -161,7 +161,7 @@ public class HttpResourceServlet extends HttpServlet {
         }
     }
 
-    public void serRoot(String rootstr) {
+    public void setRoot(String rootstr) {
         if (rootstr == null) return;
         try {
             this.root = new File(rootstr).getCanonicalFile();
@@ -170,7 +170,7 @@ public class HttpResourceServlet extends HttpServlet {
         }
     }
 
-    public void serRoot(File file) {
+    public void setRoot(File file) {
         if (file == null) return;
         try {
             this.root = file.getCanonicalFile();

src/org/redkale/net/http/HttpResponse.java

@@ -259,7 +259,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         return Utility.createAsyncHandler((v, a) -> {
             finish(v);
         }, (t, a) -> {
-            context.getLogger().log(Level.WARNING, "Servlet occur, forece to close channel. request = " + request + ", result is CompletionHandler", (Throwable) t);
+            context.getLogger().log(Level.WARNING, "Servlet occur, force to close channel. request = " + request + ", result is CompletionHandler", (Throwable) t);
             finish(500, null);
         });
     }
@@ -471,7 +471,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         } else if (obj instanceof CompletableFuture) {
             ((CompletableFuture) obj).whenComplete((v, e) -> {
                 if (e != null) {
-                    context.getLogger().log(Level.WARNING, "Servlet occur, forece to close channel. request = " + request + ", result is CompletableFuture", (Throwable) e);
+                    context.getLogger().log(Level.WARNING, "Servlet occur, force to close channel. request = " + request + ", result is CompletableFuture", (Throwable) e);
                     finish(500, null);
                     return;
                 }
@@ -489,7 +489,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
             try {
                 finish((File) obj);
             } catch (IOException e) {
-                context.getLogger().log(Level.WARNING, "HttpServlet finish File occur, forece to close channel. request = " + getRequest(), e);
+                context.getLogger().log(Level.WARNING, "HttpServlet finish File occur, force to close channel. request = " + getRequest(), e);
                 finish(500, null);
             }
         } else if (obj instanceof HttpResult) {
@@ -941,7 +941,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         }
         if (request.newsessionid != null) {
             String domain = defaultCookie == null ? null : defaultCookie.getDomain();
-            if (domain == null) {
+            if (domain == null || domain.isEmpty()) {
                 domain = "";
             } else {
                 domain = "Domain=" + domain + "; ";
@@ -949,9 +949,9 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
             String path = defaultCookie == null ? null : defaultCookie.getPath();
             if (path == null || path.isEmpty()) path = "/";
             if (request.newsessionid.isEmpty()) {
-                buffer.put(("Set-Cookie: " + HttpRequest.SESSIONID_NAME + "=; " + domain + "Path=" + path + "; Max-Age=0; HttpOnly\r\n").getBytes());
+                buffer.put(("Set-Cookie: " + HttpRequest.SESSIONID_NAME + "=; " + domain + "Path=/; Max-Age=0; HttpOnly\r\n").getBytes());
             } else {
-                buffer.put(("Set-Cookie: " + HttpRequest.SESSIONID_NAME + "=" + request.newsessionid + "; " + domain + "Path=" + path + "; HttpOnly\r\n").getBytes());
+                buffer.put(("Set-Cookie: " + HttpRequest.SESSIONID_NAME + "=" + request.newsessionid + "; " + domain + "Path=/; HttpOnly\r\n").getBytes());
             }
         }
         if (this.cookies != null) {

src/org/redkale/net/http/Rest.java

@@ -375,6 +375,10 @@ public final class Rest {
             pushInt(mv, rws.wsmaxbody());
             mv.visitFieldInsn(PUTFIELD, newDynName, "wsmaxbody", "I");
 
+            mv.visitVarInsn(ALOAD, 0);
+            mv.visitInsn(rws.mergemsg() ? ICONST_1 : ICONST_0);
+            mv.visitFieldInsn(PUTFIELD, newDynName, "mergemsg", "Z");
+
             mv.visitVarInsn(ALOAD, 0);
             mv.visitInsn(rws.single() ? ICONST_1 : ICONST_0);
             mv.visitFieldInsn(PUTFIELD, newDynName, "single", "Z");
@@ -728,7 +732,13 @@ public final class Rest {
         final RestService controller = serviceType.getAnnotation(RestService.class);
         if (controller != null && controller.ignore()) throw new RuntimeException(serviceType + " is ignore Rest Service Class"); //标记为ignore=true不创建Servlet
         ClassLoader loader = classLoader == null ? Thread.currentThread().getContextClassLoader() : classLoader;
-        String newDynName = serviceTypeInternalName.substring(0, serviceTypeInternalName.lastIndexOf('/') + 1) + "_Dyn" + serviceType.getSimpleName().replaceAll("Service.*$", "") + "RestServlet";
+        String stname = serviceType.getSimpleName();
+        if (stname.startsWith("Service")) { //类似ServiceWatchService这样的类保留第一个Service字样 
+            stname = "Service" + stname.substring("Service".length()).replaceAll("Service.*$", "");
+        } else {
+            stname = stname.replaceAll("Service.*$", "");
+        }
+        String newDynName = serviceTypeInternalName.substring(0, serviceTypeInternalName.lastIndexOf('/') + 1) + "_Dyn" + stname + "RestServlet";
 
         //------------------------------------------------------------------------------
         final String defmodulename = getWebModuleNameLowerCase(serviceType);

src/org/redkale/net/http/RestWebSocket.java

@@ -60,6 +60,13 @@ public @interface RestWebSocket {
      */
     boolean anyuser() default false;
 
+    /**
+     * 接收客户端的分包(last=false)消息时是否自动合并包
+     *
+     * @return 默认true
+     */
+    boolean mergemsg() default true;
+
     /**
      * WebScoket服务器给客户端进行ping操作的间隔时间, 单位: 秒， 默认值：15秒
      *

src/org/redkale/net/http/WebSocket.java

@@ -540,7 +540,7 @@ public abstract class WebSocket<G extends Serializable, T> {
      */
     public CompletableFuture<Void> changeUserid(final G newuserid) {
         if (newuserid == null) throw new NullPointerException("newuserid is null");
-        return _engine.changeUserid(this, newuserid);
+        return _engine.changeLocalUserid(this, newuserid);
     }
 
     /**
@@ -558,26 +558,26 @@ public abstract class WebSocket<G extends Serializable, T> {
     /**
      * 获取当前WebSocket下的属性，非线程安全
      *
-     * @param <T>  属性值的类型
+     * @param <V>  属性值的类型
      * @param name 属性名
      *
      * @return 属性值
      */
     @SuppressWarnings("unchecked")
-    public final <T> T getAttribute(String name) {
+    public final <V> V getAttribute(String name) {
-        return attributes == null ? null : (T) attributes.get(name);
+        return attributes == null ? null : (V) attributes.get(name);
     }
 
     /**
      * 移出当前WebSocket下的属性，非线程安全
      *
-     * @param <T>  属性值的类型
+     * @param <V>  属性值的类型
      * @param name 属性名
      *
      * @return 属性值
      */
-    public final <T> T removeAttribute(String name) {
+    public final <V> V removeAttribute(String name) {
-        return attributes == null ? null : (T) attributes.remove(name);
+        return attributes == null ? null : (V) attributes.remove(name);
     }
 
     /**

src/org/redkale/net/http/WebSocketEngine.java

@@ -76,11 +76,14 @@ public class WebSocketEngine {
     @Comment("最大消息体长度, 小于1表示无限制")
     protected int wsmaxbody;
 
+    @Comment("接收客户端的分包(last=false)消息时是否自动合并包")
+    protected boolean mergemsg = true;
+
     @Comment("加密解密器")
     protected Cryptor cryptor;
 
-    protected WebSocketEngine(String engineid, boolean single, HttpContext context, int liveinterval,
+    protected WebSocketEngine(String engineid, boolean single, HttpContext context, int liveinterval, int wsmaxconns,
-        int wsmaxconns, int wsthreads, int wsmaxbody, Cryptor cryptor, WebSocketNode node, Convert sendConvert, Logger logger) {
+        int wsthreads, int wsmaxbody, boolean mergemsg, Cryptor cryptor, WebSocketNode node, Convert sendConvert, Logger logger) {
         this.engineid = engineid;
         this.single = single;
         this.context = context;
@@ -90,6 +93,7 @@ public class WebSocketEngine {
         this.wsmaxconns = wsmaxconns;
         this.wsthreads = wsthreads;
         this.wsmaxbody = wsmaxbody;
+        this.mergemsg = mergemsg;
         this.cryptor = cryptor;
         this.logger = logger;
         this.index = sequence.getAndIncrement();
@@ -127,7 +131,7 @@ public class WebSocketEngine {
     }
 
     @Comment("添加WebSocket")
-    void add(WebSocket socket) {
+    CompletableFuture<Void> addLocal(WebSocket socket) {
         if (single) {
             currconns.incrementAndGet();
             websockets.put(socket._userid, socket);
@@ -140,11 +144,12 @@ public class WebSocketEngine {
             currconns.incrementAndGet();
             list.add(socket);
         }
-        if (node != null) node.connect(socket._userid);
+        if (node != null) return node.connect(socket._userid);
+        return null;
     }
 
     @Comment("从WebSocketEngine删除指定WebSocket")
-    CompletableFuture<Void> removeThenClose(WebSocket socket) {
+    CompletableFuture<Void> removeLocalThenClose(WebSocket socket) {
         Serializable userid = socket._userid;
         if (single) {
             currconns.decrementAndGet();
@@ -165,7 +170,7 @@ public class WebSocketEngine {
     }
 
     @Comment("更改WebSocket的userid")
-    CompletableFuture<Void> changeUserid(WebSocket socket, final Serializable newuserid) {
+    CompletableFuture<Void> changeLocalUserid(WebSocket socket, final Serializable newuserid) {
         if (newuserid == null) throw new NullPointerException("newuserid is null");
         final Serializable olduserid = socket._userid;
         socket._userid = newuserid;
@@ -207,20 +212,20 @@ public class WebSocketEngine {
     }
 
     @Comment("给所有连接用户发送消息")
-    public CompletableFuture<Integer> broadcastMessage(final Object message, final boolean last) {
+    public CompletableFuture<Integer> broadcastLocalMessage(final Object message, final boolean last) {
-        return broadcastMessage((Predicate) null, message, last);
+        return WebSocketEngine.this.broadcastLocalMessage((Predicate) null, message, last);
     }
 
     @Comment("给指定WebSocket连接用户发送消息")
-    public CompletableFuture<Integer> broadcastMessage(final WebSocketRange wsrange, final Object message, final boolean last) {
+    public CompletableFuture<Integer> broadcastLocalMessage(final WebSocketRange wsrange, final Object message, final boolean last) {
         Predicate<WebSocket> predicate = wsrange == null ? null : (ws) -> ws.predicate(wsrange);
-        return broadcastMessage(predicate, message, last);
+        return WebSocketEngine.this.broadcastLocalMessage(predicate, message, last);
     }
 
     @Comment("给指定WebSocket连接用户发送消息")
-    public CompletableFuture<Integer> broadcastMessage(final Predicate<WebSocket> predicate, final Object message, final boolean last) {
+    public CompletableFuture<Integer> broadcastLocalMessage(final Predicate<WebSocket> predicate, final Object message, final boolean last) {
         if (message instanceof CompletableFuture) {
-            return ((CompletableFuture) message).thenCompose((json) -> broadcastMessage(predicate, json, last));
+            return ((CompletableFuture) message).thenCompose((json) -> WebSocketEngine.this.broadcastLocalMessage(predicate, json, last));
         }
         final boolean more = (!(message instanceof WebSocketPacket) || ((WebSocketPacket) message).sendBuffers == null);
         if (more) {
@@ -265,19 +270,19 @@ public class WebSocketEngine {
     }
 
     @Comment("给指定用户组发送消息")
-    public CompletableFuture<Integer> sendMessage(final Object message, final boolean last, final Stream<? extends Serializable> userids) {
+    public CompletableFuture<Integer> sendLocalMessage(final Object message, final boolean last, final Stream<? extends Serializable> userids) {
         Object[] array = userids.toArray();
         Serializable[] ss = new Serializable[array.length];
         for (int i = 0; i < array.length; i++) {
             ss[i] = (Serializable) array[i];
         }
-        return sendMessage(message, last, ss);
+        return WebSocketEngine.this.sendLocalMessage(message, last, ss);
     }
 
     @Comment("给指定用户组发送消息")
-    public CompletableFuture<Integer> sendMessage(final Object message, final boolean last, final Serializable... userids) {
+    public CompletableFuture<Integer> sendLocalMessage(final Object message, final boolean last, final Serializable... userids) {
         if (message instanceof CompletableFuture) {
-            return ((CompletableFuture) message).thenCompose((json) -> sendMessage(json, last, userids));
+            return ((CompletableFuture) message).thenCompose((json) -> WebSocketEngine.this.sendLocalMessage(json, last, userids));
         }
         final boolean more = (!(message instanceof WebSocketPacket) || ((WebSocketPacket) message).sendBuffers == null) && userids.length > 1;
         if (more) {
@@ -326,7 +331,7 @@ public class WebSocketEngine {
     }
 
     @Comment("给指定WebSocket连接用户发起操作指令")
-    public CompletableFuture<Integer> broadcastAction(final WebSocketAction action) {
+    public CompletableFuture<Integer> broadcastLocalAction(final WebSocketAction action) {
         CompletableFuture<Integer> future = null;
         if (single) {
             for (WebSocket websocket : websockets.values()) {
@@ -343,17 +348,17 @@ public class WebSocketEngine {
     }
 
     @Comment("给指定用户组发送操作")
-    public CompletableFuture<Integer> sendAction(final WebSocketAction action, final Stream<? extends Serializable> userids) {
+    public CompletableFuture<Integer> sendLocalAction(final WebSocketAction action, final Stream<? extends Serializable> userids) {
         Object[] array = userids.toArray();
         Serializable[] ss = new Serializable[array.length];
         for (int i = 0; i < array.length; i++) {
             ss[i] = (Serializable) array[i];
         }
-        return sendAction(action, ss);
+        return WebSocketEngine.this.sendLocalAction(action, ss);
     }
 
     @Comment("给指定用户组发送操作")
-    public CompletableFuture<Integer> sendAction(final WebSocketAction action, final Serializable... userids) {
+    public CompletableFuture<Integer> sendLocalAction(final WebSocketAction action, final Serializable... userids) {
         CompletableFuture<Integer> future = null;
         if (single) {
             for (Serializable userid : userids) {

src/org/redkale/net/http/WebSocketNode.java

@@ -59,7 +59,11 @@ public abstract class WebSocketNode {
 
     protected Semaphore semaphore;
 
+    private int tryAcquireSeconds = 12;
+
     public void init(AnyValue conf) {
+        this.tryAcquireSeconds = Integer.getInteger("WebSocketNode.tryAcquireSeconds", 12);
+
         if (sncpNodeAddresses != null && "memory".equals(sncpNodeAddresses.getType())) {
             sncpNodeAddresses.initValueType(InetSocketAddress.class);
         }
@@ -79,7 +83,7 @@ public abstract class WebSocketNode {
     }
 
     @Local
-    public final void postDestroy(AnyValue conf) {
+    protected void postDestroy(AnyValue conf) {
         if (this.localEngine == null) return;
         //关掉所有本地本地WebSocket
         this.localEngine.getLocalWebSockets().forEach(g -> g.close());
@@ -90,11 +94,11 @@ public abstract class WebSocketNode {
 
     protected abstract CompletableFuture<List<String>> getWebSocketAddresses(@RpcTargetAddress InetSocketAddress targetAddress, Serializable userid);
 
-    protected abstract CompletableFuture<Integer> sendMessage(@RpcTargetAddress InetSocketAddress targetAddress, Object message, boolean last, Serializable userid);
+    protected abstract CompletableFuture<Integer> sendMessage(@RpcTargetAddress InetSocketAddress targetAddress, Object message, boolean last, Serializable... userids);
 
     protected abstract CompletableFuture<Integer> broadcastMessage(@RpcTargetAddress InetSocketAddress targetAddress, WebSocketRange wsrange, Object message, boolean last);
 
-    protected abstract CompletableFuture<Integer> sendAction(@RpcTargetAddress InetSocketAddress targetAddress, WebSocketAction action, Serializable userid);
+    protected abstract CompletableFuture<Integer> sendAction(@RpcTargetAddress InetSocketAddress targetAddress, WebSocketAction action, Serializable... userids);
 
     protected abstract CompletableFuture<Integer> broadcastAction(@RpcTargetAddress InetSocketAddress targetAddress, WebSocketAction action);
 
@@ -204,25 +208,6 @@ public abstract class WebSocketNode {
         return rs;
     }
 
-    /**
-     * @deprecated
-     *
-     * 判断指定用户是否WebSocket在线
-     *
-     * @param userid Serializable
-     *
-     * @return boolean
-     */
-    private CompletableFuture<Boolean> existsWebSocket2(final Serializable userid) {
-        if (this.localEngine != null && this.sncpNodeAddresses == null) {
-            return CompletableFuture.completedFuture(this.localEngine.existsLocalWebSocket(userid));
-        }
-        tryAcquireSemaphore();
-        CompletableFuture<Boolean> rs = this.sncpNodeAddresses.existsAsync(SOURCE_SNCP_USERID_PREFIX + userid);
-        if (semaphore != null) rs.whenComplete((r, e) -> releaseSemaphore());
-        return rs;
-    }
-
     /**
      * 判断指定用户是否WebSocket在线
      *
@@ -429,15 +414,97 @@ public abstract class WebSocketNode {
         if (message0 instanceof CompletableFuture) return ((CompletableFuture) message0).thenApply(msg -> sendMessage(convert, msg, last, userids));
         final Object message = (convert == null || message0 instanceof WebSocketPacket) ? message0 : ((convert instanceof TextConvert) ? new WebSocketPacket(((TextConvert) convert).convertTo(message0), last) : new WebSocketPacket(((BinaryConvert) convert).convertTo(message0), last));
         if (this.localEngine != null && this.sncpNodeAddresses == null) { //本地模式且没有分布式
-            return this.localEngine.sendMessage(message, last, userids);
+            return this.localEngine.sendLocalMessage(message, last, userids);
         }
         final Object remoteMessage = formatRemoteMessage(message);
-        CompletableFuture<Integer> future = null;
+        CompletableFuture<Integer> rsfuture;
-        for (Serializable userid : userids) {
+        if (userids.length == 1) {
-            future = future == null ? sendOneMessage(remoteMessage, last, userid)
+            rsfuture = sendOneUserMessage(remoteMessage, last, userids[0]);
-                : future.thenCombine(sendOneMessage(remoteMessage, last, userid), (a, b) -> a | b);
+        } else {
+            String[] keys = new String[userids.length];
+            final Map<String, Serializable> keyuser = new HashMap<>();
+            for (int i = 0; i < userids.length; i++) {
+                keys[i] = SOURCE_SNCP_USERID_PREFIX + userids[i];
+                keyuser.put(keys[i], userids[i]);
+            }
+            tryAcquireSemaphore();
+            CompletableFuture<Map<String, Collection<InetSocketAddress>>> addrsFuture = sncpNodeAddresses.getCollectionMapAsync(InetSocketAddress.class, keys);
+            if (semaphore != null) addrsFuture.whenComplete((r, e) -> releaseSemaphore());
+            rsfuture = addrsFuture.thenCompose((Map<String, Collection<InetSocketAddress>> addrs) -> {
+                if (addrs == null || addrs.isEmpty()) {
+                    if (logger.isLoggable(Level.FINER)) logger.finer("websocket not found userids:" + JsonConvert.root().convertTo(userids) + " on any node ");
+                    return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
+                }
+                Map<InetSocketAddress, List<Serializable>> addrUsers = new HashMap<>();
+                addrs.forEach((key, as) -> {
+                    for (InetSocketAddress a : as) {
+                        addrUsers.computeIfAbsent(a, k -> new ArrayList<>()).add(keyuser.get(key));
+                    }
+                });
+                if (logger.isLoggable(Level.FINEST)) {
+                    logger.finest("websocket(localaddr=" + localSncpAddress + ", userids=" + JsonConvert.root().convertTo(userids) + ") found message-addr-userids: " + addrUsers);
+                }
+                CompletableFuture<Integer> future = null;
+                for (Map.Entry<InetSocketAddress, List<Serializable>> en : addrUsers.entrySet()) {
+                    Serializable[] us = en.getValue().toArray(new Serializable[en.getValue().size()]);
+                    future = future == null ? sendOneAddrMessage(en.getKey(), remoteMessage, last, us)
+                        : future.thenCombine(sendOneAddrMessage(en.getKey(), remoteMessage, last, us), (a, b) -> a | b);
+                }
+                return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
+            });
         }
-        return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
+        return rsfuture == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : rsfuture;
+    }
+
+    protected CompletableFuture<Integer> sendOneUserMessage(final Object message, final boolean last, final Serializable userid) {
+        if (message instanceof CompletableFuture) return ((CompletableFuture) message).thenApply(msg -> sendOneUserMessage(msg, last, userid));
+        if (logger.isLoggable(Level.FINEST)) {
+            logger.finest("websocket want send message {userid:" + userid + ", content:'" + (message instanceof WebSocketPacket ? ((WebSocketPacket) message).toSimpleString() : JsonConvert.root().convertTo(message)) + "'} from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine");
+        }
+        CompletableFuture<Integer> localFuture = null;
+        if (this.localEngine != null) localFuture = localEngine.sendLocalMessage(message, last, userid);
+        if (this.sncpNodeAddresses == null || this.remoteNode == null) {
+            if (logger.isLoggable(Level.FINEST)) logger.finest("websocket remote node is null");
+            //没有CacheSource就不会有分布式节点
+            return localFuture == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : localFuture;
+        }
+        //远程节点发送消息
+        final Object remoteMessage = formatRemoteMessage(message);
+        tryAcquireSemaphore();
+        CompletableFuture<Collection<InetSocketAddress>> addrsFuture = sncpNodeAddresses.getCollectionAsync(SOURCE_SNCP_USERID_PREFIX + userid, InetSocketAddress.class);
+        if (semaphore != null) addrsFuture.whenComplete((r, e) -> releaseSemaphore());
+        CompletableFuture<Integer> remoteFuture = addrsFuture.thenCompose((Collection<InetSocketAddress> addrs) -> {
+            if (addrs == null || addrs.isEmpty()) {
+                if (logger.isLoggable(Level.FINER)) logger.finer("websocket not found userid:" + userid + " on any node ");
+                return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
+            }
+            if (logger.isLoggable(Level.FINEST)) logger.finest("websocket(localaddr=" + localSncpAddress + ") found userid:" + userid + " on " + addrs);
+            CompletableFuture<Integer> future = null;
+            for (InetSocketAddress addr : addrs) {
+                if (addr == null || addr.equals(localSncpAddress)) continue;
+                future = future == null ? remoteNode.sendMessage(addr, remoteMessage, last, userid)
+                    : future.thenCombine(remoteNode.sendMessage(addr, remoteMessage, last, userid), (a, b) -> a | b);
+            }
+            return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
+        });
+        return localFuture == null ? remoteFuture : localFuture.thenCombine(remoteFuture, (a, b) -> a | b);
+    }
+
+    protected CompletableFuture<Integer> sendOneAddrMessage(final InetSocketAddress sncpAddr, final Object message, final boolean last, final Serializable... userids) {
+        if (message instanceof CompletableFuture) return ((CompletableFuture) message).thenApply(msg -> sendOneAddrMessage(sncpAddr, msg, last, userids));
+        if (logger.isLoggable(Level.FINEST)) {
+            logger.finest("websocket want send message {userids:" + JsonConvert.root().convertTo(userids) + ", sncpaddr:" + sncpAddr + ", content:'" + (message instanceof WebSocketPacket ? ((WebSocketPacket) message).toSimpleString() : JsonConvert.root().convertTo(message)) + "'} from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine");
+        }
+        if (Objects.equals(sncpAddr, this.localSncpAddress)) {
+            return this.localEngine == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : localEngine.sendLocalMessage(message, last, userids);
+        }
+        if (this.sncpNodeAddresses == null || this.remoteNode == null) {
+            if (logger.isLoggable(Level.FINEST)) logger.finest("websocket remote node is null");
+            //没有CacheSource就不会有分布式节点
+            return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
+        }
+        final Object remoteMessage = formatRemoteMessage(message);
+        return remoteNode.sendMessage(sncpAddr, remoteMessage, last, userids);
     }
 
     /**
@@ -548,10 +615,10 @@ public abstract class WebSocketNode {
         if (message0 instanceof CompletableFuture) return ((CompletableFuture) message0).thenApply(msg -> broadcastMessage(wsrange, convert, msg, last));
         final Object message = (convert == null || message0 instanceof WebSocketPacket) ? message0 : ((convert instanceof TextConvert) ? new WebSocketPacket(((TextConvert) convert).convertTo(message0), last) : new WebSocketPacket(((BinaryConvert) convert).convertTo(message0), last));
         if (this.localEngine != null && this.sncpNodeAddresses == null) { //本地模式且没有分布式
-            return this.localEngine.broadcastMessage(wsrange, message, last);
+            return this.localEngine.broadcastLocalMessage(wsrange, message, last);
         }
         final Object remoteMessage = formatRemoteMessage(message);
-        CompletableFuture<Integer> localFuture = this.localEngine == null ? null : this.localEngine.broadcastMessage(wsrange, message, last);
+        CompletableFuture<Integer> localFuture = this.localEngine == null ? null : this.localEngine.broadcastLocalMessage(wsrange, message, last);
         tryAcquireSemaphore();
         CompletableFuture<Collection<InetSocketAddress>> addrsFuture = sncpNodeAddresses.getCollectionAsync(SOURCE_SNCP_ADDRS_KEY, InetSocketAddress.class);
         if (semaphore != null) addrsFuture.whenComplete((r, e) -> releaseSemaphore());
@@ -569,40 +636,6 @@ public abstract class WebSocketNode {
         return localFuture == null ? remoteFuture : localFuture.thenCombine(remoteFuture, (a, b) -> a | b);
     }
 
-    protected CompletableFuture<Integer> sendOneMessage(final Object message, final boolean last, final Serializable userid) {
-        if (message instanceof CompletableFuture) return ((CompletableFuture) message).thenApply(msg -> sendOneMessage(msg, last, userid));
-        if (logger.isLoggable(Level.FINEST)) {
-            logger.finest("websocket want send message {userid:" + userid + ", content:'" + (message instanceof WebSocketPacket ? ((WebSocketPacket) message).toSimpleString() : JsonConvert.root().convertTo(message)) + "'} from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine");
-        }
-        CompletableFuture<Integer> localFuture = null;
-        if (this.localEngine != null) localFuture = localEngine.sendMessage(message, last, userid);
-        if (this.sncpNodeAddresses == null || this.remoteNode == null) {
-            if (logger.isLoggable(Level.FINEST)) logger.finest("websocket remote node is null");
-            //没有CacheSource就不会有分布式节点
-            return localFuture == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : localFuture;
-        }
-        //远程节点发送消息
-        final Object remoteMessage = formatRemoteMessage(message);
-        tryAcquireSemaphore();
-        CompletableFuture<Collection<InetSocketAddress>> addrsFuture = sncpNodeAddresses.getCollectionAsync(SOURCE_SNCP_USERID_PREFIX + userid, InetSocketAddress.class);
-        if (semaphore != null) addrsFuture.whenComplete((r, e) -> releaseSemaphore());
-        CompletableFuture<Integer> remoteFuture = addrsFuture.thenCompose((Collection<InetSocketAddress> addrs) -> {
-            if (addrs == null || addrs.isEmpty()) {
-                if (logger.isLoggable(Level.FINER)) logger.finer("websocket not found userid:" + userid + " on any node ");
-                return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
-            }
-            if (logger.isLoggable(Level.FINEST)) logger.finest("websocket(localaddr=" + localSncpAddress + ") found userid:" + userid + " on " + addrs);
-            CompletableFuture<Integer> future = null;
-            for (InetSocketAddress addr : addrs) {
-                if (addr == null || addr.equals(localSncpAddress)) continue;
-                future = future == null ? remoteNode.sendMessage(addr, remoteMessage, last, userid)
-                    : future.thenCombine(remoteNode.sendMessage(addr, remoteMessage, last, userid), (a, b) -> a | b);
-            }
-            return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
-        });
-        return localFuture == null ? remoteFuture : localFuture.thenCombine(remoteFuture, (a, b) -> a | b);
-    }
-
     /**
      * 广播操作， 给所有人发操作
      *
@@ -613,9 +646,9 @@ public abstract class WebSocketNode {
     @Local
     public CompletableFuture<Integer> broadcastAction(final WebSocketAction action) {
         if (this.localEngine != null && this.sncpNodeAddresses == null) { //本地模式且没有分布式
-            return this.localEngine.broadcastAction(action);
+            return this.localEngine.broadcastLocalAction(action);
         }
-        CompletableFuture<Integer> localFuture = this.localEngine == null ? null : this.localEngine.broadcastAction(action);
+        CompletableFuture<Integer> localFuture = this.localEngine == null ? null : this.localEngine.broadcastLocalAction(action);
         tryAcquireSemaphore();
         CompletableFuture<Collection<InetSocketAddress>> addrsFuture = sncpNodeAddresses.getCollectionAsync(SOURCE_SNCP_ADDRS_KEY, InetSocketAddress.class);
         if (semaphore != null) addrsFuture.whenComplete((r, e) -> releaseSemaphore());
@@ -646,21 +679,53 @@ public abstract class WebSocketNode {
     public CompletableFuture<Integer> sendAction(final WebSocketAction action, final Serializable... userids) {
         if (userids == null || userids.length < 1) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
         if (this.localEngine != null && this.sncpNodeAddresses == null) { //本地模式且没有分布式
-            return this.localEngine.sendAction(action, userids);
+            return this.localEngine.sendLocalAction(action, userids);
         }
-        CompletableFuture<Integer> future = null;
+        CompletableFuture<Integer> rsfuture;
-        for (Serializable userid : userids) {
+        if (userids.length == 1) {
-            future = future == null ? sendOneAction(action, userid) : future.thenCombine(sendOneAction(action, userid), (a, b) -> a | b);
+            rsfuture = sendOneUserAction(action, userids[0]);
+        } else {
+            String[] keys = new String[userids.length];
+            final Map<String, Serializable> keyuser = new HashMap<>();
+            for (int i = 0; i < userids.length; i++) {
+                keys[i] = SOURCE_SNCP_USERID_PREFIX + userids[i];
+                keyuser.put(keys[i], userids[i]);
+            }
+            tryAcquireSemaphore();
+            CompletableFuture<Map<String, Collection<InetSocketAddress>>> addrsFuture = sncpNodeAddresses.getCollectionMapAsync(InetSocketAddress.class, keys);
+            if (semaphore != null) addrsFuture.whenComplete((r, e) -> releaseSemaphore());
+            rsfuture = addrsFuture.thenCompose((Map<String, Collection<InetSocketAddress>> addrs) -> {
+                if (addrs == null || addrs.isEmpty()) {
+                    if (logger.isLoggable(Level.FINER)) logger.finer("websocket not found userids:" + JsonConvert.root().convertTo(userids) + " on any node ");
+                    return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
+                }
+                Map<InetSocketAddress, List<Serializable>> addrUsers = new HashMap<>();
+                addrs.forEach((key, as) -> {
+                    for (InetSocketAddress a : as) {
+                        addrUsers.computeIfAbsent(a, k -> new ArrayList<>()).add(keyuser.get(key));
+                    }
+                });
+                if (logger.isLoggable(Level.FINEST)) {
+                    logger.finest("websocket(localaddr=" + localSncpAddress + ", userids=" + JsonConvert.root().convertTo(userids) + ") found action-userid-addrs: " + addrUsers);
+                }
+                CompletableFuture<Integer> future = null;
+                for (Map.Entry<InetSocketAddress, List<Serializable>> en : addrUsers.entrySet()) {
+                    Serializable[] us = en.getValue().toArray(new Serializable[en.getValue().size()]);
+                    future = future == null ? sendOneAddrAction(en.getKey(), action, us)
+                        : future.thenCombine(sendOneAddrAction(en.getKey(), action, us), (a, b) -> a | b);
+                }
+                return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
+            });
         }
-        return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
+        return rsfuture == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : rsfuture;
     }
 
-    protected CompletableFuture<Integer> sendOneAction(final WebSocketAction action, final Serializable userid) {
+    protected CompletableFuture<Integer> sendOneUserAction(final WebSocketAction action, final Serializable userid) {
         if (logger.isLoggable(Level.FINEST)) {
             logger.finest("websocket want send action {userid:" + userid + ", action:" + action + "} from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine");
         }
         CompletableFuture<Integer> localFuture = null;
-        if (this.localEngine != null) localFuture = localEngine.sendAction(action, userid);
+        if (this.localEngine != null) localFuture = localEngine.sendLocalAction(action, userid);
         if (this.sncpNodeAddresses == null || this.remoteNode == null) {
             if (logger.isLoggable(Level.FINEST)) logger.finest("websocket remote node is null");
             //没有CacheSource就不会有分布式节点
@@ -687,6 +752,21 @@ public abstract class WebSocketNode {
         return localFuture == null ? remoteFuture : localFuture.thenCombine(remoteFuture, (a, b) -> a | b);
     }
 
+    protected CompletableFuture<Integer> sendOneAddrAction(final InetSocketAddress sncpAddr, final WebSocketAction action, final Serializable... userids) {
+        if (logger.isLoggable(Level.FINEST)) {
+            logger.finest("websocket want send action {userids:" + JsonConvert.root().convertTo(userids) + ", sncpaddr:" + sncpAddr + ", action:" + action + " from locale node to " + ((this.localEngine != null) ? "locale" : "remote") + " engine");
+        }
+        if (Objects.equals(sncpAddr, this.localSncpAddress)) {
+            return this.localEngine == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : localEngine.sendLocalAction(action, userids);
+        }
+        if (this.sncpNodeAddresses == null || this.remoteNode == null) {
+            if (logger.isLoggable(Level.FINEST)) logger.finest("websocket remote node is null");
+            //没有CacheSource就不会有分布式节点
+            return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
+        }
+        return remoteNode.sendAction(sncpAddr, action, userids);
+    }
+
     protected Object formatRemoteMessage(Object message) {
         if (message instanceof WebSocketPacket) return message;
         if (message instanceof byte[]) return message;
@@ -699,7 +779,7 @@ public abstract class WebSocketNode {
     protected boolean tryAcquireSemaphore() {
         if (this.semaphore == null) return true;
         try {
-            return this.semaphore.tryAcquire(6, TimeUnit.SECONDS);
+            return this.semaphore.tryAcquire(tryAcquireSeconds, TimeUnit.SECONDS);
         } catch (Exception e) {
             return false;
         }

src/org/redkale/net/http/WebSocketPacket.java

@@ -14,6 +14,7 @@ import java.util.function.*;
 import java.util.logging.*;
 import org.redkale.convert.*;
 import org.redkale.net.Cryptor;
+import org.redkale.util.*;
 
 /**
  *
@@ -24,6 +25,8 @@ import org.redkale.net.Cryptor;
  */
 public final class WebSocketPacket {
 
+    public static final Object MESSAGE_NIL = new Object();
+
     static final WebSocketPacket NONE = new WebSocketPacket();
 
     public static final WebSocketPacket DEFAULT_PING_PACKET = new WebSocketPacket(FrameType.PING, new byte[0]);
@@ -34,7 +37,7 @@ public final class WebSocketPacket {
 
     public static enum FrameType {
 
-        TEXT(0x01), BINARY(0x02), CLOSE(0x08), PING(0x09), PONG(0x0A);
+        SERIES(0x00), TEXT(0x01), BINARY(0x02), CLOSE(0x08), PING(0x09), PONG(0x0A);
 
         private final int value;
 
@@ -48,6 +51,7 @@ public final class WebSocketPacket {
 
         public static FrameType valueOf(int v) {
             switch (v) {
+                case 0x00: return SERIES;
                 case 0x01: return TEXT;
                 case 0x02: return BINARY;
                 case 0x08: return CLOSE;
@@ -344,11 +348,19 @@ public final class WebSocketPacket {
      *
      * @return boolean 已接收完返回true， 需要继续接收body返回false；
      */
-    boolean receiveBody(WebSocket webSocket, ByteBuffer readBuffer) {
+    boolean receiveBody(final Logger logger, WebSocketRunner runner, WebSocket webSocket, ByteBuffer readBuffer) {
+        final boolean debug = false; //调试开关
         int need = receiveLength - receiveCount;
-        boolean over = readBuffer.remaining() >= need;
+        final int remain = readBuffer.remaining();
+        boolean over = remain >= need;
         this.receiveBuffers = Utility.append(this.receiveBuffers, readBuffer);
-        if (over) parseReceiveMessage(webSocket, this.receiveBuffers);
+        if (debug) logger.finest("receiveBody: receiveLength=" + receiveLength + ", this.receiveCount=" + this.receiveCount + ", readBuffer=" + remain);
+        if (over) {
+            this.receiveCount = this.receiveLength;
+            parseReceiveMessage(logger, runner, webSocket, this.receiveBuffers);
+        } else {
+            this.receiveCount += remain;
+        }
         return over;
     }
 
@@ -379,7 +391,7 @@ public final class WebSocketPacket {
      *
      * @return 返回NONE表示Buffer内容不够； 返回this表示解析完成或部分解析完成；返回null表示解析异常；
      */
-    WebSocketPacket decode(final Logger logger, final WebSocket webSocket, final int wsmaxbody,
+    WebSocketPacket decode(final Logger logger, final WebSocketRunner runner, final WebSocket webSocket, final int wsmaxbody,
         final AbstractMap.SimpleEntry<String, byte[]> halfBytes, final ByteBuffer buffer) {
         //开始
         final boolean debug = false; //调试开关
@@ -394,9 +406,13 @@ public final class WebSocketPacket {
         final byte opcode = buffer.get();   //第一个字节
         this.last = (opcode & 0b1000_0000) != 0;
         this.type = FrameType.valueOf(opcode & 0xF);
+
         if (type == FrameType.CLOSE) {
             if (debug) logger.log(Level.FINEST, " receive close command from websocket client");
         }
+        if (type == null) {
+            logger.log(Level.SEVERE, " receive unknown frametype(opcode=" + (opcode & 0xF) + ") from websocket client");
+        }
         final boolean checkrsv = false;//暂时不校验
         if (checkrsv && (opcode & 0b0111_0000) != 0) {
             if (debug) logger.log(Level.FINE, "rsv1 rsv2 rsv3 must be 0, but not (" + opcode + ")");
@@ -438,15 +454,18 @@ public final class WebSocketPacket {
             }
             if (lengthCode == 0x7E) {//0x7E=126
                 length = (int) buffer.getChar();
+            } else if (lengthCode == 0x7F) {//0x7E=127
+                length = (int) buffer.getLong();
             } else {
                 length = buffer.getInt();
             }
         }
         if (length > wsmaxbody && wsmaxbody > 0) {
-            if (debug) logger.log(Level.FINE, "message length (" + length + ") too big, must less " + wsmaxbody + "");
+            logger.log(Level.WARNING, "message length (" + length + ") too big, must less " + wsmaxbody + "");
             return null;
         }
         this.receiveLength = length;
+        if (debug) logger.finest("this.receiveLength: " + length + ", code=" + lengthCode + ", last=" + last);
         if (masked) {
             final byte[] masks = new byte[4];
             buffer.get(masks);
@@ -461,7 +480,7 @@ public final class WebSocketPacket {
             };
         }
         if (buffer.remaining() >= this.receiveLength) { //内容足够， 可以解析
-            this.parseReceiveMessage(webSocket, buffer);
+            this.parseReceiveMessage(logger, runner, webSocket, buffer);
             this.receiveCount = this.receiveLength;
         } else {
             this.receiveCount = buffer.remaining();
@@ -470,38 +489,77 @@ public final class WebSocketPacket {
         return this;
     }
 
-    void parseReceiveMessage(WebSocket webSocket, ByteBuffer... buffers) {
+    void parseReceiveMessage(final Logger logger, WebSocketRunner runner, WebSocket webSocket, ByteBuffer... buffers) {
         if (webSocket._engine.cryptor != null) {
             HttpContext context = webSocket._engine.context;
             buffers = webSocket._engine.cryptor.decrypt(buffers, context.getBufferSupplier(), context.getBufferConsumer());
         }
-        if (this.type == FrameType.TEXT) {
+        FrameType selfType = this.type;
+        final boolean series = selfType == FrameType.SERIES;
+        if (series) {
+            selfType = runner.currSeriesMergeFrameType;
+            this.type = selfType;
+        } else if (!this.last && (selfType == FrameType.TEXT || selfType == FrameType.BINARY)) {
+            runner.currSeriesMergeFrameType = selfType;
+        }
+
+        if (selfType == FrameType.TEXT) {
             Convert textConvert = webSocket.getTextConvert();
-            if (textConvert == null) {
+            if (textConvert == null || (!runner.mergemsg && (series || !this.last))) {
                 this.receiveMessage = new String(this.getReceiveBytes(buffers), StandardCharsets.UTF_8);
                 this.receiveType = MessageType.STRING;
             } else {
-                this.receiveMessage = textConvert.convertFrom(webSocket._messageTextType, this.receiveMasker, buffers);
+                if (this.last || !runner.mergemsg) {
+                    if (runner.currSeriesMergeMessage == null) {
+                        this.receiveMessage = textConvert.convertFrom(webSocket._messageTextType, this.receiveMasker, buffers);
+                    } else {
+                        runner.currSeriesMergeMessage.write(this.getReceiveBytes(buffers));
+                        try {
+                            this.receiveMessage = textConvert.convertFrom(webSocket._messageTextType, runner.currSeriesMergeMessage.getBytes());
+                        } finally {
+                            runner.currSeriesMergeMessage = null;
+                        }
+                    }
+                } else {
+                    if (runner.currSeriesMergeMessage == null) runner.currSeriesMergeMessage = new ByteArray();
+                    runner.currSeriesMergeMessage.write(this.getReceiveBytes(buffers));
+                    this.receiveMessage = MESSAGE_NIL;
+                }
                 this.receiveCount = this.receiveLength;
                 this.receiveType = MessageType.OBJECT;
             }
-        } else if (this.type == FrameType.BINARY) {
+        } else if (selfType == FrameType.BINARY) {
             Convert binaryConvert = webSocket.getBinaryConvert();
-            if (binaryConvert == null) {
+            if (binaryConvert == null || (!runner.mergemsg && (series || !this.last))) {
                 this.receiveMessage = this.getReceiveBytes(buffers);
                 this.receiveType = MessageType.BYTES;
             } else {
-                this.receiveMessage = binaryConvert.convertFrom(webSocket._messageTextType, this.receiveMasker, buffers);
+                if (this.last || !runner.mergemsg) {
+                    if (runner.currSeriesMergeMessage == null) {
+                        this.receiveMessage = binaryConvert.convertFrom(webSocket._messageTextType, this.receiveMasker, buffers);
+                    } else {
+                        runner.currSeriesMergeMessage.write(this.getReceiveBytes(buffers));
+                        try {
+                            this.receiveMessage = binaryConvert.convertFrom(webSocket._messageTextType, runner.currSeriesMergeMessage.getBytes());
+                        } finally {
+                            runner.currSeriesMergeMessage = null;
+                        }
+                    }
+                } else {
+                    if (runner.currSeriesMergeMessage == null) runner.currSeriesMergeMessage = new ByteArray();
+                    runner.currSeriesMergeMessage.write(this.getReceiveBytes(buffers));
+                    this.receiveMessage = MESSAGE_NIL;
+                }
                 this.receiveCount = this.receiveLength;
                 this.receiveType = MessageType.OBJECT;
             }
-        } else if (this.type == FrameType.PING) {
+        } else if (selfType == FrameType.PING) {
             this.receiveMessage = this.getReceiveBytes(buffers);
             this.receiveType = MessageType.BYTES;
-        } else if (this.type == FrameType.PONG) {
+        } else if (selfType == FrameType.PONG) {
             this.receiveMessage = this.getReceiveBytes(buffers);
             this.receiveType = MessageType.BYTES;
-        } else if (this.type == FrameType.CLOSE) {
+        } else if (selfType == FrameType.CLOSE) {
             this.receiveMessage = this.getReceiveBytes(buffers);
             this.receiveType = MessageType.BYTES;
         }

src/org/redkale/net/http/WebSocketRunner.java

@@ -15,6 +15,7 @@ import java.util.AbstractMap.SimpleEntry;
 import java.util.concurrent.*;
 import java.util.function.BiConsumer;
 import java.util.logging.*;
+import org.redkale.util.ByteArray;
 
 /**
  * WebSocket的消息接收发送器, 一个WebSocket对应一个WebSocketRunner
@@ -34,10 +35,14 @@ class WebSocketRunner implements Runnable {
 
     protected final HttpContext context;
 
-    private ByteBuffer readBuffer;
+    protected final boolean mergemsg;
 
     volatile boolean closed = false;
 
+    FrameType currSeriesMergeFrameType;
+
+    ByteArray currSeriesMergeMessage;
+
     private final BiConsumer<WebSocket, Object> restMessageConsumer;  //主要供RestWebSocket使用
 
     protected long lastSendTime;
@@ -48,20 +53,21 @@ class WebSocketRunner implements Runnable {
         this.context = context;
         this.engine = webSocket._engine;
         this.webSocket = webSocket;
+        this.mergemsg = webSocket._engine.mergemsg;
         this.restMessageConsumer = messageConsumer;
         this.channel = channel;
-        this.readBuffer = context.pollBuffer();
     }
 
     @Override
     public void run() {
         final boolean debug = context.getLogger().isLoggable(Level.FINEST);
+        final WebSocketRunner self = this;
         try {
             webSocket.onConnected();
             channel.setReadTimeoutSeconds(300); //读取超时5分钟
             if (channel.isOpen()) {
                 final int wsmaxbody = webSocket._engine.wsmaxbody;
-                channel.read(readBuffer, null, new CompletionHandler<Integer, Void>() {
+                channel.read(new CompletionHandler<Integer, ByteBuffer>() {
 
                     //尚未解析完的数据包
                     private WebSocketPacket unfinishPacket;
@@ -72,31 +78,27 @@ class WebSocketRunner implements Runnable {
                     private final SimpleEntry<String, byte[]> halfBytes = new SimpleEntry("", null);
 
                     @Override
-                    public void completed(Integer count, Void attachment1) {
+                    public void completed(Integer count, ByteBuffer readBuffer) {
                         if (count < 1) {
                             if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner(userid=" + webSocket.getUserid() + ") abort on read buffer count, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds");
                             closeRunner(CLOSECODE_ILLPACKET, "read buffer count is " + count);
                             return;
                         }
                         try {
-                            ByteBuffer readBuf = readBuffer;
-                            if (readBuf == null) return; //关闭后readBuffer为null
                             lastReadTime = System.currentTimeMillis();
-                            readBuf.flip();
+                            readBuffer.flip();
 
                             WebSocketPacket onePacket = null;
                             if (unfinishPacket != null) {
-                                if (unfinishPacket.receiveBody(webSocket, readBuf)) { //已经接收完毕
+                                if (unfinishPacket.receiveBody(context.getLogger(), self, webSocket, readBuffer)) { //已经接收完毕
                                     onePacket = unfinishPacket;
                                     unfinishPacket = null;
                                     for (ByteBuffer b : exBuffers) {
                                         context.offerBuffer(b);
                                     }
                                     exBuffers.clear();
-                                } else { //需要继续接收
+                                } else { //需要继续接收,  此处不能回收readBuffer
-                                    readBuf = context.pollBuffer();
+                                    channel.read(this);
-                                    readBuffer = readBuf;
-                                    channel.read(readBuf, null, this);
                                     return;
                                 }
                             }
@@ -105,39 +107,43 @@ class WebSocketRunner implements Runnable {
                             if (onePacket != null) packets.add(onePacket);
                             try {
                                 while (true) {
-                                    WebSocketPacket packet = new WebSocketPacket().decode(context.getLogger(), webSocket, wsmaxbody, halfBytes, readBuf);
+                                    WebSocketPacket packet = new WebSocketPacket().decode(context.getLogger(), self, webSocket, wsmaxbody, halfBytes, readBuffer);
                                     if (packet == WebSocketPacket.NONE) break; //解析完毕但是buffer有多余字节
                                     if (packet != null && !packet.isReceiveFinished()) {
                                         unfinishPacket = packet;
-                                        if (readBuf.hasRemaining()) {
+                                        if (readBuffer.hasRemaining()) {
-                                            exBuffers.add(readBuf);
+                                            exBuffers.add(readBuffer);
-                                            readBuf = context.pollBuffer();
-                                            readBuffer = readBuf;
                                         }
                                         break;
                                     }
                                     packets.add(packet);
-                                    if (packet == null || !readBuf.hasRemaining()) break;
+                                    if (packet == null || !readBuffer.hasRemaining()) break;
                                 }
                             } catch (Exception e) {
                                 context.getLogger().log(Level.SEVERE, "WebSocket parse message error", e);
                                 webSocket.onOccurException(e, null);
                             }
                             //继续监听消息
-                            readBuf.clear();
+                            if (readBuffer.hasRemaining()) { //exBuffers缓存了
+                                readBuffer = context.pollBuffer();
+                            } else {
+                                readBuffer.clear();
+                            }
                             if (halfBytes.getValue() != null) {
-                                readBuf.put(halfBytes.getValue());
+                                readBuffer.put(halfBytes.getValue());
                                 halfBytes.setValue(null);
                             }
-                            channel.read(readBuf, null, this);
+                            channel.setReadBuffer(readBuffer);
+                            channel.read(this);
 
                             //消息处理
                             for (final WebSocketPacket packet : packets) {
                                 if (packet == null) {
                                     if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner abort on decode WebSocketPacket, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds");
-                                    failed(null, attachment1);
+                                    failed(null, readBuffer);
                                     return;
                                 }
+                                if (packet.receiveMessage == WebSocketPacket.MESSAGE_NIL) continue; //last=false && mergemsg=true 的粘包
 
                                 if (packet.type == FrameType.TEXT) {
                                     try {
@@ -175,7 +181,7 @@ class WebSocketRunner implements Runnable {
                                     }
                                 } else if (packet.type == FrameType.PONG) {
                                     try {
-                                        if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner onMessage by PONG FrameType : " + packet);
+                                        //if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner onMessage by PONG FrameType : " + packet);
                                         webSocket.onPong((byte[]) packet.receiveMessage);
                                     } catch (Exception e) {
                                         context.getLogger().log(Level.SEVERE, "WebSocket onPong error (" + packet + ")", e);
@@ -197,7 +203,7 @@ class WebSocketRunner implements Runnable {
                     }
 
                     @Override
-                    public void failed(Throwable exc, Void attachment2) {
+                    public void failed(Throwable exc, ByteBuffer attachment2) {
                         if (exc != null) {
                             if (debug) context.getLogger().log(Level.FINEST, "WebSocketRunner read WebSocketPacket failed, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", exc);
                             closeRunner(CLOSECODE_WSEXCEPTION, "read websocket-packet failed");
@@ -277,8 +283,8 @@ class WebSocketRunner implements Runnable {
                 public void failed(Throwable exc, ByteBuffer[] attachments) {
                     future.complete(RETCODE_SENDEXCEPTION);
                     closeRunner(RETCODE_SENDEXCEPTION, "websocket send message failed on CompletionHandler");
-                    if (exc != null) {
+                    if (exc != null && context.getLogger().isLoggable(Level.FINER)) {
-                        context.getLogger().log(Level.FINE, "WebSocket sendMessage on CompletionHandler failed, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", exc);
+                        context.getLogger().log(Level.FINER, "WebSocket sendMessage on CompletionHandler failed, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", exc);
                     }
 
                 }
@@ -286,7 +292,9 @@ class WebSocketRunner implements Runnable {
         } catch (Exception t) {
             futureResult.complete(RETCODE_SENDEXCEPTION);
             closeRunner(RETCODE_SENDEXCEPTION, "websocket send message failed on channel.write");
-            context.getLogger().log(Level.FINE, "WebSocket sendMessage abort, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", t);
+            if (t != null && context.getLogger().isLoggable(Level.FINER)) {
+                context.getLogger().log(Level.FINER, "WebSocket sendMessage abort, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", t);
+            }
 
         }
         return futureResult;
@@ -301,26 +309,11 @@ class WebSocketRunner implements Runnable {
         synchronized (this) {
             if (closed) return null;
             closed = true;
+            CompletableFuture<Void> future = engine.removeLocalThenClose(webSocket);
             channel.dispose();
-            context.offerBuffer(readBuffer);
-            readBuffer = null;
-            CompletableFuture<Void> future = engine.removeThenClose(webSocket);
             webSocket.onClose(code, reason);
             return future;
         }
     }
 
-    private static final class QueueEntry {
-
-        public final CompletableFuture<Integer> future;
-
-        public final WebSocketPacket packet;
-
-        public QueueEntry(CompletableFuture<Integer> future, WebSocketPacket packet) {
-            this.future = future;
-            this.packet = packet;
-        }
-
-    }
-
 }

src/org/redkale/net/http/WebSocketServlet.java

@@ -56,6 +56,9 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
     @Comment("最大消息体长度, 小于1表示无限制")
     public static final String WEBPARAM__WSMAXBODY = "wsmaxbody";
 
+    @Comment("接收客户端的分包(last=false)消息时是否自动合并包")
+    public static final String WEBPARAM__WSMERGEMSG = "wsmergemsg";
+
     @Comment("加密解密器")
     public static final String WEBPARAM__CRYPTOR = "cryptor";
 
@@ -88,6 +91,9 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
     //同RestWebSocket.anyuser
     protected boolean anyuser = false;
 
+    //同RestWebSocket.mergemsg
+    protected boolean mergemsg = true;
+
     //同RestWebSocket.cryptor, 变量名不可改， 被Rest.createRestWebSocketServlet用到
     protected Cryptor cryptor;
 
@@ -106,6 +112,9 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
     @Resource(name = "$")
     protected WebSocketNode node;
 
+    @Resource(name = "SERVER_RESFACTORY")
+    protected ResourceFactory resourceFactory;
+
     protected WebSocketServlet() {
         Type msgtype = String.class;
         try {
@@ -145,6 +154,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
                 if (cryptorClass != null && !cryptorClass.isEmpty()) {
                     try {
                         this.cryptor = (Cryptor) Thread.currentThread().getContextClassLoader().loadClass(cryptorClass).getDeclaredConstructor().newInstance();
+                        if (resourceFactory != null && this.cryptor != null) resourceFactory.inject(this.cryptor);
                     } catch (Exception e) {
                         throw new RuntimeException(e);
                     }
@@ -153,7 +163,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
         }
         //存在WebSocketServlet，则此WebSocketNode必须是本地模式Service
         this.node.localEngine = new WebSocketEngine("WebSocketEngine-" + addr.getHostString() + ":" + addr.getPort() + "-[" + resourceName() + "]",
-            this.single, context, liveinterval, wsmaxconns, wsthreads, wsmaxbody, this.cryptor, this.node, this.sendConvert, logger);
+            this.single, context, liveinterval, wsmaxconns, wsthreads, wsmaxbody, mergemsg, this.cryptor, this.node, this.sendConvert, logger);
         this.node.init(conf);
         this.node.localEngine.init(conf);
 
@@ -251,7 +261,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
                                             CompletableFuture<Boolean> rcFuture = webSocket.onSingleRepeatConnect();
                                             Consumer<Boolean> task = (oldkilled) -> {
                                                 if (oldkilled) {
-                                                    WebSocketServlet.this.node.localEngine.add(webSocket);
+                                                    WebSocketServlet.this.node.localEngine.addLocal(webSocket);
                                                     WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.removeChannel());
                                                     webSocket._runner = runner;
                                                     context.runAsync(runner);
@@ -272,7 +282,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
                                                 });
                                             }
                                         } else {
-                                            WebSocketServlet.this.node.localEngine.add(webSocket);
+                                            WebSocketServlet.this.node.localEngine.addLocal(webSocket);
                                             WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.removeChannel());
                                             webSocket._runner = runner;
                                             context.runAsync(runner);
@@ -280,7 +290,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
                                         }
                                     });
                                 } else {
-                                    WebSocketServlet.this.node.localEngine.add(webSocket);
+                                    WebSocketServlet.this.node.localEngine.addLocal(webSocket);
                                     WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.removeChannel());
                                     webSocket._runner = runner;
                                     context.runAsync(runner);

src/org/redkale/net/sncp/SncpClient.java

@@ -307,7 +307,7 @@ public final class SncpClient {
                         byte i;
                         while ((i = reader.readByte()) != 0) {
                             final Attribute attr = action.paramAttrs[i];
-                            attr.set(params[i - 1], bsonConvert.convertFrom(attr.type(), reader));
+                            attr.set(params[i - 1], bsonConvert.convertFrom(attr.genericType(), reader));
                         }
                         Object rs = bsonConvert.convertFrom(Object.class, reader);
 
@@ -327,7 +327,7 @@ public final class SncpClient {
             byte i;
             while ((i = reader.readByte()) != 0) {
                 final Attribute attr = action.paramAttrs[i];
-                attr.set(params[i - 1], bsonConvert.convertFrom(attr.type(), reader));
+                attr.set(params[i - 1], bsonConvert.convertFrom(attr.genericType(), reader));
             }
             return bsonConvert.convertFrom(action.handlerFuncParamIndex >= 0 ? Object.class : action.resultTypes, reader);
         } catch (RpcRemoteException re) {
@@ -370,7 +370,6 @@ public final class SncpClient {
             final ByteBuffer[] sendBuffers = writer.toBuffers();
             fillHeader(sendBuffers[0], seqid, actionid, reqBodyLength);
 
-            final ByteBuffer buffer = transport.pollBuffer();
             conn.write(sendBuffers, sendBuffers, new CompletionHandler<Integer, ByteBuffer[]>() {
 
                 @Override
@@ -394,24 +393,24 @@ public final class SncpClient {
                         return;
                     }
                     //----------------------- 读取返回结果 -------------------------------------     
-                    buffer.clear();
+                    conn.read(new CompletionHandler<Integer, ByteBuffer>() {
-                    conn.read(buffer, null, new CompletionHandler<Integer, Void>() {
 
                         private byte[] body;
 
                         private int received;
 
                         @Override
-                        public void completed(Integer count, Void attachment2) {
+                        public void completed(Integer count, ByteBuffer buffer) {
                             try {
                                 if (count < 1 && buffer.remaining() == buffer.limit()) {   //没有数据可读
                                     future.completeExceptionally(new RpcRemoteException(action.method + " sncp[" + conn.getRemoteAddress() + "] remote no response data"));
-                                    transport.offerBuffer(buffer);
+                                    conn.offerBuffer(buffer);
                                     transport.offerConnection(true, conn);
                                     return;
                                 }
                                 if (received < 1 && buffer.limit() < buffer.remaining() + HEADER_SIZE) { //header都没读全
-                                    conn.read(buffer, attachment2, this);
+                                    conn.setReadBuffer(buffer);
+                                    conn.read(this);
                                     return;
                                 }
                                 buffer.flip();
@@ -421,8 +420,10 @@ public final class SncpClient {
                                     buffer.get(body, offset, Math.min(buffer.remaining(), this.body.length - offset));
                                     if (this.received < this.body.length) {// 数据仍然不全，需要继续读取          
                                         buffer.clear();
-                                        conn.read(buffer, attachment2, this);
+                                        conn.setReadBuffer(buffer);
+                                        conn.read(this);
                                     } else {
+                                        conn.offerBuffer(buffer);
                                         success();
                                     }
                                     return;
@@ -441,10 +442,12 @@ public final class SncpClient {
                                     this.received = buffer.remaining();
                                     buffer.get(body, 0, this.received);
                                     buffer.clear();
-                                    conn.read(buffer, attachment2, this);
+                                    conn.setReadBuffer(buffer);
+                                    conn.read(this);
                                 } else {
                                     this.body = new byte[respBodyLength];
                                     buffer.get(body, 0, respBodyLength);
+                                    conn.offerBuffer(buffer);
                                     success();
                                 }
                             } catch (Throwable e) {
@@ -461,7 +464,6 @@ public final class SncpClient {
                         @SuppressWarnings("unchecked")
                         public void success() {
                             future.complete(this.body);
-                            transport.offerBuffer(buffer);
                             transport.offerConnection(false, conn);
                             if (handler != null) {
                                 final Object handlerAttach = action.handlerAttachParamIndex >= 0 ? params[action.handlerAttachParamIndex] : null;
@@ -471,7 +473,7 @@ public final class SncpClient {
                                     int i;
                                     while ((i = (reader.readByte() & 0xff)) != 0) {
                                         final Attribute attr = action.paramAttrs[i];
-                                        attr.set(params[i - 1], bsonConvert.convertFrom(attr.type(), reader));
+                                        attr.set(params[i - 1], bsonConvert.convertFrom(attr.genericType(), reader));
                                     }
                                     Object rs = bsonConvert.convertFrom(action.handlerFuncParamIndex >= 0 ? Object.class : action.resultTypes, reader);
                                     handler.completed(rs, handlerAttach);
@@ -484,9 +486,9 @@ public final class SncpClient {
                         }
 
                         @Override
-                        public void failed(Throwable exc, Void attachment2) {
+                        public void failed(Throwable exc, ByteBuffer attachment2) {
                             future.completeExceptionally(new RuntimeException(action.method + " sncp remote exec failed"));
-                            transport.offerBuffer(buffer);
+                            conn.offerBuffer(attachment2);
                             transport.offerConnection(true, conn);
                             if (handler != null) {
                                 final Object handlerAttach = action.handlerAttachParamIndex >= 0 ? params[action.handlerAttachParamIndex] : null;
@@ -500,7 +502,6 @@ public final class SncpClient {
                 @Override
                 public void failed(Throwable exc, ByteBuffer[] attachment) {
                     future.completeExceptionally(new RuntimeException(action.method + " sncp remote exec failed"));
-                    transport.offerBuffer(buffer);
                     transport.offerConnection(true, conn);
                     if (handler != null) {
                         final Object handlerAttach = action.handlerAttachParamIndex >= 0 ? params[action.handlerAttachParamIndex] : null;

src/org/redkale/net/sncp/SncpContext.java

@@ -5,8 +5,6 @@
  */
 package org.redkale.net.sncp;
 
-import java.nio.ByteBuffer;
-import java.util.function.*;
 import org.redkale.net.*;
 
 /**
@@ -21,21 +19,6 @@ public class SncpContext extends Context {
         super(config);
     }
 
-    @Override
-    protected Consumer<ByteBuffer> getBufferConsumer() {
-        return super.getBufferConsumer();
-    }
-
-    @Override
-    protected void offerBuffer(ByteBuffer buffer) {
-        super.offerBuffer(buffer);
-    }
-
-    @Override
-    protected void offerBuffer(ByteBuffer... buffers) {
-        super.offerBuffer(buffers);
-    }
-
     public static class SncpContextConfig extends ContextConfig {
 
     }

src/org/redkale/net/sncp/SncpDynServlet.java

@@ -14,6 +14,7 @@ import java.nio.*;
 import java.nio.channels.CompletionHandler;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicInteger;
 import java.util.function.*;
 import java.util.logging.*;
 import javax.annotation.*;
@@ -36,9 +37,9 @@ import org.redkale.service.RpcCall;
  */
 public final class SncpDynServlet extends SncpServlet {
 
-    private static volatile int maxClassNameLength = 0;
+    private final AtomicInteger maxClassNameLength;
 
-    private static volatile int maxNameLength = 0;
+    private final AtomicInteger maxNameLength;
 
     private static final Logger logger = Logger.getLogger(SncpDynServlet.class.getSimpleName());
 
@@ -48,8 +49,11 @@ public final class SncpDynServlet extends SncpServlet {
 
     private Supplier<ByteBuffer> bufferSupplier;
 
-    public SncpDynServlet(final BsonConvert convert, final String serviceName, final Class serviceOrSourceType, final Service service) {
+    public SncpDynServlet(final BsonConvert convert, final String serviceName, final Class serviceOrSourceType, final Service service,
+        final AtomicInteger maxClassNameLength, AtomicInteger maxNameLength) {
         super(serviceName, serviceOrSourceType, service);
+        this.maxClassNameLength = maxClassNameLength;
+        this.maxNameLength = maxNameLength;
         this.serviceid = Sncp.hash(type.getName() + ':' + serviceName);
         Set<DLong> actionids = new HashSet<>();
         for (java.lang.reflect.Method method : service.getClass().getMethods()) {
@@ -70,20 +74,20 @@ public final class SncpDynServlet extends SncpServlet {
             actions.put(actionid, action);
             actionids.add(actionid);
         }
-        maxNameLength = Math.max(maxNameLength, serviceName.length() + 1);
+        maxNameLength.set(Math.max(maxNameLength.get(), serviceName.length() + 1));
-        maxClassNameLength = Math.max(maxClassNameLength, type.getName().length());
+        maxClassNameLength.set(Math.max(maxClassNameLength.get(), type.getName().length()));
     }
 
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
         sb.append(this.getClass().getSimpleName()).append(" (type=").append(type.getName());
-        int len = maxClassNameLength - type.getName().length();
+        int len = this.maxClassNameLength.get() - type.getName().length();
         for (int i = 0; i < len; i++) {
             sb.append(' ');
         }
         sb.append(", serviceid=").append(serviceid).append(", name='").append(serviceName).append("'");
-        for (int i = 0; i < maxNameLength - serviceName.length(); i++) {
+        for (int i = 0; i < this.maxNameLength.get() - serviceName.length(); i++) {
             sb.append(' ');
         }
         sb.append(", actions.size=").append(actions.size() > 9 ? "" : " ").append(actions.size()).append(")");
@@ -196,7 +200,7 @@ public final class SncpDynServlet extends SncpServlet {
                     org.redkale.util.Attribute attr = paramAttrs[i];
                     if (attr == null) continue;
                     out.writeByte((byte) i);
-                    convert.convertTo(out, attr.type(), attr.get(params[i - 1]));
+                    convert.convertTo(out, attr.genericType(), attr.get(params[i - 1]));
                 }
             }
             out.writeByte((byte) 0);

src/org/redkale/net/sncp/SncpServer.java

@@ -25,6 +25,10 @@ import org.redkale.util.*;
 @SuppressWarnings("unchecked")
 public class SncpServer extends Server<DLong, SncpContext, SncpRequest, SncpResponse, SncpServlet> {
 
+    private final AtomicInteger maxClassNameLength = new AtomicInteger();
+
+    private final AtomicInteger maxNameLength = new AtomicInteger();
+
     public SncpServer() {
         this(System.currentTimeMillis(), ResourceFactory.root());
     }
@@ -87,7 +91,8 @@ public class SncpServer extends Server<DLong, SncpContext, SncpRequest, SncpResp
     }
 
     public void addSncpServlet(Service sncpService) {
-        SncpDynServlet sds = new SncpDynServlet(BsonFactory.root().getConvert(), Sncp.getResourceName(sncpService), Sncp.getResourceType(sncpService), sncpService);
+        SncpDynServlet sds = new SncpDynServlet(BsonFactory.root().getConvert(), Sncp.getResourceName(sncpService),
+            Sncp.getResourceType(sncpService), sncpService, maxClassNameLength, maxNameLength);
         this.prepare.addServlet(sds, null, Sncp.getConf(sncpService));
     }
 

src/org/redkale/service/RetResult.java

@@ -58,6 +58,10 @@ public class RetResult<T> {
         return new RetResult();
     }
 
+    public static <T> RetResult<T> success(T result) {
+        return new RetResult().result(result);
+    }
+
     public static <T> CompletableFuture<RetResult<T>> successFuture() {
         return CompletableFuture.completedFuture(new RetResult());
     }
@@ -203,6 +207,18 @@ public class RetResult<T> {
         return attach;
     }
 
+    /**
+     * 获取附件元素值
+     *
+     * @param name     元素名
+     * @param defValue 默认值
+     *
+     * @return 结果值
+     */
+    public String getAttach(String name, String defValue) {
+        return attach == null ? defValue : attach.getOrDefault(name, defValue);
+    }
+
     /**
      * 设置结果附件
      *

src/org/redkale/service/WebSocketNodeService.java

@@ -56,27 +56,27 @@ public class WebSocketNodeService extends WebSocketNode implements Service {
     }
 
     @Override
-    public CompletableFuture<Integer> sendMessage(@RpcTargetAddress InetSocketAddress targetAddress, Object message, boolean last, Serializable userid) {
+    public CompletableFuture<Integer> sendMessage(@RpcTargetAddress InetSocketAddress targetAddress, Object message, boolean last, Serializable... userids) {
         if (this.localEngine == null) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
-        return this.localEngine.sendMessage(message, last, userid);
+        return this.localEngine.sendLocalMessage(message, last, userids);
     }
 
     @Override
     public CompletableFuture<Integer> broadcastMessage(@RpcTargetAddress InetSocketAddress targetAddress, final WebSocketRange wsrange, Object message, boolean last) {
         if (this.localEngine == null) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
-        return this.localEngine.broadcastMessage(wsrange, message, last);
+        return this.localEngine.broadcastLocalMessage(wsrange, message, last);
     }
 
     @Override
-    public CompletableFuture<Integer> sendAction(@RpcTargetAddress InetSocketAddress targetAddress, final WebSocketAction action, Serializable userid) {
+    public CompletableFuture<Integer> sendAction(@RpcTargetAddress InetSocketAddress targetAddress, final WebSocketAction action, Serializable... userids) {
         if (this.localEngine == null) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
-        return this.localEngine.sendAction(action, userid);
+        return this.localEngine.sendLocalAction(action, userids);
     }
 
     @Override
     public CompletableFuture<Integer> broadcastAction(@RpcTargetAddress InetSocketAddress targetAddress, final WebSocketAction action) {
         if (this.localEngine == null) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
-        return this.localEngine.broadcastAction(action);
+        return this.localEngine.broadcastLocalAction(action);
     }
 
     /**

src/org/redkale/source/CacheMemorySource.java

@@ -200,62 +200,61 @@ public class CacheMemorySource<V extends Object> extends AbstractService impleme
         }
     }
 
-    /**
+    public static void main(String[] args) throws Exception {
-     * public static void main(String[] args) throws Exception {
+        AnyValue.DefaultAnyValue conf = new AnyValue.DefaultAnyValue();
-     * AnyValue.DefaultAnyValue conf = new AnyValue.DefaultAnyValue();
+        conf.addValue("node", new AnyValue.DefaultAnyValue().addValue("addr", "127.0.0.1").addValue("port", "6379"));
-     * conf.addValue("node", new AnyValue.DefaultAnyValue().addValue("addr", "127.0.0.1").addValue("port", "6379"));
+
-     *
+        CacheMemorySource source = new CacheMemorySource();
-     * CacheMemorySource source = new CacheMemorySource();
+        source.defaultConvert = JsonFactory.root().getConvert();
-     * source.defaultConvert = JsonFactory.root().getConvert();
+        source.initValueType(String.class); //value用String类型
-     * source.initValueType(String.class); //value用String类型
+        source.initTransient(false);
-     * source.initTransient(false);
+        source.init(conf);
-     * source.init(conf);
+
-     *
+        System.out.println("------------------------------------");
-     * System.out.println("------------------------------------");
+        source.remove("key1");
-     * source.remove("key1");
+        source.remove("key2");
-     * source.remove("key2");
+        source.remove("300");
-     * source.remove("300");
+        source.set("key1", "value1");
-     * source.set("key1", "value1");
+        source.setString("keystr1", "strvalue1");
-     * source.setString("keystr1", "strvalue1");
+        source.setLong("keylong1", 333L);
-     * source.setLong("keylong1", 333L);
+        source.set("300", "4000");
-     * source.set("300", "4000");
+        source.getAndRefresh("key1", 3500);
-     * source.getAndRefresh("key1", 3500);
+        System.out.println("[有值] 300 GET : " + source.get("300"));
-     * System.out.println("[有值] 300 GET : " + source.get("300"));
+        System.out.println("[有值] key1 GET : " + source.get("key1"));
-     * System.out.println("[有值] key1 GET : " + source.get("key1"));
+        System.out.println("[无值] key2 GET : " + source.get("key2"));
-     * System.out.println("[无值] key2 GET : " + source.get("key2"));
+        System.out.println("[有值] keylong1 GET : " + source.getLong("keylong1", 0L));
-     * System.out.println("[有值] keylong1 GET : " + source.getLong("keylong1", 0L));
+        System.out.println("[有值] key1 EXISTS : " + source.exists("key1"));
-     * System.out.println("[有值] key1 EXISTS : " + source.exists("key1"));
+        System.out.println("[无值] key2 EXISTS : " + source.exists("key2"));
-     * System.out.println("[无值] key2 EXISTS : " + source.exists("key2"));
+
-     *
+        source.remove("keys3");
-     * source.remove("keys3");
+        source.appendListItem("keys3", "vals1");
-     * source.appendListItem("keys3", "vals1");
+        source.appendListItem("keys3", "vals2");
-     * source.appendListItem("keys3", "vals2");
+        System.out.println("-------- keys3 追加了两个值 --------");
-     * System.out.println("-------- keys3 追加了两个值 --------");
+        System.out.println("[两值] keys3 VALUES : " + source.getCollection("keys3"));
-     * System.out.println("[两值] keys3 VALUES : " + source.getCollection("keys3"));
+        System.out.println("[有值] keys3 EXISTS : " + source.exists("keys3"));
-     * System.out.println("[有值] keys3 EXISTS : " + source.exists("keys3"));
+        source.removeListItem("keys3", "vals1");
-     * source.removeListItem("keys3", "vals1");
+        System.out.println("[一值] keys3 VALUES : " + source.getCollection("keys3"));
-     * System.out.println("[一值] keys3 VALUES : " + source.getCollection("keys3"));
+        source.getCollectionAndRefresh("keys3", 3000);
-     * source.getCollectionAndRefresh("keys3", 3000);
+
-     *
+        source.remove("sets3");
-     * source.remove("sets3");
+        source.appendSetItem("sets3", "setvals1");
-     * source.appendSetItem("sets3", "setvals1");
+        source.appendSetItem("sets3", "setvals2");
-     * source.appendSetItem("sets3", "setvals2");
+        source.appendSetItem("sets3", "setvals1");
-     * source.appendSetItem("sets3", "setvals1");
+        System.out.println("[两值] sets3 VALUES : " + source.getCollection("sets3"));
-     * System.out.println("[两值] sets3 VALUES : " + source.getCollection("sets3"));
+        System.out.println("[有值] sets3 EXISTS : " + source.exists("sets3"));
-     * System.out.println("[有值] sets3 EXISTS : " + source.exists("sets3"));
+        source.removeSetItem("sets3", "setvals1");
-     * source.removeSetItem("sets3", "setvals1");
+        System.out.println("[一值] sets3 VALUES : " + source.getCollection("sets3"));
-     * System.out.println("[一值] sets3 VALUES : " + source.getCollection("sets3"));
+        System.out.println("sets3 大小 : " + source.getCollectionSize("sets3"));
-     * System.out.println("sets3 大小 : " + source.getCollectionSize("sets3"));
+        System.out.println("all keys: " + source.queryKeys());
-     * System.out.println("all keys: " + source.queryKeys());
+        System.out.println("newnum 值 : " + source.incr("newnum"));
-     * System.out.println("newnum 值 : " + source.incr("newnum"));
+        System.out.println("newnum 值 : " + source.decr("newnum"));
-     * System.out.println("newnum 值 : " + source.decr("newnum"));
+        System.out.println("------------------------------------");
-     * System.out.println("------------------------------------");
+        source.destroy(null);
-     * source.destroy(null);
+        source.init(null);
-     * source.init(null);
+        System.out.println("all keys: " + source.queryKeys());
-     * System.out.println("all keys: " + source.queryKeys());
+        System.out.println("[有值] keylong1 GET : " + source.getLong("keylong1", 0L));
-     * System.out.println("[有值] keylong1 GET : " + source.getLong("keylong1", 0L));
+    }
-     * }
+
-     */
     @Override
     public void close() throws Exception {  //给Application 关闭时调用
         destroy(null);
@@ -677,16 +676,46 @@ public class CacheMemorySource<V extends Object> extends AbstractService impleme
         return (Collection<T>) get(key);
     }
 
+    @Override
+    public <T> Map<String, Collection<T>> getCollectionMap(final Type componentType, final String... keys) {
+        Map<String, Collection<T>> map = new HashMap<>();
+        for (String key : keys) {
+            Collection<T> s = (Collection<T>) get(key);
+            if (s != null) map.put(key, s);
+        }
+        return map;
+    }
+
     @Override
     public Collection<String> getStringCollection(final String key) {
         return (Collection<String>) get(key);
     }
 
+    @Override
+    public Map<String, Collection<String>> getStringCollectionMap(final String... keys) {
+        Map<String, Collection<String>> map = new HashMap<>();
+        for (String key : keys) {
+            Collection<String> s = (Collection<String>) get(key);
+            if (s != null) map.put(key, s);
+        }
+        return map;
+    }
+
     @Override
     public Collection<Long> getLongCollection(final String key) {
         return (Collection<Long>) get(key);
     }
 
+    @Override
+    public Map<String, Collection<Long>> getLongCollectionMap(final String... keys) {
+        Map<String, Collection<Long>> map = new HashMap<>();
+        for (String key : keys) {
+            Collection<Long> s = (Collection<Long>) get(key);
+            if (s != null) map.put(key, s);
+        }
+        return map;
+    }
+
     @Override
     public CompletableFuture<Collection<V>> getCollectionAsync(final String key) {
         return CompletableFuture.supplyAsync(() -> getCollection(key), getExecutor());
@@ -697,16 +726,31 @@ public class CacheMemorySource<V extends Object> extends AbstractService impleme
         return CompletableFuture.supplyAsync(() -> getCollection(key, componentType), getExecutor());
     }
 
+    @Override
+    public CompletableFuture<Map<String, Collection<V>>> getCollectionMapAsync(final Type componentType, final String... keys) {
+        return CompletableFuture.supplyAsync(() -> getCollectionMap(componentType, keys), getExecutor());
+    }
+
     @Override
     public CompletableFuture<Collection<String>> getStringCollectionAsync(final String key) {
         return CompletableFuture.supplyAsync(() -> getStringCollection(key), getExecutor());
     }
 
+    @Override
+    public CompletableFuture<Map<String, Collection<String>>> getStringCollectionMapAsync(final String... keys) {
+        return CompletableFuture.supplyAsync(() -> getStringCollectionMap(keys), getExecutor());
+    }
+
     @Override
     public CompletableFuture<Collection<Long>> getLongCollectionAsync(final String key) {
         return CompletableFuture.supplyAsync(() -> getLongCollection(key), getExecutor());
     }
 
+    @Override
+    public CompletableFuture<Map<String, Collection<Long>>> getLongCollectionMapAsync(final String... keys) {
+        return CompletableFuture.supplyAsync(() -> getLongCollectionMap(keys), getExecutor());
+    }
+
     @Override
     public int getCollectionSize(final String key) {
         Collection<V> collection = (Collection<V>) get(key);

src/org/redkale/source/CacheSource.java

@@ -92,6 +92,8 @@ public interface CacheSource<V extends Object> {
 
     public <T> Collection<T> getCollection(final String key, final Type componentType);
 
+    public <T> Map<String, Collection<T>> getCollectionMap(final Type componentType, final String... keys);
+
     public int getCollectionSize(final String key);
 
     public Collection<V> getCollectionAndRefresh(final String key, final int expireSeconds);
@@ -138,6 +140,8 @@ public interface CacheSource<V extends Object> {
 
     public Collection<String> getStringCollection(final String key);
 
+    public Map<String, Collection<String>> getStringCollectionMap(final String... keys);
+
     public Collection<String> getStringCollectionAndRefresh(final String key, final int expireSeconds);
 
     public void appendStringListItem(final String key, final String value);
@@ -160,6 +164,8 @@ public interface CacheSource<V extends Object> {
 
     public Collection<Long> getLongCollection(final String key);
 
+    public Map<String, Collection<Long>> getLongCollectionMap(final String... keys);
+
     public Collection<Long> getLongCollectionAndRefresh(final String key, final int expireSeconds);
 
     public void appendLongListItem(final String key, final long value);
@@ -235,6 +241,8 @@ public interface CacheSource<V extends Object> {
 
     public <T> CompletableFuture<Collection<T>> getCollectionAsync(final String key, final Type componentType);
 
+    public <T> CompletableFuture<Map<String, Collection<T>>> getCollectionMapAsync(final Type componentType, final String... keys);
+
     public CompletableFuture<Integer> getCollectionSizeAsync(final String key);
 
     public CompletableFuture<Collection<V>> getCollectionAndRefreshAsync(final String key, final int expireSeconds);
@@ -281,6 +289,8 @@ public interface CacheSource<V extends Object> {
 
     public CompletableFuture<Collection<String>> getStringCollectionAsync(final String key);
 
+    public CompletableFuture<Map<String, Collection<String>>> getStringCollectionMapAsync(final String... keys);
+
     public CompletableFuture<Collection<String>> getStringCollectionAndRefreshAsync(final String key, final int expireSeconds);
 
     public CompletableFuture<Void> appendStringListItemAsync(final String key, final String value);
@@ -303,6 +313,8 @@ public interface CacheSource<V extends Object> {
 
     public CompletableFuture<Collection<Long>> getLongCollectionAsync(final String key);
 
+    public CompletableFuture<Map<String, Collection<Long>>> getLongCollectionMapAsync(final String... keys);
+
     public CompletableFuture<Collection<Long>> getLongCollectionAndRefreshAsync(final String key, final int expireSeconds);
 
     public CompletableFuture<Void> appendLongListItemAsync(final String key, final long value);

src/org/redkale/source/CryptColumn.java

@@ -0,0 +1,30 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.source;
+
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.*;
+
+/**
+ * 加密字段标记 <br>
+ * 注意: 加密字段不能用于 LIKE 等过滤查询 <br>
+ * 如果有对加密字段进行过滤查询的需求，就要保证加密算法也能兼容LIKE，如："abc"的加密字符串也是"abcde"的加密字符串的一部分
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @since 2.0.0
+ */
+@Inherited
+@Documented
+@Target({FIELD})
+@Retention(RUNTIME)
+public @interface CryptColumn {
+
+    Class<? extends CryptHandler> handler();
+}

src/org/redkale/source/CryptHandler.java

@@ -0,0 +1,38 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.source;
+
+/**
+ * 字段加密解密接口
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @since 2.0.0
+ * @param <S> 加密的字段类型
+ * @param <D> 加密后的数据类型
+ */
+public interface CryptHandler<S, D> {
+
+    /**
+     * 加密
+     *
+     * @param value 加密前的字段值
+     *
+     * @return 加密后的字段值
+     */
+    public D encrypt(S value);
+
+    /**
+     * 解密
+     *
+     * @param value 加密的字段值
+     *
+     * @return 解密后的字段值
+     */
+    public S decrypt(D value);
+}

src/org/redkale/source/DataCacheListener.java

@@ -20,5 +20,5 @@ public interface DataCacheListener {
 
     public <T> int updateCache(Class<T> clazz, T... entitys);
 
-    public <T> int deleteCache(Class<T> clazz, Serializable... ids);
+    public <T> int deleteCache(Class<T> clazz, Serializable... pks);
 }

src/org/redkale/source/DataJdbcSource.java

@@ -50,18 +50,18 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
     }
 
     @Override
-    protected <T> CompletableFuture<Integer> insertDB(EntityInfo<T> info, T... values) {
+    protected <T> CompletableFuture<Integer> insertDB(EntityInfo<T> info, T... entitys) {
         Connection conn = null;
         try {
             int c = 0;
             conn = writePool.poll();
-            final String sql = info.getInsertPrepareSQL(values[0]);
+            final String sql = info.getInsertPrepareSQL(entitys[0]);
             final Class primaryType = info.getPrimary().type();
             final Attribute primary = info.getPrimary();
             Attribute<T, Serializable>[] attrs = info.insertAttributes;
             conn.setReadOnly(false);
             conn.setAutoCommit(true);
-            PreparedStatement prestmt = createInsertPreparedStatement(conn, sql, info, values);
+            PreparedStatement prestmt = createInsertPreparedStatement(conn, sql, info, entitys);
             try {
                 int[] cs = prestmt.executeBatch();
                 int c1 = 0;
@@ -73,7 +73,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
                 if (info.tableStrategy == null || !info.isTableNotExist(se)) throw se;
                 synchronized (info.tables) {
                     final String oldTable = info.table;
-                    final String newTable = info.getTable(values[0]);
+                    final String newTable = info.getTable(entitys[0]);
                     if (!info.tables.contains(newTable)) {
                         try {
                             Statement st = conn.createStatement();
@@ -105,7 +105,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
                     }
                 }
                 prestmt.close();
-                prestmt = createInsertPreparedStatement(conn, sql, info, values);
+                prestmt = createInsertPreparedStatement(conn, sql, info, entitys);
                 int[] cs = prestmt.executeBatch();
                 int c1 = 0;
                 for (int cc : cs) {
@@ -118,11 +118,11 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
                 int i = -1;
                 while (set.next()) {
                     if (primaryType == int.class) {
-                        primary.set(values[++i], set.getInt(1));
+                        primary.set(entitys[++i], set.getInt(1));
                     } else if (primaryType == long.class) {
-                        primary.set(values[++i], set.getLong(1));
+                        primary.set(entitys[++i], set.getLong(1));
                     } else {
-                        primary.set(values[++i], set.getObject(1));
+                        primary.set(entitys[++i], set.getObject(1));
                     }
                 }
                 set.close();
@@ -131,13 +131,13 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
             //------------------------------------------------------------
             if (info.isLoggable(logger, Level.FINEST)) {  //打印调试信息
                 char[] sqlchars = sql.toCharArray();
-                for (final T value : values) {
+                for (final T value : entitys) {
                     //-----------------------------
                     StringBuilder sb = new StringBuilder(128);
                     int i = 0;
                     for (char ch : sqlchars) {
                         if (ch == '?') {
-                            Object obj = attrs[i++].get(value);
+                            Object obj = info.getSQLValue(attrs[i++], value);
                             if (obj != null && obj.getClass().isArray()) {
                                 sb.append("'[length=").append(java.lang.reflect.Array.getLength(obj)).append("]'");
                             } else {
@@ -162,32 +162,40 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
     }
 
     protected <T> PreparedStatement createInsertPreparedStatement(final Connection conn, final String sql,
-        final EntityInfo<T> info, T... values) throws SQLException {
+        final EntityInfo<T> info, T... entitys) throws SQLException {
         Attribute<T, Serializable>[] attrs = info.insertAttributes;
         final PreparedStatement prestmt = info.autoGenerated ? conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS) : conn.prepareStatement(sql);
 
-        for (final T value : values) {
+        for (final T value : entitys) {
-            int i = 0;
             if (info.autouuid) info.createPrimaryValue(value);
-            for (Attribute<T, Serializable> attr : attrs) {
+            batchStatementParameters(conn, prestmt, info, attrs, value);
-                Serializable val = attr.get(value);
-                if (val instanceof byte[]) {
-                    Blob blob = conn.createBlob();
-                    blob.setBytes(1, (byte[]) val);
-                    prestmt.setObject(++i, blob);
-                } else if (val instanceof AtomicInteger) {
-                    prestmt.setObject(++i, ((AtomicInteger) val).get());
-                } else if (val instanceof AtomicLong) {
-                    prestmt.setObject(++i, ((AtomicLong) val).get());
-                } else {
-                    prestmt.setObject(++i, val);
-                }
-            }
             prestmt.addBatch();
         }
         return prestmt;
     }
 
+    protected <T> int batchStatementParameters(Connection conn, PreparedStatement prestmt, EntityInfo<T> info, Attribute<T, Serializable>[] attrs, T entity) throws SQLException {
+        int i = 0;
+        for (Attribute<T, Serializable> attr : attrs) {
+            Serializable val = info.getSQLValue(attr, entity);
+            if (val instanceof byte[]) {
+                Blob blob = conn.createBlob();
+                blob.setBytes(1, (byte[]) val);
+                prestmt.setObject(++i, blob);
+            } else if (val instanceof AtomicInteger) {
+                prestmt.setObject(++i, ((AtomicInteger) val).get());
+            } else if (val instanceof AtomicLong) {
+                prestmt.setObject(++i, ((AtomicLong) val).get());
+            } else if (val != null && !(val instanceof Number) && !(val instanceof CharSequence) && !(entity instanceof java.util.Date)
+                && !val.getClass().getName().startsWith("java.sql.") && !val.getClass().getName().startsWith("java.time.")) {
+                prestmt.setObject(++i, info.jsonConvert.convertTo(attr.genericType(), val));
+            } else {
+                prestmt.setObject(++i, val);
+            }
+        }
+        return i;
+    }
+
     @Override
     protected <T> CompletableFuture<Integer> deleteDB(EntityInfo<T> info, Flipper flipper, String sql) {
         Connection conn = null;
@@ -211,34 +219,60 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
     }
 
     @Override
-    protected <T> CompletableFuture<Integer> updateDB(EntityInfo<T> info, T... values) {
+    protected <T> CompletableFuture<Integer> clearTableDB(EntityInfo<T> info, String sql) {
         Connection conn = null;
         try {
             conn = writePool.poll();
             conn.setReadOnly(false);
             conn.setAutoCommit(true);
-            final String updateSQL = info.getUpdatePrepareSQL(values[0]);
+            final Statement stmt = conn.createStatement();
+            int c = stmt.executeUpdate(sql);
+            stmt.close();
+            return CompletableFuture.completedFuture(c);
+        } catch (SQLException e) {
+            CompletableFuture future = new CompletableFuture();
+            future.completeExceptionally(e);
+            return future;
+        } finally {
+            if (conn != null) writePool.offerConnection(conn);
+        }
+    }
+
+    @Override
+    protected <T> CompletableFuture<Integer> dropTableDB(EntityInfo<T> info, String sql) {
+        Connection conn = null;
+        try {
+            conn = writePool.poll();
+            conn.setReadOnly(false);
+            conn.setAutoCommit(true);
+            final Statement stmt = conn.createStatement();
+            int c = stmt.executeUpdate(sql);
+            stmt.close();
+            return CompletableFuture.completedFuture(c);
+        } catch (SQLException e) {
+            CompletableFuture future = new CompletableFuture();
+            future.completeExceptionally(e);
+            return future;
+        } finally {
+            if (conn != null) writePool.offerConnection(conn);
+        }
+    }
+
+    @Override
+    protected <T> CompletableFuture<Integer> updateDB(EntityInfo<T> info, T... entitys) {
+        Connection conn = null;
+        try {
+            conn = writePool.poll();
+            conn.setReadOnly(false);
+            conn.setAutoCommit(true);
+            final String updateSQL = info.getUpdatePrepareSQL(entitys[0]);
             final PreparedStatement prestmt = conn.prepareStatement(updateSQL);
             Attribute<T, Serializable>[] attrs = info.updateAttributes;
             final boolean debugfinest = info.isLoggable(logger, Level.FINEST);
             char[] sqlchars = debugfinest ? updateSQL.toCharArray() : null;
             final Attribute<T, Serializable> primary = info.getPrimary();
-            for (final T value : values) {
+            for (final T value : entitys) {
-                int k = 0;
+                int k = batchStatementParameters(conn, prestmt, info, attrs, value);
-                for (Attribute<T, Serializable> attr : attrs) {
-                    Serializable val = attr.get(value);
-                    if (val instanceof byte[]) {
-                        Blob blob = conn.createBlob();
-                        blob.setBytes(1, (byte[]) val);
-                        prestmt.setObject(++k, blob);
-                    } else if (val instanceof AtomicInteger) {
-                        prestmt.setObject(++k, ((AtomicInteger) val).get());
-                    } else if (val instanceof AtomicLong) {
-                        prestmt.setObject(++k, ((AtomicLong) val).get());
-                    } else {
-                        prestmt.setObject(++k, val);
-                    }
-                }
                 prestmt.setObject(++k, primary.get(value));
                 prestmt.addBatch();//------------------------------------------------------------
                 if (debugfinest) {  //打印调试信息
@@ -247,7 +281,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
                     StringBuilder sb = new StringBuilder(128);
                     for (char ch : sqlchars) {
                         if (ch == '?') {
-                            Object obj = i == attrs.length ? primary.get(value) : attrs[i++].get(value);
+                            Object obj = i == attrs.length ? info.getSQLValue(primary, value) : info.getSQLValue(attrs[i++], value);
                             if (obj != null && obj.getClass().isArray()) {
                                 sb.append("'[length=").append(java.lang.reflect.Array.getLength(obj)).append("]'");
                             } else {
@@ -258,7 +292,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
                         }
                     }
                     String debugsql = sb.toString();
-                    if (info.isLoggable(logger, Level.FINEST, debugsql)) logger.finest(info.getType().getSimpleName() + " update sql=" + debugsql.replaceAll("(\r|\n)", "\\n"));
+                    if (info.isLoggable(logger, Level.FINEST, debugsql)) logger.finest(info.getType().getSimpleName() + " updates sql=" + debugsql.replaceAll("(\r|\n)", "\\n"));
                 } //打印结束
             }
             int[] pc = prestmt.executeBatch();
@@ -316,7 +350,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
         Connection conn = null;
         try {
             conn = readPool.poll();
-            conn.setReadOnly(true);
+            //conn.setReadOnly(true);
             final Statement stmt = conn.createStatement();
             ResultSet set = stmt.executeQuery(sql);
             final Map map = new HashMap<>();
@@ -348,7 +382,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
         Connection conn = null;
         try {
             conn = readPool.poll();
-            conn.setReadOnly(true);
+            //conn.setReadOnly(true);
             final Statement stmt = conn.createStatement();
             Number rs = defVal;
             ResultSet set = stmt.executeQuery(sql);
@@ -373,7 +407,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
         Connection conn = null;
         try {
             conn = readPool.poll();
-            conn.setReadOnly(true);
+            //conn.setReadOnly(true);
             final Statement stmt = conn.createStatement();
             Map<K, N> rs = new LinkedHashMap<>();
             ResultSet set = stmt.executeQuery(sql);
@@ -399,11 +433,11 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
         Connection conn = null;
         try {
             conn = readPool.poll();
-            conn.setReadOnly(true);
+            //conn.setReadOnly(true);
             final PreparedStatement ps = conn.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
             ps.setFetchSize(1);
             final ResultSet set = ps.executeQuery();
-            T rs = set.next() ? info.getValue(selects, set) : null;
+            T rs = set.next() ? info.getEntityValue(selects, set) : null;
             set.close();
             ps.close();
             return CompletableFuture.completedFuture(rs);
@@ -422,19 +456,14 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
         Connection conn = null;
         try {
             conn = readPool.poll();
-            conn.setReadOnly(true);
+            //conn.setReadOnly(true);
             final Attribute<T, Serializable> attr = info.getAttribute(column);
             final PreparedStatement ps = conn.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
             ps.setFetchSize(1);
             final ResultSet set = ps.executeQuery();
             Serializable val = defValue;
             if (set.next()) {
-                if (attr.type() == byte[].class) {
+                val = info.getFieldValue(attr, set, 1);
-                    Blob blob = set.getBlob(1);
-                    if (blob != null) val = blob.getBytes(1, (int) blob.length());
-                } else {
-                    val = (Serializable) set.getObject(1);
-                }
             }
             set.close();
             ps.close();
@@ -454,7 +483,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
         Connection conn = null;
         try {
             conn = readPool.poll();
-            conn.setReadOnly(true);
+            //conn.setReadOnly(true);
             final PreparedStatement ps = conn.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
             final ResultSet set = ps.executeQuery();
             boolean rs = set.next() ? (set.getInt(1) > 0) : false;
@@ -473,11 +502,11 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
     }
 
     @Override
-    protected <T> CompletableFuture<Sheet<T>> querySheetDB(EntityInfo<T> info, boolean needtotal, SelectColumn selects, Flipper flipper, FilterNode node) {
+    protected <T> CompletableFuture<Sheet<T>> querySheetDB(EntityInfo<T> info, final boolean readcache, boolean needtotal, SelectColumn selects, Flipper flipper, FilterNode node) {
         Connection conn = null;
         try {
             conn = readPool.poll();
-            conn.setReadOnly(true);
+            //conn.setReadOnly(true);
             final SelectColumn sels = selects;
             final List<T> list = new ArrayList();
             final Map<Class, String> joinTabalis = node == null ? null : node.getJoinTabalis();
@@ -487,20 +516,20 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
             if ("mysql".equals(dbtype) || "postgresql".equals(dbtype)) {
                 final String listsql = "SELECT " + info.getQueryColumns("a", selects) + " FROM " + info.getTable(node) + " a" + (join == null ? "" : join)
                     + ((where == null || where.length() == 0) ? "" : (" WHERE " + where)) + createSQLOrderby(info, flipper) + (flipper == null || flipper.getLimit() < 1 ? "" : (" LIMIT " + flipper.getLimit() + " OFFSET " + flipper.getOffset()));
-                if (info.isLoggable(logger, Level.FINEST, listsql)) {
+                if (readcache && info.isLoggable(logger, Level.FINEST, listsql)) {
                     logger.finest(info.getType().getSimpleName() + " query sql=" + listsql);
                 }
                 PreparedStatement ps = conn.prepareStatement(listsql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
                 ResultSet set = ps.executeQuery();
                 while (set.next()) {
-                    list.add(infoGetValue(info, sels, set));
+                    list.add(getEntityValue(info, sels, set));
                 }
                 set.close();
                 ps.close();
                 long total = list.size();
                 if (needtotal) {
                     final String countsql = "SELECT COUNT(*) FROM " + info.getTable(node) + " a" + (join == null ? "" : join) + ((where == null || where.length() == 0) ? "" : (" WHERE " + where));
-                    if (info.isLoggable(logger, Level.FINEST, countsql)) {
+                    if (readcache && info.isLoggable(logger, Level.FINEST, countsql)) {
                         logger.finest(info.getType().getSimpleName() + " query countsql=" + countsql);
                     }
                     ps = conn.prepareStatement(countsql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
@@ -513,10 +542,10 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
             }
             final String sql = "SELECT " + info.getQueryColumns("a", selects) + " FROM " + info.getTable(node) + " a" + (join == null ? "" : join)
                 + ((where == null || where.length() == 0) ? "" : (" WHERE " + where)) + info.createSQLOrderby(flipper);
-            if (info.isLoggable(logger, Level.FINEST, sql)) {
+            if (readcache && info.isLoggable(logger, Level.FINEST, sql)) {
                 logger.finest(info.getType().getSimpleName() + " query sql=" + sql + (flipper == null || flipper.getLimit() < 1 ? "" : (" LIMIT " + flipper.getLimit() + " OFFSET " + flipper.getOffset())));
             }
-            conn.setReadOnly(true);
+            //conn.setReadOnly(true);
             final PreparedStatement ps = conn.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
             if (flipper != null && flipper.getLimit() > 0) ps.setFetchSize(flipper.getLimit());
             final ResultSet set = ps.executeQuery();
@@ -525,7 +554,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
             int i = 0;
             while (set.next()) {
                 i++;
-                list.add(info.getValue(sels, set));
+                list.add(info.getEntityValue(sels, set));
                 if (limit <= i) break;
             }
             long total = list.size();
@@ -606,7 +635,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
         final Connection conn = readPool.poll();
         try {
             if (logger.isLoggable(Level.FINEST)) logger.finest("direct query sql=" + sql);
-            conn.setReadOnly(true);
+            //conn.setReadOnly(true);
             final Statement statement = conn.createStatement();
             //final PreparedStatement statement = conn.prepareStatement(sql, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_READ_ONLY);
             final ResultSet set = statement.executeQuery(sql);// ps.executeQuery();

src/org/redkale/source/DataMemorySource.java

@@ -84,7 +84,7 @@ public class DataMemorySource extends DataSqlSource<Void> {
     }
 
     @Override
-    protected <T> CompletableFuture<Integer> insertDB(EntityInfo<T> info, T... values) {
+    protected <T> CompletableFuture<Integer> insertDB(EntityInfo<T> info, T... entitys) {
         return CompletableFuture.completedFuture(0);
     }
 
@@ -94,7 +94,17 @@ public class DataMemorySource extends DataSqlSource<Void> {
     }
 
     @Override
-    protected <T> CompletableFuture<Integer> updateDB(EntityInfo<T> info, T... values) {
+    protected <T> CompletableFuture<Integer> clearTableDB(EntityInfo<T> info, String sql) {
+        return CompletableFuture.completedFuture(0);
+    }
+
+    @Override
+    protected <T> CompletableFuture<Integer> dropTableDB(EntityInfo<T> info, String sql) {
+        return CompletableFuture.completedFuture(0);
+    }
+
+    @Override
+    protected <T> CompletableFuture<Integer> updateDB(EntityInfo<T> info, T... entitys) {
         return CompletableFuture.completedFuture(0);
     }
 
@@ -134,7 +144,7 @@ public class DataMemorySource extends DataSqlSource<Void> {
     }
 
     @Override
-    protected <T> CompletableFuture<Sheet<T>> querySheetDB(EntityInfo<T> info, boolean needtotal, SelectColumn selects, Flipper flipper, FilterNode node) {
+    protected <T> CompletableFuture<Sheet<T>> querySheetDB(EntityInfo<T> info, final boolean readcache, boolean needtotal, SelectColumn selects, Flipper flipper, FilterNode node) {
         return CompletableFuture.completedFuture(new Sheet<>());
     }
 

src/org/redkale/source/DataSource.java

@@ -32,60 +32,105 @@ public interface DataSource {
     public String getType();
 
     //----------------------insertAsync-----------------------------
+    //insert 暂时不支持Collection、Stream， 因为存在@RpcCall问题
     /**
      * 新增记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
      *
-     * @param <T>    泛型
+     * @param <T>     泛型
-     * @param values Entity对象
+     * @param entitys Entity对象
      *
      * @return 影响的记录条数
      */
-    public <T> int insert(final T... values);
+    public <T> int insert(final T... entitys);
 
     /**
      * 新增记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
      *
-     * @param <T>    泛型
+     * @param <T>     泛型
-     * @param values Entity对象
+     * @param entitys Entity对象
      *
      * @return CompletableFuture
      */
-    public <T> CompletableFuture<Integer> insertAsync(final T... values);
+    public <T> CompletableFuture<Integer> insertAsync(final T... entitys);
 
     //-------------------------deleteAsync--------------------------
     /**
      * 删除指定主键值的记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
      * 等价SQL: DELETE FROM {table} WHERE {primary} IN {values.id}  <br>
      *
-     * @param <T>    泛型
+     * @param <T>     泛型
-     * @param values Entity对象
+     * @param entitys Entity对象
      *
      * @return 影响的记录条数
      */
-    public <T> int delete(final T... values);
+    public <T> int delete(final T... entitys);
 
     /**
      * 删除指定主键值的记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
      * 等价SQL: DELETE FROM {table} WHERE {primary} IN {values.id}  <br>
      *
-     * @param <T>    泛型
+     * @param <T>     泛型
-     * @param values Entity对象
+     * @param entitys Entity对象
-     *
-     * @return 影响的记录条数CompletableFuture
-     */
-    public <T> CompletableFuture<Integer> deleteAsync(final T... values);
-
-    /**
-     * 删除指定主键值的记录,多主键值必须在同一张表中  <br>
-     * 等价SQL: DELETE FROM {table} WHERE {primary} IN {ids}  <br>
-     *
-     * @param <T>   Entity泛型
-     * @param clazz Entity类
-     * @param ids   主键值
      *
      * @return 影响的记录条数
      */
-    public <T> int delete(final Class<T> clazz, final Serializable... ids);
+    default <T> int delete(final Collection<T> entitys) {
+        if (entitys == null || entitys.isEmpty()) return 0;
+        return delete(entitys.toArray());
+    }
+
+    /**
+     * 删除指定主键值的记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
+     * 等价SQL: DELETE FROM {table} WHERE {primary} IN {values.id}  <br>
+     *
+     * @param <T>     泛型
+     * @param entitys Entity对象
+     *
+     * @return 影响的记录条数
+     */
+    default <T> int delete(final Stream<T> entitys) {
+        if (entitys == null) return 0;
+        return delete(entitys.toArray());
+    }
+
+    /**
+     * 删除指定主键值的记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
+     * 等价SQL: DELETE FROM {table} WHERE {primary} IN {values.id}  <br>
+     *
+     * @param <T>     泛型
+     * @param entitys Entity对象
+     *
+     * @return 影响的记录条数CompletableFuture
+     */
+    public <T> CompletableFuture<Integer> deleteAsync(final T... entitys);
+
+    /**
+     * 删除指定主键值的记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
+     * 等价SQL: DELETE FROM {table} WHERE {primary} IN {values.id}  <br>
+     *
+     * @param <T>     泛型
+     * @param entitys Entity对象
+     *
+     * @return 影响的记录条数CompletableFuture
+     */
+    default <T> CompletableFuture<Integer> deleteAsync(final Collection<T> entitys) {
+        if (entitys == null || entitys.isEmpty()) return CompletableFuture.completedFuture(0);
+        return deleteAsync(entitys.toArray());
+    }
+
+    /**
+     * 删除指定主键值的记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
+     * 等价SQL: DELETE FROM {table} WHERE {primary} IN {values.id}  <br>
+     *
+     * @param <T>     泛型
+     * @param entitys Entity对象
+     *
+     * @return 影响的记录条数CompletableFuture
+     */
+    default <T> CompletableFuture<Integer> deleteAsync(final Stream<T> entitys) {
+        if (entitys == null) return CompletableFuture.completedFuture(0);
+        return deleteAsync(entitys.toArray());
+    }
 
     /**
      * 删除指定主键值的记录,多主键值必须在同一张表中  <br>
@@ -93,11 +138,23 @@ public interface DataSource {
      *
      * @param <T>   Entity泛型
      * @param clazz Entity类
-     * @param ids   主键值
+     * @param pks   主键值
+     *
+     * @return 影响的记录条数
+     */
+    public <T> int delete(final Class<T> clazz, final Serializable... pks);
+
+    /**
+     * 删除指定主键值的记录,多主键值必须在同一张表中  <br>
+     * 等价SQL: DELETE FROM {table} WHERE {primary} IN {ids}  <br>
+     *
+     * @param <T>   Entity泛型
+     * @param clazz Entity类
+     * @param pks   主键值
      *
      * @return 影响的记录条数CompletableFuture
      */
-    public <T> CompletableFuture<Integer> deleteAsync(final Class<T> clazz, final Serializable... ids);
+    public <T> CompletableFuture<Integer> deleteAsync(final Class<T> clazz, final Serializable... pks);
 
     /**
      * 删除符合过滤条件的记录  <br>
@@ -151,6 +208,100 @@ public interface DataSource {
      */
     public <T> CompletableFuture<Integer> deleteAsync(final Class<T> clazz, final Flipper flipper, final FilterNode node);
 
+    //------------------------clearAsync---------------------------
+    /**
+     * 清空表  <br>
+     * 等价SQL: TRUNCATE TABLE {table}<br>
+     *
+     * @param <T>   Entity泛型
+     * @param clazz Entity类
+     *
+     * @return 影响的记录条数
+     */
+    public <T> int clearTable(final Class<T> clazz);
+
+    /**
+     * 清空表  <br>
+     * 等价SQL: TRUNCATE TABLE {table}<br>
+     *
+     * @param <T>   Entity泛型
+     * @param clazz Entity类
+     *
+     * @return 影响的记录条数CompletableFuture
+     */
+    public <T> CompletableFuture<Integer> clearTableAsync(final Class<T> clazz);
+
+    /**
+     * 清空表  <br>
+     * 等价SQL: TRUNCATE TABLE {table}<br>
+     *
+     * @param <T>   Entity泛型
+     * @param clazz Entity类
+     * @param node  过滤条件
+     *
+     * @return 影响的记录条数
+     */
+    public <T> int clearTable(final Class<T> clazz, final FilterNode node);
+
+    /**
+     * 清空表  <br>
+     * 等价SQL: TRUNCATE TABLE {table}<br>
+     *
+     * @param <T>   Entity泛型
+     * @param clazz Entity类
+     * @param node  过滤条件
+     *
+     * @return 影响的记录条数CompletableFuture
+     */
+    public <T> CompletableFuture<Integer> clearTableAsync(final Class<T> clazz, final FilterNode node);
+
+    //------------------------dropAsync---------------------------
+    /**
+     * 删除表  <br>
+     * 等价SQL: DROP TABLE {table}<br>
+     *
+     * @param <T>   Entity泛型
+     * @param clazz Entity类
+     *
+     * @return 影响的记录条数
+     */
+    public <T> int dropTable(final Class<T> clazz);
+
+    /**
+     * 删除表  <br>
+     * 等价SQL: DROP TABLE {table}<br>
+     *
+     * @param <T>   Entity泛型
+     * @param clazz Entity类
+     *
+     * @return 影响的记录条数CompletableFuture
+     */
+    public <T> CompletableFuture<Integer> dropTableAsync(final Class<T> clazz);
+
+    /**
+     * 删除表  <br>
+     * 等价SQL: DROP TABLE {table}<br>
+     *
+     * @param <T>   Entity泛型
+     * @param clazz Entity类
+     * @param node  过滤条件
+     *
+     * @return 影响的记录条数
+     */
+    public <T> int dropTable(final Class<T> clazz, final FilterNode node);
+
+    /**
+     * 删除表  <br>
+     * 等价SQL: DROP TABLE {table}<br>
+     *
+     * @param <T>   Entity泛型
+     * @param clazz Entity类
+     * @param node  过滤条件
+     *
+     * @return 影响的记录条数CompletableFuture
+     */
+    public <T> CompletableFuture<Integer> dropTableAsync(final Class<T> clazz, final FilterNode node);
+
     //------------------------updateAsync---------------------------
     /**
      * 更新记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
@@ -159,12 +310,12 @@ public interface DataSource {
      * UPDATE {table} SET column1 = value1, column2 = value2, &#183;&#183;&#183; WHERE {primary} = {id2}  <br>
      * &#183;&#183;&#183;  <br>
      *
-     * @param <T>    泛型
+     * @param <T>     泛型
-     * @param values Entity对象
+     * @param entitys Entity对象
      *
      * @return 影响的记录条数
      */
-    public <T> int update(final T... values);
+    public <T> int update(final T... entitys);
 
     /**
      * 更新记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
@@ -173,12 +324,80 @@ public interface DataSource {
      * UPDATE {table} SET column1 = value1, column2 = value2, &#183;&#183;&#183; WHERE {primary} = {id2}  <br>
      * &#183;&#183;&#183;  <br>
      *
-     * @param <T>    泛型
+     * @param <T>     泛型
-     * @param values Entity对象
+     * @param entitys Entity对象
+     *
+     * @return 影响的记录条数
+     */
+    default <T> int update(final Collection<T> entitys) {
+        if (entitys == null || entitys.isEmpty()) return 0;
+        return update(entitys.toArray());
+    }
+
+    /**
+     * 更新记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
+     * 等价SQL:  <br>
+     * UPDATE {table} SET column1 = value1, column2 = value2, &#183;&#183;&#183; WHERE {primary} = {id1}  <br>
+     * UPDATE {table} SET column1 = value1, column2 = value2, &#183;&#183;&#183; WHERE {primary} = {id2}  <br>
+     * &#183;&#183;&#183;  <br>
+     *
+     * @param <T>     泛型
+     * @param entitys Entity对象
+     *
+     * @return 影响的记录条数
+     */
+    default <T> int update(final Stream<T> entitys) {
+        if (entitys == null) return 0;
+        return update(entitys.toArray());
+    }
+
+    /**
+     * 更新记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
+     * 等价SQL:  <br>
+     * UPDATE {table} SET column1 = value1, column2 = value2, &#183;&#183;&#183; WHERE {primary} = {id1}  <br>
+     * UPDATE {table} SET column1 = value1, column2 = value2, &#183;&#183;&#183; WHERE {primary} = {id2}  <br>
+     * &#183;&#183;&#183;  <br>
+     *
+     * @param <T>     泛型
+     * @param entitys Entity对象
      *
      * @return 影响的记录条数CompletableFuture
      */
-    public <T> CompletableFuture<Integer> updateAsync(final T... values);
+    public <T> CompletableFuture<Integer> updateAsync(final T... entitys);
+
+    /**
+     * 更新记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
+     * 等价SQL:  <br>
+     * UPDATE {table} SET column1 = value1, column2 = value2, &#183;&#183;&#183; WHERE {primary} = {id1}  <br>
+     * UPDATE {table} SET column1 = value1, column2 = value2, &#183;&#183;&#183; WHERE {primary} = {id2}  <br>
+     * &#183;&#183;&#183;  <br>
+     *
+     * @param <T>     泛型
+     * @param entitys Entity对象
+     *
+     * @return 影响的记录条数CompletableFuture
+     */
+    default <T> CompletableFuture<Integer> updateAsync(final Collection<T> entitys) {
+        if (entitys == null || entitys.isEmpty()) return CompletableFuture.completedFuture(0);
+        return updateAsync(entitys.toArray());
+    }
+
+    /**
+     * 更新记录， 多对象必须是同一个Entity类且必须在同一张表中  <br>
+     * 等价SQL:  <br>
+     * UPDATE {table} SET column1 = value1, column2 = value2, &#183;&#183;&#183; WHERE {primary} = {id1}  <br>
+     * UPDATE {table} SET column1 = value1, column2 = value2, &#183;&#183;&#183; WHERE {primary} = {id2}  <br>
+     * &#183;&#183;&#183;  <br>
+     *
+     * @param <T>     泛型
+     * @param entitys Entity对象
+     *
+     * @return 影响的记录条数CompletableFuture
+     */
+    default <T> CompletableFuture<Integer> updateAsync(final Stream<T> entitys) {
+        if (entitys == null) return CompletableFuture.completedFuture(0);
+        return updateAsync(entitys.toArray());
+    }
 
     /**
      * 更新单个记录的单个字段  <br>
@@ -187,13 +406,13 @@ public interface DataSource {
      *
      * @param <T>    Entity泛型
      * @param clazz  Entity类
-     * @param id     主键
+     * @param pk     主键
      * @param column 待更新的字段名
      * @param value  更新值
      *
      * @return 影响的记录条数
      */
-    public <T> int updateColumn(final Class<T> clazz, final Serializable id, final String column, final Serializable value);
+    public <T> int updateColumn(final Class<T> clazz, final Serializable pk, final String column, final Serializable value);
 
     /**
      * 更新单个记录的单个字段  <br>
@@ -202,13 +421,13 @@ public interface DataSource {
      *
      * @param <T>    Entity泛型
      * @param clazz  Entity类
-     * @param id     主键
+     * @param pk     主键
      * @param column 待更新的字段名
      * @param value  更新值
      *
      * @return 影响的记录条数CompletableFuture
      */
-    public <T> CompletableFuture<Integer> updateColumnAsync(final Class<T> clazz, final Serializable id, final String column, final Serializable value);
+    public <T> CompletableFuture<Integer> updateColumnAsync(final Class<T> clazz, final Serializable pk, final String column, final Serializable value);
 
     /**
      * 更新符合过滤条件记录的单个字段   <br>
@@ -247,12 +466,12 @@ public interface DataSource {
      *
      * @param <T>    Entity泛型
      * @param clazz  Entity类
-     * @param id     主键
+     * @param pk     主键
      * @param values 更新字段
      *
      * @return 影响的记录条数
      */
-    public <T> int updateColumn(final Class<T> clazz, final Serializable id, final ColumnValue... values);
+    public <T> int updateColumn(final Class<T> clazz, final Serializable pk, final ColumnValue... values);
 
     /**
      * 更新指定主键值记录的部分字段   <br>
@@ -261,12 +480,12 @@ public interface DataSource {
      *
      * @param <T>    Entity泛型
      * @param clazz  Entity类
-     * @param id     主键
+     * @param pk     主键
      * @param values 更新字段
      *
      * @return 影响的记录条数CompletableFuture
      */
-    public <T> CompletableFuture<Integer> updateColumnAsync(final Class<T> clazz, final Serializable id, final ColumnValue... values);
+    public <T> CompletableFuture<Integer> updateColumnAsync(final Class<T> clazz, final Serializable pk, final ColumnValue... values);
 
     /**
      * 更新符合过滤条件记录的部分字段   <br>
@@ -336,12 +555,12 @@ public interface DataSource {
      * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, &#183;&#183;&#183; WHERE {primary} = {bean.id}  <br>
      *
      * @param <T>     Entity泛型
-     * @param bean    待更新的Entity对象
+     * @param entity  待更新的Entity对象
      * @param columns 需更新的字段名
      *
      * @return 影响的记录条数
      */
-    public <T> int updateColumn(final T bean, final String... columns);
+    public <T> int updateColumn(final T entity, final String... columns);
 
     /**
      * 更新单个记录的指定字段   <br>
@@ -349,12 +568,12 @@ public interface DataSource {
      * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, &#183;&#183;&#183; WHERE {primary} = {bean.id}  <br>
      *
      * @param <T>     Entity泛型
-     * @param bean    待更新的Entity对象
+     * @param entity  待更新的Entity对象
      * @param columns 需更新的字段名
      *
      * @return 影响的记录条数CompletableFuture
      */
-    public <T> CompletableFuture<Integer> updateColumnAsync(final T bean, final String... columns);
+    public <T> CompletableFuture<Integer> updateColumnAsync(final T entity, final String... columns);
 
     /**
      * 更新符合过滤条件记录的指定字段   <br>
@@ -362,13 +581,13 @@ public interface DataSource {
      * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, &#183;&#183;&#183; WHERE {filter node}  <br>
      *
      * @param <T>     Entity泛型
-     * @param bean    待更新的Entity对象
+     * @param entity  待更新的Entity对象
      * @param node    过滤条件
      * @param columns 需更新的字段名
      *
      * @return 影响的记录条数
      */
-    public <T> int updateColumn(final T bean, final FilterNode node, final String... columns);
+    public <T> int updateColumn(final T entity, final FilterNode node, final String... columns);
 
     /**
      * 更新符合过滤条件记录的指定字段   <br>
@@ -376,13 +595,13 @@ public interface DataSource {
      * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, &#183;&#183;&#183; WHERE {filter node}  <br>
      *
      * @param <T>     Entity泛型
-     * @param bean    待更新的Entity对象
+     * @param entity  待更新的Entity对象
      * @param node    过滤条件
      * @param columns 需更新的字段名
      *
      * @return 影响的记录条数CompletableFuture
      */
-    public <T> CompletableFuture<Integer> updateColumnAsync(final T bean, final FilterNode node, final String... columns);
+    public <T> CompletableFuture<Integer> updateColumnAsync(final T entity, final FilterNode node, final String... columns);
 
     /**
      * 更新单个记录的指定字段   <br>
@@ -390,12 +609,12 @@ public interface DataSource {
      * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, &#183;&#183;&#183; WHERE {primary} = {bean.id}  <br>
      *
      * @param <T>     Entity泛型
-     * @param bean    待更新的Entity对象
+     * @param entity  待更新的Entity对象
      * @param selects 指定字段
      *
      * @return 影响的记录条数
      */
-    public <T> int updateColumn(final T bean, final SelectColumn selects);
+    public <T> int updateColumn(final T entity, final SelectColumn selects);
 
     /**
      * 更新单个记录的指定字段   <br>
@@ -403,12 +622,12 @@ public interface DataSource {
      * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, &#183;&#183;&#183; WHERE {primary} = {bean.id}  <br>
      *
      * @param <T>     Entity泛型
-     * @param bean    待更新的Entity对象
+     * @param entity  待更新的Entity对象
      * @param selects 指定字段
      *
      * @return 影响的记录条数CompletableFuture
      */
-    public <T> CompletableFuture<Integer> updateColumnAsync(final T bean, final SelectColumn selects);
+    public <T> CompletableFuture<Integer> updateColumnAsync(final T entity, final SelectColumn selects);
 
     /**
      * 更新符合过滤条件记录的指定字段   <br>
@@ -416,13 +635,13 @@ public interface DataSource {
      * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, &#183;&#183;&#183; WHERE {filter node}  <br>
      *
      * @param <T>     Entity泛型
-     * @param bean    待更新的Entity对象
+     * @param entity  待更新的Entity对象
      * @param node    过滤条件
      * @param selects 指定字段
      *
      * @return 影响的记录条数
      */
-    public <T> int updateColumn(final T bean, final FilterNode node, final SelectColumn selects);
+    public <T> int updateColumn(final T entity, final FilterNode node, final SelectColumn selects);
 
     /**
      * 更新符合过滤条件记录的指定字段   <br>
@@ -430,13 +649,13 @@ public interface DataSource {
      * 等价SQL: UPDATE {table} SET {column1} = {value1}, {column2} = {value2}, {column3} = {value3}, &#183;&#183;&#183; WHERE {filter node}  <br>
      *
      * @param <T>     Entity泛型
-     * @param bean    待更新的Entity对象
+     * @param entity  待更新的Entity对象
      * @param node    过滤条件
      * @param selects 指定字段
      *
      * @return 影响的记录条数CompletableFuture
      */
-    public <T> CompletableFuture<Integer> updateColumnAsync(final T bean, final FilterNode node, final SelectColumn selects);
+    public <T> CompletableFuture<Integer> updateColumnAsync(final T entity, final FilterNode node, final SelectColumn selects);
 
     //############################################# 查询接口 #############################################
     //-----------------------getXXXXResult-----------------------------
@@ -856,11 +1075,11 @@ public interface DataSource {
      * @param <T>    Entity泛型
      * @param clazz  Entity类
      * @param column 过滤字段名
-     * @param key    过滤字段值
+     * @param colval 过滤字段值
      *
      * @return Entity对象
      */
-    public <T> T find(final Class<T> clazz, final String column, final Serializable key);
+    public <T> T find(final Class<T> clazz, final String column, final Serializable colval);
 
     /**
      * 获取符合过滤条件单个记录, 返回null表示不存在值   <br>
@@ -869,11 +1088,11 @@ public interface DataSource {
      * @param <T>    Entity泛型
      * @param clazz  Entity类
      * @param column 过滤字段名
-     * @param key    过滤字段值
+     * @param colval 过滤字段值
      *
      * @return Entity对象CompletableFuture
      */
-    public <T> CompletableFuture<T> findAsync(final Class<T> clazz, final String column, final Serializable key);
+    public <T> CompletableFuture<T> findAsync(final Class<T> clazz, final String column, final Serializable colval);
 
     /**
      * 获取符合过滤条件单个记录, 返回null表示不存在值   <br>
@@ -1219,11 +1438,11 @@ public interface DataSource {
      * @param selectedColumn 指定字段
      * @param clazz          Entity类
      * @param column         过滤字段名
-     * @param key            过滤字段值
+     * @param colval         过滤字段值
      *
      * @return 字段值的集合
      */
-    public <T, V extends Serializable> HashSet<V> queryColumnSet(final String selectedColumn, final Class<T> clazz, final String column, final Serializable key);
+    public <T, V extends Serializable> HashSet<V> queryColumnSet(final String selectedColumn, final Class<T> clazz, final String column, final Serializable colval);
 
     /**
      * 查询符合过滤条件记录的某个字段Set集合   <br>
@@ -1234,11 +1453,11 @@ public interface DataSource {
      * @param selectedColumn 指定字段
      * @param clazz          Entity类
      * @param column         过滤字段名
-     * @param key            过滤字段值
+     * @param colval         过滤字段值
      *
      * @return 字段值的集合CompletableFuture
      */
-    public <T, V extends Serializable> CompletableFuture<HashSet<V>> queryColumnSetAsync(final String selectedColumn, final Class<T> clazz, final String column, final Serializable key);
+    public <T, V extends Serializable> CompletableFuture<HashSet<V>> queryColumnSetAsync(final String selectedColumn, final Class<T> clazz, final String column, final Serializable colval);
 
     /**
      * 查询符合过滤条件记录的某个字段Set集合   <br>
@@ -1305,11 +1524,11 @@ public interface DataSource {
      * @param selectedColumn 指定字段
      * @param clazz          Entity类
      * @param column         过滤字段名
-     * @param key            过滤字段值
+     * @param colval         过滤字段值
      *
      * @return 字段值的集合
      */
-    public <T, V extends Serializable> List<V> queryColumnList(final String selectedColumn, final Class<T> clazz, final String column, final Serializable key);
+    public <T, V extends Serializable> List<V> queryColumnList(final String selectedColumn, final Class<T> clazz, final String column, final Serializable colval);
 
     /**
      * 查询符合过滤条件记录的某个字段List集合   <br>
@@ -1320,11 +1539,11 @@ public interface DataSource {
      * @param selectedColumn 指定字段
      * @param clazz          Entity类
      * @param column         过滤字段名
-     * @param key            过滤字段值
+     * @param colval         过滤字段值
      *
      * @return 字段值的集合CompletableFuture
      */
-    public <T, V extends Serializable> CompletableFuture<List<V>> queryColumnListAsync(final String selectedColumn, final Class<T> clazz, final String column, final Serializable key);
+    public <T, V extends Serializable> CompletableFuture<List<V>> queryColumnListAsync(final String selectedColumn, final Class<T> clazz, final String column, final Serializable colval);
 
     /**
      * 查询符合过滤条件记录的某个字段List集合   <br>
@@ -1671,11 +1890,11 @@ public interface DataSource {
      * @param <T>    Entity泛型
      * @param clazz  Entity类
      * @param column 过滤字段名
-     * @param key    过滤字段值
+     * @param colval 过滤字段值
      *
      * @return Entity的集合
      */
-    public <T> List<T> queryList(final Class<T> clazz, final String column, final Serializable key);
+    public <T> List<T> queryList(final Class<T> clazz, final String column, final Serializable colval);
 
     /**
      * 查询符合过滤条件记录的List集合   <br>
@@ -1684,11 +1903,11 @@ public interface DataSource {
      * @param <T>    Entity泛型
      * @param clazz  Entity类
      * @param column 过滤字段名
-     * @param key    过滤字段值
+     * @param colval 过滤字段值
      *
      * @return Entity的集合CompletableFuture
      */
-    public <T> CompletableFuture<List<T>> queryListAsync(final Class<T> clazz, final String column, final Serializable key);
+    public <T> CompletableFuture<List<T>> queryListAsync(final Class<T> clazz, final String column, final Serializable colval);
 
     /**
      * 查询符合过滤条件记录的List集合   <br>
@@ -1824,11 +2043,11 @@ public interface DataSource {
      * @param clazz   Entity类
      * @param flipper 翻页对象
      * @param column  过滤字段名
-     * @param key     过滤字段值
+     * @param colval  过滤字段值
      *
      * @return Entity的集合
      */
-    public <T> List<T> queryList(final Class<T> clazz, final Flipper flipper, final String column, final Serializable key);
+    public <T> List<T> queryList(final Class<T> clazz, final Flipper flipper, final String column, final Serializable colval);
 
     /**
      * 查询符合过滤条件记录的List集合   <br>
@@ -1838,11 +2057,11 @@ public interface DataSource {
      * @param clazz   Entity类
      * @param flipper 翻页对象
      * @param column  过滤字段名
-     * @param key     过滤字段值
+     * @param colval  过滤字段值
      *
      * @return Entity的集合CompletableFuture
      */
-    public <T> CompletableFuture<List<T>> queryListAsync(final Class<T> clazz, final Flipper flipper, final String column, final Serializable key);
+    public <T> CompletableFuture<List<T>> queryListAsync(final Class<T> clazz, final Flipper flipper, final String column, final Serializable colval);
 
     /**
      * 查询符合过滤条件记录的List集合   <br>

src/org/redkale/source/DataSources.java

@@ -10,6 +10,7 @@ import java.lang.reflect.Constructor;
 import java.net.URL;
 import java.util.*;
 import javax.xml.stream.*;
+import org.redkale.util.AnyValue;
 
 /**
  *
@@ -56,55 +57,28 @@ public final class DataSources {
     private DataSources() {
     }
 
-    public static DataSource createDataSource2(final String unitName, Properties prop) throws IOException {
+    public static DataSource createDataSource(final String unitName, final AnyValue conf) throws IOException {
-        return new DataJdbcSource(unitName, null, prop, prop);
+        Properties prop = new Properties();
-    }
+        AnyValue[] confs = conf.getAnyValues("property");
-
+        if (confs != null) {
-    public static DataSource createDataSource2(final String unitName, Properties readprop, Properties writeprop) throws IOException {
+            for (AnyValue itemConf : confs) {
-        return new DataJdbcSource(unitName, null, readprop, writeprop);
+                String name = itemConf.getValue("name");
-    }
+                String value = itemConf.getValue("value");
-
+                if (name != null && value != null) prop.put(name, value);
-    public static DataSource createDataSource(final String unitName) throws IOException {
-        return createDataSource(unitName, System.getProperty(DATASOURCE_CONFPATH) == null
-            ? DataJdbcSource.class.getResource("/META-INF/persistence.xml")
-            : new File(System.getProperty(DATASOURCE_CONFPATH)).toURI().toURL());
-    }
-
-    public static DataSource createDataSource(final String unitName, URL persistxml) throws IOException {
-        if (persistxml == null) persistxml = DataSources.class.getResource("/persistence.xml");
-        InputStream in = persistxml == null ? null : persistxml.openStream();
-        if (in == null) return null;
-        Map<String, Properties> map = loadPersistenceXml(in);
-        Properties readprop = null;
-        Properties writeprop = null;
-        if (unitName != null) {
-            readprop = map.get(unitName);
-            writeprop = readprop;
-            if (readprop == null) {
-                readprop = map.get(unitName + ".read");
-                writeprop = map.get(unitName + ".write");
             }
         }
-        if ((unitName == null || unitName.isEmpty()) || readprop == null) {
+        return createDataSource(unitName, prop, prop);
-            String key = null;
+    }
-            for (Map.Entry<String, Properties> en : map.entrySet()) {
-                key = en.getKey();
-                readprop = en.getValue();
-                writeprop = readprop;
-                break;
-            }
-            if (key != null && (key.endsWith(".read") || key.endsWith(".write"))) {
-                if (key.endsWith(".read")) {
-                    writeprop = map.get(key.substring(0, key.lastIndexOf('.')) + ".write");
-                } else {
-                    readprop = map.get(key.substring(0, key.lastIndexOf('.')) + ".read");
-                }
-            }
-        }
-        if (readprop == null) throw new IOException("Cannot find (resource.name = '" + unitName + "') DataSource");
-        if (writeprop == null) writeprop = readprop;
-        if (readprop.getProperty(JDBC_URL, "").startsWith("memory:source")) return new DataMemorySource(unitName, persistxml, readprop, writeprop);
 
+    public static DataSource createDataSource(final String unitName, Properties prop) throws IOException {
+        return createDataSource(unitName, prop, prop);
+    }
+
+    public static DataSource createDataSource(final String unitName, Properties readprop, Properties writeprop) throws IOException {
+        return createDataSource(unitName, null, readprop, writeprop);
+    }
+
+    public static DataSource createDataSource(final String unitName, URL persistxml, Properties readprop, Properties writeprop) throws IOException {
         String impl = readprop.getProperty(JDBC_DATASOURCE_CLASS, DataJdbcSource.class.getName());
         if (DataJdbcSource.class.getName().equals(impl)) {
             try {
@@ -162,6 +136,50 @@ public final class DataSources {
         }
     }
 
+    public static DataSource createDataSource(final String unitName) throws IOException {
+        return createDataSource(unitName, System.getProperty(DATASOURCE_CONFPATH) == null
+            ? DataJdbcSource.class.getResource("/META-INF/persistence.xml")
+            : new File(System.getProperty(DATASOURCE_CONFPATH)).toURI().toURL());
+    }
+
+    public static DataSource createDataSource(final String unitName, URL persistxml) throws IOException {
+        if (persistxml == null) persistxml = DataSources.class.getResource("/persistence.xml");
+        InputStream in = persistxml == null ? null : persistxml.openStream();
+        if (in == null) return null;
+        Map<String, Properties> map = loadPersistenceXml(in);
+        Properties readprop = null;
+        Properties writeprop = null;
+        if (unitName != null) {
+            readprop = map.get(unitName);
+            writeprop = readprop;
+            if (readprop == null) {
+                readprop = map.get(unitName + ".read");
+                writeprop = map.get(unitName + ".write");
+            }
+        }
+        if (unitName == null || unitName.isEmpty()) {
+            String key = null;
+            for (Map.Entry<String, Properties> en : map.entrySet()) {
+                key = en.getKey();
+                readprop = en.getValue();
+                writeprop = readprop;
+                break;
+            }
+            if (key != null && (key.endsWith(".read") || key.endsWith(".write"))) {
+                if (key.endsWith(".read")) {
+                    writeprop = map.get(key.substring(0, key.lastIndexOf('.')) + ".write");
+                } else {
+                    readprop = map.get(key.substring(0, key.lastIndexOf('.')) + ".read");
+                }
+            }
+        }
+        if (readprop == null) throw new IOException("Cannot find (resource.name = '" + unitName + "') DataSource");
+        if (writeprop == null) writeprop = readprop;
+        if (readprop.getProperty(JDBC_URL, "").startsWith("memory:source")) return new DataMemorySource(unitName, persistxml, readprop, writeprop);
+
+        return createDataSource(unitName, readprop, writeprop);
+    }
+
     public static Map<String, Properties> loadPersistenceXml(final InputStream in0) {
         final Map<String, Properties> map = new LinkedHashMap();
         Properties result = new Properties();