Redkale 2.0.0 正式版 结束

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>

libs/readme.txt

@@ -1 +0,0 @@
-<EFBFBD>Լ<EFBFBD><EFBFBD><EFBFBD>ҵ<EFBFBD><EFBFBD>jarĬ<EFBFBD>Ϸ<EFBFBD><EFBFBD>ڴ˴<EFBFBD>

my/assembly.xml

@@ -16,10 +16,6 @@
             <directory>${project.basedir}/conf</directory>  
             <outputDirectory>conf</outputDirectory>  
         </fileSet>  
-        <fileSet>  
-            <directory>${project.basedir}/libs</directory>  
-            <outputDirectory>libs</outputDirectory>  
-        </fileSet>
         <fileSet>  
             <directory>${project.basedir}/logs</directory>  
             <outputDirectory>logs</outputDirectory>  

my/pom.xml

@@ -67,7 +67,6 @@
                     <encoding>UTF-8</encoding>
                     <compilerArguments>
                         <verbose />
-                        <bootclasspath>${java.home}/lib/rt.jar</bootclasspath>
                     </compilerArguments>
                 </configuration>    
             </plugin>
@@ -78,6 +77,7 @@
                 <version>2.6</version>
                 <configuration>
                     <archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
                         <manifest>
                             <mainClass>org.redkale.boot.Application</mainClass>
                         </manifest>
@@ -114,7 +114,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/application-template.xml

@@ -116,10 +116,10 @@
         excludelibs: 排除lib.path与excludes中的正则表达式匹配的路径, 多个正则表达式用分号;隔开
         charset: 文本编码， 默认: UTF-8
         backlog:  默认10K
-        threads： 线程数， 默认: CPU核数*32
+        threads： 线程数， 默认: CPU核数*2，最小8个
         maxconns：最大连接数, 小于1表示无限制， 默认: 0
         maxbody: request.body最大值， 默认: 64K
-        bufferCapacity: ByteBuffer的初始化大小， 默认: 32K;  (HTTP 2.0、WebSocket，必须要16k以上)
+        bufferCapacity: ByteBuffer的初始化大小， TCP默认: 32K;  (HTTP 2.0、WebSocket，必须要16k以上); UDP默认: 1350B
         bufferPoolSize： ByteBuffer池的大小，默认: 线程数*4
         responsePoolSize： Response池的大小，默认: 线程数*2
         aliveTimeoutSeconds: KeepAlive读操作超时秒数， 默认30， 0表示永久不超时; -1表示禁止KeepAlive

src/javax/persistence/GeneratedValue.java

@@ -1,63 +0,0 @@
-/** *****************************************************************************
- * Copyright (c) 2008 - 2013 Oracle Corporation. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v1.0 and Eclipse Distribution License v. 1.0
- * which accompanies this distribution.
- * The Eclipse Public License is available at http://www.eclipse.org/legal/epl-v10.html
- * and the Eclipse Distribution License is available at
- * http://www.eclipse.org/org/documents/edl-v10.php.
- *
- * Contributors:
- *     Linda DeMichiel - Java Persistence 2.1
- *     Linda DeMichiel - Java Persistence 2.0
- *
- ***************************************************************************** */
-package javax.persistence;
-
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import static java.lang.annotation.ElementType.FIELD;
-import static java.lang.annotation.ElementType.METHOD;
-import static java.lang.annotation.RetentionPolicy.RUNTIME;
-
-/**
- * Provides for the specification of generation strategies for the
- * values of primary keys.
- *
- * <p>
- * The <code>GeneratedValue</code> annotation
- * may be applied to a primary key property or field of an entity or
- * mapped superclass in conjunction with the {@link Id} annotation.
- * The use of the <code>GeneratedValue</code> annotation is only
- * required to be supported for simple primary keys. Use of the
- * <code>GeneratedValue</code> annotation is not supported for derived
- * primary keys.
- *
- * <pre>
- *
- *     Example 1:
- *
- *     &#064;Id
- *     &#064;GeneratedValue(strategy=SEQUENCE, generator="CUST_SEQ")
- *     &#064;Column(name="CUST_ID")
- *     public Long getId() { return id; }
- *
- *     Example 2:
- *
- *     &#064;Id
- *     &#064;GeneratedValue(strategy=TABLE, generator="CUST_GEN")
- *     &#064;Column(name="CUST_ID")
- *     Long id;
- * </pre>
- *
- * @see Id
- *
- * @since Java Persistence 1.0
- */
-@Target({METHOD, FIELD})
-@Retention(RUNTIME)
-
-public @interface GeneratedValue {
-
-}

src/javax/persistence/Id.java

@@ -45,7 +45,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
  * </pre>
  *
  * @see Column
- * @see GeneratedValue
+ * see GeneratedValue
  *
  * @since Java Persistence 1.0
  */

src/module-info.txt

@@ -30,5 +30,7 @@ module org.redkale {
     exports org.redkale.util;
     exports org.redkale.watch;
     
+    uses org.redkale.source.SourceLoader;
+    uses org.redkale.util.ResourceInjectLoader;
 }
 */

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.getConfPath(), "apidoc-template.html");
+        File doctemplate = new File(app.getConfPath().toString(), "apidoc-template.html");
         InputStream in = null;
         if (doctemplate.isFile() && doctemplate.canRead()) {
             in = new FileInputStream(doctemplate);

src/org/redkale/boot/Application.java

@@ -57,12 +57,12 @@ public final class Application {
     public static final String RESNAME_APP_TIME = "APP_TIME";
 
     /**
-     * 当前进程的根目录， 类型：String、File、Path
+     * 当前进程的根目录， 类型：String、File、Path、URI
      */
     public static final String RESNAME_APP_HOME = "APP_HOME";
 
     /**
-     * 当前进程的配置目录，如果不是绝对路径则视为HOME目录下的相对路径 类型：String、File、Path
+     * 当前进程的配置目录，如果不是绝对路径则视为HOME目录下的相对路径 类型：String、File、Path、URI
      */
     public static final String RESNAME_APP_CONF = "APP_CONF";
 
@@ -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 confPath;
+    private final URI confPath;
 
     //日志
     private final Logger logger;
@@ -176,16 +176,19 @@ public final class Application {
         this.resourceFactory.register(RESNAME_APP_TIME, long.class, this.startTime);
         this.resourceFactory.register(RESNAME_APP_HOME, Path.class, root.toPath());
         this.resourceFactory.register(RESNAME_APP_HOME, File.class, root);
+        this.resourceFactory.register(RESNAME_APP_HOME, URI.class, root.toURI());
         try {
             this.resourceFactory.register(RESNAME_APP_HOME, root.getCanonicalPath());
             this.home = root.getCanonicalFile();
             String confsubpath = System.getProperty(RESNAME_APP_CONF, "conf");
-            if (confsubpath.charAt(0) == '/' || confsubpath.indexOf(':') > 0) {
-                this.confPath = new File(confsubpath).getCanonicalFile();
+            if (confsubpath.contains("://")) {
+                this.confPath = new URI(confsubpath);
+            } else if (confsubpath.charAt(0) == '/' || confsubpath.indexOf(':') > 0) {
+                this.confPath = new File(confsubpath).getCanonicalFile().toURI();
             } else {
-                this.confPath = new File(this.home, confsubpath).getCanonicalFile();
+                this.confPath = new File(this.home, confsubpath).getCanonicalFile().toURI();
             }
-        } catch (IOException e) {
+        } catch (Exception e) {
             throw new RuntimeException(e);
         }
         String localaddr = config.getValue("address", "").trim();
@@ -209,11 +212,12 @@ public final class Application {
             System.setProperty(RESNAME_APP_NODE, node);
         }
         //以下是初始化日志配置
-        final File logconf = new File(confPath, "logging.properties");
-        if (logconf.isFile() && logconf.canRead()) {
+        final URI logConfURI = "file".equals(confPath.getScheme()) ? new File(new File(confPath), "logging.properties").toURI()
+            : URI.create(confPath.toString() + (confPath.toString().endsWith("/") ? "" : "/") + "logging.properties");
+        if (!"file".equals(confPath.getScheme()) || (new File(logConfURI).isFile() && new File(logConfURI).canRead())) {
             try {
                 final String rootpath = root.getCanonicalPath().replace('\\', '/');
-                FileInputStream fin = new FileInputStream(logconf);
+                InputStream fin = logConfURI.toURL().openStream();
                 Properties properties = new Properties();
                 properties.load(fin);
                 fin.close();
@@ -301,7 +305,7 @@ public final class Application {
                     transportExec = Executors.newFixedThreadPool(threads, (Runnable r) -> {
                         Thread t = new Thread(r);
                         t.setDaemon(true);
-                        t.setName("Transport-Thread-" + counter.incrementAndGet());
+                        t.setName("Redkale-Transport-Thread-" + counter.incrementAndGet());
                         return t;
                     });
                     transportGroup = AsynchronousChannelGroup.withCachedThreadPool(transportExec, 1);
@@ -316,7 +320,7 @@ public final class Application {
             transportExec = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors() * 8, (Runnable r) -> {
                 Thread t = new Thread(r);
                 t.setDaemon(true);
-                t.setName("Transport-Thread-" + counter.incrementAndGet());
+                t.setName("Redkale-Transport-Thread-" + counter.incrementAndGet());
                 return t;
             });
             try {
@@ -375,7 +379,7 @@ public final class Application {
         return home;
     }
 
-    public File getConfPath() {
+    public URI getConfPath() {
         return confPath;
     }
 
@@ -398,10 +402,14 @@ 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.confPath, "persistence.xml");
+        final String confpath = this.confPath.toString();
         final String homepath = this.home.getCanonicalPath();
-        final String confpath = this.confPath.getCanonicalPath();
-        if (persist.isFile()) System.setProperty(DataSources.DATASOURCE_CONFPATH, persist.getCanonicalPath());
+        if ("file".equals(this.confPath.getScheme())) {
+            File persist = new File(new File(confPath), "persistence.xml");
+            if (persist.isFile()) System.setProperty(DataSources.DATASOURCE_CONFPATH, persist.getCanonicalPath());
+        } else {
+            System.setProperty(DataSources.DATASOURCE_CONFPATH, confpath + (confpath.endsWith("/") ? "" : "/") + "persistence.xml");
+        }
         String pidstr = "";
         try { //JDK 9+
             Class phclass = Class.forName("java.lang.ProcessHandle");
@@ -425,13 +433,17 @@ 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(confPath, "/" + dfload) : new File(dfload);
-                        if (df.isFile()) {
+                        final URI df = (dfload.indexOf('/') < 0) ? URI.create(confpath + (confpath.endsWith("/") ? "" : "/") + dfload) : new File(dfload).toURI();
+                        if (!"file".equals(df.getScheme()) || new File(df).isFile()) {
                             Properties ps = new Properties();
-                            InputStream in = new FileInputStream(df);
-                            ps.load(in);
-                            in.close();
-                            ps.forEach((x, y) -> resourceFactory.register("property." + x, y.toString().replace("${APP_HOME}", homepath)));
+                            try {
+                                InputStream in = df.toURL().openStream();
+                                ps.load(in);
+                                in.close();
+                                ps.forEach((x, y) -> resourceFactory.register("property." + x, y.toString().replace("${APP_HOME}", homepath)));
+                            } catch (Exception e) {
+                                logger.log(Level.WARNING, "load properties(" + dfload + ") error", e);
+                            }
                         }
                     }
                 }
@@ -558,9 +570,10 @@ public final class Application {
     }
 
     public void restoreConfig() throws IOException {
+        if (!"file".equals(this.confPath.getScheme())) return;
         synchronized (this) {
-            File confFile = new File(this.confPath, "application.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"));
+            File confFile = new File(this.confPath.toString(), "application.xml");
+            confFile.renameTo(new File(this.confPath.toString(), "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();
@@ -571,7 +584,7 @@ public final class Application {
         final Application application = this;
         new Thread() {
             {
-                setName("Application-Control-Thread");
+                setName("Redkale-Application-SelfServer-Thread");
             }
 
             @Override
@@ -742,7 +755,7 @@ public final class Application {
             Thread thread = new Thread() {
                 {
                     String host = serconf.getValue("host", "0.0.0.0").replace("0.0.0.0", "*");
-                    setName(serconf.getValue("protocol", "Server").toUpperCase() + "-" + host + ":" + serconf.getIntValue("port") + "-Thread");
+                    setName("Redkale-" + serconf.getValue("protocol", "Server").toUpperCase() + "-" + host + ":" + serconf.getIntValue("port") + "-Thread");
                     this.setDaemon(true);
                 }
 
@@ -812,13 +825,22 @@ public final class Application {
         sercdl.await();
     }
 
-    public static <T extends Service> T singleton(Class<T> serviceClass) throws Exception {
-        return singleton("", serviceClass);
+    public static <T extends Service> T singleton(Class<T> serviceClass, Class<? extends Service>... extServiceClasses) throws Exception {
+        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) {
@@ -834,18 +856,20 @@ public final class Application {
         final String home = new File(System.getProperty(RESNAME_APP_HOME, "")).getCanonicalPath().replace('\\', '/');
         System.setProperty(RESNAME_APP_HOME, home);
         String confsubpath = System.getProperty(RESNAME_APP_CONF, "conf");
-        File appfile;
-        if (confsubpath.charAt(0) == '/' || confsubpath.indexOf(':') > 0) {
-            appfile = new File(confsubpath).getCanonicalFile();
+        URI appconf;
+        if (confsubpath.contains("://")) {
+            appconf = URI.create(confsubpath + (confsubpath.endsWith("/") ? "" : "/") + "application.xml");
+        } else if (confsubpath.charAt(0) == '/' || confsubpath.indexOf(':') > 0) {
+            appconf = new File(confsubpath, "application.xml").toURI();
         } else {
-            appfile = new File(new File(home), confsubpath);
+            appconf = new File(new File(home, confsubpath), "application.xml").toURI();
         }
-        File appconf = new File(appfile, "application.xml");
-        return new Application(singleton, load(new FileInputStream(appconf)));
+        return new Application(singleton, load(appconf.toURL().openStream()));
     }
 
     public static void main(String[] args) throws Exception {
         Utility.midnight(); //先初始化一下Utility
+        Thread.currentThread().setName("Redkale-Application-Main-Thread");
         //运行主程序
         final Application application = Application.create(false);
         if (System.getProperty("CMD") != null) {
@@ -878,7 +902,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,9 @@ 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) || (cfe instanceof UnsupportedClassVersionError) || ((NoClassDefFoundError) cfe).getMessage().startsWith("java.lang.NoClassDefFoundError: java"))) {
+                && !clazzname.startsWith("com.mysql.") && !clazzname.startsWith("com.microsoft.")
+                && !clazzname.startsWith("org.redkale") && (clazzname.contains("Service") || clazzname.contains("Servlet"))) {
+                //&& (!(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 +352,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/LogFileHandler.java

@@ -46,19 +46,19 @@ public class LogFileHandler extends Handler {
         private static final String format = "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%tL %4$s %2$s\r\n%5$s%6$s\r\n";
 
         @Override
-        public String format(LogRecord record) {
+        public String format(LogRecord log) {
             String source;
-            if (record.getSourceClassName() != null) {
-                source = record.getSourceClassName();
-                if (record.getSourceMethodName() != null) {
-                    source += " " + record.getSourceMethodName();
+            if (log.getSourceClassName() != null) {
+                source = log.getSourceClassName();
+                if (log.getSourceMethodName() != null) {
+                    source += " " + log.getSourceMethodName();
                 }
             } else {
-                source = record.getLoggerName();
+                source = log.getLoggerName();
             }
-            String message = formatMessage(record);
+            String message = formatMessage(log);
             String throwable = "";
-            if (record.getThrown() != null) {
+            if (log.getThrown() != null) {
                 StringWriter sw = new StringWriter();
                 PrintWriter pw = new PrintWriter(sw) {
                     @Override
@@ -67,22 +67,22 @@ public class LogFileHandler extends Handler {
                     }
                 };
                 pw.println();
-                record.getThrown().printStackTrace(pw);
+                log.getThrown().printStackTrace(pw);
                 pw.close();
                 throwable = sw.toString();
             }
             return String.format(format,
                 System.currentTimeMillis(),
                 source,
-                record.getLoggerName(),
-                record.getLevel().getName(),
+                log.getLoggerName(),
+                log.getLevel().getName(),
                 message,
                 throwable);
         }
 
     }
 
-    protected final LinkedBlockingQueue<LogRecord> records = new LinkedBlockingQueue();
+    protected final LinkedBlockingQueue<LogRecord> logqueue = new LinkedBlockingQueue();
 
     private String pattern;
 
@@ -133,7 +133,7 @@ public class LogFileHandler extends Handler {
     }
 
     private void open() {
-        final String name = "Logging-" + getClass().getSimpleName() + "-Thread";
+        final String name = "Redkale-Logging-" + getClass().getSimpleName() + "-Thread";
         new Thread() {
             {
                 setName(name);
@@ -144,9 +144,9 @@ public class LogFileHandler extends Handler {
             public void run() {
                 while (true) {
                     try {
-                        LogRecord record = records.take();
+                        LogRecord log = logqueue.take();
                         final boolean bigger = (limit > 0 && limit <= loglength.get());
-                        final boolean changeday = tomorrow <= record.getMillis();
+                        final boolean changeday = tomorrow <= log.getMillis();
                         if (bigger || changeday) {
                             updateTomorrow();
                             if (logstream != null) {
@@ -193,12 +193,12 @@ public class LogFileHandler extends Handler {
                             logunusualstream = new FileOutputStream(logunusualfile, append);
                         }
                         //----------------------写日志-------------------------
-                        String message = getFormatter().format(record);
+                        String message = getFormatter().format(log);
                         String encoding = getEncoding();
                         byte[] bytes = encoding == null ? message.getBytes() : message.getBytes(encoding);
                         logstream.write(bytes);
                         loglength.addAndGet(bytes.length);
-                        if (unusual != null && (record.getLevel() == Level.WARNING || record.getLevel() == Level.SEVERE)) {
+                        if (unusual != null && (log.getLevel() == Level.WARNING || log.getLevel() == Level.SEVERE)) {
                             logunusualstream.write(bytes);
                             logunusuallength.addAndGet(bytes.length);
                         }
@@ -310,21 +310,21 @@ public class LogFileHandler extends Handler {
     }
 
     @Override
-    public void publish(LogRecord record) {
-        final String sourceClassName = record.getSourceClassName();
+    public void publish(LogRecord log) {
+        final String sourceClassName = log.getSourceClassName();
         if (sourceClassName == null || true) {
             StackTraceElement[] ses = new Throwable().getStackTrace();
             for (int i = 2; i < ses.length; i++) {
                 if (ses[i].getClassName().startsWith("java.util.logging")) continue;
-                record.setSourceClassName('[' + Thread.currentThread().getName() + "] " + ses[i].getClassName());
-                record.setSourceMethodName(ses[i].getMethodName());
+                log.setSourceClassName('[' + Thread.currentThread().getName() + "] " + ses[i].getClassName());
+                log.setSourceMethodName(ses[i].getMethodName());
                 break;
             }
         } else {
-            record.setSourceClassName('[' + Thread.currentThread().getName() + "] " + sourceClassName);
+            log.setSourceClassName('[' + Thread.currentThread().getName() + "] " + sourceClassName);
         }
-        if (denyreg != null && denyreg.matcher(record.getMessage()).find()) return;
-        records.offer(record);
+        if (denyreg != null && denyreg.matcher(log.getMessage()).find()) return;
+        logqueue.offer(log);
     }
 
     @Override

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

@@ -154,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();
@@ -162,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);
-        loadServlet(servletFilter, otherFilter);
-
+        if (!application.singletonrun) { //非singleton模式下才加载Filter、Servlet
+            loadFilter(filterFilter, otherFilter);
+            loadServlet(servletFilter, otherFilter);
+        }
         if (this.interceptor != null) this.resourceFactory.inject(this.interceptor);
     }
 
@@ -288,7 +303,7 @@ public abstract class NodeServer {
                 //NodeServer.this.watchFactory.inject(src);
                 if (source instanceof Service && needinit) ((Service) source).init(sourceConf);
             } catch (Exception e) {
-                logger.log(Level.SEVERE, "DataSource inject error", e);
+                logger.log(Level.SEVERE, "[" + Thread.currentThread().getName() + "] DataSource inject error", e);
             }
         }, DataSource.class);
 
@@ -422,7 +437,7 @@ public abstract class NodeServer {
             final ResourceFactory.ResourceLoader resourceLoader = (ResourceFactory rf, final Object src, final String resourceName, Field field, final Object attachment) -> {
                 try {
                     if (SncpClient.parseMethod(serviceImplClass).isEmpty() && serviceImplClass.getAnnotation(Priority.class) == null) {  //class没有可用的方法且没有标记启动优先级的， 通常为BaseService
-                        logger.log(Level.FINE, serviceImplClass + " cannot load because not found less one public non-final method");
+                        if (!serviceImplClass.getName().startsWith("org.redkale.")) logger.log(Level.FINE, serviceImplClass + " cannot load because not found less one public non-final method");
                         return;
                     }
 
@@ -483,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/FilterWatchService.java

@@ -35,7 +35,7 @@ public class FilterWatchService extends AbstractWatchService {
     @Resource
     protected Application application;
 
-    @RestMapping(name = "addfilter", auth = false, comment = "动态增加Filter")
+    @RestMapping(name = "addFilter", auth = false, comment = "动态增加Filter")
     public RetResult addFilter(@RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameReg = "\\.jar$") byte[] jar,
         @RestParam(name = "server", comment = "Server节点名") final String serverName,
         @RestParam(name = "type", comment = "Filter类名") final String filterType) throws IOException {

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

@@ -50,7 +50,7 @@ public class ServerWatchService extends AbstractWatchService {
         return new RetResult(rs);
     }
 
-    @RestMapping(name = "changeaddress", comment = "更改Server的监听地址和端口")
+    @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`");

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

@@ -30,8 +30,8 @@ public class ServiceWatchService extends AbstractWatchService {
     protected Application application;
 
     @RestConvert(type = void.class)
-    @RestMapping(name = "setfield", auth = false, comment = "设置Service中指定字段的内容")
-    public RetResult setfield(@RestParam(name = "name", comment = "Service的资源名") String name,
+    @RestMapping(name = "setField", auth = false, comment = "设置Service中指定字段的内容")
+    public RetResult setField(@RestParam(name = "name", comment = "Service的资源名") String name,
         @RestParam(name = "type", comment = "Service的类名") String type,
         @RestParam(name = "field", comment = "字段名") String field,
         @RestParam(name = "value", comment = "字段值") String value) {
@@ -65,8 +65,8 @@ public class ServiceWatchService extends AbstractWatchService {
     }
 
     @RestConvert(type = void.class)
-    @RestMapping(name = "getfield", auth = false, comment = "查询Service中指定字段的内容")
-    public RetResult getfield(@RestParam(name = "name", comment = "Service的资源名") String name,
+    @RestMapping(name = "getField", auth = false, comment = "查询Service中指定字段的内容")
+    public RetResult getField(@RestParam(name = "name", comment = "Service的资源名") String name,
         @RestParam(name = "type", comment = "Service的类名") String type,
         @RestParam(name = "field", comment = "字段名") String field) {
         if (name == null) name = "";
@@ -98,8 +98,8 @@ public class ServiceWatchService extends AbstractWatchService {
     }
 
     @RestConvert(type = void.class)
-    @RestMapping(name = "runmethod", auth = false, comment = "调用Service中指定方法")
-    public RetResult runmethod(@RestParam(name = "name", comment = "Service的资源名") String name,
+    @RestMapping(name = "runMethod", auth = false, comment = "调用Service中指定方法")
+    public RetResult runMethod(@RestParam(name = "name", comment = "Service的资源名") String name,
         @RestParam(name = "type", comment = "Service的类名") String type,
         @RestParam(name = "method", comment = "Service的方法名") String method,
         @RestParam(name = "params", comment = "方法的参数值") List<String> params,
@@ -169,28 +169,28 @@ public class ServiceWatchService extends AbstractWatchService {
         return dest;
     }
 
-    @RestMapping(name = "load", auth = false, comment = "动态增加Service")
+    @RestMapping(name = "loadService", auth = false, comment = "动态增加Service")
     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")
+    @RestMapping(name = "reloadService", auth = false, comment = "重新加载Service")
     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")
+    @RestMapping(name = "stopService", auth = false, comment = "动态停止Service")
     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")
+    @RestMapping(name = "findService", auth = false, comment = "查找Service")
     public RetResult find(@RestParam(name = "name", comment = "Service的资源名") String name,
         @RestParam(name = "type", comment = "Service的类名") String type) {
         //待开发

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

@@ -25,13 +25,13 @@ public class ServletWatchService extends AbstractWatchService {
     @Resource
     protected TransportFactory transportFactory;
 //
-//    @RestMapping(name = "load", auth = false, comment = "动态增加Servlet")
+//    @RestMapping(name = "loadServlet", auth = false, comment = "动态增加Servlet")
 //    public RetResult loadServlet(String type, @RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameReg = "\\.jar$") byte[] jar) {
 //        //待开发
 //        return RetResult.success();
 //    }
 //
-//    @RestMapping(name = "stop", auth = false, comment = "动态停止Servlet")
+//    @RestMapping(name = "stopServlet", auth = false, comment = "动态停止Servlet")
 //    public RetResult stopServlet(String type) {
 //        //待开发
 //        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/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>
@@ -60,6 +60,17 @@ 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);

src/org/redkale/convert/Convert.java

@@ -7,7 +7,8 @@ package org.redkale.convert;
 
 import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
-import java.util.function.Supplier;
+import java.util.function.*;
+import org.redkale.util.Attribute;
 
 /**
  * 序列化/反序列化操作类
@@ -31,8 +32,24 @@ public abstract class Convert<R extends Reader, W extends Writer> {
         return this.factory;
     }
 
+    protected <S extends W> S configWrite(S writer) {
+        return writer;
+    }
+
+    protected <S extends W> S fieldFunc(S writer, BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, ConvertField[]> objExtFunc) {
+        writer.objFieldFunc = objFieldFunc;
+        writer.objExtFunc = objExtFunc;
+        return writer;
+    }
+
+    public abstract Convert<R, W> newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc);
+
+    public abstract Convert<R, W> newConvert(final BiFunction<Attribute, Object, Object> objFieldFunc, Function<Object, ConvertField[]> objExtFunc);
+
     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,11 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
 
             this.register(Number.class, NumberSimpledCoder.instance);
             this.register(String.class, StringSimpledCoder.instance);
+            this.register(StringWrapper.class, StringWrapperSimpledCoder.instance);
             this.register(CharSequence.class, CharSequenceSimpledCoder.instance);
+            this.register(StringBuilder.class, CharSequenceSimpledCoder.StringBuilderSimpledCoder.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);
@@ -130,6 +133,54 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
                 }
 
             });
+            try {
+                Class sqldateClass = Class.forName("java.sql.Date");
+                this.register(sqldateClass, new SimpledCoder<R, W, java.sql.Date>() {
+
+                    @Override
+                    public void convertTo(W out, java.sql.Date value) {
+                         out.writeSmallString(value == null ? null : value.toString());
+                    }
+
+                    @Override
+                    public java.sql.Date convertFrom(R in) {
+                        String t = in.readSmallString();
+                        return t == null ? null : java.sql.Date.valueOf(t);
+                    }
+
+                });
+                Class sqltimeClass = Class.forName("java.sql.Time");
+                this.register(sqltimeClass, new SimpledCoder<R, W, java.sql.Time>() {
+
+                    @Override
+                    public void convertTo(W out, java.sql.Time value) {
+                        out.writeSmallString(value == null ? null : value.toString());
+                    }
+
+                    @Override
+                    public java.sql.Time convertFrom(R in) {
+                        String t = in.readSmallString();
+                        return t == null ? null : java.sql.Time.valueOf(t);
+                    }
+
+                });
+                Class timestampClass = Class.forName("java.sql.Timestamp");
+                this.register(timestampClass, new SimpledCoder<R, W, java.sql.Timestamp>() {
+
+                    @Override
+                    public void convertTo(W out, java.sql.Timestamp value) {
+                        out.writeSmallString(value == null ? null : value.toString());
+                    }
+
+                    @Override
+                    public java.sql.Timestamp convertFrom(R in) {
+                        String t = in.readSmallString();
+                        return t == null ? null : java.sql.Timestamp.valueOf(t);
+                    }
+
+                });
+            } catch (Throwable t) {
+            }
         }
     }
 
@@ -219,15 +270,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;
-        if (element instanceof Method) {
-            onlyColumns = ignoreAlls.get(((Method) element).getDeclaringClass());
-        } else if (element instanceof Field) {
-            onlyColumns = ignoreAlls.get(((Field) element).getDeclaringClass());
-        }
+        Set<String> onlyColumns = ignoreAlls.get(clazz);
         if (en != null && onlyColumns == null) return en;
         final ConvertType ct = this.getConvertType();
         ConvertColumn[] ccs = element.getAnnotationsByType(ConvertColumn.class);
@@ -254,8 +300,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 +309,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,37 +455,59 @@ 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));
     }
 
     public final boolean register(final Class type, String column, ConvertColumnEntry entry) {
         if (type == null || column == null || entry == null) return false;
+        Field field = null;
         try {
-            final Field field = type.getDeclaredField(column);
-            String get = "get";
-            if (field.getType() == boolean.class || field.getType() == Boolean.class) get = "is";
-            char[] cols = column.toCharArray();
-            cols[0] = Character.toUpperCase(cols[0]);
-            String col2 = new String(cols);
-            try {
-                register(type.getMethod(get + col2), entry);
-            } catch (Exception ex) {
-            }
-            try {
-                register(type.getMethod("set" + col2, field.getType()), entry);
-            } catch (Exception ex) {
-            }
-            return register(field, entry);
+            field = type.getDeclaredField(column);
         } catch (Exception e) {
-            return false;
         }
+        String get = "get";
+        if (field != null && (field.getType() == boolean.class || field.getType() == Boolean.class)) get = "is";
+        char[] cols = column.toCharArray();
+        cols[0] = Character.toUpperCase(cols[0]);
+        final String bigColumn = new String(cols);
+        try {
+            register(type.getMethod(get + bigColumn), entry);
+        } catch (NoSuchMethodException mex) {
+            if (get.length() >= 3) { //get
+                try {
+                    register(type.getMethod("is" + bigColumn), entry);
+                } catch (Exception ex) {
+                }
+            }
+        } catch (Exception ex) {
+        }
+        try {
+            register(type.getMethod("set" + bigColumn, field.getType()), entry);
+        } catch (Exception ex) {
+        }
+        return field == null ? true : register(field, entry);
     }
 
     public final <E> boolean register(final AccessibleObject field, final ConvertColumnEntry entry) {
@@ -604,6 +675,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 +759,8 @@ 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.Map.Entry.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/ConvertField.java

@@ -0,0 +1,102 @@
+/*
+ * 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.io.Serializable;
+import java.lang.reflect.Type;
+import org.redkale.convert.json.JsonConvert;
+
+/**
+ * newConvert参数中的Function返回结果的数据类
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+public class ConvertField implements Serializable {
+
+    protected String name;
+
+    protected Type type;
+
+    protected int position;
+
+    protected Object value;
+
+    public ConvertField() {
+    }
+
+    public ConvertField(String name, Object value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public ConvertField(String name, int position, Object value) {
+        this.name = name;
+        this.position = position;
+        this.value = value;
+    }
+
+    public ConvertField(String name, Type type, Object value) {
+        this.name = name;
+        this.type = type;
+        this.value = value;
+    }
+
+    public ConvertField(String name, Type type, int position, Object value) {
+        this.name = name;
+        this.type = type;
+        this.position = position;
+        this.value = value;
+    }
+
+    public static ConvertField[] ofArray(Object... items) {
+        int len = items.length / 2;
+        ConvertField[] rs = new ConvertField[len];
+        for (int i = 0; i < len; i++) {
+            rs[i] = new ConvertField(items[i * 2].toString(), items[i * 2 + 1]);
+        }
+        return rs;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public void setPosition(int position) {
+        this.position = position;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return JsonConvert.root().convertTo(this);
+    }
+}

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>
@@ -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);

src/org/redkale/convert/ObjectDecoder.java

@@ -94,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) {
@@ -123,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));

src/org/redkale/convert/ObjectEncoder.java

@@ -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) {
@@ -164,9 +164,22 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
             return;
         }
         if (out.writeObjectB(value) < 0) {
+            int maxPosition = 0;
             for (EnMember member : members) {
+                maxPosition = member.getPosition();
                 out.writeObjectField(member, value);
             }
+            if (out.objExtFunc != null) {
+                ConvertField[] extFields = out.objExtFunc.apply(value);
+                if (extFields != null) {
+                    Encodeable<W, ?> anyEncoder = factory.getAnyEncoder();
+                    for (ConvertField en : extFields) {
+                        if (en == null) continue;
+                        maxPosition++;
+                        out.writeObjectField(en.getName(), en.getType(), Math.max(en.getPosition(), maxPosition), anyEncoder, en.getValue());
+                    }
+                }
+            }
         }
         out.writeObjectE(value);
     }
@@ -253,24 +266,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/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的子类。
      *

src/org/redkale/convert/Writer.java

@@ -6,6 +6,8 @@
 package org.redkale.convert;
 
 import java.lang.reflect.*;
+import java.util.function.*;
+import org.redkale.util.*;
 
 /**
  * 序列化的数据输出流
@@ -23,6 +25,12 @@ public abstract class Writer {
     //convertTo时是否以指定Type的ObjectEncoder进行处理
     protected Type specify;
 
+    //对某个字段值进行动态处理
+    protected BiFunction<Attribute, Object, Object> objFieldFunc;
+
+    //对某个对象进行动态扩展字段值处理
+    protected Function<Object, ConvertField[]> objExtFunc;
+
     /**
      * 设置specify
      *
@@ -38,6 +46,11 @@ public abstract class Writer {
         }
     }
 
+    protected boolean recycle() {
+        this.objFieldFunc = null;
+        return true;
+    }
+
     /**
      * 返回specify
      *
@@ -105,7 +118,12 @@ public abstract class Writer {
      */
     @SuppressWarnings("unchecked")
     public void writeObjectField(final EnMember member, Object obj) {
-        Object value = member.attribute.get(obj);
+        Object value;
+        if (objFieldFunc == null) {
+            value = member.attribute.get(obj);
+        } else {
+            value = objFieldFunc.apply(member.attribute, obj);
+        }
         if (value == null) return;
         if (tiny()) {
             if (member.istring) {
@@ -114,11 +132,49 @@ public abstract class Writer {
                 if (!((Boolean) value)) return;
             }
         }
-        this.writeFieldName(member);
+        Attribute attr = member.getAttribute();
+        this.writeFieldName(attr.field(), attr.genericType(), member.getPosition());
         member.encoder.convertTo(this, value);
         this.comma = true;
     }
 
+    /**
+     * 输出一个对象的某个扩展字段
+     *
+     *
+     * @param fieldName  字段名称
+     * @param fieldType  字段类型
+     * @param fieldPos   字段顺序
+     * @param anyEncoder Encoder
+     * @param value      写入的字段对象
+     */
+    @SuppressWarnings("unchecked")
+    public void writeObjectField(final String fieldName, Type fieldType, int fieldPos, Encodeable anyEncoder, Object value) {
+        if (value == null) return;
+        if (fieldType == null) fieldType = value.getClass();
+        if (tiny() && fieldType instanceof Class) {
+            Class clazz = (Class) fieldType;
+            if (CharSequence.class.isAssignableFrom(clazz)) {
+                if (((CharSequence) value).length() == 0) return;
+            } else if (clazz == boolean.class || clazz == Boolean.class) {
+                if (!((Boolean) value)) return;
+            }
+        }
+        this.writeFieldName(fieldName, fieldType, fieldPos);
+        anyEncoder.convertTo(this, value);
+        this.comma = true;
+    }
+
+    /**
+     * 输出一个字段名
+     *
+     * @param member 字段
+     */
+    public final void writeFieldName(final EnMember member) {
+        Attribute attr = member.getAttribute();
+        this.writeFieldName(attr.field(), attr.genericType(), member.getPosition());
+    }
+
     /**
      * 输出一个对象后的操作
      *
@@ -129,9 +185,9 @@ public abstract class Writer {
     /**
      * 输出一个数组前的操作
      *
-     * @param size    数组长度
+     * @param size             数组长度
      * @param componentEncoder Encodeable
-     * @param obj     对象
+     * @param obj              对象, 不一定是数组、Collection对象，也可能是伪Collection对象
      *
      * @return 返回-1表示还没有写入对象内容，大于-1表示已写入对象内容，返回对象内容大小
      */
@@ -155,7 +211,7 @@ public abstract class Writer {
      * @param size         map大小
      * @param keyEncoder   Encodeable
      * @param valueEncoder Encodeable
-     * @param obj          对象
+     * @param obj          对象, 不一定是Map对象，也可能是伪Map对象
      *
      * @return 返回-1表示还没有写入对象内容，大于-1表示已写入对象内容，返回对象内容大小
      */
@@ -176,9 +232,11 @@ public abstract class Writer {
     /**
      * 输出一个字段名
      *
-     * @param member 字段的EnMember对象
+     * @param fieldName 字段名称
+     * @param fieldType 字段类型
+     * @param fieldPos  字段顺序
      */
-    public abstract void writeFieldName(EnMember member);
+    public abstract void writeFieldName(String fieldName, Type fieldType, int fieldPos);
 
     /**
      * 写入一个boolean值
@@ -256,4 +314,11 @@ public abstract class Writer {
      * @param value String值
      */
     public abstract void writeString(String value);
+
+    /**
+     * 写入一个StringConvertWrapper值
+     *
+     * @param value StringConvertWrapper值
+     */
+    public abstract void writeWrapper(StringWrapper value);
 }

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

@@ -131,6 +131,7 @@ public class BsonByteBufferWriter extends BsonWriter {
 
     @Override
     protected boolean recycle() {
+        super.recycle();
         this.index = 0;
         this.specify = null;
         this.buffers = null;

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

@@ -37,7 +37,7 @@ import org.redkale.util.*;
  *
  * @author zhangjx
  */
-public final class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
+public class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
 
     private static final ObjectPool<BsonReader> readerPool = BsonReader.createPool(Integer.getInteger("convert.bson.pool.size", 16));
 
@@ -59,6 +59,21 @@ public final class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
         return BsonFactory.root().getConvert();
     }
 
+    @Override
+    public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc) {
+        return newConvert(fieldFunc, null);
+    }
+
+    @Override
+    public BsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc, Function<Object, ConvertField[]> objExtFunc) {
+        return new BsonConvert(getFactory(), tiny) {
+            @Override
+            protected <S extends BsonWriter> S configWrite(S writer) {
+                return fieldFunc(writer, fieldFunc, objExtFunc);
+            }
+        };
+    }
+
     //------------------------------ reader -----------------------------------------------------------
     public BsonReader pollBsonReader(final ByteBuffer... buffers) {
         return new BsonByteBufferReader((ConvertMask) null, buffers);
@@ -78,11 +93,11 @@ public final class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
 
     //------------------------------ writer -----------------------------------------------------------
     public BsonByteBufferWriter pollBsonWriter(final Supplier<ByteBuffer> supplier) {
-        return new BsonByteBufferWriter(tiny, supplier);
+        return configWrite(new BsonByteBufferWriter(tiny, supplier));
     }
 
     public BsonWriter pollBsonWriter(final OutputStream out) {
-        return new BsonStreamWriter(tiny, out);
+        return configWrite(new BsonStreamWriter(tiny, out));
     }
 
     public BsonWriter pollBsonWriter() {
@@ -94,6 +109,7 @@ public final class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
     }
 
     //------------------------------ convertFrom -----------------------------------------------------------
+    @Override
     public <T> T convertFrom(final Type type, final byte[] bytes) {
         if (bytes == null) return null;
         return convertFrom(type, bytes, 0, bytes.length);
@@ -173,33 +189,33 @@ public final class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
 
     public void convertTo(final OutputStream out, final Object value) {
         if (value == null) {
-            new BsonStreamWriter(tiny, out).writeNull();
+            pollBsonWriter(out).writeNull();
         } else {
-            factory.loadEncoder(value.getClass()).convertTo(new BsonStreamWriter(tiny, out), value);
+            factory.loadEncoder(value.getClass()).convertTo(pollBsonWriter(out), value);
         }
     }
 
     public void convertTo(final OutputStream out, final Type type, final Object value) {
         if (type == null) return;
         if (value == null) {
-            new BsonStreamWriter(tiny, out).writeNull();
+            pollBsonWriter(out).writeNull();
         } else {
-            factory.loadEncoder(type).convertTo(new BsonStreamWriter(tiny, out), value);
+            factory.loadEncoder(type).convertTo(pollBsonWriter(out), value);
         }
     }
 
     public void convertMapTo(final OutputStream out, final Object... values) {
         if (values == null) {
-            new BsonStreamWriter(tiny, out).writeNull();
+            pollBsonWriter(out).writeNull();
         } else {
-            ((AnyEncoder) factory.getAnyEncoder()).convertMapTo(new BsonStreamWriter(tiny, out), values);
+            ((AnyEncoder) factory.getAnyEncoder()).convertMapTo(pollBsonWriter(out), values);
         }
     }
 
     @Override
     public ByteBuffer[] convertTo(final Supplier<ByteBuffer> supplier, final Object value) {
         if (supplier == null) return null;
-        BsonByteBufferWriter out = new BsonByteBufferWriter(tiny, supplier);
+        BsonByteBufferWriter out = pollBsonWriter(supplier);
         if (value == null) {
             out.writeNull();
         } else {
@@ -211,7 +227,7 @@ public final class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
     @Override
     public ByteBuffer[] convertTo(final Supplier<ByteBuffer> supplier, final Type type, final Object value) {
         if (supplier == null || type == null) return null;
-        BsonByteBufferWriter out = new BsonByteBufferWriter(tiny, supplier);
+        BsonByteBufferWriter out = pollBsonWriter(supplier);
         if (value == null) {
             out.writeNull();
         } else {
@@ -223,7 +239,7 @@ public final class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
     @Override
     public ByteBuffer[] convertMapTo(final Supplier<ByteBuffer> supplier, final Object... values) {
         if (supplier == null) return null;
-        BsonByteBufferWriter out = new BsonByteBufferWriter(tiny, supplier);
+        BsonByteBufferWriter out = pollBsonWriter(supplier);
         if (values == null) {
             out.writeNull();
         } else {

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

@@ -346,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

@@ -5,6 +5,7 @@
  */
 package org.redkale.convert.bson;
 
+import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
 import org.redkale.convert.*;
 import org.redkale.convert.ext.ByteSimpledCoder;
@@ -43,7 +44,7 @@ public class BsonWriter extends Writer {
     }
 
     protected BsonWriter(byte[] bs) {
-        this.content = bs;
+        this.content = bs == null ? new byte[0] : bs;
     }
 
     public BsonWriter() {
@@ -97,10 +98,12 @@ public class BsonWriter extends Writer {
         count += len;
     }
 
+    @Override
     protected boolean recycle() {
+        super.recycle();
         this.count = 0;
         this.specify = null;
-        if (this.content.length > defaultSize) {
+        if (this.content != null && this.content.length > defaultSize) {
             this.content = new byte[defaultSize];
         }
         return true;
@@ -198,11 +201,10 @@ public class BsonWriter extends Writer {
     }
 
     @Override
-    public final void writeFieldName(EnMember member) {
-        Attribute attribute = member.getAttribute();
+    public final void writeFieldName(String fieldName, Type fieldType, int fieldPos) {
         writeByte(BsonReader.SIGN_HASNEXT);
-        writeSmallString(attribute.field());
-        writeByte(BsonFactory.typeEnum(attribute.type()));
+        writeSmallString(fieldName);
+        writeByte(BsonFactory.typeEnum(fieldType));
     }
 
     /**
@@ -241,6 +243,11 @@ public class BsonWriter extends Writer {
         writeTo(bytes);
     }
 
+    @Override
+    public final void writeWrapper(StringWrapper value) {
+        this.writeString(value == null ? null : value.getValue());
+    }
+
     @Override
     public final void writeNull() {
         writeShort(Reader.SIGN_NULL);

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

@@ -8,9 +8,11 @@ package org.redkale.convert.ext;
 import org.redkale.convert.*;
 
 /**
- *  CharSequence 的SimpledCoder实现
+ * CharSequence 的SimpledCoder实现
+ *
+ * <p>
+ * 详情见: https://redkale.org
  *
- * <p> 详情见: https://redkale.org
  * @author zhangjx
  * @param <R> Reader输入的子类型
  * @param <W> Writer输出的子类型
@@ -28,4 +30,20 @@ public class CharSequenceSimpledCoder<R extends Reader, W extends Writer> extend
     public CharSequence convertFrom(R in) {
         return in.readString();
     }
+
+    public static class StringBuilderSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, StringBuilder> {
+
+        public static final StringBuilderSimpledCoder instance = new StringBuilderSimpledCoder();
+
+        @Override
+        public void convertTo(W out, StringBuilder value) {
+            out.writeString(value == null ? null : value.toString());
+        }
+
+        @Override
+        public StringBuilder convertFrom(R in) {
+            String rs = in.readString();
+            return rs == null ? null : new StringBuilder(rs);
+        }
+    }
 }

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/FileSimpledCoder.java

@@ -20,7 +20,7 @@ import org.redkale.convert.*;
  */
 public class FileSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, File> {
 
-    public static final PatternSimpledCoder instance = new PatternSimpledCoder();
+    public static final FileSimpledCoder instance = new FileSimpledCoder();
 
     @Override
     public void convertTo(W out, File value) {

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

@@ -0,0 +1,35 @@
+/*
+ * 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.*;
+import org.redkale.util.StringWrapper;
+
+/**
+ * String 的SimpledCoder实现
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @param <R> Reader输入的子类型
+ * @param <W> Writer输出的子类型
+ */
+public final class StringWrapperSimpledCoder<R extends Reader, W extends Writer> extends SimpledCoder<R, W, StringWrapper> {
+
+    public static final StringWrapperSimpledCoder instance = new StringWrapperSimpledCoder();
+
+    @Override
+    public void convertTo(W out, StringWrapper value) {
+        out.writeWrapper(value);
+    }
+
+    @Override
+    public StringWrapper convertFrom(R in) {
+        return new StringWrapper(in.readString());
+    }
+
+}

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

@@ -48,6 +48,7 @@ public class JsonByteBufferWriter extends JsonWriter {
 
     @Override
     protected boolean recycle() {
+        super.recycle();
         this.index = 0;
         this.specify = null;
         this.charset = null;
@@ -114,7 +115,7 @@ public class JsonByteBufferWriter extends JsonWriter {
         int byteLength = quote ? 2 : 0;
         ByteBuffer bb = null;
         if (charset == null) {
-            byteLength += encodeUTF8Length(chs, start, len);
+            byteLength += Utility.encodeUTF8Length(chs, start, len);
         } else {
             bb = charset.encode(CharBuffer.wrap(chs, start, len));
             byteLength += bb.remaining();
@@ -133,6 +134,13 @@ public class JsonByteBufferWriter extends JsonWriter {
                     } else if (c < 0x800) {
                         buffer.put((byte) (0xc0 | (c >> 6)));
                         buffer.put((byte) (0x80 | (c & 0x3f)));
+                    } else if (Character.isSurrogate(c)) { //连取两个
+                        int uc = Character.toCodePoint(c, chs[i + 1]);
+                        buffer.put((byte) (0xf0 | ((uc >> 18))));
+                        buffer.put((byte) (0x80 | ((uc >> 12) & 0x3f)));
+                        buffer.put((byte) (0x80 | ((uc >> 6) & 0x3f)));
+                        buffer.put((byte) (0x80 | (uc & 0x3f)));
+                        i++;
                     } else {
                         buffer.put((byte) (0xe0 | ((c >> 12))));
                         buffer.put((byte) (0x80 | ((c >> 6) & 0x3f)));
@@ -154,7 +162,34 @@ public class JsonByteBufferWriter extends JsonWriter {
         if (charset == null) { //UTF-8
             final int limit = start + len;
             for (int i = start; i < limit; i++) {
-                buffer = putUTF8Char(buffer, chs[i]);
+                char c = chs[i];
+                if (c < 0x80) {
+                    if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                    buffer.put((byte) c);
+                } else if (c < 0x800) {
+                    if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                    buffer.put((byte) (0xc0 | (c >> 6)));
+                    if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                    buffer.put((byte) (0x80 | (c & 0x3f)));
+                } else if (Character.isSurrogate(c)) { //连取两个
+                    int uc = Character.toCodePoint(c, chs[i + 1]);
+                    if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                    buffer.put((byte) (0xf0 | ((uc >> 18))));
+                    if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                    buffer.put((byte) (0x80 | ((uc >> 12) & 0x3f)));
+                    if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                    buffer.put((byte) (0x80 | ((uc >> 6) & 0x3f)));
+                    if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                    buffer.put((byte) (0x80 | (uc & 0x3f)));
+                    i++;
+                } else {
+                    if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                    buffer.put((byte) (0xe0 | ((c >> 12))));
+                    if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                    buffer.put((byte) (0x80 | ((c >> 6) & 0x3f)));
+                    if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                    buffer.put((byte) (0x80 | (c & 0x3f)));
+                }
             }
         } else {
             while (bb.hasRemaining()) {
@@ -168,50 +203,18 @@ public class JsonByteBufferWriter extends JsonWriter {
         }
     }
 
-    private ByteBuffer putUTF8Char(ByteBuffer buffer, char c) {
-        if (c < 0x80) {
-            if (!buffer.hasRemaining()) buffer = nextByteBuffer();
-            buffer.put((byte) c);
-        } else if (c < 0x800) {
-            if (!buffer.hasRemaining()) buffer = nextByteBuffer();
-            buffer.put((byte) (0xc0 | (c >> 6)));
-            if (!buffer.hasRemaining()) buffer = nextByteBuffer();
-            buffer.put((byte) (0x80 | (c & 0x3f)));
-        } else {
-            if (!buffer.hasRemaining()) buffer = nextByteBuffer();
-            buffer.put((byte) (0xe0 | ((c >> 12))));
-            if (!buffer.hasRemaining()) buffer = nextByteBuffer();
-            buffer.put((byte) (0x80 | ((c >> 6) & 0x3f)));
-            if (!buffer.hasRemaining()) buffer = nextByteBuffer();
-            buffer.put((byte) (0x80 | (c & 0x3f)));
-        }
-        return buffer;
-    }
-
     private ByteBuffer nextByteBuffer() {
         this.buffers[this.index].flip();
         return this.buffers[++this.index];
     }
 
-    protected static int encodeUTF8Length(final char[] text, final int start, final int len) {
-        char c;
-        int size = 0;
-        final char[] chars = text;
-        final int limit = start + len;
-        for (int i = start; i < limit; i++) {
-            c = chars[i];
-            size += (c < 0x80 ? 1 : (c < 0x800 ? 2 : 3));
-        }
-        return size;
-    }
-
     protected static int encodeEscapeUTF8Length(final char[] text, final int start, final int len) {
         char c;
         int size = 0;
-        final char[] chars = text;
+        final char[] chs = text;
         final int limit = start + len;
         for (int i = start; i < limit; i++) {
-            c = chars[i];
+            c = chs[i];
             switch (c) {
                 case '\n': size += 2;
                     break;
@@ -224,7 +227,7 @@ public class JsonByteBufferWriter extends JsonWriter {
                 case '"': size += 2;
                     break;
                 default:
-                    size += (c < 0x80 ? 1 : (c < 0x800 ? 2 : 3));
+                    size += (c < 0x80 ? 1 : (c < 0x800 || Character.isSurrogate(c) ? 2 : 3));
                     break;
             }
         }
@@ -238,19 +241,39 @@ public class JsonByteBufferWriter extends JsonWriter {
      * @param value String值
      */
     @Override
-    public void writeTo(final boolean quote, final String value) {
-        char[] chs = Utility.charArray(value);
-        writeTo(-1, quote, chs, 0, chs.length);
+    public void writeLatin1To(final boolean quote, final String value) {
+        byte[] bs = Utility.byteArray(value);
+        int expandsize = expand(bs.length + (quote ? 2 : 0));
+        if (expandsize == 0) {// 只需要一个buffer 
+            final ByteBuffer buffer = this.buffers[index];
+            if (quote) buffer.put((byte) '"');
+            buffer.put(bs);
+            if (quote) buffer.put((byte) '"');
+        } else {
+            ByteBuffer buffer = this.buffers[index];
+            if (quote) {
+                if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                buffer.put((byte) '"');
+            }
+            for (byte b : bs) {
+                if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                buffer.put(b);
+            }
+            if (quote) {
+                if (!buffer.hasRemaining()) buffer = nextByteBuffer();
+                buffer.put((byte) '"');
+            }
+        }
     }
 
     @Override
     public void writeInt(int value) {
-        writeTo(false, String.valueOf(value));
+        writeLatin1To(false, String.valueOf(value));
     }
 
     @Override
     public void writeLong(long value) {
-        writeTo(false, String.valueOf(value));
+        writeLatin1To(false, String.valueOf(value));
     }
 
     @Override
@@ -288,7 +311,8 @@ public class JsonByteBufferWriter extends JsonWriter {
             if (expandsize == 0) { // 只需要一个buffer 
                 final ByteBuffer buffer = this.buffers[index];
                 buffer.put((byte) '"');
-                for (char c : chs) {
+                for (int i = 0; i < chs.length; i++) {
+                    char c = chs[i];
                     switch (c) {
                         case '\n': buffer.put((byte) '\\').put((byte) 'n');
                             break;
@@ -306,6 +330,13 @@ public class JsonByteBufferWriter extends JsonWriter {
                             } else if (c < 0x800) {
                                 buffer.put((byte) (0xc0 | (c >> 6)));
                                 buffer.put((byte) (0x80 | (c & 0x3f)));
+                            } else if (Character.isSurrogate(c)) { //连取两个
+                                int uc = Character.toCodePoint(c, chs[i + 1]);
+                                buffer.put((byte) (0xf0 | ((uc >> 18))));
+                                buffer.put((byte) (0x80 | ((uc >> 12) & 0x3f)));
+                                buffer.put((byte) (0x80 | ((uc >> 6) & 0x3f)));
+                                buffer.put((byte) (0x80 | (uc & 0x3f)));
+                                i++;
                             } else {
                                 buffer.put((byte) (0xe0 | ((c >> 12))));
                                 buffer.put((byte) (0x80 | ((c >> 6) & 0x3f)));

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

@@ -21,7 +21,7 @@ import org.redkale.util.*;
  * @author zhangjx
  */
 @SuppressWarnings("unchecked")
-public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
+public class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
 
     public static final Type TYPE_MAP_STRING_STRING = new TypeToken<java.util.HashMap<String, String>>() {
     }.getType();
@@ -46,6 +46,21 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
         return JsonFactory.root().getConvert();
     }
 
+    @Override
+    public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc) {
+        return newConvert(fieldFunc, null);
+    }
+
+    @Override
+    public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc, Function<Object, ConvertField[]> objExtFunc) {
+        return new JsonConvert(getFactory(), tiny) {
+            @Override
+            protected <S extends JsonWriter> S configWrite(S writer) {
+                return fieldFunc(writer, fieldFunc, objExtFunc);
+            }
+        };
+    }
+
     //------------------------------ reader -----------------------------------------------------------
     public JsonReader pollJsonReader(final ByteBuffer... buffers) {
         return new JsonByteBufferReader((ConvertMask) null, buffers);
@@ -65,19 +80,19 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
 
     //------------------------------ writer -----------------------------------------------------------
     public JsonByteBufferWriter pollJsonWriter(final Supplier<ByteBuffer> supplier) {
-        return new JsonByteBufferWriter(tiny, supplier);
+        return configWrite(new JsonByteBufferWriter(tiny, supplier));
     }
 
     public JsonWriter pollJsonWriter(final OutputStream out) {
-        return new JsonStreamWriter(tiny, out);
+        return configWrite(new JsonStreamWriter(tiny, out));
     }
 
     public JsonWriter pollJsonWriter(final Charset charset, final OutputStream out) {
-        return new JsonStreamWriter(tiny, charset, out);
+        return configWrite(new JsonStreamWriter(tiny, charset, out));
     }
 
     public JsonWriter pollJsonWriter() {
-        return writerPool.get().tiny(tiny);
+        return configWrite(writerPool.get().tiny(tiny));
     }
 
     public void offerJsonWriter(final JsonWriter writer) {
@@ -85,6 +100,12 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     }
 
     //------------------------------ convertFrom -----------------------------------------------------------
+    @Override
+    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 +149,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) {
@@ -139,7 +206,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     public String convertTo(final Type type, final Object value) {
         if (type == null) return null;
         if (value == null) return "null";
-        final JsonWriter writer = writerPool.get().tiny(tiny);
+        final JsonWriter writer = pollJsonWriter();
         writer.specify(type);
         factory.loadEncoder(type).convertTo(writer, value);
         String result = writer.toString();
@@ -150,7 +217,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     @Override
     public String convertMapTo(final Object... values) {
         if (values == null) return "null";
-        final JsonWriter writer = writerPool.get().tiny(tiny);
+        final JsonWriter writer = pollJsonWriter();
         ((AnyEncoder) factory.getAnyEncoder()).convertMapTo(writer, values);
         String result = writer.toString();
         writerPool.accept(writer);
@@ -159,7 +226,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
 
     public void convertTo(final OutputStream out, final Object value) {
         if (value == null) {
-            new JsonStreamWriter(tiny, out).writeNull();
+            pollJsonWriter(out).writeNull();
         } else {
             convertTo(out, value.getClass(), value);
         }
@@ -168,9 +235,9 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     public void convertTo(final OutputStream out, final Type type, final Object value) {
         if (type == null) return;
         if (value == null) {
-            new JsonStreamWriter(tiny, out).writeNull();
+            pollJsonWriter(out).writeNull();
         } else {
-            final JsonWriter writer = writerPool.get().tiny(tiny);
+            final JsonWriter writer = pollJsonWriter();
             writer.specify(type);
             factory.loadEncoder(type).convertTo(writer, value);
             byte[] bs = writer.toBytes();
@@ -185,9 +252,9 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
 
     public void convertMapTo(final OutputStream out, final Object... values) {
         if (values == null) {
-            new JsonStreamWriter(tiny, out).writeNull();
+            pollJsonWriter(out).writeNull();
         } else {
-            final JsonWriter writer = writerPool.get().tiny(tiny);
+            final JsonWriter writer = pollJsonWriter();
             ((AnyEncoder) factory.getAnyEncoder()).convertMapTo(writer, values);
             byte[] bs = writer.toBytes();
             writerPool.accept(writer);
@@ -202,7 +269,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     @Override
     public ByteBuffer[] convertTo(final Supplier<ByteBuffer> supplier, final Object value) {
         if (supplier == null) return null;
-        JsonByteBufferWriter out = new JsonByteBufferWriter(tiny, null, supplier);
+        JsonByteBufferWriter out = pollJsonWriter(supplier);
         if (value == null) {
             out.writeNull();
         } else {
@@ -214,7 +281,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     @Override
     public ByteBuffer[] convertTo(final Supplier<ByteBuffer> supplier, final Type type, final Object value) {
         if (supplier == null || type == null) return null;
-        JsonByteBufferWriter out = new JsonByteBufferWriter(tiny, null, supplier);
+        JsonByteBufferWriter out = pollJsonWriter(supplier);
         if (value == null) {
             out.writeNull();
         } else {
@@ -227,7 +294,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     @Override
     public ByteBuffer[] convertMapTo(final Supplier<ByteBuffer> supplier, final Object... values) {
         if (supplier == null) return null;
-        JsonByteBufferWriter out = new JsonByteBufferWriter(tiny, null, supplier);
+        JsonByteBufferWriter out = pollJsonWriter(supplier);
         if (values == null) {
             out.writeNull();
         } else {
@@ -269,14 +336,14 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
 
     public JsonWriter convertToWriter(final Type type, final Object value) {
         if (type == null) return null;
-        final JsonWriter writer = writerPool.get().tiny(tiny);
+        final JsonWriter writer = pollJsonWriter();
         writer.specify(type);
         factory.loadEncoder(type).convertTo(writer, value);
         return writer;
     }
 
     public JsonWriter convertMapToWriter(final Object... values) {
-        final JsonWriter writer = writerPool.get().tiny(tiny);
+        final JsonWriter writer = pollJsonWriter();
         ((AnyEncoder) factory.getAnyEncoder()).convertMapTo(writer, values);
         return writer;
     }

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

@@ -26,10 +26,7 @@ public final class JsonFactory extends ConvertFactory<JsonReader, JsonWriter> {
     private static final JsonFactory instance = new JsonFactory(null, Boolean.getBoolean("convert.json.tiny"));
 
     static {
-        instance.register(InetAddress.class, InetAddressSimpledCoder.InetAddressJsonSimpledCoder.instance);
-        instance.register(InetSocketAddress.class, InetAddressSimpledCoder.InetSocketAddressJsonSimpledCoder.instance);
-        instance.register(DLong.class, DLongSimpledCoder.DLongJsonSimpledCoder.instance);
-        instance.register(BigInteger.class, BigIntegerSimpledCoder.BigIntegerJsonSimpledCoder.instance);
+
         instance.register(Serializable.class, instance.loadEncoder(Object.class));
 
         instance.register(AnyValue.class, instance.loadDecoder(AnyValue.DefaultAnyValue.class));
@@ -38,6 +35,12 @@ public final class JsonFactory extends ConvertFactory<JsonReader, JsonWriter> {
 
     private JsonFactory(JsonFactory parent, boolean tiny) {
         super(parent, tiny);
+        if (parent == null) {
+            this.register(InetAddress.class, InetAddressSimpledCoder.InetAddressJsonSimpledCoder.instance);
+            this.register(InetSocketAddress.class, InetAddressSimpledCoder.InetSocketAddressJsonSimpledCoder.instance);
+            this.register(DLong.class, DLongSimpledCoder.DLongJsonSimpledCoder.instance);
+            this.register(BigInteger.class, BigIntegerSimpledCoder.BigIntegerJsonSimpledCoder.instance);
+        }
     }
 
     @Override

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;
+    }
+
     /**
      * 判断下一个非空白字符是否为{
      *

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

@@ -87,19 +87,19 @@ class JsonStreamWriter extends JsonByteBufferWriter {
      * @param value String值
      */
     @Override
-    public void writeTo(final boolean quote, final String value) {
+    public void writeLatin1To(final boolean quote, final String value) {
         char[] chs = Utility.charArray(value);
         writeTo(quote, chs, 0, chs.length);
     }
 
     @Override
     public void writeInt(int value) {
-        writeTo(false, String.valueOf(value));
+        writeLatin1To(false, String.valueOf(value));
     }
 
     @Override
     public void writeLong(long value) {
-        writeTo(false, String.valueOf(value));
+        writeLatin1To(false, String.valueOf(value));
     }
 
     @Override

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

@@ -5,6 +5,7 @@
  */
 package org.redkale.convert.json;
 
+import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
 import org.redkale.convert.*;
 import org.redkale.util.*;
@@ -88,7 +89,7 @@ public class JsonWriter extends Writer {
      * @param quote 是否加双引号
      * @param value 非null且不含需要转义的字符的String值
      */
-    public void writeTo(final boolean quote, final String value) {
+    public void writeLatin1To(final boolean quote, final String value) {
         int len = value.length();
         expand(len + (quote ? 2 : 0));
         if (quote) content[count++] = '"';
@@ -97,10 +98,12 @@ public class JsonWriter extends Writer {
         if (quote) content[count++] = '"';
     }
 
+    @Override
     protected boolean recycle() {
+        super.recycle();
         this.count = 0;
         this.specify = null;
-        if (this.content.length > defaultSize) {
+        if (this.content != null && this.content.length > defaultSize) {
             this.content = new char[defaultSize];
         }
         return true;
@@ -157,15 +160,15 @@ public class JsonWriter extends Writer {
     }
 
     @Override
-    public final void writeFieldName(EnMember member) {
+    public final void writeFieldName(String fieldName, Type fieldType, int fieldPos) {
         if (this.comma) writeTo(',');
-        writeTo(true, member.getAttribute().field());
+        writeLatin1To(true, fieldName);
         writeTo(':');
     }
 
     @Override
     public final void writeSmallString(String value) {
-        writeTo(true, value);
+        writeLatin1To(true, value);
     }
 
     @Override
@@ -311,12 +314,17 @@ public class JsonWriter extends Writer {
 
     @Override
     public final void writeFloat(float value) {
-        writeTo(false, String.valueOf(value));
+        writeLatin1To(false, String.valueOf(value));
     }
 
     @Override
     public final void writeDouble(double value) {
-        writeTo(false, String.valueOf(value));
+        writeLatin1To(false, String.valueOf(value));
+    }
+
+    @Override
+    public final void writeWrapper(StringWrapper value) {
+        writeLatin1To(false, String.valueOf(value));
     }
 
     @Override

src/org/redkale/net/AsyncConnection.java

@@ -14,7 +14,7 @@ import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
 import java.util.function.*;
 import javax.net.ssl.SSLContext;
-import org.redkale.util.ObjectPool;
+import org.redkale.util.*;
 
 /**
  *
@@ -52,10 +52,6 @@ public abstract class AsyncConnection implements ReadableByteChannel, WritableBy
     //关联的事件数， 小于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);
     }
@@ -68,6 +64,14 @@ public abstract class AsyncConnection implements ReadableByteChannel, WritableBy
         this.sslContext = sslContext;
     }
 
+    public Supplier<ByteBuffer> getBufferSupplier() {
+        return this.bufferSupplier;
+    }
+
+    public Consumer<ByteBuffer> getBufferConsumer() {
+        return this.bufferConsumer;
+    }
+
     public final long getLastReadTime() {
         return readtime;
     }
@@ -114,8 +118,6 @@ public abstract class AsyncConnection implements ReadableByteChannel, WritableBy
 
     public abstract void read(CompletionHandler<Integer, ByteBuffer> handler);
 
-    public abstract void read(long timeout, TimeUnit unit, CompletionHandler<Integer, ByteBuffer> handler);
-
     @Override
     public abstract int write(ByteBuffer src) throws IOException;
 
@@ -127,9 +129,9 @@ public abstract class AsyncConnection implements ReadableByteChannel, WritableBy
 
     public abstract <A> void write(ByteBuffer[] srcs, int offset, int length, A attachment, CompletionHandler<Integer, ? super A> handler);
 
-    public void setReadBuffer(Buffer buffer) {
+    public void setReadBuffer(ByteBuffer buffer) {
         if (this.readBuffer != null) throw new RuntimeException("repeat AsyncConnection.setReadBuffer");
-        this.readBuffer = (ByteBuffer) buffer;
+        this.readBuffer = buffer;
     }
 
     public ByteBuffer pollReadBuffer() {
@@ -138,22 +140,40 @@ public abstract class AsyncConnection implements ReadableByteChannel, WritableBy
             this.readBuffer = null;
             return rs;
         }
+//        Thread thread = Thread.currentThread();
+//        if (thread instanceof IOThread) {
+//            return ((IOThread) thread).getBufferPool().get();
+//        }
         return bufferSupplier.get();
     }
 
-    public void offerBuffer(Buffer buffer) {
+    public void offerBuffer(ByteBuffer buffer) {
         if (buffer == null) return;
-        bufferConsumer.accept((ByteBuffer) buffer);
+//        Thread thread = Thread.currentThread();
+//        if (thread instanceof IOThread) {
+//            ((IOThread) thread).getBufferPool().accept((ByteBuffer) buffer);
+//            return;
+//        }
+        bufferConsumer.accept(buffer);
     }
 
-    public void offerBuffer(Buffer... buffers) {
+    public void offerBuffer(ByteBuffer... buffers) {
         if (buffers == null) return;
-        for (Buffer buffer : buffers) {
-            bufferConsumer.accept((ByteBuffer) buffer);
+        Consumer<ByteBuffer> consumer = this.bufferConsumer;
+//        Thread thread = Thread.currentThread();
+//        if (thread instanceof IOThread) {
+//            consumer = ((IOThread) thread).getBufferPool();
+//        }
+        for (ByteBuffer buffer : buffers) {
+            consumer.accept(buffer);
         }
     }
 
     public ByteBuffer pollWriteBuffer() {
+//        Thread thread = Thread.currentThread();
+//        if (thread instanceof IOThread) {
+//            return ((IOThread) thread).getBufferPool().get();
+//        }
         return bufferSupplier.get();
     }
 
@@ -186,7 +206,12 @@ public abstract class AsyncConnection implements ReadableByteChannel, WritableBy
             }
         }
         if (this.readBuffer != null) {
-            bufferConsumer.accept(this.readBuffer);
+            Consumer<ByteBuffer> consumer = this.bufferConsumer;
+//            Thread thread = Thread.currentThread();
+//            if (thread instanceof IOThread) {
+//                consumer = ((IOThread) thread).getBufferPool();
+//            }
+            consumer.accept(this.readBuffer);
         }
         if (attributes == null) return;
         try {
@@ -245,22 +270,6 @@ public abstract class AsyncConnection implements ReadableByteChannel, WritableBy
         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协议客户端连接
      *
@@ -371,35 +380,6 @@ public abstract class AsyncConnection implements ReadableByteChannel, WritableBy
         return new UdpBioAsyncConnection(bufferPool, bufferPool, ch, sslContext, addr, client0, readTimeoutSeconds0, writeTimeoutSeconds0, livingCounter, closedCounter);
     }
 
-    public static AsyncConnection create(final Context context, final AsynchronousSocketChannel ch) {
-        return create(context, ch, (SocketAddress) null, 0, 0);
-    }
-
-    public static AsyncConnection create(final Context context, final AsynchronousSocketChannel ch,
-        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 Context context, final AsynchronousSocketChannel ch,
-        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 Context context, final AsynchronousSocketChannel ch, SSLContext sslContext,
-        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 Context context, final AsynchronousSocketChannel ch,
-        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds, final AtomicLong livingCounter, final AtomicLong closedCounter) {
-        return new TcpAioAsyncConnection(context.getBufferSupplier(), context.getBufferConsumer(), ch, null, addr0, readTimeoutSeconds, writeTimeoutSeconds, livingCounter, closedCounter);
-    }
-
-    public static AsyncConnection create(final Context context, final AsynchronousSocketChannel ch, SSLContext sslContext,
-        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds, final AtomicLong livingCounter, final AtomicLong closedCounter) {
-        return new TcpAioAsyncConnection(context.getBufferSupplier(), context.getBufferConsumer(), ch, sslContext, addr0, readTimeoutSeconds, writeTimeoutSeconds, livingCounter, closedCounter);
-    }
-
     public static AsyncConnection create(final ObjectPool<ByteBuffer> bufferPool, final AsynchronousSocketChannel ch) {
         return create(bufferPool, ch, null, 0, 0);
     }

src/org/redkale/net/Context.java

@@ -6,11 +6,8 @@
 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.*;
 import javax.net.ssl.SSLContext;
 import org.redkale.convert.bson.*;
@@ -39,12 +36,6 @@ public class Context {
     //ByteBuffer的容量，默认8K
     protected final int bufferCapacity;
 
-    //ByteBuffer对象池
-    protected final ObjectPool<ByteBuffer> bufferPool;
-
-    //Response对象池
-    protected final ObjectPool<Response> responsePool;
-
     //服务的根Servlet
     protected final PrepareServlet prepare;
 
@@ -83,22 +74,18 @@ public class Context {
 
     public Context(ContextConfig config) {
         this(config.serverStartTime, config.logger, config.executor, config.sslContext,
-            config.bufferCapacity, config.bufferPool, config.responsePool, config.maxconns, config.maxbody,
-            config.charset, config.address, config.resourceFactory, config.prepare,
-            config.aliveTimeoutSeconds, config.readTimeoutSeconds, config.writeTimeoutSeconds);
+            config.bufferCapacity, config.maxconns, config.maxbody, config.charset, config.address, config.resourceFactory,
+            config.prepare, config.aliveTimeoutSeconds, config.readTimeoutSeconds, config.writeTimeoutSeconds);
     }
 
     public Context(long serverStartTime, Logger logger, ThreadPoolExecutor executor, SSLContext sslContext,
-        int bufferCapacity, ObjectPool<ByteBuffer> bufferPool, ObjectPool<Response> responsePool, final int maxconns,
-        final int maxbody, Charset charset, InetSocketAddress address, ResourceFactory resourceFactory,
-        final PrepareServlet prepare, final int aliveTimeoutSeconds, final int readTimeoutSeconds, final int writeTimeoutSeconds) {
+        int bufferCapacity, final int maxconns, final int maxbody, Charset charset, InetSocketAddress address,
+        ResourceFactory resourceFactory, PrepareServlet prepare, int aliveTimeoutSeconds, int readTimeoutSeconds, int writeTimeoutSeconds) {
         this.serverStartTime = serverStartTime;
         this.logger = logger;
         this.executor = executor;
         this.sslContext = sslContext;
         this.bufferCapacity = bufferCapacity;
-        this.bufferPool = bufferPool;
-        this.responsePool = responsePool;
         this.maxconns = maxconns;
         this.maxbody = maxbody;
         this.charset = StandardCharsets.UTF_8.equals(charset) ? null : charset;
@@ -148,40 +135,18 @@ public class Context {
         executor.execute(r);
     }
 
+    public int getCorePoolSize() {
+        return executor.getCorePoolSize();
+    }
+
+    public ThreadFactory getThreadFactory() {
+        return executor.getThreadFactory();
+    }
+
     public int getBufferCapacity() {
         return bufferCapacity;
     }
 
-    public Supplier<ByteBuffer> getBufferSupplier() {
-        return bufferPool;
-    }
-
-    public Consumer<ByteBuffer> getBufferConsumer() {
-        return bufferPool;
-    }
-
-    public ByteBuffer pollBuffer() {
-        return bufferPool.get();
-    }
-
-    public void offerBuffer(ByteBuffer buffer) {
-        bufferPool.accept(buffer);
-    }
-
-    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);
-        }
-    }
-
     public Logger getLogger() {
         return logger;
     }
@@ -220,12 +185,6 @@ public class Context {
         //ByteBuffer的容量，默认8K
         public int bufferCapacity;
 
-        //ByteBuffer对象池
-        public ObjectPool<ByteBuffer> bufferPool;
-
-        //Response对象池
-        public ObjectPool<Response> responsePool;
-
         //服务的根Servlet
         public PrepareServlet prepare;
 

src/org/redkale/net/IOThread.java

@@ -0,0 +1,61 @@
+/*
+ * 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.nio.ByteBuffer;
+import java.util.concurrent.ExecutorService;
+import org.redkale.util.*;
+
+/**
+ * 协议处理的IO线程类
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+public class IOThread extends Thread {
+
+    protected Thread localThread;
+
+    protected final ExecutorService executor;
+
+    protected ObjectPool<ByteBuffer> bufferPool;
+
+    public IOThread(ExecutorService executor, ObjectPool<ByteBuffer> bufferPool, Runnable runner) {
+        super(runner);
+        this.executor = executor;
+        this.bufferPool = bufferPool;
+        this.setDaemon(true);
+    }
+
+    public void runAsync(Runnable runner) {
+        executor.execute(runner);
+    }
+
+    public ExecutorService getExecutor() {
+        return executor;
+    }
+
+    public ObjectPool<ByteBuffer> getBufferPool() {
+        return bufferPool;
+    }
+
+    @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/PrepareRunner.java

@@ -8,7 +8,6 @@ package org.redkale.net;
 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.*;
@@ -28,12 +27,15 @@ public class PrepareRunner implements Runnable {
 
     private final Context context;
 
+    private final ObjectPool<Response> responsePool;
+
     private ByteBuffer data;
 
     private Response response;
 
-    public PrepareRunner(Context context, AsyncConnection channel, ByteBuffer data, Response response) {
+    public PrepareRunner(Context context, ObjectPool<Response> responsePool, AsyncConnection channel, ByteBuffer data, Response response) {
         this.context = context;
+        this.responsePool = responsePool;
         this.channel = channel;
         this.data = data;
         this.response = response;
@@ -41,8 +43,6 @@ public class PrepareRunner implements Runnable {
 
     @Override
     public void run() {
-        final boolean keepalive = response != null;
-        final ObjectPool<? extends Response> responsePool = context.responsePool;
         if (data != null) { //BIO模式的UDP连接创建AsyncConnection时已经获取到ByteBuffer数据了
             if (response == null) response = responsePool.get();
             try {
@@ -56,12 +56,12 @@ public class PrepareRunner implements Runnable {
         }
         if (response == null) response = responsePool.get();
         try {
-            channel.read(keepalive ? context.getAliveTimeoutSeconds() : context.getReadTimeoutSeconds(), TimeUnit.SECONDS,
-                new CompletionHandler<Integer, ByteBuffer>() {
+            channel.read(new CompletionHandler<Integer, ByteBuffer>() {
                 @Override
                 public void completed(Integer count, ByteBuffer buffer) {
                     if (count < 1) {
-                        response.request.offerReadBuffer(buffer);
+                        buffer.clear();
+                        channel.setReadBuffer(buffer);
                         channel.dispose();// response.init(channel); 在调用之前异常
                         response.removeChannel();
                         response.finish(true);
@@ -85,7 +85,8 @@ public class PrepareRunner implements Runnable {
 
                 @Override
                 public void failed(Throwable exc, ByteBuffer buffer) {
-                    response.request.offerReadBuffer(buffer);
+                    buffer.clear();
+                    channel.setReadBuffer(buffer);
                     channel.dispose();// response.init(channel); 在调用之前异常
                     response.removeChannel();
                     response.finish(true);
@@ -98,7 +99,7 @@ public class PrepareRunner implements Runnable {
             channel.dispose();// response.init(channel); 在调用之前异常
             response.removeChannel();
             response.finish(true);
-            if (te != null && context.logger.isLoggable(Level.FINEST)) {
+            if (context.logger.isLoggable(Level.FINEST)) {
                 context.logger.log(Level.FINEST, "Servlet read channel erroneous, force to close channel ", te);
             }
         }
@@ -117,7 +118,8 @@ public class PrepareRunner implements Runnable {
             if (buffer.hasRemaining()) {
                 request.setMoredata(buffer);
             } else {
-                response.request.offerReadBuffer(buffer);
+                buffer.clear();
+                channel.setReadBuffer(buffer);
             }
             preparer.prepare(request, response);
         } else {
@@ -138,7 +140,8 @@ public class PrepareRunner implements Runnable {
                         if (attachment.hasRemaining()) {
                             request.setMoredata(attachment);
                         } else {
-                            response.request.offerReadBuffer(attachment);
+                            attachment.clear();
+                            channel.setReadBuffer(attachment);
                         }
                         try {
                             preparer.prepare(request, response);
@@ -152,7 +155,8 @@ public class PrepareRunner implements Runnable {
                 @Override
                 public void failed(Throwable exc, ByteBuffer attachment) {
                     preparer.illRequestCounter.incrementAndGet();
-                    response.request.offerReadBuffer(attachment);
+                    attachment.clear();
+                    channel.setReadBuffer(attachment);
                     response.finish(true);
                     if (exc != null) request.context.logger.log(Level.FINER, "Servlet read channel erroneous, force to close channel ", exc);
                 }
@@ -165,7 +169,7 @@ public class PrepareRunner implements Runnable {
     }
 
     protected Response pollResponse() {
-        return context.responsePool.get();
+        return responsePool.get();
     }
 
     protected Request pollRequest(Response response) {
@@ -176,19 +180,4 @@ public class PrepareRunner implements Runnable {
         return response.removeChannel();
     }
 
-    protected ByteBuffer pollReadBuffer(Request request) {
-        return request.pollReadBuffer();
-    }
-
-    protected ByteBuffer pollReadBuffer(Response response) {
-        return response.request.pollReadBuffer();
-    }
-
-    protected void offerReadBuffer(Request request, ByteBuffer buffer) {
-        request.offerReadBuffer(buffer);
-    }
-
-    protected void offerReadBuffer(Response response, ByteBuffer buffer) {
-        response.request.offerReadBuffer(buffer);
-    }
 }

src/org/redkale/net/ProtocolServer.java

@@ -43,7 +43,7 @@ public abstract class ProtocolServer {
 
     public abstract <T> void setOption(SocketOption<T> name, T value) throws IOException;
 
-    public abstract void accept() throws IOException;
+    public abstract void accept(Server server) throws IOException;
 
     public abstract void close() throws IOException;
 

src/org/redkale/net/Request.java

@@ -9,6 +9,7 @@ import java.nio.ByteBuffer;
 import java.util.*;
 import org.redkale.convert.bson.BsonConvert;
 import org.redkale.convert.json.JsonConvert;
+import org.redkale.util.ObjectPool;
 
 /**
  * 协议请求对象
@@ -23,6 +24,8 @@ public abstract class Request<C extends Context> {
 
     protected final C context;
 
+    protected final ObjectPool<ByteBuffer> bufferPool;
+
     protected final BsonConvert bsonConvert;
 
     protected final JsonConvert jsonConvert;
@@ -37,8 +40,6 @@ public abstract class Request<C extends Context> {
 
     protected AsyncConnection channel;
 
-    protected ByteBuffer readBuffer;
-
     /**
      * properties 与 attributes 的区别在于：调用recycle时， attributes会被清空而properties会保留;
      * properties 通常存放需要永久绑定在request里的一些对象
@@ -47,9 +48,9 @@ public abstract class Request<C extends Context> {
 
     protected final Map<String, Object> attributes = new HashMap<>();
 
-    protected Request(C context) {
+    protected Request(C context, ObjectPool<ByteBuffer> bufferPool) {
         this.context = context;
-        this.readBuffer = context.pollBuffer();
+        this.bufferPool = bufferPool;
         this.bsonConvert = context.getBsonConvert();
         this.jsonConvert = context.getJsonConvert();
     }
@@ -64,23 +65,6 @@ public abstract class Request<C extends Context> {
         return rs;
     }
 
-    protected ByteBuffer pollReadBuffer() {
-        ByteBuffer buffer = this.readBuffer;
-        this.readBuffer = null;
-        if (buffer == null) buffer = context.pollBuffer();
-        return buffer;
-    }
-
-    protected void offerReadBuffer(ByteBuffer buffer) {
-        if (buffer == null) return;
-        if (this.readBuffer == null) {
-            buffer.clear();
-            this.readBuffer = buffer;
-        } else {
-            context.offerBuffer(buffer);
-        }
-    }
-
     /**
      * 返回值：Integer.MIN_VALUE: 帧数据； -1：数据不合法； 0：解析完毕； &gt;0: 需再读取的字节数。
      *

src/org/redkale/net/Response.java

@@ -10,6 +10,7 @@ import java.nio.ByteBuffer;
 import java.nio.channels.CompletionHandler;
 import java.util.function.*;
 import java.util.logging.Level;
+import org.redkale.util.ObjectPool;
 
 /**
  * 协议响应对象
@@ -26,14 +27,12 @@ public abstract class Response<C extends Context, R extends Request<C>> {
 
     protected final C context;
 
+    protected final ObjectPool<Response> responsePool;
+
     protected final R request;
 
     protected AsyncConnection channel;
 
-    protected ByteBuffer writeHeadBuffer;
-
-    protected ByteBuffer writeBodyBuffer;
-
     private volatile boolean inited = true;
 
     protected Object output; //输出的结果对象
@@ -44,8 +43,6 @@ public abstract class Response<C extends Context, R extends Request<C>> {
 
     protected Servlet<C, R, ? extends Response<C, R>> servlet;
 
-    private Supplier<ByteBuffer> bodyBufferSupplier;
-
     private final CompletionHandler finishHandler = new CompletionHandler<Integer, ByteBuffer>() {
 
         @Override
@@ -53,31 +50,21 @@ public abstract class Response<C extends Context, R extends Request<C>> {
             if (attachment.hasRemaining()) {
                 channel.write(attachment, attachment, this);
             } else {
-                offerResponseBuffer(attachment);
+                channel.offerBuffer(attachment);
+                ByteBuffer data = request.removeMoredata();
+                final boolean more = data != null && request.keepAlive;
+                request.more = more;
                 finish();
+                if (more) new PrepareRunner(context, responsePool, request.channel, null, Response.this).run();
             }
         }
 
         @Override
         public void failed(Throwable exc, ByteBuffer attachment) {
-            offerResponseBuffer(attachment);
+            channel.offerBuffer(attachment);
             finish(true);
         }
 
-        private void offerResponseBuffer(ByteBuffer attachment) {
-            if (writeHeadBuffer == null) {
-                if (context.bufferPool.getRecyclerPredicate().test(attachment)) {
-                    writeHeadBuffer = attachment;
-                }
-            } else if (writeBodyBuffer == null) {
-                if (context.bufferPool.getRecyclerPredicate().test(attachment)) {
-                    writeBodyBuffer = attachment;
-                }
-            } else {
-                context.offerBuffer(attachment);
-            }
-        }
-
     };
 
     private final CompletionHandler finishHandler2 = new CompletionHandler<Integer, ByteBuffer[]>() {
@@ -94,70 +81,37 @@ public abstract class Response<C extends Context, R extends Request<C>> {
             if (index >= 0) {
                 channel.write(attachments, index, attachments.length - index, attachments, this);
             } else {
-                offerResponseBuffer(attachments);
+                for (ByteBuffer attachment : attachments) {
+                    channel.offerBuffer(attachment);
+                }
+                ByteBuffer data = request.removeMoredata();
+                final boolean more = data != null && request.keepAlive;
+                request.more = more;
                 finish();
+                if (more) new PrepareRunner(context, responsePool, request.channel, null, Response.this).run();
             }
         }
 
         @Override
         public void failed(Throwable exc, final ByteBuffer[] attachments) {
-            offerResponseBuffer(attachments);
+            for (ByteBuffer attachment : attachments) {
+                channel.offerBuffer(attachment);
+            }
             finish(true);
         }
 
-        private void offerResponseBuffer(ByteBuffer[] attachments) {
-            int start = 0;
-            if (writeHeadBuffer == null && attachments.length > start) {
-                if (context.bufferPool.getRecyclerPredicate().test(attachments[start])) {
-                    writeHeadBuffer = attachments[start];
-                    start++;
-                }
-            }
-            if (writeBodyBuffer == null && attachments.length > start) {
-                if (context.bufferPool.getRecyclerPredicate().test(attachments[start])) {
-                    writeBodyBuffer = attachments[start];
-                    start++;
-                }
-            }
-            for (int i = start; i < attachments.length; i++) {
-                context.offerBuffer(attachments[i]);
-            }
-        }
     };
 
-    protected Response(C context, final R request) {
+    protected Response(C context, final R request, ObjectPool<Response> responsePool) {
         this.context = context;
         this.request = request;
-        this.writeHeadBuffer = context.pollBuffer();
-        this.writeBodyBuffer = context.pollBuffer();
-        this.bodyBufferSupplier = () -> {
-            ByteBuffer buffer = writeBodyBuffer;
-            if (buffer == null) return context.pollBuffer();
-            writeBodyBuffer = null;
-            return buffer;
-        };
-    }
-
-    protected ByteBuffer pollWriteReadBuffer() {
-        ByteBuffer buffer = this.writeHeadBuffer;
-        this.writeHeadBuffer = null;
-        if (buffer == null) buffer = context.pollBuffer();
-        return buffer;
-    }
-
-    protected ByteBuffer pollWriteBodyBuffer() {
-        ByteBuffer buffer = this.writeBodyBuffer;
-        this.writeBodyBuffer = null;
-        if (buffer == null) buffer = context.pollBuffer();
-        return buffer;
-    }
-
-    protected Supplier<ByteBuffer> getBodyBufferSupplier() {
-        return bodyBufferSupplier;
+        this.responsePool = responsePool;
     }
 
     protected void offerBuffer(ByteBuffer... buffers) {
-        context.offerBuffer(buffers);
+        for (ByteBuffer buffer : buffers) {
+            channel.offerBuffer(buffer);
+        }
     }
 
     protected AsyncConnection removeChannel() {
@@ -257,19 +211,19 @@ public abstract class Response<C extends Context, R extends Request<C>> {
                 AsyncConnection conn = removeChannel();
                 this.recycle();
                 this.prepare();
-                new PrepareRunner(context, conn, null, this).run();
+                new PrepareRunner(context, this.responsePool, conn, null, this).run();
             } else {
                 channel.dispose();
             }
         } else {
-            this.context.responsePool.accept(this);
+            this.responsePool.accept(this);
         }
     }
 
     public void finish(final byte[] bs) {
         if (!this.inited) return; //避免重复关闭
         if (this.context.bufferCapacity == bs.length) {
-            ByteBuffer buffer = this.context.pollBuffer();
+            ByteBuffer buffer = channel.bufferSupplier.get();
             buffer.put(bs);
             buffer.flip();
             this.finish(buffer);
@@ -280,33 +234,33 @@ public abstract class Response<C extends Context, R extends Request<C>> {
 
     public void finish(ByteBuffer buffer) {
         if (!this.inited) return; //避免重复关闭
-        ByteBuffer data = this.request.removeMoredata();
         final AsyncConnection conn = this.channel;
-        final boolean more = data != null && this.request.keepAlive;
-        this.request.more = more;
+//        ByteBuffer data = this.request.removeMoredata();
+//        final boolean more = data != null && this.request.keepAlive;
+//        this.request.more = more;
         conn.write(buffer, buffer, finishHandler);
-        if (more) new PrepareRunner(this.context, conn, data, null).run();
+//        if (more) new PrepareRunner(this.context, this.responsePool, conn, data, null).run();
     }
 
     public void finish(boolean kill, ByteBuffer buffer) {
         if (!this.inited) return; //避免重复关闭
         if (kill) refuseAlive();
-        ByteBuffer data = this.request.removeMoredata();
         final AsyncConnection conn = this.channel;
-        final boolean more = data != null && this.request.keepAlive;
-        this.request.more = more;
+//        ByteBuffer data = this.request.removeMoredata();
+//        final boolean more = data != null && this.request.keepAlive;
+//        this.request.more = more;
         conn.write(buffer, buffer, finishHandler);
-        if (more) new PrepareRunner(this.context, conn, data, null).run();
+//        if (more) new PrepareRunner(this.context, this.responsePool, conn, data, null).run();
     }
 
     public void finish(ByteBuffer... buffers) {
         if (!this.inited) return; //避免重复关闭
         final AsyncConnection conn = this.channel;
-        ByteBuffer data = this.request.removeMoredata();
-        final boolean more = data != null && this.request.keepAlive;
-        this.request.more = more;
+//        ByteBuffer data = this.request.removeMoredata();
+//        final boolean more = data != null && this.request.keepAlive;
+//        this.request.more = more;
         conn.write(buffers, buffers, finishHandler2);
-        if (more) new PrepareRunner(this.context, conn, data, null).run();
+//        if (more) new PrepareRunner(this.context, this.responsePool, conn, data, null).run();
     }
 
     public void finish(boolean kill, ByteBuffer... buffers) {
@@ -317,7 +271,7 @@ public abstract class Response<C extends Context, R extends Request<C>> {
         final boolean more = data != null && this.request.keepAlive;
         this.request.more = more;
         conn.write(buffers, buffers, finishHandler2);
-        if (more) new PrepareRunner(this.context, conn, data, null).run();
+        if (more) new PrepareRunner(this.context, this.responsePool, conn, data, null).run();
     }
 
     protected <A> void send(final ByteBuffer buffer, final A attachment, final CompletionHandler<Integer, A> handler) {
@@ -328,14 +282,14 @@ public abstract class Response<C extends Context, R extends Request<C>> {
                 if (buffer.hasRemaining()) {
                     channel.write(buffer, attachment, this);
                 } else {
-                    context.offerBuffer(buffer);
+                    channel.offerBuffer(buffer);
                     if (handler != null) handler.completed(result, attachment);
                 }
             }
 
             @Override
             public void failed(Throwable exc, A attachment) {
-                context.offerBuffer(buffer);
+                channel.offerBuffer(buffer);
                 if (handler != null) handler.failed(exc, attachment);
             }
 
@@ -353,7 +307,7 @@ public abstract class Response<C extends Context, R extends Request<C>> {
                         index = i;
                         break;
                     }
-                    context.offerBuffer(buffers[i]);
+                    channel.offerBuffer(buffers[i]);
                 }
                 if (index == 0) {
                     channel.write(buffers, attachment, this);
@@ -367,7 +321,7 @@ public abstract class Response<C extends Context, R extends Request<C>> {
             @Override
             public void failed(Throwable exc, A attachment) {
                 for (ByteBuffer buffer : buffers) {
-                    context.offerBuffer(buffer);
+                    channel.offerBuffer(buffer);
                 }
                 if (handler != null) handler.failed(exc, attachment);
             }

src/org/redkale/net/Server.java

@@ -7,14 +7,14 @@ package org.redkale.net;
 
 import java.io.*;
 import java.net.*;
+import java.nio.ByteBuffer;
 import java.nio.charset.Charset;
 import java.text.*;
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.*;
 import java.util.logging.*;
 import javax.net.ssl.SSLContext;
-import org.redkale.net.Filter;
 import org.redkale.util.*;
 
 /**
@@ -125,11 +125,11 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
         this.aliveTimeoutSeconds = config.getIntValue("aliveTimeoutSeconds", 30);
         this.readTimeoutSeconds = config.getIntValue("readTimeoutSeconds", 0);
         this.writeTimeoutSeconds = config.getIntValue("writeTimeoutSeconds", 0);
-        this.backlog = parseLenth(config.getValue("backlog"), 8 * 1024);
+        this.backlog = parseLenth(config.getValue("backlog"), 1024);
         this.maxbody = parseLenth(config.getValue("maxbody"), 64 * 1024);
-        int bufCapacity = parseLenth(config.getValue("bufferCapacity"), 32 * 1024);
-        this.bufferCapacity = bufCapacity < 8 * 1024 ? 8 * 1024 : bufCapacity;
-        this.threads = config.getIntValue("threads", Runtime.getRuntime().availableProcessors() * 32);
+        int bufCapacity = parseLenth(config.getValue("bufferCapacity"), "UDP".equalsIgnoreCase(protocol) ? 1350 : 32 * 1024);
+        this.bufferCapacity = "UDP".equalsIgnoreCase(protocol) ? bufCapacity : (bufCapacity < 8 * 1024 ? 8 * 1024 : bufCapacity);
+        this.threads = config.getIntValue("threads", Math.max(8, Runtime.getRuntime().availableProcessors() * 2));
         this.bufferPoolSize = config.getIntValue("bufferPoolSize", this.threads * 4);
         this.responsePoolSize = config.getIntValue("responsePoolSize", this.threads * 2);
         this.name = config.getValue("name", "Server-" + protocol + "-" + this.address.getPort());
@@ -153,7 +153,7 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
         final String n = name;
         this.executor = (ThreadPoolExecutor) Executors.newFixedThreadPool(threads, (Runnable r) -> {
             Thread t = new WorkThread(executor, r);
-            t.setName(n + "-ServletThread-" + f.format(counter.incrementAndGet()));
+            t.setName("Redkale-" + n + "-ServletThread-" + f.format(counter.incrementAndGet()));
             return t;
         });
     }
@@ -281,13 +281,17 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
         this.serverChannel = ProtocolServer.create(this.protocol, context, this.serverClassLoader, config == null ? null : config.getValue("netimpl"));
         this.serverChannel.open(config);
         serverChannel.bind(address, backlog);
-        serverChannel.accept();
+        serverChannel.accept(this);
         final String threadName = "[" + Thread.currentThread().getName() + "] ";
+        postStart();
         logger.info(threadName + this.getClass().getSimpleName() + ("TCP".equalsIgnoreCase(protocol) ? "" : ("." + protocol)) + " listen: " + address
             + ", threads: " + threads + ", maxbody: " + formatLenth(context.maxbody) + ", bufferCapacity: " + formatLenth(bufferCapacity) + ", bufferPoolSize: " + bufferPoolSize + ", responsePoolSize: " + responsePoolSize
             + ", started in " + (System.currentTimeMillis() - context.getServerStartTime()) + " ms");
     }
 
+    protected void postStart() {
+    }
+
     public void changeAddress(final InetSocketAddress addr) throws IOException {
         long s = System.currentTimeMillis();
         Objects.requireNonNull(addr);
@@ -299,7 +303,7 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
             newServerChannel = ProtocolServer.create(this.protocol, context, this.serverClassLoader, config == null ? null : config.getValue("netimpl"));
             newServerChannel.open(config);
             newServerChannel.bind(addr, backlog);
-            newServerChannel.accept();
+            newServerChannel.accept(this);
         } catch (IOException e) {
             context.address = oldAddress;
             throw e;
@@ -358,6 +362,15 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
 
     protected abstract C createContext();
 
+    //必须在 createContext()之后调用
+    protected abstract ObjectPool<ByteBuffer> createBufferPool(AtomicLong createCounter, AtomicLong cycleCounter, int bufferPoolSize);
+
+    //必须在 createContext()之后调用
+    protected abstract ObjectPool<Response> createResponsePool(AtomicLong createCounter, AtomicLong cycleCounter, int responsePoolSize);
+
+    //必须在 createResponsePool()之后调用
+    protected abstract Creator<Response> createResponseCreator(ObjectPool<ByteBuffer> bufferPool, ObjectPool<Response> responsePool);
+
     public void shutdown() throws IOException {
         long s = System.currentTimeMillis();
         logger.info(this.getClass().getSimpleName() + "-" + this.protocol + " shutdowning");
@@ -481,7 +494,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/Servlet.java

@@ -23,11 +23,13 @@ public abstract class Servlet<C extends Context, R extends Request<C>, P extends
 
     AnyValue _conf; //当前Servlet的配置
 
+    //Server执行start时运行此方法
     public void init(C context, AnyValue config) {
     }
 
     public abstract void execute(R request, P response) throws IOException;
 
+    //Server执行shutdown后运行此方法
     public void destroy(C context, AnyValue config) {
     }
 

src/org/redkale/net/TcpAioAsyncConnection.java

@@ -24,7 +24,7 @@ import javax.net.ssl.SSLContext;
  */
 public class TcpAioAsyncConnection extends AsyncConnection {
 
-    private final Semaphore semaphore = new Semaphore(1);
+    //private final Semaphore semaphore = new Semaphore(1);
 
     private int readTimeoutSeconds;
 
@@ -103,30 +103,35 @@ public class TcpAioAsyncConnection extends AsyncConnection {
         }
     }
 
-    @Override
-    public void read(long timeout, TimeUnit unit, CompletionHandler<Integer, ByteBuffer> handler) {
-        this.readtime = System.currentTimeMillis();
-        ByteBuffer dst = pollReadBuffer();
-        channel.read(dst, timeout < 0 ? 0 : timeout, unit, dst, handler);
-    }
-
-    private <A> void nextWrite(A attachment) {
-        BlockingQueue<WriteEntry> queue = this.writeQueue;
-        WriteEntry entry = queue == null ? null : queue.poll();
-        if (entry != null) {
-            try {
-                if (entry.writeOneBuffer == null) {
-                    write(false, entry.writeBuffers, entry.writeOffset, entry.writeLength, entry.writeAttachment, entry.writeHandler);
-                } else {
-                    write(false, entry.writeOneBuffer, entry.writeAttachment, entry.writeHandler);
-                }
-            } catch (Exception e) {
-                entry.writeHandler.failed(e, entry.writeAttachment);
-            }
-        } else {
-            semaphore.release();
-        }
-    }
+//    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) {
+//                    write(false, entry.writeBuffers, entry.writeOffset, entry.writeLength, entry.writeAttachment, entry.writeHandler);
+//                } else {
+//                    write(false, entry.writeOneBuffer, entry.writeAttachment, entry.writeHandler);
+//                }
+//            } catch (Exception e) {
+//                entry.writeHandler.failed(e, entry.writeAttachment);
+//            }
+//        } else {
+//            semaphore.release();
+//        }
+//    }
 
     @Override
     public <A> void write(ByteBuffer src, A attachment, CompletionHandler<Integer, ? super A> handler) {
@@ -134,17 +139,17 @@ public class TcpAioAsyncConnection extends AsyncConnection {
     }
 
     private <A> void write(boolean acquire, ByteBuffer src, A attachment, CompletionHandler<Integer, ? super A> handler) {
-        if (acquire && !semaphore.tryAcquire()) {
-            if (this.writeQueue == null) {
-                synchronized (semaphore) {
-                    if (this.writeQueue == null) {
-                        this.writeQueue = new LinkedBlockingDeque<>();
-                    }
-                }
-            }
-            this.writeQueue.add(new WriteEntry(src, attachment, handler));
-            return;
-        }
+//        if (acquire && !semaphore.tryAcquire()) {
+//            if (this.writeQueue == null) {
+//                synchronized (semaphore) {
+//                    if (this.writeQueue == null) {
+//                        this.writeQueue = new LinkedBlockingDeque<>();
+//                    }
+//                }
+//            }
+//            this.writeQueue.add(new WriteEntry(src, attachment, handler));
+//            return;
+//        }
         WriteOneCompletionHandler newHandler = new WriteOneCompletionHandler(src, handler);
         if (!channel.isOpen()) {
             newHandler.failed(new ClosedChannelException(), attachment);
@@ -168,17 +173,17 @@ public class TcpAioAsyncConnection extends AsyncConnection {
     }
 
     private <A> void write(boolean acquire, ByteBuffer[] srcs, int offset, int length, A attachment, final CompletionHandler<Integer, ? super A> handler) {
-        if (acquire && !semaphore.tryAcquire()) {
-            if (this.writeQueue == null) {
-                synchronized (semaphore) {
-                    if (this.writeQueue == null) {
-                        this.writeQueue = new LinkedBlockingDeque<>();
-                    }
-                }
-            }
-            this.writeQueue.add(new WriteEntry(srcs, offset, length, attachment, handler));
-            return;
-        }
+//        if (acquire && !semaphore.tryAcquire()) {
+//            if (this.writeQueue == null) {
+//                synchronized (semaphore) {
+//                    if (this.writeQueue == null) {
+//                        this.writeQueue = new LinkedBlockingDeque<>();
+//                    }
+//                }
+//            }
+//            this.writeQueue.add(new WriteEntry(srcs, offset, length, attachment, handler));
+//            return;
+//        }
         WriteMoreCompletionHandler newHandler = new WriteMoreCompletionHandler(srcs, offset, length, handler);
         if (!channel.isOpen()) {
             newHandler.failed(new ClosedChannelException(), attachment);
@@ -295,16 +300,16 @@ public class TcpAioAsyncConnection extends AsyncConnection {
             if (result >= 0) {
                 writeCount += result;
                 try {
-                    int index = -1;
+                    int incre = -1;
                     for (int i = writeOffset; i < (writeOffset + writeLength); i++) {
                         if (writeBuffers[i].hasRemaining()) {
-                            index = i;
+                            incre = i - writeOffset;
                             break;
                         }
                     }
-                    if (index >= 0) {
-                        writeOffset += index;
-                        writeLength -= index;
+                    if (incre >= 0) {
+                        writeOffset += incre;
+                        writeLength -= incre;
                         channel.write(writeBuffers, writeOffset, writeLength, writeTimeoutSeconds > 0 ? writeTimeoutSeconds : 60, TimeUnit.SECONDS, attachment, this);
                         return;
                     }
@@ -312,18 +317,27 @@ public class TcpAioAsyncConnection extends AsyncConnection {
                     failed(e, attachment);
                     return;
                 }
-                nextWrite(attachment);
-                writeHandler.completed(writeCount, attachment);
+//                try {
+                    writeHandler.completed(writeCount, attachment);
+//                } finally {
+//                    nextWrite(null, attachment);
+//                }
             } else {
-                nextWrite(attachment);
-                writeHandler.completed(result.intValue(), attachment);
+//                try {
+                    writeHandler.completed(result.intValue(), attachment);
+//                } finally {
+//                    nextWrite(null, attachment);
+//                }
             }
         }
 
         @Override
         public void failed(Throwable exc, A attachment) {
-            nextWrite(attachment);
-            writeHandler.failed(exc, attachment);
+//            try {
+                writeHandler.failed(exc, attachment);
+//            } finally {
+//                nextWrite(exc, attachment);
+//            }
         }
 
     }
@@ -350,14 +364,21 @@ public class TcpAioAsyncConnection extends AsyncConnection {
                 failed(e, attachment);
                 return;
             }
-            nextWrite(attachment);
-            writeHandler.completed(result, attachment);
+//            try {
+                writeHandler.completed(result, attachment);
+//            } finally {
+//                nextWrite(null, attachment);
+//            }
+
         }
 
         @Override
         public void failed(Throwable exc, A attachment) {
-            nextWrite(attachment);
-            writeHandler.failed(exc, attachment);
+//            try {
+                writeHandler.failed(exc, attachment);
+//            } finally {
+//                nextWrite(exc, attachment);
+//            }
         }
 
     }

src/org/redkale/net/TcpAioProtocolServer.java

@@ -7,10 +7,12 @@ 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.atomic.AtomicLong;
 import java.util.logging.Level;
-import org.redkale.util.AnyValue;
+import org.redkale.util.*;
 
 /**
  * 协议底层Server
@@ -70,7 +72,14 @@ public class TcpAioProtocolServer extends ProtocolServer {
     }
 
     @Override
-    public void accept() throws IOException {
+    public void accept(Server server) throws IOException {
+        AtomicLong createBufferCounter = new AtomicLong();
+        AtomicLong cycleBufferCounter = new AtomicLong();
+        ObjectPool<ByteBuffer> bufferPool = server.createBufferPool(createBufferCounter, cycleBufferCounter, server.bufferPoolSize);
+        AtomicLong createResponseCounter = new AtomicLong();
+        AtomicLong cycleResponseCounter = new AtomicLong();
+        ObjectPool<Response> responsePool = server.createResponsePool(createResponseCounter, cycleResponseCounter, server.responsePoolSize);
+        responsePool.setCreator(server.createResponseCreator(bufferPool, responsePool));
         final AsynchronousServerSocketChannel serchannel = this.serverChannel;
         serchannel.accept(null, new CompletionHandler<AsynchronousSocketChannel, Void>() {
 
@@ -93,9 +102,10 @@ public class TcpAioProtocolServer extends ProtocolServer {
                     channel.setOption(StandardSocketOptions.SO_RCVBUF, 16 * 1024);
                     channel.setOption(StandardSocketOptions.SO_SNDBUF, 16 * 1024);
 
-                    AsyncConnection conn = new TcpAioAsyncConnection(context.getBufferSupplier(), context.getBufferConsumer(), channel,
+                    AsyncConnection conn = new TcpAioAsyncConnection(bufferPool, bufferPool, channel,
                         context.getSSLContext(), null, context.readTimeoutSeconds, context.writeTimeoutSeconds, livingCounter, closedCounter);
-                    context.runAsync(new PrepareRunner(context, conn, null, null));
+                    //context.runAsync(new PrepareRunner(context, responsePool, conn, null, null));
+                    new PrepareRunner(context, responsePool, conn, null, null).run();
                 } catch (Throwable e) {
                     context.logger.log(Level.INFO, channel + " accept error", e);
                 }

src/org/redkale/net/TransportFactory.java

@@ -119,7 +119,7 @@ public class TransportFactory {
             if (this.checkinterval < 2) this.checkinterval = 2;
         }
         this.scheduler = new ScheduledThreadPoolExecutor(1, (Runnable r) -> {
-            final Thread t = new Thread(r, this.getClass().getSimpleName() + "-TransportFactoryTask-Thread");
+            final Thread t = new Thread(r, "Redkale-" + this.getClass().getSimpleName() + "-Schedule-Thread");
             t.setDaemon(true);
             return t;
         });
@@ -162,7 +162,7 @@ public class TransportFactory {
         ExecutorService transportExec = Executors.newFixedThreadPool(threads, (Runnable r) -> {
             Thread t = new Thread(r);
             t.setDaemon(true);
-            t.setName("Transport-Thread-" + counter.incrementAndGet());
+            t.setName("Redkale-Transport-Thread-" + counter.incrementAndGet());
             return t;
         });
         AsynchronousChannelGroup transportGroup = null;

src/org/redkale/net/UdpBioAsyncConnection.java

@@ -10,7 +10,6 @@ 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;
 import java.util.function.*;
 import javax.net.ssl.SSLContext;
@@ -142,11 +141,6 @@ public class UdpBioAsyncConnection extends AsyncConnection {
         }
     }
 
-    @Override
-    public void read(long timeout, TimeUnit unit, CompletionHandler<Integer, ByteBuffer> handler) {
-        read(handler);
-    }
-
     @Override
     public int read(ByteBuffer dst) throws IOException {
         int rs = channel.read(dst);

src/org/redkale/net/UdpBioProtocolServer.java

@@ -11,7 +11,8 @@ import java.nio.ByteBuffer;
 import java.nio.channels.DatagramChannel;
 import java.util.Set;
 import java.util.concurrent.CountDownLatch;
-import org.redkale.util.AnyValue;
+import java.util.concurrent.atomic.AtomicLong;
+import org.redkale.util.*;
 
 /**
  * 协议底层Server
@@ -70,7 +71,14 @@ public class UdpBioProtocolServer extends ProtocolServer {
     }
 
     @Override
-    public void accept() throws IOException {
+    public void accept(Server server) throws IOException {
+        AtomicLong createBufferCounter = new AtomicLong();
+        AtomicLong cycleBufferCounter = new AtomicLong();
+        ObjectPool<ByteBuffer> bufferPool = server.createBufferPool(createBufferCounter, cycleBufferCounter, server.bufferPoolSize);
+        AtomicLong createResponseCounter = new AtomicLong();
+        AtomicLong cycleResponseCounter = new AtomicLong();
+        ObjectPool<Response> responsePool = server.createResponsePool(createResponseCounter, cycleResponseCounter, server.responsePoolSize);
+        responsePool.setCreator(server.createResponseCreator(bufferPool, responsePool));
         final DatagramChannel serchannel = this.serverChannel;
         final int readTimeoutSeconds = this.context.readTimeoutSeconds;
         final int writeTimeoutSeconds = this.context.writeTimeoutSeconds;
@@ -81,15 +89,15 @@ public class UdpBioProtocolServer extends ProtocolServer {
             public void run() {
                 cdl.countDown();
                 while (running) {
-                    final ByteBuffer buffer = context.pollBuffer();
+                    final ByteBuffer buffer = bufferPool.get();
                     try {
                         SocketAddress address = serchannel.receive(buffer);
                         buffer.flip();
-                        AsyncConnection conn = new UdpBioAsyncConnection(context.getBufferSupplier(), context.getBufferConsumer(), serchannel,
+                        AsyncConnection conn = new UdpBioAsyncConnection(bufferPool, bufferPool, serchannel,
                             context.getSSLContext(), address, false, readTimeoutSeconds, writeTimeoutSeconds, null, null);
-                        context.runAsync(new PrepareRunner(context, conn, buffer, null));
+                        context.runAsync(new PrepareRunner(context, responsePool, conn, buffer, null));
                     } catch (Exception e) {
-                        context.offerBuffer(buffer);
+                        bufferPool.accept(buffer);
                     }
                 }
             }

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

@@ -28,8 +28,11 @@ public class HttpContext extends Context {
 
     protected final ConcurrentHashMap<Class, Creator> asyncHandlerCreators = new ConcurrentHashMap<>();
 
+    protected String remoteAddrHeader;
+
     public HttpContext(HttpContextConfig config) {
         super(config);
+        this.remoteAddrHeader = config.remoteAddrHeader;
         random.setSeed(Math.abs(System.nanoTime()));
     }
 
@@ -43,10 +46,6 @@ public class HttpContext extends Context {
         return executor;
     }
 
-    protected ObjectPool<Response> getResponsePool() {
-        return responsePool;
-    }
-
     @SuppressWarnings("unchecked")
     protected <H extends CompletionHandler> Creator<H> loadAsyncHandlerCreator(Class<H> handlerClass) {
         Creator<H> creator = asyncHandlerCreators.get(handlerClass);
@@ -162,5 +161,6 @@ public class HttpContext extends Context {
 
     public static class HttpContextConfig extends ContextConfig {
 
+        public String remoteAddrHeader;
     }
 }

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

@@ -6,6 +6,7 @@
 package org.redkale.net.http;
 
 import org.redkale.net.Filter;
+import org.redkale.util.AnyValue;
 
 /**
  * HTTP 过滤器  <br>
@@ -17,4 +18,7 @@ import org.redkale.net.Filter;
  */
 public abstract class HttpFilter extends Filter<HttpContext, HttpRequest, HttpResponse> {
 
+    //Server执行start后运行此方法
+    public void postStart(HttpContext context, AnyValue config) {
+    }
 }

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

@@ -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);
             }
         }
     }
@@ -402,6 +402,21 @@ public class HttpPrepareServlet extends PrepareServlet<String, HttpContext, Http
         return this.resourceHttpServlet;
     }
 
+    public void postStart(HttpContext context, AnyValue config) {
+        List filters = getFilters();
+        synchronized (filters) {
+            if (!filters.isEmpty()) {
+                for (Object filter : filters) {
+                    ((HttpFilter) filter).postStart(context, config);
+                }
+            }
+        }
+        this.resourceHttpServlet.postStart(context, config);
+        getServlets().forEach(s -> {
+            s.postStart(context, getServletConf(s));
+        });
+    }
+
     @Override
     public void destroy(HttpContext context, AnyValue config) {
         super.destroy(context, config); //必须要执行

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

@@ -6,22 +6,25 @@
 package org.redkale.net.http;
 
 import java.io.*;
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Array;
 import java.net.*;
 import java.nio.ByteBuffer;
 import java.nio.channels.Channels;
 import java.nio.charset.*;
 import java.util.*;
+import java.util.logging.Level;
 import org.redkale.convert.json.JsonConvert;
 import org.redkale.net.*;
-import org.redkale.util.*;
 import org.redkale.util.AnyValue.DefaultAnyValue;
+import org.redkale.util.*;
 
 /**
  * Http请求包 与javax.servlet.http.HttpServletRequest 基本类似。  <br>
  * 同时提供json的解析接口: public Object getJsonParameter(Type type, String name)  <br>
  * Redkale提倡带简单的参数的GET请求采用类似REST风格, 因此提供了 getRequstURIPath 系列接口。  <br>
  * 例如简单的翻页查询   <br>
- *      /pipes/record/query/offset:0/limit:20 <br>
+ *      /pipes/user/query/offset:0/limit:20 <br>
  * 获取页号: int offset = request.getRequstURIPath("offset:", 0);   <br>
  * 获取行数: int limit = request.getRequstURIPath("limit:", 10);  <br>
  * <p>
@@ -40,6 +43,8 @@ public class HttpRequest extends Request<HttpContext> {
 
     protected String requestURI;
 
+    private byte[] queryBytes;
+
     private long contentLength = -1;
 
     private String contentType;
@@ -69,15 +74,17 @@ public class HttpRequest extends Request<HttpContext> {
 
     protected int actionid;
 
+    protected Annotation[] annotations;
+
     protected Object currentUser;
 
     private final String remoteAddrHeader;
 
     Object attachment; //仅供HttpServlet传递Entry使用
 
-    public HttpRequest(HttpContext context, String remoteAddrHeader) {
-        super(context);
-        this.remoteAddrHeader = remoteAddrHeader;
+    public HttpRequest(HttpContext context, ObjectPool<ByteBuffer> bufferPool) {
+        super(context, bufferPool);
+        this.remoteAddrHeader = context.remoteAddrHeader;
     }
 
     protected boolean isWebSocket() {
@@ -102,34 +109,44 @@ public class HttpRequest extends Request<HttpContext> {
 
     @Override
     protected int readHeader(final ByteBuffer buffer) {
-        if (!readLine(buffer, array)) return -1;
+        ByteArray bytes = array;
+        if (!readLine(buffer, bytes)) return -1;
         Charset charset = this.context.getCharset();
         int index = 0;
-        int offset = array.find(index, ' ');
+        int offset = bytes.find(index, ' ');
         if (offset <= 0) return -1;
-        this.method = array.toString(index, offset, charset).trim();
+        this.method = bytes.toString(index, offset, charset);
         index = ++offset;
-        offset = array.find(index, ' ');
+        offset = bytes.find(index, ' ');
         if (offset <= 0) return -1;
-        int off = array.find(index, '#');
+        int off = bytes.find(index, '#');
         if (off > 0) offset = off;
-        int qst = array.find(index, offset, (byte) '?');
+        int qst = bytes.find(index, offset, (byte) '?');
         if (qst > 0) {
-            this.requestURI = array.toDecodeString(index, qst - index, charset).trim();
-            addParameter(array, qst + 1, offset - qst - 1);
+            this.requestURI = bytes.toDecodeString(index, qst - index, charset);
+            this.queryBytes = bytes.getBytes(qst + 1, offset - qst - 1);
+            try {
+                addParameter(bytes, qst + 1, offset - qst - 1);
+            } catch (Exception e) {
+                this.context.getLogger().log(Level.WARNING, "HttpRequest.addParameter error: " + bytes.toString(), e);
+            }
         } else {
-            this.requestURI = array.toDecodeString(index, offset - index, charset).trim();
+            this.requestURI = bytes.toDecodeString(index, offset - index, charset);
+            this.queryBytes = new byte[0];
         }
         index = ++offset;
-        this.protocol = array.toString(index, array.size() - index, charset).trim();
-        while (readLine(buffer, array)) {
-            if (array.size() < 2) break;
+        this.protocol = bytes.toString(index, bytes.size() - index, charset);
+
+        //header
+        while (readLine(buffer, bytes)) {
+            if (bytes.size() < 2) break;
             index = 0;
-            offset = array.find(index, ':');
+            offset = bytes.find(index, ':');
             if (offset <= 0) return -1;
-            String name = array.toString(index, offset, charset).trim();
+            String name = bytes.toString(index, offset, charset);
             index = offset + 1;
-            String value = array.toString(index, array.size() - index, charset).trim();
+            //Upgrade: websocket 前面有空格，所以需要trim()
+            String value = bytes.toString(index, bytes.size() - index, charset).trim();
             switch (name) {
                 case "Content-Type":
                 case "content-type":
@@ -168,14 +185,14 @@ public class HttpRequest extends Request<HttpContext> {
         if (this.contentType != null && this.contentType.contains("boundary=")) this.boundary = true;
         if (this.boundary) this.keepAlive = false; //文件上传必须设置keepAlive为false，因为文件过大时用户不一定会skip掉多余的数据
 
-        array.clear();
+        bytes.clear();
         if (this.contentLength > 0 && (this.contentType == null || !this.boundary)) {
             if (this.contentLength > context.getMaxbody()) return -1;
-            array.write(buffer, Math.min((int) this.contentLength, buffer.remaining()));
-            int lr = (int) this.contentLength - array.size();
+            bytes.write(buffer, Math.min((int) this.contentLength, buffer.remaining()));
+            int lr = (int) this.contentLength - bytes.size();
             return lr > 0 ? lr : 0;
         }
-        if (buffer.hasRemaining() && (this.boundary || !this.keepAlive)) array.write(buffer, buffer.remaining()); //文件上传、HTTP1.0或Connection:close
+        if (buffer.hasRemaining() && (this.boundary || !this.keepAlive)) bytes.write(buffer, buffer.remaining()); //文件上传、HTTP1.0或Connection:close
         //暂不考虑是keep-alive且存在body却没有指定Content-Length的情况
         return 0;
     }
@@ -197,7 +214,9 @@ public class HttpRequest extends Request<HttpContext> {
 
     private void parseBody() {
         if (this.boundary || bodyparsed) return;
-        addParameter(array, 0, array.size());
+        if (this.contentType != null && this.contentType.toLowerCase().contains("x-www-form-urlencoded")) {
+            addParameter(array, 0, array.size());
+        }
         bodyparsed = true;
     }
 
@@ -298,6 +317,55 @@ public class HttpRequest extends Request<HttpContext> {
         return this.actionid;
     }
 
+    /**
+     * 获取当前操作Method上的注解集合
+     *
+     * @return Annotation[]
+     */
+    public Annotation[] getAnnotations() {
+        if (this.annotations == null) return new Annotation[0];
+        Annotation[] newanns = new Annotation[this.annotations.length];
+        System.arraycopy(this.annotations, 0, newanns, 0, newanns.length);
+        return newanns;
+    }
+
+    /**
+     * 获取当前操作Method上的注解
+     *
+     * @param <T>             注解泛型
+     * @param annotationClass 注解类型
+     *
+     * @return Annotation
+     */
+    public <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+        if (this.annotations == null) return null;
+        for (Annotation ann : this.annotations) {
+            if (ann.getClass() == annotationClass) return (T) ann;
+        }
+        return null;
+    }
+
+    /**
+     * 获取当前操作Method上的注解集合
+     *
+     * @param <T>             注解泛型
+     * @param annotationClass 注解类型
+     *
+     * @return Annotation[]
+     */
+    public <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
+        if (this.annotations == null) return (T[]) Array.newInstance(annotationClass, 0);
+        T[] news = (T[]) Array.newInstance(annotationClass, this.annotations.length);
+        int index = 0;
+        for (Annotation ann : this.annotations) {
+            if (ann.getClass() == annotationClass) {
+                news[index++] = (T) ann;
+            }
+        }
+        if (index < 1) return (T[]) Array.newInstance(annotationClass, 0);
+        return Arrays.copyOf(news, index);
+    }
+
     /**
      * 获取客户端地址IP
      *
@@ -435,6 +503,7 @@ public class HttpRequest extends Request<HttpContext> {
         this.method = null;
         this.protocol = null;
         this.requestURI = null;
+        this.queryBytes = null;
         this.contentType = null;
         this.host = null;
         this.connection = null;
@@ -443,6 +512,7 @@ public class HttpRequest extends Request<HttpContext> {
         this.bodyparsed = false;
         this.moduleid = 0;
         this.actionid = 0;
+        this.annotations = null;
         this.currentUser = null;
 
         this.attachment = null;
@@ -613,6 +683,15 @@ public class HttpRequest extends Request<HttpContext> {
         return requestURI;
     }
 
+    /**
+     * 获取请求参数的byte[]
+     *
+     * @return byte[]
+     */
+    public byte[] getQueryBytes() {
+        return queryBytes;
+    }
+
     /**
      * 截取getRequestURI最后的一个/后面的部分
      *
@@ -625,7 +704,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL最后的一个/后面的部分的short值   <br>
-     * 例如请求URL /pipes/record/query/2   <br>
+     * 例如请求URL /pipes/user/query/2   <br>
      * 获取type参数: short type = request.getRequstURILastPath((short)0); //type = 2
      *
      * @param defvalue 默认short值
@@ -644,7 +723,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL最后的一个/后面的部分的short值   <br>
-     * 例如请求URL /pipes/record/query/2   <br>
+     * 例如请求URL /pipes/user/query/2   <br>
      * 获取type参数: short type = request.getRequstURILastPath(16, (short)0); //type = 2
      *
      * @param radix    进制数
@@ -664,7 +743,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL最后的一个/后面的部分的int值   <br>
-     * 例如请求URL /pipes/record/query/2   <br>
+     * 例如请求URL /pipes/user/query/2   <br>
      * 获取type参数: int type = request.getRequstURILastPath(0); //type = 2
      *
      * @param defvalue 默认int值
@@ -682,7 +761,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL最后的一个/后面的部分的int值   <br>
-     * 例如请求URL /pipes/record/query/2   <br>
+     * 例如请求URL /pipes/user/query/2   <br>
      * 获取type参数: int type = request.getRequstURILastPath(16, 0); //type = 2
      *
      * @param radix    进制数
@@ -701,7 +780,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL最后的一个/后面的部分的float值   <br>
-     * 例如请求URL /pipes/record/query/2   <br>
+     * 例如请求URL /pipes/user/query/2   <br>
      * 获取type参数: float type = request.getRequstURILastPath(0.0f); //type = 2.0f
      *
      * @param defvalue 默认float值
@@ -719,7 +798,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL最后的一个/后面的部分的int值   <br>
-     * 例如请求URL /pipes/record/query/2   <br>
+     * 例如请求URL /pipes/user/query/2   <br>
      * 获取type参数: long type = request.getRequstURILastPath(0L); //type = 2
      *
      * @param defvalue 默认long值
@@ -737,7 +816,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL最后的一个/后面的部分的int值   <br>
-     * 例如请求URL /pipes/record/query/2   <br>
+     * 例如请求URL /pipes/user/query/2   <br>
      * 获取type参数: long type = request.getRequstURILastPath(16, 0L); //type = 2
      *
      * @param radix    进制数
@@ -756,7 +835,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL最后的一个/后面的部分的double值   <br>
-     * 例如请求URL /pipes/record/query/2   <br>
+     * 例如请求URL /pipes/user/query/2   <br>
      * 获取type参数: double type = request.getRequstURILastPath(0.0); //type = 2.0
      *
      * @param defvalue 默认double值
@@ -787,7 +866,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL分段中含prefix段的值   <br>
-     * 例如请求URL /pipes/record/query/name:hello   <br>
+     * 例如请求URL /pipes/user/query/name:hello   <br>
      * 获取name参数: String name = request.getRequstURIPath("name:", "none");
      *
      * @param prefix   prefix段前缀
@@ -806,7 +885,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL分段中含prefix段的short值   <br>
-     * 例如请求URL /pipes/record/query/type:10   <br>
+     * 例如请求URL /pipes/user/query/type:10   <br>
      * 获取type参数: short type = request.getRequstURIPath("type:", (short)0);
      *
      * @param prefix   prefix段前缀
@@ -825,7 +904,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL分段中含prefix段的short值   <br>
-     * 例如请求URL /pipes/record/query/type:a   <br>
+     * 例如请求URL /pipes/user/query/type:a   <br>
      * 获取type参数: short type = request.getRequstURIPath(16, "type:", (short)0); //type = 10
      *
      * @param radix    进制数
@@ -845,7 +924,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL分段中含prefix段的int值  <br>
-     * 例如请求URL /pipes/record/query/offset:0/limit:50   <br>
+     * 例如请求URL /pipes/user/query/offset:0/limit:50   <br>
      * 获取offset参数: int offset = request.getRequstURIPath("offset:", 0);   <br>
      * 获取limit参数: int limit = request.getRequstURIPath("limit:", 20);  <br>
      *
@@ -865,7 +944,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL分段中含prefix段的int值  <br>
-     * 例如请求URL /pipes/record/query/offset:0/limit:50   <br>
+     * 例如请求URL /pipes/user/query/offset:0/limit:50   <br>
      * 获取offset参数: int offset = request.getRequstURIPath("offset:", 0);   <br>
      * 获取limit参数: int limit = request.getRequstURIPath(16, "limit:", 20); // limit = 16  <br>
      *
@@ -886,7 +965,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL分段中含prefix段的float值   <br>
-     * 例如请求URL /pipes/record/query/point:40.0   <br>
+     * 例如请求URL /pipes/user/query/point:40.0   <br>
      * 获取time参数: float point = request.getRequstURIPath("point:", 0.0f);
      *
      * @param prefix   prefix段前缀
@@ -905,7 +984,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL分段中含prefix段的long值   <br>
-     * 例如请求URL /pipes/record/query/time:1453104341363/id:40   <br>
+     * 例如请求URL /pipes/user/query/time:1453104341363/id:40   <br>
      * 获取time参数: long time = request.getRequstURIPath("time:", 0L);
      *
      * @param prefix   prefix段前缀
@@ -924,7 +1003,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL分段中含prefix段的long值   <br>
-     * 例如请求URL /pipes/record/query/time:1453104341363/id:40   <br>
+     * 例如请求URL /pipes/user/query/time:1453104341363/id:40   <br>
      * 获取time参数: long time = request.getRequstURIPath(16, "time:", 0L);
      *
      * @param radix    进制数
@@ -944,7 +1023,7 @@ public class HttpRequest extends Request<HttpContext> {
 
     /**
      * 获取请求URL分段中含prefix段的double值   <br>
-     * 例如请求URL /pipes/record/query/point:40.0   <br>
+     * 例如请求URL /pipes/user/query/point:40.0   <br>
      * 获取time参数: double point = request.getRequstURIPath("point:", 0.0);
      *
      * @param prefix   prefix段前缀
@@ -1227,16 +1306,11 @@ public class HttpRequest extends Request<HttpContext> {
      * @return String
      */
     public String getParametersToString(String prefix) {
-        final StringBuilder sb = new StringBuilder();
-        getParameters().forEach((k, v) -> {
-            if (sb.length() > 0) sb.append('&');
-            try {
-                sb.append(k).append('=').append(URLEncoder.encode(v, "UTF-8"));
-            } catch (IOException ex) {
-                throw new RuntimeException(ex);
-            }
-        });
-        return (sb.length() > 0 && prefix != null) ? (prefix + sb) : sb.toString();
+        byte[] rbs = queryBytes;
+        if (rbs == null || rbs.length < 1) return "";
+        Charset charset = this.context.getCharset();
+        String str = charset == null ? new String(rbs, StandardCharsets.UTF_8) : new String(rbs, charset);
+        return (prefix == null) ? str : (prefix + str);
     }
 
     /**
@@ -1480,8 +1554,8 @@ public class HttpRequest extends Request<HttpContext> {
     }
 
     /**
-     * 获取翻页对象 https://redkale.org/pipes/records/list/offset:0/limit:20/sort:createtime%20ASC  <br>
-     * https://redkale.org/pipes/records/list?flipper={'offset':0,'limit':20, 'sort':'createtime ASC'}  <br>
+     * 获取翻页对象 https://redkale.org/pipes/users/list/offset:0/limit:20/sort:createtime%20ASC  <br>
+     * https://redkale.org/pipes/users/list?flipper={'offset':0,'limit':20, 'sort':'createtime ASC'}  <br>
      * 以上两种接口都可以获取到翻页对象
      *
      *

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

@@ -37,7 +37,7 @@ public class HttpResourceServlet extends HttpServlet {
 
         public WatchThread(File root) throws IOException {
             this.root = root;
-            this.setName("HttpResourceServlet-Watch-Thread");
+            this.setName("Redkale-HttpResourceServlet-Watch-Thread");
             this.setDaemon(true);
             this.watcher = this.root.toPath().getFileSystem().newWatchService();
         }
@@ -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

@@ -50,6 +50,10 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
 
     protected static final byte[] connectAliveBytes = "Connection: keep-alive\r\n".getBytes();
 
+    private static final byte[] fillContentLengthBytes = ("Content-Length:              \r\n").getBytes();
+
+    private static final ZoneId ZONE_GMT = ZoneId.of("GMT");
+
     private static final Set<OpenOption> options = new HashSet<>();
 
     private static final Map<Integer, String> httpCodes = new HashMap<>();
@@ -103,8 +107,6 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         httpCodes.put(505, "HTTP Version Not Supported");
     }
 
-    private static final ZoneId ZONE_GMT = ZoneId.of("GMT");
-
     private int status = 200;
 
     private String contentType = "";
@@ -113,9 +115,17 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
 
     private HttpCookie[] cookies;
 
-    private boolean headsended = false;
+    private int headWritedSize = -1; //0表示跳过header，正数表示header的字节长度。
+
+    private ByteBuffer headBuffer;
+
+    private int headLenPos = -1;
 
     private BiFunction<HttpResponse, ByteBuffer[], ByteBuffer[]> bufferHandler;
+
+    private BiFunction<HttpRequest, org.redkale.service.RetResult, org.redkale.service.RetResult> retResultHandler;
+
+    private Supplier<ByteBuffer> bodyBufferSupplier;
     //------------------------------------------------
 
     private final String plainContentType;
@@ -148,8 +158,8 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         return new ObjectPool<>(creatCounter, cycleCounter, max, creator, (x) -> ((HttpResponse) x).prepare(), (x) -> ((HttpResponse) x).recycle());
     }
 
-    public HttpResponse(HttpContext context, HttpRequest request, HttpResponseConfig config) {
-        super(context, request);
+    public HttpResponse(HttpContext context, HttpRequest request, ObjectPool<Response> responsePool, HttpResponseConfig config) {
+        super(context, request, responsePool);
         this.plainContentType = config.plainContentType == null || config.plainContentType.isEmpty() ? "text/plain; charset=utf-8" : config.plainContentType;
         this.jsonContentType = config.jsonContentType == null || config.jsonContentType.isEmpty() ? "application/json; charset=utf-8" : config.jsonContentType;
         this.plainContentTypeBytes = ("Content-Type: " + this.plainContentType + "\r\n").getBytes();
@@ -163,6 +173,11 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         this.hasRender = renders != null && !renders.isEmpty();
         this.onlyoneHttpRender = renders != null && renders.size() == 1 ? renders.get(0) : null;
         this.contentType = this.plainContentType;
+        this.bodyBufferSupplier = () -> {
+            if (headWritedSize >= 0 || bufferHandler != null) return channel.pollWriteBuffer(); //bufferHandler 需要cached的请求不能带上header
+            if (contentLength < 0) contentLength = -2;
+            return createHeader();
+        };
     }
 
     @Override
@@ -174,18 +189,30 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         return channel;
     }
 
+    @Override
+    protected void prepare() {
+        super.prepare();
+    }
+
     @Override
     protected boolean recycle() {
         this.status = 200;
         this.contentLength = -1;
         this.contentType = null;
         this.cookies = null;
-        this.headsended = false;
+        this.headWritedSize = -1;
+        this.headBuffer = null;
+        this.headLenPos = -1;
         this.header.clear();
         this.bufferHandler = null;
+        this.retResultHandler = null;
         return super.recycle();
     }
 
+    protected Supplier<ByteBuffer> getBodyBufferSupplier() {
+        return bodyBufferSupplier;
+    }
+
     @Override
     protected void init(AsyncConnection channel) {
         super.init(channel);
@@ -280,15 +307,6 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         return context.loadAsyncHandlerCreator(handlerClass).create(createAsyncHandler());
     }
 
-    /**
-     * 获取ByteBuffer生成器
-     *
-     * @return ByteBuffer生成器
-     */
-    public Supplier<ByteBuffer> getBufferSupplier() {
-        return getBodyBufferSupplier();
-    }
-
     /**
      * 将对象以JSON格式输出
      *
@@ -378,14 +396,19 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
      *
      * @param ret RetResult输出对象
      */
-    public void finishJson(final org.redkale.service.RetResult ret) {
+    public void finishJson(org.redkale.service.RetResult ret) {
         this.contentType = this.jsonContentType;
+        if (this.retResultHandler != null) {
+            ret = this.retResultHandler.apply(this.request, ret);
+        }
         if (this.recycleListener != null) this.output = ret;
         if (ret != null && !ret.isSuccess()) {
             this.header.addValue("retcode", String.valueOf(ret.getRetcode()));
             this.header.addValue("retinfo", ret.getRetinfo());
         }
-        finish(request.getJsonConvert().convertTo(getBodyBufferSupplier(), ret));
+        Convert convert = ret == null ? null : ret.convert();
+        if (convert == null || !(convert instanceof TextConvert)) convert = request.getJsonConvert();
+        finish(convert.convertTo(getBodyBufferSupplier(), ret));
     }
 
     /**
@@ -394,8 +417,11 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
      * @param convert 指定的JsonConvert
      * @param ret     RetResult输出对象
      */
-    public void finishJson(final JsonConvert convert, final org.redkale.service.RetResult ret) {
+    public void finishJson(final JsonConvert convert, org.redkale.service.RetResult ret) {
         this.contentType = this.jsonContentType;
+        if (this.retResultHandler != null) {
+            ret = this.retResultHandler.apply(this.request, ret);
+        }
         if (this.recycleListener != null) this.output = ret;
         if (ret != null && !ret.isSuccess()) {
             this.header.addValue("retcode", String.valueOf(ret.getRetcode()));
@@ -465,7 +491,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
      * @param obj     输出对象
      */
     @SuppressWarnings("unchecked")
-    public void finish(final Convert convert, final Type type, final Object obj) {
+    public void finish(final Convert convert, final Type type, Object obj) {
         if (obj == null) {
             finish("null");
         } else if (obj instanceof CompletableFuture) {
@@ -492,6 +518,8 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
                 context.getLogger().log(Level.WARNING, "HttpServlet finish File occur, force to close channel. request = " + getRequest(), e);
                 finish(500, null);
             }
+        } else if (obj instanceof org.redkale.service.RetResult) {
+            finishJson((org.redkale.service.RetResult) obj);
         } else if (obj instanceof HttpResult) {
             HttpResult result = (HttpResult) obj;
             if (result.getContentType() != null) setContentType(result.getContentType());
@@ -501,7 +529,9 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
             } else if (result.getResult() instanceof CharSequence) {
                 finish(result.getResult().toString());
             } else {
-                finish(convert, result.getResult());
+                Convert cc = result.convert();
+                if (cc == null || !(cc instanceof TextConvert)) cc = convert;
+                finish(cc, result.getResult());
             }
         } else {
             if (hasRender) {
@@ -528,6 +558,10 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
             if (this.recycleListener != null) this.output = obj;
             if (obj instanceof org.redkale.service.RetResult) {
                 org.redkale.service.RetResult ret = (org.redkale.service.RetResult) obj;
+                if (this.retResultHandler != null) {
+                    ret = this.retResultHandler.apply(this.request, ret);
+                    obj = ret;
+                }
                 if (!ret.isSuccess()) {
                     this.header.addValue("retcode", String.valueOf(ret.getRetcode())).addValue("retinfo", ret.getRetinfo());
                 }
@@ -626,7 +660,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
     public void finish(final String contentType, final byte[] bs) {
         if (isClosed()) return; //避免重复关闭
         final byte[] content = bs == null ? new byte[0] : bs;
-        if (!this.headsended) {
+        if (this.headWritedSize < 0) {
             this.contentType = contentType;
             this.contentLength = content.length;
             ByteBuffer headbuf = createHeader();
@@ -670,7 +704,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
     @Override
     public void finish(boolean kill, ByteBuffer buffer) {
         if (isClosed()) return; //避免重复关闭
-        if (!this.headsended) {
+        if (this.headWritedSize < 0) {
             this.contentLength = buffer == null ? 0 : buffer.remaining();
             ByteBuffer headbuf = createHeader();
             headbuf.flip();
@@ -708,7 +742,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
             if (bufs != null) buffers = bufs;
         }
         if (kill) refuseAlive();
-        if (!this.headsended) {
+        if (this.headWritedSize < 0) {
             long len = 0;
             for (ByteBuffer buf : buffers) {
                 len += buf.remaining();
@@ -725,6 +759,17 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
                 super.finish(kill, newbuffers);
             }
         } else {
+            if (this.headLenPos > 0 && buffers[0] == headBuffer) {
+                long contentlen = -this.headWritedSize;
+                for (ByteBuffer buf : buffers) {
+                    contentlen += buf.remaining();
+                }
+                byte[] lenBytes = String.valueOf(contentlen).getBytes();
+                int start = this.headLenPos - lenBytes.length;
+                for (int i = 0; i < lenBytes.length; i++) {
+                    headBuffer.put(start + i, lenBytes[i]);
+                }
+            }
             super.finish(kill, buffers);
         }
     }
@@ -738,7 +783,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
      * @param handler    异步回调函数
      */
     public <A> void sendBody(ByteBuffer buffer, A attachment, CompletionHandler<Integer, A> handler) {
-        if (!this.headsended) {
+        if (this.headWritedSize < 0) {
             if (this.contentLength < 0) this.contentLength = buffer == null ? 0 : buffer.remaining();
             ByteBuffer headbuf = createHeader();
             headbuf.flip();
@@ -761,7 +806,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
      * @param handler    异步回调函数
      */
     public <A> void sendBody(ByteBuffer[] buffers, A attachment, CompletionHandler<Integer, A> handler) {
-        if (!this.headsended) {
+        if (this.headWritedSize < 0) {
             if (this.contentLength < 0) {
                 int len = 0;
                 if (buffers != null && buffers.length > 0) {
@@ -844,7 +889,9 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         }
         this.contentLength = length;
         if (filename != null && !filename.isEmpty() && file != null) {
-            addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
+            if (this.header.getValue("Content-Disposition") == null) {
+                addHeader("Content-Disposition", "attachment;filename=" + URLEncoder.encode(filename, "UTF-8"));
+            }
         }
         this.contentType = MimeType.getByFilename(filename == null || filename.isEmpty() ? file.getName() : filename);
         if (this.contentType == null) this.contentType = "application/octet-stream";
@@ -886,14 +933,19 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
 
     //Header大小不能超过一个ByteBuffer的容量
     protected ByteBuffer createHeader() {
-        this.headsended = true;
-        ByteBuffer buffer = this.pollWriteReadBuffer();
+        ByteBuffer buffer = this.channel.pollWriteBuffer();
+        int oldpos = buffer.position();
         if (this.status == 200) {
             buffer.put(status200Bytes);
         } else {
             buffer.put(("HTTP/1.1 " + this.status + " " + httpCodes.get(this.status) + "\r\n").getBytes());
         }
-        if (this.contentLength >= 0) buffer.put(("Content-Length: " + this.contentLength + "\r\n").getBytes());
+        if (this.contentLength >= 0) {
+            buffer.put(("Content-Length: " + this.contentLength + "\r\n").getBytes());
+        } else if (this.contentLength == -2) {
+            buffer.put(fillContentLengthBytes);
+            this.headLenPos = buffer.position() - 2; //去掉\r\n
+        }
         if (!this.request.isWebSocket()) {
             if (this.contentType == this.jsonContentType) {
                 buffer.put(this.jsonContentTypeBytes);
@@ -941,7 +993,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 +1001,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) {
@@ -965,6 +1017,8 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
             }
         }
         buffer.put(LINE);
+        this.headWritedSize = buffer.position() - oldpos;
+        this.headBuffer = buffer;
         return buffer;
     }
 
@@ -990,7 +1044,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
      * @return HttpResponse
      */
     public HttpResponse skipHeader() {
-        this.headsended = true;
+        this.headWritedSize = 0;
         return this;
     }
 
@@ -1120,6 +1174,24 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
         this.bufferHandler = bufferHandler;
     }
 
+    /**
+     * 获取输出RetResult时的拦截器
+     *
+     * @return 拦截器
+     */
+    protected BiFunction<HttpRequest, org.redkale.service.RetResult, org.redkale.service.RetResult> getRetResultHandler() {
+        return retResultHandler;
+    }
+
+    /**
+     * 设置输出RetResult时的拦截器
+     *
+     * @param retResultHandler 拦截器
+     */
+    public void retResultHandler(BiFunction<HttpRequest, org.redkale.service.RetResult, org.redkale.service.RetResult> retResultHandler) {
+        this.retResultHandler = retResultHandler;
+    }
+
     protected final class TransferFileHandler implements CompletionHandler<Integer, ByteBuffer> {
 
         private final File file;
@@ -1197,7 +1269,7 @@ public class HttpResponse extends Response<HttpContext, HttpRequest> {
 
         @Override
         public void failed(Throwable exc, ByteBuffer attachment) {
-            context.offerBuffer(attachment);
+            channel.offerBuffer(attachment);
             finish(true);
             try {
                 filechannel.close();

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

@@ -8,6 +8,7 @@ package org.redkale.net.http;
 import java.io.Serializable;
 import java.net.HttpCookie;
 import java.util.*;
+import org.redkale.convert.*;
 import org.redkale.convert.json.JsonConvert;
 
 /**
@@ -22,21 +23,28 @@ public class HttpResult<T> {
 
     public static final String SESSIONID_COOKIENAME = HttpRequest.SESSIONID_NAME;
 
-    private Map<String, String> headers;
+    protected Map<String, String> headers;
 
-    private List<HttpCookie> cookies;
+    protected List<HttpCookie> cookies;
 
-    private String contentType;
+    protected String contentType;
 
-    private T result;
+    protected T result;
 
-    private int status = 0; //不设置则为 200
+    protected int status = 0; //不设置则为 200
 
-    private String message;
+    protected String message;
+
+    protected Convert convert;
 
     public HttpResult() {
     }
 
+    public HttpResult(Convert convert, T result) {
+        this.convert = convert;
+        this.result = result;
+    }
+
     public HttpResult(T result) {
         this.result = result;
     }
@@ -82,6 +90,14 @@ public class HttpResult<T> {
         return this;
     }
 
+    public Convert convert() {
+        return convert;
+    }
+
+    public void convert(Convert convert) {
+        this.convert = convert;
+    }
+
     public Map<String, String> getHeaders() {
         return headers;
     }

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

@@ -37,6 +37,8 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
 
     private byte[] currDateBytes;
 
+    private HttpResponseConfig respConfig;
+
     public HttpServer() {
         this(System.currentTimeMillis(), ResourceFactory.root());
     }
@@ -54,6 +56,11 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
         super.init(config);
     }
 
+    @Override
+    protected void postStart() {
+        ((HttpPrepareServlet) this.prepare).postStart(this.context, config);
+    }
+
     @Override
     public void destroy(final AnyValue config) throws Exception {
         super.destroy(config);
@@ -304,16 +311,7 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
     @SuppressWarnings("unchecked")
     protected HttpContext createContext() {
         final int port = this.address.getPort();
-        AtomicLong createBufferCounter = new AtomicLong();
-        AtomicLong cycleBufferCounter = new AtomicLong();
         this.bufferCapacity = Math.max(this.bufferCapacity, 16 * 1024 + 16); //兼容 HTTP 2.0;
-        final int rcapacity = this.bufferCapacity;
-        ObjectPool<ByteBuffer> bufferPool = new ObjectPool<>(createBufferCounter, cycleBufferCounter, this.bufferPoolSize,
-            (Object... params) -> ByteBuffer.allocateDirect(rcapacity), null, (e) -> {
-                if (e == null || e.isReadOnly() || e.capacity() != rcapacity) return false;
-                e.clear();
-                return true;
-            });
         final List<String[]> defaultAddHeaders = new ArrayList<>();
         final List<String[]> defaultSetHeaders = new ArrayList<>();
         boolean autoOptions = false;
@@ -423,7 +421,7 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
 
         final String addrHeader = remoteAddrHeader;
 
-        final HttpResponseConfig respConfig = new HttpResponseConfig();
+        this.respConfig = new HttpResponseConfig();
         respConfig.plainContentType = plainContentType;
         respConfig.jsonContentType = jsonContentType;
         respConfig.defaultAddHeaders = defaultAddHeaders.isEmpty() ? null : defaultAddHeaders.toArray(new String[defaultAddHeaders.size()][]);
@@ -433,18 +431,12 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
         respConfig.dateSupplier = dateSupplier;
         respConfig.renders = ((HttpPrepareServlet) prepare).renders;
 
-        AtomicLong createResponseCounter = new AtomicLong();
-        AtomicLong cycleResponseCounter = new AtomicLong();
-        ObjectPool<Response> responsePool = HttpResponse.createPool(createResponseCounter, cycleResponseCounter, this.responsePoolSize, null);
-
         final HttpContextConfig contextConfig = new HttpContextConfig();
         contextConfig.serverStartTime = this.serverStartTime;
         contextConfig.logger = this.logger;
         contextConfig.executor = this.executor;
         contextConfig.sslContext = this.sslContext;
-        contextConfig.bufferCapacity = rcapacity;
-        contextConfig.bufferPool = bufferPool;
-        contextConfig.responsePool = responsePool;
+        contextConfig.bufferCapacity = this.bufferCapacity;
         contextConfig.maxconns = this.maxconns;
         contextConfig.maxbody = this.maxbody;
         contextConfig.charset = this.charset;
@@ -454,9 +446,32 @@ public class HttpServer extends Server<String, HttpContext, HttpRequest, HttpRes
         contextConfig.aliveTimeoutSeconds = this.aliveTimeoutSeconds;
         contextConfig.readTimeoutSeconds = this.readTimeoutSeconds;
         contextConfig.writeTimeoutSeconds = this.writeTimeoutSeconds;
+        contextConfig.remoteAddrHeader = addrHeader;
 
-        HttpContext httpcontext = new HttpContext(contextConfig);
-        responsePool.setCreator((Object... params) -> new HttpResponse(httpcontext, new HttpRequest(httpcontext, addrHeader), respConfig));
-        return httpcontext;
+        return new HttpContext(contextConfig);
+    }
+
+    @Override
+    protected ObjectPool<ByteBuffer> createBufferPool(AtomicLong createCounter, AtomicLong cycleCounter, int bufferPoolSize) {
+        if (createCounter == null) createCounter = new AtomicLong();
+        if (cycleCounter == null) cycleCounter = new AtomicLong();
+        final int rcapacity = this.bufferCapacity;
+        ObjectPool<ByteBuffer> bufferPool = new ObjectPool<>(createCounter, cycleCounter, bufferPoolSize,
+            (Object... params) -> ByteBuffer.allocateDirect(rcapacity), null, (e) -> {
+                if (e == null || e.isReadOnly() || e.capacity() != rcapacity) return false;
+                e.clear();
+                return true;
+            });
+        return bufferPool;
+    }
+
+    @Override
+    protected ObjectPool<Response> createResponsePool(AtomicLong createCounter, AtomicLong cycleCounter, int responsePoolSize) {
+        return HttpResponse.createPool(createCounter, cycleCounter, responsePoolSize, null);
+    }
+
+    @Override
+    protected Creator<Response> createResponseCreator(ObjectPool<ByteBuffer> bufferPool, ObjectPool<Response> responsePool) {
+        return (Object... params) -> new HttpResponse(this.context, new HttpRequest(this.context, bufferPool), responsePool, this.respConfig);
     }
 }

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

@@ -6,6 +6,7 @@
 package org.redkale.net.http;
 
 import java.io.IOException;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Method;
 import java.nio.ByteBuffer;
 import java.util.*;
@@ -71,6 +72,7 @@ public class HttpServlet extends Servlet<HttpContext, HttpRequest, HttpResponse>
                     request.attachment = entry;
                     request.moduleid = entry.moduleid;
                     request.actionid = entry.actionid;
+                    request.annotations = entry.annotations;
                     if (entry.auth) {
                         response.thenEvent(authSuccessServlet);
                         authenticate(request, response);
@@ -103,6 +105,10 @@ public class HttpServlet extends Servlet<HttpContext, HttpRequest, HttpResponse>
     void postDestroy(HttpContext context, AnyValue config) {
     }
 
+    //Server执行start后运行此方法
+    public void postStart(HttpContext context, AnyValue config) {
+    }
+
     /**
      * <p>
      * 预执行方法，在execute方法之前运行，设置当前用户信息，或者加入常规统计和基础检测，例如 : <br>
@@ -210,6 +216,7 @@ public class HttpServlet extends Servlet<HttpContext, HttpRequest, HttpResponse>
 
         InnerActionEntry(int moduleid, int actionid, String name, String[] methods, Method method, HttpServlet servlet) {
             this(moduleid, actionid, name, methods, method, auth(method), cacheseconds(method), servlet);
+            this.annotations = annotations(method);
         }
 
         //供Rest类使用，参数不能随便更改
@@ -232,16 +239,21 @@ public class HttpServlet extends Servlet<HttpContext, HttpRequest, HttpResponse>
             } : null;
         }
 
-        private static boolean auth(Method method) {
+        protected static boolean auth(Method method) {
             HttpMapping mapping = method.getAnnotation(HttpMapping.class);
             return mapping == null || mapping.auth();
         }
 
-        private static int cacheseconds(Method method) {
+        protected static int cacheseconds(Method method) {
             HttpMapping mapping = method.getAnnotation(HttpMapping.class);
             return mapping == null ? 0 : mapping.cacheseconds();
         }
 
+        //Rest.class会用到此方法
+        protected static Annotation[] annotations(Method method) {
+            return method.getAnnotations();
+        }
+
         boolean isNeedCheck() {
             return this.moduleid != 0 || this.actionid != 0;
         }
@@ -270,9 +282,11 @@ public class HttpServlet extends Servlet<HttpContext, HttpRequest, HttpResponse>
 
         final String[] methods;
 
-        final Method method;
-
         final HttpServlet servlet;
+
+        Method method;
+
+        Annotation[] annotations;
     }
 
     private HttpServlet createActionServlet(final Method method) {

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

@@ -11,6 +11,7 @@ import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 import java.lang.reflect.*;
+import java.net.InetSocketAddress;
 import java.nio.channels.CompletionHandler;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
@@ -355,6 +356,10 @@ public final class Rest {
                 fv.visitEnd();
             }
         }
+        { //_redkale_annotations
+            fv = cw.visitField(ACC_PUBLIC + ACC_STATIC, "_redkale_annotations", "Ljava/util/Map;", "Ljava/util/Map<Ljava/lang/String;[Ljava/lang/annotation/Annotation;>;", null);
+            fv.visitEnd();
+        }
         { //_DynWebSocketServlet构造函数 
             mv = new MethodDebugVisitor(cw.visitMethod(ACC_PUBLIC, "<init>", "()V", null, null));
             mv.visitVarInsn(ALOAD, 0);
@@ -375,6 +380,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");
@@ -418,7 +427,7 @@ public final class Rest {
         }
 
         RestClassLoader newLoader = new RestClassLoader(loader);
-
+        Map<String, Annotation[]> msgclassToAnnotations = new HashMap<>();
         for (int i = 0; i < messageMethods.size(); i++) {  // _DyncXXXWebSocketMessage 子消息List
             Method method = messageMethods.get(i);
             String endfix = "_" + method.getName() + "_" + (i > 9 ? i : ("0" + i));
@@ -500,6 +509,30 @@ public final class Rest {
                 mv.visitMaxs(2, 2);
                 mv.visitEnd();
             }
+            { //getAnnotations
+                mv = new MethodDebugVisitor(cw2.visitMethod(ACC_PUBLIC, "getAnnotations", "()[Ljava/lang/annotation/Annotation;", null, null));
+                mv.visitFieldInsn(GETSTATIC, newDynName, "_redkale_annotations", "Ljava/util/Map;");
+                mv.visitLdcInsn(newDynMessageFullName + endfix);
+                mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true);
+                mv.visitTypeInsn(CHECKCAST, "[Ljava/lang/annotation/Annotation;");
+                mv.visitVarInsn(ASTORE, 1);
+                mv.visitVarInsn(ALOAD, 1);
+                Label l2 = new Label();
+                mv.visitJumpInsn(IFNONNULL, l2);
+                mv.visitInsn(ICONST_0);
+                mv.visitTypeInsn(ANEWARRAY, "java/lang/annotation/Annotation");
+                mv.visitInsn(ARETURN);
+                mv.visitLabel(l2);
+                mv.visitFrame(Opcodes.F_APPEND, 1, new Object[]{"[Ljava/lang/annotation/Annotation;"}, 0, null);
+                mv.visitVarInsn(ALOAD, 1);
+                mv.visitVarInsn(ALOAD, 1);
+                mv.visitInsn(ARRAYLENGTH);
+                mv.visitMethodInsn(INVOKESTATIC, "java/util/Arrays", "copyOf", "([Ljava/lang/Object;I)[Ljava/lang/Object;", false);
+                mv.visitTypeInsn(CHECKCAST, "[Ljava/lang/annotation/Annotation;");
+                mv.visitInsn(ARETURN);
+                mv.visitMaxs(2, 2);
+                mv.visitEnd();
+            }
             { //execute
                 mv = new MethodDebugVisitor(cw2.visitMethod(ACC_PUBLIC, "execute", "(L" + newDynWebSokcetFullName + ";)V", null, null));
                 mv.visitVarInsn(ALOAD, 0);
@@ -540,6 +573,7 @@ public final class Rest {
             }
             cw2.visitEnd();
             newLoader.loadClass((newDynMessageFullName + endfix).replace('/', '.'), cw2.toByteArray());
+            msgclassToAnnotations.put(newDynMessageFullName + endfix, method.getAnnotations());
         }
 
         { //_DynXXXWebSocketMessage class
@@ -672,6 +706,7 @@ public final class Rest {
         Class<?> newClazz = newLoader.loadClass(newDynName.replace('/', '.'), cw.toByteArray());
         try {
             T servlet = (T) newClazz.getDeclaredConstructor().newInstance();
+            newClazz.getField("_redkale_annotations").set(null, msgclassToAnnotations);
             if (rws.cryptor() != Cryptor.class) {
                 Cryptor cryptor = rws.cryptor().getDeclaredConstructor().newInstance();
                 Field cryptorField = newClazz.getSuperclass().getDeclaredField("cryptor"); //WebSocketServlet
@@ -825,7 +860,7 @@ public final class Rest {
                         break;
                     }
                 }
-                if (defmodulename.isEmpty() || (!pound && entrys.size() <= 6)) {
+                if (defmodulename.isEmpty() || (!pound && entrys.size() <= 2)) {
                     for (MappingEntry entry : entrys) {
                         String suburl = (catalog.isEmpty() ? "/" : ("/" + catalog + "/")) + (defmodulename.isEmpty() ? "" : (defmodulename + "/")) + entry.name;
                         urlpath += "," + suburl;
@@ -968,7 +1003,7 @@ public final class Rest {
 
                 RestHeader annhead = param.getAnnotation(RestHeader.class);
                 if (annhead != null) {
-                    if (ptype != String.class) throw new RuntimeException("@RestHeader must on String Parameter in " + method);
+                    if (ptype != String.class && ptype != InetSocketAddress.class) throw new RuntimeException("@RestHeader must on String or InetSocketAddress Parameter in " + method);
                     n = annhead.name();
                     radix = annhead.radix();
                     comment = annhead.comment();
@@ -1520,7 +1555,7 @@ public final class Rest {
                             RestUploadFile ru = field.getAnnotation(RestUploadFile.class);
                             RestURI ri = field.getAnnotation(RestURI.class);
                             if (rh == null && rc == null && ra == null && rb == null && rs == null && ru == null && ri == null) continue;
-                            if (rh != null && field.getType() != String.class) throw new RuntimeException("@RestHeader must on String Field in " + field);
+                            if (rh != null && field.getType() != String.class && field.getType() != InetSocketAddress.class) throw new RuntimeException("@RestHeader must on String Field in " + field);
                             if (rc != null && field.getType() != String.class) throw new RuntimeException("@RestCookie must on String Field in " + field);
                             if (rs != null && field.getType() != String.class) throw new RuntimeException("@RestSessionid must on String Field in " + field);
                             if (ra != null && field.getType() != String.class) throw new RuntimeException("@RestAddress must on String Field in " + field);
@@ -1534,7 +1569,7 @@ public final class Rest {
                             String attrFieldName;
                             String restname = "";
                             if (rh != null) {
-                                attrFieldName = "_redkale_attr_header_" + restAttributes.size();
+                                attrFieldName = "_redkale_attr_header_" + (field.getType() != String.class ? "json_" : "") + restAttributes.size();
                                 restname = rh.name();
                             } else if (rc != null) {
                                 attrFieldName = "_redkale_attr_cookie_" + restAttributes.size();
@@ -1595,6 +1630,14 @@ public final class Rest {
                                     mv.visitMethodInsn(INVOKEVIRTUAL, reqInternalName, "getConnection", "()Ljava/lang/String;", false);
                                 } else if ("Method".equalsIgnoreCase(headerkey)) {
                                     mv.visitMethodInsn(INVOKEVIRTUAL, reqInternalName, "getMethod", "()Ljava/lang/String;", false);
+                                } else if (en.getKey().contains("_header_json_")) {
+                                    String typefieldname = "_redkale_body_jsontype_" + bodyTypes.size();
+                                    bodyTypes.put(typefieldname, (java.lang.reflect.Type) en.getValue()[2]);
+                                    mv.visitVarInsn(ALOAD, 0);
+                                    mv.visitFieldInsn(GETFIELD, newDynName, typefieldname, "Ljava/lang/reflect/Type;");
+                                    mv.visitLdcInsn(headerkey);
+                                    mv.visitMethodInsn(INVOKEVIRTUAL, reqInternalName, "getJsonHeader", "(Ljava/lang/reflect/Type;Ljava/lang/String;)Ljava/lang/Object;", false);
+                                    mv.visitTypeInsn(CHECKCAST, Type.getInternalName((Class) en.getValue()[1]));
                                 } else {
                                     mv.visitLdcInsn(headerkey);
                                     mv.visitLdcInsn("");
@@ -1806,9 +1849,10 @@ public final class Rest {
 //        HashMap<String, InnerActionEntry> _createRestInnerActionEntry() {
 //              HashMap<String, InnerActionEntry> map = new HashMap<>();
 //              map.put("asyncfind3", new InnerActionEntry(100000,200000,"asyncfind3", new String[]{},null,false,0, new _Dync_asyncfind3_HttpServlet()));
-//              map.put("asyncfind3", new InnerActionEntry(1,2,"asyncfind2", new String[]{"GET", "POST"},null,true,0, new _Dync_asyncfind2_HttpServlet()));
+//              map.put("asyncfind2", new InnerActionEntry(1,2,"asyncfind2", new String[]{"GET", "POST"},null,true,0, new _Dync_asyncfind2_HttpServlet()));
 //              return map;
 //          }
+        Map<String, Method> mappingurlToMethod = new HashMap<>();
         { //_createRestInnerActionEntry 方法
             mv = new MethodDebugVisitor(cw.visitMethod(0, "_createRestInnerActionEntry", "()Ljava/util/HashMap;", "()Ljava/util/HashMap<Ljava/lang/String;L" + innerEntryName + ";>;", null));
             //mv.setDebug(true);
@@ -1818,6 +1862,7 @@ public final class Rest {
             mv.visitVarInsn(ASTORE, 1);
 
             for (final MappingEntry entry : entrys) {
+                mappingurlToMethod.put(entry.mappingurl, entry.mappingMethod);
                 mv.visitVarInsn(ALOAD, 1);
                 mv.visitLdcInsn(entry.mappingurl);  //name
                 mv.visitTypeInsn(NEW, innerEntryName); //new InnerActionEntry
@@ -1833,9 +1878,9 @@ public final class Rest {
                     mv.visitLdcInsn(entry.methods[i]);
                     mv.visitInsn(AASTORE);
                 }
-                mv.visitInsn(ACONST_NULL); //method
+                mv.visitInsn(ACONST_NULL); //method          
                 mv.visitInsn(entry.auth ? ICONST_1 : ICONST_0); //auth
-                pushInt(mv, entry.cacheseconds); //cacheseconds
+                pushInt(mv, entry.cacheseconds); //cacheseconds      
                 mv.visitTypeInsn(NEW, newDynName + "$" + entry.newActionClassName);
                 mv.visitInsn(DUP);
                 mv.visitVarInsn(ALOAD, 0);
@@ -1916,7 +1961,12 @@ public final class Rest {
             restactMethod.setAccessible(true);
             Field tmpentrysfield = HttpServlet.class.getDeclaredField("_tmpentrys");
             tmpentrysfield.setAccessible(true);
-            tmpentrysfield.set(obj, restactMethod.invoke(obj));
+            HashMap<String, HttpServlet.InnerActionEntry> innerEntryMap = (HashMap) restactMethod.invoke(obj);
+            for (Map.Entry<String, HttpServlet.InnerActionEntry> en : innerEntryMap.entrySet()) {
+                Method m = mappingurlToMethod.get(en.getKey());
+                if (m != null) en.getValue().annotations = HttpServlet.InnerActionEntry.annotations(m);
+            }
+            tmpentrysfield.set(obj, innerEntryMap);
             return obj;
         } catch (Throwable e) {
             throw new RuntimeException(e);

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

@@ -10,7 +10,7 @@ import static java.lang.annotation.ElementType.*;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
 
 /**
- * 只能注解于RestService类的方法的参数或参数内的String字段
+ * 只能注解于RestService类的方法的参数或参数内的String、java.net.InetSocketAddress字段
  * <p>
  * 详情见: https://redkale.org
  *

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

@@ -11,10 +11,11 @@ import java.net.*;
 import java.nio.ByteBuffer;
 import java.util.*;
 import java.util.concurrent.*;
-import java.util.function.Supplier;
+import java.util.function.*;
 import java.util.logging.*;
 import java.util.stream.Stream;
 import org.redkale.convert.Convert;
+import org.redkale.net.AsyncConnection;
 import org.redkale.util.Comment;
 
 /**
@@ -82,6 +83,10 @@ public abstract class WebSocket<G extends Serializable, T> {
 
     WebSocketEngine _engine; //不可能为空 
 
+    InetSocketAddress _sncpAddress; //分布式下不可为空
+
+    AsyncConnection _channel;//不可能为空 
+
     String _sessionid; //不可能为空 
 
     G _userid; //不可能为空 
@@ -540,7 +545,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);
     }
 
     /**
@@ -555,6 +560,17 @@ public abstract class WebSocket<G extends Serializable, T> {
         return _engine.node.forceCloseWebSocket(userid);
     }
 
+    /**
+     * 获取WebSocketNode
+     *
+     *
+     * @return WebSocketNode
+     */
+    @Comment("获取WebSocketNode")
+    public final WebSocketNode webSocketNode() {
+        return _engine.node;
+    }
+
     /**
      * 获取当前WebSocket下的属性，非线程安全
      *
@@ -674,12 +690,21 @@ public abstract class WebSocket<G extends Serializable, T> {
     }
 
     /**
-     * 获取ByteBuffer资源池
+     * 获取ByteBuffer生成器
      *
      * @return Supplier
      */
-    protected Supplier<ByteBuffer> getByteBufferSupplier() {
-        return this._runner.context.getBufferSupplier();
+    protected Supplier<ByteBuffer> getBufferSupplier() {
+        return this._channel.getBufferSupplier();
+    }
+
+    /**
+     * 获取ByteBuffer回收器
+     *
+     * @return Consumer
+     */
+    protected Consumer<ByteBuffer> getBufferConsumer() {
+        return this._channel.getBufferConsumer();
     }
 
     //-------------------------------------------------------------------
@@ -726,8 +751,11 @@ public abstract class WebSocket<G extends Serializable, T> {
 
     /**
      * WebSokcet连接成功后的回调方法
+     *
+     * @return Future 可以为null
      */
-    public void onConnected() {
+    public CompletableFuture onConnected() {
+        return null;
     }
 
     /**
@@ -791,8 +819,11 @@ public abstract class WebSocket<G extends Serializable, T> {
      *
      * @param code   结果码，非0表示非正常关闭
      * @param reason 关闭原因
+     *
+     * @return Future 可以为null
      */
-    public void onClose(int code, String reason) {
+    public CompletableFuture onClose(int code, String reason) {
+        return null;
     }
 
     /**
@@ -814,6 +845,15 @@ public abstract class WebSocket<G extends Serializable, T> {
         return forceCloseWebSocket(getUserid()).thenApply((r) -> true);
     }
 
+    /**
+     * 获取分布式情况下的SNCP地址, 非分布式下为null
+     *
+     * @return InetSocketAddress sncpAddress
+     */
+    public InetSocketAddress getSncpAddress() {
+        return _sncpAddress;
+    }
+
     /**
      * 获取Logger
      *

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

@@ -7,6 +7,7 @@ package org.redkale.net.http;
 
 import static org.redkale.net.http.WebSocketServlet.DEFAILT_LIVEINTERVAL;
 import java.io.*;
+import java.nio.ByteBuffer;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.*;
@@ -76,11 +77,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,
-        int wsmaxconns, int wsthreads, int wsmaxbody, Cryptor cryptor, WebSocketNode node, Convert sendConvert, Logger logger) {
+    protected WebSocketEngine(String engineid, boolean single, HttpContext context, int liveinterval, int wsmaxconns,
+        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 +94,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 +132,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 +145,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 +171,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,43 +213,62 @@ public class WebSocketEngine {
     }
 
     @Comment("给所有连接用户发送消息")
-    public CompletableFuture<Integer> broadcastMessage(final Object message, final boolean last) {
-        return broadcastMessage((Predicate) null, message, last);
+    public CompletableFuture<Integer> broadcastLocalMessage(final Object message, final boolean 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) {
+            Supplier<ByteBuffer> bufferSupplier = null;
+            Consumer<ByteBuffer> bufferConsumer = null;
             //此处的WebSocketPacket只能是包含payload或bytes内容的，不能包含sendConvert、sendJson、sendBuffers
             final WebSocketPacket packet = (message instanceof WebSocketPacket) ? (WebSocketPacket) message
                 : ((message == null || message instanceof CharSequence || message instanceof byte[])
                     ? new WebSocketPacket((Serializable) message, last) : new WebSocketPacket(this.sendConvert, false, message, last));
-            packet.setSendBuffers(packet.encode(context.getBufferSupplier(), context.getBufferConsumer(), cryptor));
+            //packet.setSendBuffers(packet.encode(context.getBufferSupplier(), context.getBufferConsumer(), cryptor));
             CompletableFuture<Integer> future = null;
             if (single) {
                 for (WebSocket websocket : websockets.values()) {
                     if (predicate != null && !predicate.test(websocket)) continue;
+                    if (bufferSupplier == null) {
+                        bufferSupplier = websocket.getBufferSupplier();
+                        bufferConsumer = websocket.getBufferConsumer();
+                        packet.setSendBuffers(packet.encode(bufferSupplier, bufferConsumer, cryptor));
+                    }
                     future = future == null ? websocket.sendPacket(packet) : future.thenCombine(websocket.sendPacket(packet), (a, b) -> a | (Integer) b);
                 }
             } else {
                 for (List<WebSocket> list : websockets2.values()) {
                     for (WebSocket websocket : list) {
                         if (predicate != null && !predicate.test(websocket)) continue;
+                        if (bufferSupplier == null) {
+                            bufferSupplier = websocket.getBufferSupplier();
+                            bufferConsumer = websocket.getBufferConsumer();
+                            packet.setSendBuffers(packet.encode(bufferSupplier, bufferConsumer, cryptor));
+                        }
                         future = future == null ? websocket.sendPacket(packet) : future.thenCombine(websocket.sendPacket(packet), (a, b) -> a | (Integer) b);
                     }
                 }
             }
-            if (future != null) future.whenComplete((rs, ex) -> context.offerBuffer(packet.sendBuffers));
+            final Consumer<ByteBuffer> bufferConsumer0 = bufferConsumer;
+            if (future != null) future.whenComplete((rs, ex) -> {
+                    if (packet.sendBuffers != null && bufferConsumer0 != null) {
+                        for (ByteBuffer buffer : packet.sendBuffers) {
+                            bufferConsumer0.accept(buffer);
+                        }
+                    }
+                });
             return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
         } else {
             CompletableFuture<Integer> future = null;
@@ -265,32 +290,39 @@ 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) {
+            Supplier<ByteBuffer> bufferSupplier = null;
+            Consumer<ByteBuffer> bufferConsumer = null;
             //此处的WebSocketPacket只能是包含payload或bytes内容的，不能包含sendConvert、sendJson、sendBuffers
             final WebSocketPacket packet = (message instanceof WebSocketPacket) ? (WebSocketPacket) message
                 : ((message == null || message instanceof CharSequence || message instanceof byte[])
                     ? new WebSocketPacket((Serializable) message, last) : new WebSocketPacket(this.sendConvert, false, message, last));
-            packet.setSendBuffers(packet.encode(context.getBufferSupplier(), context.getBufferConsumer(), cryptor));
+            //packet.setSendBuffers(packet.encode(context.getBufferSupplier(), context.getBufferConsumer(), cryptor));
             CompletableFuture<Integer> future = null;
             if (single) {
                 for (Serializable userid : userids) {
                     WebSocket websocket = websockets.get(userid);
                     if (websocket == null) continue;
+                    if (bufferSupplier == null) {
+                        bufferSupplier = websocket.getBufferSupplier();
+                        bufferConsumer = websocket.getBufferConsumer();
+                        packet.setSendBuffers(packet.encode(bufferSupplier, bufferConsumer, cryptor));
+                    }
                     future = future == null ? websocket.sendPacket(packet) : future.thenCombine(websocket.sendPacket(packet), (a, b) -> a | (Integer) b);
                 }
             } else {
@@ -298,11 +330,23 @@ public class WebSocketEngine {
                     List<WebSocket> list = websockets2.get(userid);
                     if (list == null) continue;
                     for (WebSocket websocket : list) {
+                        if (bufferSupplier == null) {
+                            bufferSupplier = websocket.getBufferSupplier();
+                            bufferConsumer = websocket.getBufferConsumer();
+                            packet.setSendBuffers(packet.encode(bufferSupplier, bufferConsumer, cryptor));
+                        }
                         future = future == null ? websocket.sendPacket(packet) : future.thenCombine(websocket.sendPacket(packet), (a, b) -> a | (Integer) b);
                     }
                 }
             }
-            if (future != null) future.whenComplete((rs, ex) -> context.offerBuffer(packet.sendBuffers));
+            final Consumer<ByteBuffer> bufferConsumer0 = bufferConsumer;
+            if (future != null) future.whenComplete((rs, ex) -> {
+                    if (packet.sendBuffers != null && bufferConsumer0 != null) {
+                        for (ByteBuffer buffer : packet.sendBuffers) {
+                            bufferConsumer0.accept(buffer);
+                        }
+                    }
+                });
             return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
         } else {
             CompletableFuture<Integer> future = null;
@@ -326,7 +370,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 +387,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) {
@@ -408,6 +452,11 @@ public class WebSocketEngine {
         return (int) websockets2.values().stream().mapToInt(sublist -> sublist.size()).count();
     }
 
+    @Comment("获取当前用户总数")
+    public Set<Serializable> getLocalUserSet() {
+        return single ? new LinkedHashSet<>(websockets.keySet()) : new LinkedHashSet<>(websockets2.keySet());
+    }
+
     @Comment("获取当前用户总数")
     public int getLocalUserSize() {
         return single ? websockets.size() : websockets2.size();

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

@@ -11,7 +11,7 @@ import java.net.*;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.logging.*;
-import java.util.stream.Stream;
+import java.util.stream.*;
 import javax.annotation.*;
 import org.redkale.boot.*;
 import org.redkale.convert.*;
@@ -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);
 
@@ -205,20 +209,17 @@ public abstract class WebSocketNode {
     }
 
     /**
-     * @deprecated
+     * 获取在线用户总数
      *
-     * 判断指定用户是否WebSocket在线
-     *
-     * @param userid Serializable
      *
      * @return boolean
      */
-    private CompletableFuture<Boolean> existsWebSocket2(final Serializable userid) {
+    public CompletableFuture<Set<String>> getUserSet() {
         if (this.localEngine != null && this.sncpNodeAddresses == null) {
-            return CompletableFuture.completedFuture(this.localEngine.existsLocalWebSocket(userid));
+            return CompletableFuture.completedFuture(new LinkedHashSet<>(this.localEngine.getLocalUserSet().stream().map(x -> String.valueOf(x)).collect(Collectors.toList())));
         }
         tryAcquireSemaphore();
-        CompletableFuture<Boolean> rs = this.sncpNodeAddresses.existsAsync(SOURCE_SNCP_USERID_PREFIX + userid);
+        CompletableFuture<Set<String>> rs = this.sncpNodeAddresses.queryKeysStartsWithAsync(SOURCE_SNCP_USERID_PREFIX).thenApply(v -> new LinkedHashSet<>(v.stream().map(x -> x.substring(SOURCE_SNCP_USERID_PREFIX.length())).collect(Collectors.toList())));
         if (semaphore != null) rs.whenComplete((r, e) -> releaseSemaphore());
         return rs;
     }
@@ -232,6 +233,7 @@ public abstract class WebSocketNode {
      */
     @Local
     public CompletableFuture<Boolean> existsWebSocket(final Serializable userid) {
+        if (userid instanceof WebSocketUserAddress) return existsWebSocket((WebSocketUserAddress) userid);
         CompletableFuture<Boolean> localFuture = null;
         if (this.localEngine != null) localFuture = CompletableFuture.completedFuture(localEngine.existsLocalWebSocket(userid));
         if (this.sncpNodeAddresses == null || this.remoteNode == null) {
@@ -244,7 +246,7 @@ public abstract class WebSocketNode {
         CompletableFuture<Collection<InetSocketAddress>> addrsFuture = sncpNodeAddresses.getCollectionAsync(SOURCE_SNCP_USERID_PREFIX + userid, InetSocketAddress.class);
         if (semaphore != null) addrsFuture.whenComplete((r, e) -> releaseSemaphore());
         CompletableFuture<Boolean> remoteFuture = addrsFuture.thenCompose((Collection<InetSocketAddress> addrs) -> {
-            if (logger.isLoggable(Level.FINEST)) logger.finest("websocket found userid:" + userid + " on " + addrs);
+            //if (logger.isLoggable(Level.FINEST)) logger.finest("websocket found userid:" + userid + " on " + addrs);
             if (addrs == null || addrs.isEmpty()) return CompletableFuture.completedFuture(false);
             CompletableFuture<Boolean> future = null;
             for (InetSocketAddress addr : addrs) {
@@ -257,6 +259,38 @@ public abstract class WebSocketNode {
         return localFuture == null ? remoteFuture : localFuture.thenCombine(remoteFuture, (a, b) -> a | b);
     }
 
+    /**
+     * 判断指定用户是否WebSocket在线
+     *
+     * @param userAddress WebSocketUserAddress
+     *
+     * @return boolean
+     */
+    @Local
+    public CompletableFuture<Boolean> existsWebSocket(final WebSocketUserAddress userAddress) {
+        CompletableFuture<Boolean> localFuture = null;
+        if (this.localEngine != null) localFuture = CompletableFuture.completedFuture(localEngine.existsLocalWebSocket(userAddress.userid()));
+        if (this.sncpNodeAddresses == null || this.remoteNode == null) {
+            if (logger.isLoggable(Level.FINEST)) logger.finest("websocket remote node is null");
+            //没有CacheSource就不会有分布式节点
+            return localFuture;
+        }
+        Collection<InetSocketAddress> addrs = userAddress.sncpAddresses();
+        if (addrs != null) addrs = new ArrayList<>(addrs); //不能修改参数内部值
+        if (userAddress.sncpAddress() != null) {
+            if (addrs == null) addrs = new ArrayList<>();
+            addrs.add(userAddress.sncpAddress());
+        }
+        if (addrs == null || addrs.isEmpty()) return CompletableFuture.completedFuture(false);
+        CompletableFuture<Boolean> future = null;
+        for (InetSocketAddress addr : addrs) {
+            if (addr == null || addr.equals(localSncpAddress)) continue;
+            future = future == null ? remoteNode.existsWebSocket(userAddress.userid(), addr)
+                : future.thenCombine(remoteNode.existsWebSocket(userAddress.userid(), addr), (a, b) -> a | b);
+        }
+        return future == null ? CompletableFuture.completedFuture(false) : future;
+    }
+
     /**
      * 强制关闭用户WebSocket
      *
@@ -266,17 +300,45 @@ public abstract class WebSocketNode {
      */
     @Local
     public CompletableFuture<Integer> forceCloseWebSocket(final Serializable userid) {
+        return forceCloseWebSocket(userid, (WebSocketUserAddress) null);
+    }
+
+    /**
+     * 强制关闭用户WebSocket
+     *
+     * @param userAddress WebSocketUserAddress
+     *
+     * @return int
+     */
+    @Local
+    public CompletableFuture<Integer> forceCloseWebSocket(final WebSocketUserAddress userAddress) {
+        return forceCloseWebSocket(null, userAddress);
+    }
+
+    private CompletableFuture<Integer> forceCloseWebSocket(final Serializable userid, final WebSocketUserAddress userAddress) {
         CompletableFuture<Integer> localFuture = null;
-        if (this.localEngine != null) localFuture = CompletableFuture.completedFuture(localEngine.forceCloseLocalWebSocket(userid));
+        if (this.localEngine != null) localFuture = CompletableFuture.completedFuture(localEngine.forceCloseLocalWebSocket(userAddress == null ? userid : userAddress.userid()));
         if (this.sncpNodeAddresses == null || this.remoteNode == null) {
             if (logger.isLoggable(Level.FINEST)) logger.finest("websocket remote node is null");
             //没有CacheSource就不会有分布式节点
             return localFuture;
         }
         //远程节点关闭
-        tryAcquireSemaphore();
-        CompletableFuture<Collection<InetSocketAddress>> addrsFuture = sncpNodeAddresses.getCollectionAsync(SOURCE_SNCP_USERID_PREFIX + userid, InetSocketAddress.class);
-        if (semaphore != null) addrsFuture.whenComplete((r, e) -> releaseSemaphore());
+        CompletableFuture<Collection<InetSocketAddress>> addrsFuture;
+        if (userAddress == null) {
+            tryAcquireSemaphore();
+            addrsFuture = sncpNodeAddresses.getCollectionAsync(SOURCE_SNCP_USERID_PREFIX + userid, InetSocketAddress.class);
+            if (semaphore != null) addrsFuture.whenComplete((r, e) -> releaseSemaphore());
+        } else {
+            Collection<InetSocketAddress> addrs = userAddress.sncpAddresses();
+            if (addrs != null) addrs = new ArrayList<>(addrs); //不能修改参数内部值
+            if (userAddress.sncpAddress() != null) {
+                if (addrs == null) addrs = new ArrayList<>();
+                addrs.add(userAddress.sncpAddress());
+            }
+            if (addrs == null || addrs.isEmpty()) return CompletableFuture.completedFuture(0);
+            addrsFuture = CompletableFuture.completedFuture(addrs);
+        }
         CompletableFuture<Integer> remoteFuture = addrsFuture.thenCompose((Collection<InetSocketAddress> addrs) -> {
             if (logger.isLoggable(Level.FINEST)) logger.finest("websocket found userid:" + userid + " on " + addrs);
             if (addrs == null || addrs.isEmpty()) return CompletableFuture.completedFuture(0);
@@ -307,88 +369,88 @@ public abstract class WebSocketNode {
      * 向指定用户发送消息，先发送本地连接，再发送远程连接  <br>
      * 如果当前WebSocketNode是远程模式，此方法只发送远程连接
      *
-     * @param message 消息内容
-     * @param userids Stream
+     * @param message       消息内容
+     * @param useridOrAddrs Stream
      *
      * @return 为0表示成功， 其他值表示部分发送异常
      */
     @Local
-    public final CompletableFuture<Integer> sendMessage(Object message, final Stream<? extends Serializable> userids) {
-        return sendMessage((Convert) null, message, true, userids);
+    public final CompletableFuture<Integer> sendMessage(Object message, final Stream<? extends Serializable> useridOrAddrs) {
+        return sendMessage((Convert) null, message, true, useridOrAddrs);
     }
 
     /**
      * 向指定用户发送消息，先发送本地连接，再发送远程连接  <br>
      * 如果当前WebSocketNode是远程模式，此方法只发送远程连接
      *
-     * @param message 消息内容
-     * @param userids Serializable[]
+     * @param message       消息内容
+     * @param useridOrAddrs Serializable[]
      *
      * @return 为0表示成功， 其他值表示部分发送异常
      */
     @Local
-    public final CompletableFuture<Integer> sendMessage(Object message, final Serializable... userids) {
-        return sendMessage((Convert) null, message, true, userids);
+    public final CompletableFuture<Integer> sendMessage(Object message, final Serializable... useridOrAddrs) {
+        return sendMessage((Convert) null, message, true, useridOrAddrs);
     }
 
     /**
      * 向指定用户发送消息，先发送本地连接，再发送远程连接  <br>
      * 如果当前WebSocketNode是远程模式，此方法只发送远程连接
      *
-     * @param convert Convert
-     * @param message 消息内容
-     * @param userids Stream
+     * @param convert       Convert
+     * @param message       消息内容
+     * @param useridOrAddrs Stream
      *
      * @return 为0表示成功， 其他值表示部分发送异常
      */
     @Local
-    public final CompletableFuture<Integer> sendMessage(final Convert convert, Object message, final Stream<? extends Serializable> userids) {
-        return sendMessage(convert, message, true, userids);
+    public final CompletableFuture<Integer> sendMessage(final Convert convert, Object message, final Stream<? extends Serializable> useridOrAddrs) {
+        return sendMessage(convert, message, true, useridOrAddrs);
     }
 
     /**
      * 向指定用户发送消息，先发送本地连接，再发送远程连接  <br>
      * 如果当前WebSocketNode是远程模式，此方法只发送远程连接
      *
-     * @param convert Convert
-     * @param message 消息内容
-     * @param userids Serializable[]
+     * @param convert       Convert
+     * @param message       消息内容
+     * @param useridOrAddrs Serializable[]
      *
      * @return 为0表示成功， 其他值表示部分发送异常
      */
     @Local
-    public final CompletableFuture<Integer> sendMessage(final Convert convert, Object message, final Serializable... userids) {
-        return sendMessage(convert, message, true, userids);
+    public final CompletableFuture<Integer> sendMessage(final Convert convert, Object message, final Serializable... useridOrAddrs) {
+        return sendMessage(convert, message, true, useridOrAddrs);
     }
 
     /**
      * 向指定用户发送消息，先发送本地连接，再发送远程连接  <br>
      * 如果当前WebSocketNode是远程模式，此方法只发送远程连接
      *
-     * @param message 消息内容
-     * @param last    是否最后一条
-     * @param userids Stream
+     * @param message       消息内容
+     * @param last          是否最后一条
+     * @param useridOrAddrs Stream
      *
      * @return 为0表示成功， 其他值表示部分发送异常
      */
     @Local
-    public final CompletableFuture<Integer> sendMessage(final Object message, final boolean last, final Stream<? extends Serializable> userids) {
-        return sendMessage((Convert) null, message, last, userids);
+    public final CompletableFuture<Integer> sendMessage(final Object message, final boolean last, final Stream<? extends Serializable> useridOrAddrs) {
+        return sendMessage((Convert) null, message, last, useridOrAddrs);
     }
 
     /**
      * 向指定用户发送消息，先发送本地连接，再发送远程连接  <br>
      * 如果当前WebSocketNode是远程模式，此方法只发送远程连接
      *
-     * @param message 消息内容
-     * @param last    是否最后一条
-     * @param userids Serializable[]
+     * @param message       消息内容
+     * @param last          是否最后一条
+     * @param useridOrAddrs Serializable[]
      *
      * @return 为0表示成功， 其他值表示部分发送异常
      */
     @Local
-    public final CompletableFuture<Integer> sendMessage(final Object message, final boolean last, final Serializable... userids) {
-        return sendMessage((Convert) null, message, last, userids);
+    public final CompletableFuture<Integer> sendMessage(final Object message, final boolean last, final Serializable... useridOrAddrs) {
+        return sendMessage((Convert) null, message, last, useridOrAddrs);
     }
 
     /**
@@ -426,18 +488,168 @@ public abstract class WebSocketNode {
     @Local
     public CompletableFuture<Integer> sendMessage(final Convert convert, final Object message0, final boolean last, final Serializable... userids) {
         if (userids == null || userids.length < 1) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
+        if (userids[0] instanceof WebSocketUserAddress) {
+            WebSocketUserAddress[] useraddrs = new WebSocketUserAddress[userids.length];
+            for (int i = 0; i < useraddrs.length; i++) {
+                useraddrs[i] = (WebSocketUserAddress) userids[i];
+            }
+            return sendMessage(convert, message0, last, useraddrs);
+        }
         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> rsfuture;
+        if (userids.length == 1) {
+            rsfuture = sendOneUserMessage(remoteMessage, last, 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(true, 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[] oneaddrUserids = en.getValue().toArray(new Serializable[en.getValue().size()]);
+                    future = future == null ? sendOneAddrMessage(en.getKey(), remoteMessage, last, oneaddrUserids)
+                        : future.thenCombine(sendOneAddrMessage(en.getKey(), remoteMessage, last, oneaddrUserids), (a, b) -> a | b);
+                }
+                return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
+            });
+        }
+        return rsfuture == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : rsfuture;
+    }
+
+    /**
+     * 向指定用户发送消息，先发送本地连接，再发送远程连接  <br>
+     * 如果当前WebSocketNode是远程模式，此方法只发送远程连接
+     *
+     * @param convert   Convert
+     * @param message0  消息内容
+     * @param last      是否最后一条
+     * @param useraddrs WebSocketUserAddress[]
+     *
+     * @return 为0表示成功， 其他值表示部分发送异常
+     */
+    @Local
+    public CompletableFuture<Integer> sendMessage(final Convert convert, final Object message0, final boolean last, final WebSocketUserAddress... useraddrs) {
+        if (useraddrs == null || useraddrs.length < 1) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
+        if (message0 instanceof CompletableFuture) return ((CompletableFuture) message0).thenApply(msg -> sendMessage(convert, msg, last, useraddrs));
+        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.sendLocalMessage(message, last, userAddressToUserids(useraddrs));
+        }
+
+        final Object remoteMessage = formatRemoteMessage(message);
+        final Map<InetSocketAddress, List<Serializable>> addrUsers = userAddressToAddrMap(useraddrs);
+        if (logger.isLoggable(Level.FINEST)) {
+            logger.finest("websocket(localaddr=" + localSncpAddress + ", useraddrs=" + JsonConvert.root().convertTo(useraddrs) + ") found message-addr-userids: " + addrUsers);
+        }
         CompletableFuture<Integer> future = null;
-        for (Serializable userid : userids) {
-            future = future == null ? sendOneMessage(remoteMessage, last, userid)
-                : future.thenCombine(sendOneMessage(remoteMessage, last, userid), (a, b) -> a | b);
+        for (Map.Entry<InetSocketAddress, List<Serializable>> en : addrUsers.entrySet()) {
+            Serializable[] oneaddrUserids = en.getValue().toArray(new Serializable[en.getValue().size()]);
+            future = future == null ? sendOneAddrMessage(en.getKey(), remoteMessage, last, oneaddrUserids)
+                : future.thenCombine(sendOneAddrMessage(en.getKey(), remoteMessage, last, oneaddrUserids), (a, b) -> a | b);
         }
         return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
+
+    }
+
+    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() : (message instanceof CharSequence ? message : 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) && this.localEngine == null) { //只打印远程模式的
+            logger.finest("websocket want send message {userids:" + JsonConvert.root().convertTo(userids) + ", sncpaddr:" + sncpAddr + ", content:" + (message instanceof WebSocketPacket ? ((WebSocketPacket) message).toSimpleString() : (message instanceof CharSequence ? message : 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);
+    }
+
+    protected Serializable[] userAddressToUserids(WebSocketUserAddress... useraddrs) {
+        if (useraddrs == null || useraddrs.length == 1) return new Serializable[0];
+        Set<Serializable> set = new HashSet<>();
+        for (WebSocketUserAddress userAddress : useraddrs) {
+            set.add(userAddress.userid());
+        }
+        return set.toArray(new Serializable[set.size()]);
+    }
+
+    protected Map<InetSocketAddress, List<Serializable>> userAddressToAddrMap(WebSocketUserAddress... useraddrs) {
+        final Map<InetSocketAddress, List<Serializable>> addrUsers = new HashMap<>();
+        for (WebSocketUserAddress userAddress : useraddrs) {
+            if (userAddress.sncpAddress() != null) {
+                addrUsers.computeIfAbsent(userAddress.sncpAddress(), k -> new ArrayList<>()).add(userAddress.userid());
+            }
+            if (userAddress.sncpAddresses() != null) {
+                for (InetSocketAddress addr : userAddress.sncpAddresses()) {
+                    if (addr != null) {
+                        addrUsers.computeIfAbsent(addr, k -> new ArrayList<>()).add(userAddress.userid());
+                    }
+                }
+            }
+        }
+        return addrUsers;
     }
 
     /**
@@ -548,10 +760,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 +781,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 +791,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());
@@ -645,22 +823,90 @@ public abstract class WebSocketNode {
     @Local
     public CompletableFuture<Integer> sendAction(final WebSocketAction action, final Serializable... userids) {
         if (userids == null || userids.length < 1) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
+        if (userids[0] instanceof WebSocketUserAddress) {
+            WebSocketUserAddress[] useraddrs = new WebSocketUserAddress[userids.length];
+            for (int i = 0; i < useraddrs.length; i++) {
+                useraddrs[i] = (WebSocketUserAddress) userids[i];
+            }
+            return sendAction(action, useraddrs);
+        }
         if (this.localEngine != null && this.sncpNodeAddresses == null) { //本地模式且没有分布式
-            return this.localEngine.sendAction(action, userids);
+            return this.localEngine.sendLocalAction(action, userids);
+        }
+        CompletableFuture<Integer> rsfuture;
+        if (userids.length == 1) {
+            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(true, 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[] oneaddrUserids = en.getValue().toArray(new Serializable[en.getValue().size()]);
+                    future = future == null ? sendOneAddrAction(en.getKey(), action, oneaddrUserids)
+                        : future.thenCombine(sendOneAddrAction(en.getKey(), action, oneaddrUserids), (a, b) -> a | b);
+                }
+                return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
+            });
+        }
+        return rsfuture == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : rsfuture;
+    }
+
+    /**
+     * 向指定用户发送操作，先发送本地连接，再发送远程连接  <br>
+     * 如果当前WebSocketNode是远程模式，此方法只发送远程连接
+     *
+     * @param action    操作参数
+     * @param useraddrs WebSocketUserAddress[]
+     *
+     * @return 为0表示成功， 其他值表示部分发送异常
+     */
+    @Local
+    public CompletableFuture<Integer> sendAction(final WebSocketAction action, final WebSocketUserAddress... useraddrs) {
+        if (useraddrs == null || useraddrs.length < 1) return CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY);
+        if (this.localEngine != null && this.sncpNodeAddresses == null) { //本地模式且没有分布式
+            return this.localEngine.sendLocalAction(action, userAddressToUserids(useraddrs));
+        }
+
+        final Map<InetSocketAddress, List<Serializable>> addrUsers = userAddressToAddrMap(useraddrs);
+        if (logger.isLoggable(Level.FINEST)) {
+            logger.finest("websocket(localaddr=" + localSncpAddress + ", useraddrs=" + JsonConvert.root().convertTo(useraddrs) + ") found action-userid-addrs: " + addrUsers);
         }
         CompletableFuture<Integer> future = null;
-        for (Serializable userid : userids) {
-            future = future == null ? sendOneAction(action, userid) : future.thenCombine(sendOneAction(action, userid), (a, b) -> a | b);
+        for (Map.Entry<InetSocketAddress, List<Serializable>> en : addrUsers.entrySet()) {
+            Serializable[] oneaddrUserids = en.getValue().toArray(new Serializable[en.getValue().size()]);
+            future = future == null ? sendOneAddrAction(en.getKey(), action, oneaddrUserids)
+                : future.thenCombine(sendOneAddrAction(en.getKey(), action, oneaddrUserids), (a, b) -> a | b);
         }
         return future == null ? CompletableFuture.completedFuture(RETCODE_GROUP_EMPTY) : future;
     }
 
-    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 +933,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) && this.localEngine == null) { //只打印远程模式的
+            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 +960,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());
+            buffers = webSocket._engine.cryptor.decrypt(buffers, webSocket._channel.getBufferSupplier(), webSocket._channel.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/WebSocketParam.java

@@ -5,6 +5,10 @@
  */
 package org.redkale.net.http;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Array;
+import java.util.Arrays;
+
 /**
  *
  * 供WebSocket.preOnMessage 方法获取RestWebSocket里OnMessage方法的参数  <br>
@@ -16,6 +20,29 @@ package org.redkale.net.http;
 public interface WebSocketParam {
 
     public <T> T getValue(String name);
-    
+
     public String[] getNames();
+
+    public Annotation[] getAnnotations();
+
+    default <T extends Annotation> T getAnnotation(Class<T> annotationClass) {
+        for (Annotation ann : getAnnotations()) {
+            if (ann.getClass() == annotationClass) return (T) ann;
+        }
+        return null;
+    }
+
+    default <T extends Annotation> T[] getAnnotationsByType(Class<T> annotationClass) {
+        Annotation[] annotations = getAnnotations();
+        if (annotations == null) return (T[]) Array.newInstance(annotationClass, 0);
+        T[] news = (T[]) Array.newInstance(annotationClass, annotations.length);
+        int index = 0;
+        for (Annotation ann : annotations) {
+            if (ann.getClass() == annotationClass) {
+                news[index++] = (T) ann;
+            }
+        }
+        if (index < 1) return (T[]) Array.newInstance(annotationClass, 0);
+        return Arrays.copyOf(news, index);
+    }
 }

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

@@ -18,35 +18,47 @@ import org.redkale.convert.json.JsonConvert;
  * @author zhangjx
  */
 public class WebSocketRange implements Serializable {
-    
+
     protected String wskey;
-    
+
     protected Map<String, String> attach;
-    
+
     public WebSocketRange() {
     }
-    
+
     public WebSocketRange(String wskey) {
         this.wskey = wskey;
     }
-    
+
     public WebSocketRange(String wskey, Map<String, String> attach) {
         this.wskey = wskey;
         this.attach = attach;
     }
-    
+
+    public boolean containsAttach(String key) {
+        return this.attach == null ? false : this.attach.containsKey(key);
+    }
+
+    public String getAttach(String key) {
+        return this.attach == null ? null : this.attach.get(key);
+    }
+
+    public String getAttach(String key, String defval) {
+        return this.attach == null ? defval : this.attach.getOrDefault(key, defval);
+    }
+
     public String getWskey() {
         return wskey;
     }
-    
+
     public void setWskey(String wskey) {
         this.wskey = wskey;
     }
-    
+
     public Map<String, String> getAttach() {
         return attach;
     }
-    
+
     public void setAttach(Map<String, String> attach) {
         this.attach = attach;
     }

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

@@ -5,7 +5,6 @@
  */
 package org.redkale.net.http;
 
-import org.redkale.net.AsyncConnection;
 import static org.redkale.net.http.WebSocket.*;
 import org.redkale.net.http.WebSocketPacket.FrameType;
 import java.nio.ByteBuffer;
@@ -15,6 +14,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
@@ -28,37 +28,47 @@ class WebSocketRunner implements Runnable {
 
     private final WebSocketEngine engine;
 
-    private final AsyncConnection channel;
-
     private final WebSocket webSocket;
 
     protected final HttpContext context;
 
+    protected final boolean mergemsg;
+
+    protected final Semaphore writeSemaphore = new Semaphore(1);
+
+    protected final LinkedBlockingQueue<WriteEntry> writeQueue = new LinkedBlockingQueue();
+
     volatile boolean closed = false;
 
+    FrameType currSeriesMergeFrameType;
+
+    ByteArray currSeriesMergeMessage;
+
     private final BiConsumer<WebSocket, Object> restMessageConsumer;  //主要供RestWebSocket使用
 
     protected long lastSendTime;
 
     protected long lastReadTime;
 
-    WebSocketRunner(HttpContext context, WebSocket webSocket, BiConsumer<WebSocket, Object> messageConsumer, AsyncConnection channel) {
+    WebSocketRunner(HttpContext context, WebSocket webSocket, BiConsumer<WebSocket, Object> messageConsumer) {
         this.context = context;
         this.engine = webSocket._engine;
         this.webSocket = webSocket;
+        this.mergemsg = webSocket._engine.mergemsg;
         this.restMessageConsumer = messageConsumer;
-        this.channel = channel;
     }
 
     @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()) {
+            CompletableFuture connectfFuture = webSocket.onConnected();
+            if (connectfFuture != null) connectfFuture.join();
+            webSocket._channel.setReadTimeoutSeconds(300); //读取超时5分钟
+            if (webSocket._channel.isOpen()) {
                 final int wsmaxbody = webSocket._engine.wsmaxbody;
-                channel.read(new CompletionHandler<Integer, ByteBuffer>() {
+                webSocket._channel.read(new CompletionHandler<Integer, ByteBuffer>() {
 
                     //尚未解析完的数据包
                     private WebSocketPacket unfinishPacket;
@@ -81,15 +91,15 @@ class WebSocketRunner implements Runnable {
 
                             WebSocketPacket onePacket = null;
                             if (unfinishPacket != null) {
-                                if (unfinishPacket.receiveBody(webSocket, readBuffer)) { //已经接收完毕
+                                if (unfinishPacket.receiveBody(context.getLogger(), self, webSocket, readBuffer)) { //已经接收完毕
                                     onePacket = unfinishPacket;
                                     unfinishPacket = null;
                                     for (ByteBuffer b : exBuffers) {
-                                        context.offerBuffer(b);
+                                        webSocket._channel.offerBuffer(b);
                                     }
                                     exBuffers.clear();
                                 } else { //需要继续接收,  此处不能回收readBuffer
-                                    channel.read(this);
+                                    webSocket._channel.read(this);
                                     return;
                                 }
                             }
@@ -98,7 +108,7 @@ class WebSocketRunner implements Runnable {
                             if (onePacket != null) packets.add(onePacket);
                             try {
                                 while (true) {
-                                    WebSocketPacket packet = new WebSocketPacket().decode(context.getLogger(), webSocket, wsmaxbody, halfBytes, readBuffer);
+                                    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;
@@ -115,13 +125,17 @@ class WebSocketRunner implements Runnable {
                                 webSocket.onOccurException(e, null);
                             }
                             //继续监听消息
-                            readBuffer.clear();
+                            if (readBuffer.hasRemaining()) { //exBuffers缓存了
+                                readBuffer = webSocket._channel.pollReadBuffer();
+                            } else {
+                                readBuffer.clear();
+                            }
                             if (halfBytes.getValue() != null) {
                                 readBuffer.put(halfBytes.getValue());
                                 halfBytes.setValue(null);
                             }
-                            channel.setReadBuffer(readBuffer);
-                            channel.read(this);
+                            webSocket._channel.setReadBuffer(readBuffer);
+                            webSocket._channel.read(this);
 
                             //消息处理
                             for (final WebSocketPacket packet : packets) {
@@ -130,6 +144,7 @@ class WebSocketRunner implements Runnable {
                                     failed(null, readBuffer);
                                     return;
                                 }
+                                if (packet.receiveMessage == WebSocketPacket.MESSAGE_NIL) continue; //last=false && mergemsg=true 的粘包
 
                                 if (packet.type == FrameType.TEXT) {
                                     try {
@@ -167,7 +182,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);
@@ -215,11 +230,9 @@ class WebSocketRunner implements Runnable {
         //System.out.println("推送消息");        
         final CompletableFuture<Integer> futureResult = new CompletableFuture<>();
         try {
-            ByteBuffer[] buffers = packet.sendBuffers != null ? packet.duplicateSendBuffers() : packet.encode(this.context.getBufferSupplier(), this.context.getBufferConsumer(), webSocket._engine.cryptor);
+            ByteBuffer[] buffers = packet.sendBuffers != null ? packet.duplicateSendBuffers() : packet.encode(webSocket._channel.getBufferSupplier(), webSocket._channel.getBufferConsumer(), webSocket._engine.cryptor);
             //if (debug) context.getLogger().log(Level.FINEST, "wsrunner.sending websocket message:  " + packet);
-
-            this.lastSendTime = System.currentTimeMillis();
-            channel.write(buffers, buffers, new CompletionHandler<Integer, ByteBuffer[]>() {
+            CompletionHandler<Integer, ByteBuffer[]> handler = new CompletionHandler<Integer, ByteBuffer[]>() {
 
                 private CompletableFuture<Integer> future = futureResult;
 
@@ -231,7 +244,7 @@ class WebSocketRunner implements Runnable {
                             future = null;
                             if (attachments != null) {
                                 for (ByteBuffer buf : attachments) {
-                                    context.offerBuffer(buf);
+                                    webSocket._channel.offerBuffer(buf);
                                 }
                             }
                         }
@@ -246,7 +259,7 @@ class WebSocketRunner implements Runnable {
                             }
                         }
                         if (index >= 0) { //ByteBuffer[]统一回收的可以采用此写法
-                            channel.write(attachments, index, attachments.length - index, attachments, this);
+                            webSocket._channel.write(attachments, index, attachments.length - index, attachments, this);
                             return;
                         }
                         if (future != null) {
@@ -254,7 +267,7 @@ class WebSocketRunner implements Runnable {
                             future = null;
                             if (attachments != null) {
                                 for (ByteBuffer buf : attachments) {
-                                    context.offerBuffer(buf);
+                                    webSocket._channel.offerBuffer(buf);
                                 }
                             }
                         }
@@ -269,19 +282,35 @@ 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) {
-                        context.getLogger().log(Level.FINE, "WebSocket sendMessage on CompletionHandler failed, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", exc);
+                    if (exc != null && context.getLogger().isLoggable(Level.FINER)) {
+                        context.getLogger().log(Level.FINER, "WebSocket sendMessage on CompletionHandler failed, force to close channel, live " + (System.currentTimeMillis() - webSocket.getCreatetime()) / 1000 + " seconds", exc);
                     }
 
                 }
-            });
+            };
+            this.lastSendTime = System.currentTimeMillis();
+            if (writeSemaphore.tryAcquire()) {
+                webSocket._channel.write(buffers, buffers, handler);
+            } else {
+                writeQueue.add(new WriteEntry(buffers, handler));
+            }
+
         } 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;
+        return futureResult.whenComplete((r, t) -> {
+            WriteEntry entry = writeQueue.poll();
+            if (entry != null) {
+                webSocket._channel.write(entry.writeBuffers, entry.writeBuffers, entry.writeHandler);
+            } else {
+                writeSemaphore.release();
+            }
+        });
     }
 
     public boolean isClosed() {
@@ -293,24 +322,24 @@ class WebSocketRunner implements Runnable {
         synchronized (this) {
             if (closed) return null;
             closed = true;
-            channel.dispose();
-            CompletableFuture<Void> future = engine.removeThenClose(webSocket);
-            webSocket.onClose(code, reason);
-            return future;
+            CompletableFuture<Void> future = engine.removeLocalThenClose(webSocket);
+            webSocket._channel.dispose();
+            CompletableFuture closeFuture = webSocket.onClose(code, reason);
+            if (closeFuture == null) return future;
+            return CompletableFuture.allOf(future, closeFuture);
         }
     }
 
-    private static final class QueueEntry {
+    private static class WriteEntry {
 
-        public final CompletableFuture<Integer> future;
+        ByteBuffer[] writeBuffers;
 
-        public final WebSocketPacket packet;
+        CompletionHandler writeHandler;
 
-        public QueueEntry(CompletableFuture<Integer> future, WebSocketPacket packet) {
-            this.future = future;
-            this.packet = packet;
+        public WriteEntry(ByteBuffer[] writeBuffers, CompletionHandler writeHandler) {
+            this.writeBuffers = writeBuffers;
+            this.writeHandler = writeHandler;
         }
 
     }
-
 }

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;
 
@@ -157,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);
 
@@ -196,12 +202,14 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
         }
         final WebSocket webSocket = this.createWebSocket();
         webSocket._engine = this.node.localEngine;
+        webSocket._channel = response.getChannel();
         webSocket._messageTextType = this.messageTextType;
         webSocket._textConvert = textConvert;
         webSocket._binaryConvert = binaryConvert;
         webSocket._sendConvert = sendConvert;
         webSocket._remoteAddress = request.getRemoteAddress();
         webSocket._remoteAddr = request.getRemoteAddr();
+        webSocket._sncpAddress = this.node.localSncpAddress;
         initRestWebSocket(webSocket);
         CompletableFuture<String> sessionFuture = webSocket.onOpen(request);
         if (sessionFuture == null) {
@@ -255,8 +263,9 @@ 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);
-                                                    WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.removeChannel());
+                                                    WebSocketServlet.this.node.localEngine.addLocal(webSocket);
+                                                    response.removeChannel();
+                                                    WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer);
                                                     webSocket._runner = runner;
                                                     context.runAsync(runner);
                                                     response.finish(true);
@@ -276,23 +285,25 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
                                                 });
                                             }
                                         } else {
-                                            WebSocketServlet.this.node.localEngine.add(webSocket);
-                                            WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.removeChannel());
+                                            WebSocketServlet.this.node.localEngine.addLocal(webSocket);
+                                            response.removeChannel();
+                                            WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer);
                                             webSocket._runner = runner;
                                             context.runAsync(runner);
                                             response.finish(true);
                                         }
                                     });
                                 } else {
-                                    WebSocketServlet.this.node.localEngine.add(webSocket);
-                                    WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.removeChannel());
+                                    WebSocketServlet.this.node.localEngine.addLocal(webSocket);
+                                    response.removeChannel();
+                                    WebSocketRunner runner = new WebSocketRunner(context, webSocket, restMessageConsumer);
                                     webSocket._runner = runner;
                                     context.runAsync(runner);
                                     response.finish(true);
                                 }
                             };
                             if (webSocket.delayPackets != null) { //存在待发送的消息
-                                if (temprunner == null) temprunner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.getChannel());
+                                if (temprunner == null) temprunner = new WebSocketRunner(context, webSocket, restMessageConsumer);
                                 List<WebSocketPacket> delayPackets = webSocket.delayPackets;
                                 webSocket.delayPackets = null;
                                 CompletableFuture<Integer> cf = null;
@@ -317,7 +328,7 @@ public abstract class WebSocketServlet extends HttpServlet implements Resourcabl
                         });
                     };
                     if (webSocket.delayPackets != null) { //存在待发送的消息
-                        if (temprunner == null) temprunner = new WebSocketRunner(context, webSocket, restMessageConsumer, response.getChannel());
+                        if (temprunner == null) temprunner = new WebSocketRunner(context, webSocket, restMessageConsumer);
                         List<WebSocketPacket> delayPackets = webSocket.delayPackets;
                         webSocket.delayPackets = null;
                         CompletableFuture<Integer> cf = null;

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

@@ -0,0 +1,107 @@
+/*
+ * 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.http;
+
+import java.io.Serializable;
+import java.net.InetSocketAddress;
+import java.util.Collection;
+import org.redkale.convert.json.JsonConvert;
+
+/**
+ * userid 与 sncpaddress组合对象
+ *
+ *
+ * @author zhangjx
+ */
+public interface WebSocketUserAddress extends Serializable {
+
+    Serializable userid();
+
+    InetSocketAddress sncpAddress();
+
+    Collection<InetSocketAddress> sncpAddresses();
+
+    public static WebSocketUserAddress create(WebSocketUserAddress userAddress) {
+        return new SimpleWebSocketUserAddress(userAddress);
+    }
+
+    public static WebSocketUserAddress create(Serializable userid, InetSocketAddress sncpAddress) {
+        return new SimpleWebSocketUserAddress(userid, sncpAddress, null);
+    }
+
+    public static WebSocketUserAddress create(Serializable userid, Collection<InetSocketAddress> sncpAddresses) {
+        return new SimpleWebSocketUserAddress(userid, null, sncpAddresses);
+    }
+
+    public static class SimpleWebSocketUserAddress implements WebSocketUserAddress {
+
+        private Serializable userid;
+
+        private InetSocketAddress sncpAddress;
+
+        private Collection<InetSocketAddress> sncpAddresses;
+
+        public SimpleWebSocketUserAddress() {
+        }
+
+        public SimpleWebSocketUserAddress(Serializable userid, InetSocketAddress sncpAddress, Collection<InetSocketAddress> sncpAddresses) {
+            this.userid = userid;
+            this.sncpAddress = sncpAddress;
+            this.sncpAddresses = sncpAddresses;
+        }
+
+        public SimpleWebSocketUserAddress(WebSocketUserAddress userAddress) {
+            if (userAddress == null) return;
+            this.userid = userAddress.userid();
+            this.sncpAddress = userAddress.sncpAddress();
+            this.sncpAddresses = userAddress.sncpAddresses();
+        }
+
+        @Override
+        public Serializable userid() {
+            return userid;
+        }
+
+        @Override
+        public InetSocketAddress sncpAddress() {
+            return sncpAddress;
+        }
+
+        @Override
+        public Collection<InetSocketAddress> sncpAddresses() {
+            return sncpAddresses;
+        }
+
+        public Serializable getUserid() {
+            return userid;
+        }
+
+        public void setUserid(Serializable userid) {
+            this.userid = userid;
+        }
+
+        public InetSocketAddress getSncpAddress() {
+            return sncpAddress;
+        }
+
+        public void setSncpAddress(InetSocketAddress sncpAddress) {
+            this.sncpAddress = sncpAddress;
+        }
+
+        public Collection<InetSocketAddress> getSncpAddresses() {
+            return sncpAddresses;
+        }
+
+        public void setSncpAddresses(Collection<InetSocketAddress> sncpAddresses) {
+            this.sncpAddresses = sncpAddresses;
+        }
+
+        @Override
+        public String toString() {
+            return JsonConvert.root().convertTo(this);
+        }
+    }
+}

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

@@ -332,9 +332,10 @@ public final class SncpClient {
             return bsonConvert.convertFrom(action.handlerFuncParamIndex >= 0 ? Object.class : action.resultTypes, reader);
         } catch (RpcRemoteException re) {
             throw re;
-        } catch (InterruptedException | ExecutionException | TimeoutException e) {
-            //logger.log(Level.SEVERE, actions[index].method + " sncp (params: " + jsonConvert.convertTo(params) + ") remote error", e);
-            throw new RpcRemoteException(actions[index].method + " sncp remote error", e);
+        } catch (TimeoutException e) {
+            throw new RpcRemoteException(actions[index].method + " sncp remote timeout, params=" + JsonConvert.root().convertTo(params));
+        } catch (InterruptedException | ExecutionException e) {
+            throw new RpcRemoteException(actions[index].method + " sncp remote error, params=" + JsonConvert.root().convertTo(params), e);
         } finally {
             bsonConvert.offerBsonReader(reader);
         }
@@ -348,7 +349,12 @@ public final class SncpClient {
         final BsonWriter writer = bsonConvert.pollBsonWriter(transport.getBufferSupplier()); // 将head写入
         writer.writeTo(DEFAULT_HEADER);
         for (int i = 0; i < params.length; i++) {  //params 可能包含: 3 个 boolean
-            bsonConvert.convertTo(writer, CompletionHandler.class.isAssignableFrom(myparamclass[i]) ? CompletionHandler.class : myparamtypes[i], params[i]);
+            BsonConvert bcc = bsonConvert;
+            if (params[i] instanceof org.redkale.service.RetResult) {
+                org.redkale.convert.Convert cc = ((org.redkale.service.RetResult) params[i]).convert();
+                if (cc instanceof BsonConvert) bcc = (BsonConvert) cc;
+            }
+            bcc.convertTo(writer, CompletionHandler.class.isAssignableFrom(myparamclass[i]) ? CompletionHandler.class : myparamtypes[i], params[i]);
         }
         final int reqBodyLength = writer.count() - HEADER_SIZE; //body总长度
         final long seqid = System.nanoTime();
@@ -358,12 +364,12 @@ public final class SncpClient {
         return connFuture.thenCompose(conn0 -> {
             final CompletableFuture<byte[]> future = new CompletableFuture();
             if (conn0 == null) {
-                future.completeExceptionally(new RuntimeException("sncp " + (conn0 == null ? addr : conn0.getRemoteAddress()) + " cannot connect"));
+                future.completeExceptionally(new RpcRemoteException("sncp " + (conn0 == null ? addr : conn0.getRemoteAddress()) + " cannot connect, params=" + JsonConvert.root().convertTo(params)));
                 return future;
             }
             if (!conn0.isOpen()) {
                 conn0.dispose();
-                future.completeExceptionally(new RuntimeException("sncp " + (conn0 == null ? addr : conn0.getRemoteAddress()) + " cannot connect"));
+                future.completeExceptionally(new RpcRemoteException("sncp " + (conn0 == null ? addr : conn0.getRemoteAddress()) + " cannot connect, params=" + JsonConvert.root().convertTo(params)));
                 return future;
             }
             final AsyncConnection conn = conn0;
@@ -403,7 +409,7 @@ public final class SncpClient {
                         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"));
+                                    future.completeExceptionally(new RpcRemoteException(action.method + " sncp[" + conn.getRemoteAddress() + "] remote no response data, params=" + JsonConvert.root().convertTo(params)));
                                     conn.offerBuffer(buffer);
                                     transport.offerConnection(true, conn);
                                     return;
@@ -433,7 +439,7 @@ public final class SncpClient {
                                 final int respBodyLength = buffer.getInt();
                                 final int retcode = buffer.getInt();
                                 if (retcode != 0) {
-                                    logger.log(Level.SEVERE, action.method + " sncp (params: " + convert.convertTo(params) + ") deal error (retcode=" + retcode + ", retinfo=" + SncpResponse.getRetCodeInfo(retcode) + ")");
+                                    logger.log(Level.SEVERE, action.method + " sncp (params: " + convert.convertTo(params) + ") deal error (retcode=" + retcode + ", retinfo=" + SncpResponse.getRetCodeInfo(retcode) + "), params=" + JsonConvert.root().convertTo(params));
                                     throw new RuntimeException("remote service(" + action.method + ") deal error (retcode=" + retcode + ", retinfo=" + SncpResponse.getRetCodeInfo(retcode) + ")");
                                 }
 
@@ -451,7 +457,7 @@ public final class SncpClient {
                                     success();
                                 }
                             } catch (Throwable e) {
-                                future.completeExceptionally(new RuntimeException(action.method + " sncp[" + conn.getRemoteAddress() + "] remote response error"));
+                                future.completeExceptionally(new RpcRemoteException(action.method + " sncp[" + conn.getRemoteAddress() + "] remote response error, params=" + JsonConvert.root().convertTo(params)));
                                 transport.offerConnection(true, conn);
                                 if (handler != null) {
                                     final Object handlerAttach = action.handlerAttachParamIndex >= 0 ? params[action.handlerAttachParamIndex] : null;
@@ -487,27 +493,27 @@ public final class SncpClient {
 
                         @Override
                         public void failed(Throwable exc, ByteBuffer attachment2) {
-                            future.completeExceptionally(new RuntimeException(action.method + " sncp remote exec failed"));
+                            future.completeExceptionally(new RpcRemoteException(action.method + " sncp remote exec failed, params=" + JsonConvert.root().convertTo(params)));
                             conn.offerBuffer(attachment2);
                             transport.offerConnection(true, conn);
                             if (handler != null) {
                                 final Object handlerAttach = action.handlerAttachParamIndex >= 0 ? params[action.handlerAttachParamIndex] : null;
                                 handler.failed(exc, handlerAttach);
                             }
-                            logger.log(Level.SEVERE, action.method + " sncp (params: " + convert.convertTo(params) + ") remote read exec failed", exc);
+                            logger.log(Level.SEVERE, action.method + " sncp (params: " + convert.convertTo(params) + ") remote read exec failed, params=" + JsonConvert.root().convertTo(params), exc);
                         }
                     });
                 }
 
                 @Override
                 public void failed(Throwable exc, ByteBuffer[] attachment) {
-                    future.completeExceptionally(new RuntimeException(action.method + " sncp remote exec failed"));
+                    future.completeExceptionally(new RpcRemoteException(action.method + " sncp remote exec failed, params=" + JsonConvert.root().convertTo(params)));
                     transport.offerConnection(true, conn);
                     if (handler != null) {
                         final Object handlerAttach = action.handlerAttachParamIndex >= 0 ? params[action.handlerAttachParamIndex] : null;
                         handler.failed(exc, handlerAttach);
                     }
-                    logger.log(Level.SEVERE, action.method + " sncp (params: " + convert.convertTo(params) + ") remote write exec failed", exc);
+                    logger.log(Level.SEVERE, action.method + " sncp (params: " + convert.convertTo(params) + ") remote write exec failed, params=" + JsonConvert.root().convertTo(params), exc);
                 }
             });
             return future;

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

@@ -112,7 +112,7 @@ public final class SncpDynServlet extends SncpServlet {
     @SuppressWarnings("unchecked")
     public void execute(SncpRequest request, SncpResponse response) throws IOException {
         if (bufferSupplier == null) {
-            bufferSupplier = request.getContext().getBufferSupplier();
+            bufferSupplier = request.getBufferPool();
         }
         final SncpServletAction action = actions.get(request.getActionid());
         //logger.log(Level.FINEST, "sncpdyn.execute: " + request + ", " + (action == null ? "null" : action.method));

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

@@ -45,11 +45,15 @@ public final class SncpRequest extends Request<SncpContext> {
 
     private byte[] bufferbytes = new byte[6];
 
-    protected SncpRequest(SncpContext context) {
-        super(context);
+    protected SncpRequest(SncpContext context, ObjectPool<ByteBuffer> bufferPool) {
+        super(context, bufferPool);
         this.convert = context.getBsonConvert();
     }
 
+    protected ObjectPool<ByteBuffer> getBufferPool() {
+        return this.bufferPool;
+    }
+
     @Override
     protected int readHeader(ByteBuffer buffer) {
         if (buffer.remaining() < HEADER_SIZE) {

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

@@ -21,13 +21,13 @@ import org.redkale.util.*;
  */
 public final class SncpResponse extends Response<SncpContext, SncpRequest> {
 
-    public static final int RETCODE_ILLSERVICEID = (1 << 10); //无效serviceid
+    public static final int RETCODE_ILLSERVICEID = (1 << 1); //无效serviceid
 
-    public static final int RETCODE_ILLSERVICEVER = (1 << 11); //无效serviceversion
+    public static final int RETCODE_ILLSERVICEVER = (1 << 2); //无效serviceversion
 
-    public static final int RETCODE_ILLACTIONID = (1 << 15); //无效actionid
+    public static final int RETCODE_ILLACTIONID = (1 << 3); //无效actionid
 
-    public static final int RETCODE_THROWEXCEPTION = (1 << 30); //内部异常
+    public static final int RETCODE_THROWEXCEPTION = (1 << 4); //内部异常
 
     public static ObjectPool<Response> createPool(AtomicLong creatCounter, AtomicLong cycleCounter, int max, Creator<Response> creator) {
         return new ObjectPool<>(creatCounter, cycleCounter, max, creator, (x) -> ((SncpResponse) x).prepare(), (x) -> ((SncpResponse) x).recycle());
@@ -45,8 +45,8 @@ public final class SncpResponse extends Response<SncpContext, SncpRequest> {
         return null;
     }
 
-    protected SncpResponse(SncpContext context, SncpRequest request) {
-        super(context, request);
+    protected SncpResponse(SncpContext context, SncpRequest request, ObjectPool<Response> responsePool) {
+        super(context, request, responsePool);
         this.addrBytes = context.getServerAddress().getAddress().getAddress();
         this.addrPort = context.getServerAddress().getPort();
         if (this.addrBytes.length != 4) throw new RuntimeException("SNCP serverAddress only support IPv4");
@@ -56,10 +56,10 @@ public final class SncpResponse extends Response<SncpContext, SncpRequest> {
     protected void offerBuffer(ByteBuffer... buffers) {
         super.offerBuffer(buffers);
     }
-    
+
     public void finish(final int retcode, final BsonWriter out) {
         if (out == null) {
-            final ByteBuffer buffer = pollWriteReadBuffer();
+            final ByteBuffer buffer = channel.pollWriteBuffer();
             fillHeader(buffer, 0, retcode);
             finish(buffer);
             return;

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

@@ -5,10 +5,10 @@
  */
 package org.redkale.net.sncp;
 
-import java.nio.*;
-import java.util.*;
+import java.nio.ByteBuffer;
+import java.util.List;
 import java.util.concurrent.atomic.*;
-import org.redkale.convert.bson.*;
+import org.redkale.convert.bson.BsonFactory;
 import org.redkale.net.*;
 import org.redkale.net.sncp.SncpContext.SncpContextConfig;
 import org.redkale.service.Service;
@@ -99,28 +99,14 @@ public class SncpServer extends Server<DLong, SncpContext, SncpRequest, SncpResp
     @Override
     @SuppressWarnings("unchecked")
     protected SncpContext createContext() {
-        final int port = this.address.getPort();
-        AtomicLong createBufferCounter = new AtomicLong();
-        AtomicLong cycleBufferCounter = new AtomicLong();
-        final int rcapacity = Math.max(this.bufferCapacity, 8 * 1024);
-        ObjectPool<ByteBuffer> bufferPool = new ObjectPool<>(createBufferCounter, cycleBufferCounter, this.bufferPoolSize,
-            (Object... params) -> ByteBuffer.allocateDirect(rcapacity), null, (e) -> {
-                if (e == null || e.isReadOnly() || e.capacity() != rcapacity) return false;
-                e.clear();
-                return true;
-            });
-        AtomicLong createResponseCounter = new AtomicLong();
-        AtomicLong cycleResponseCounter = new AtomicLong();
-        ObjectPool<Response> responsePool = SncpResponse.createPool(createResponseCounter, cycleResponseCounter, this.responsePoolSize, null);
+        this.bufferCapacity = Math.max(this.bufferCapacity, 8 * 1024);
 
         final SncpContextConfig contextConfig = new SncpContextConfig();
         contextConfig.serverStartTime = this.serverStartTime;
         contextConfig.logger = this.logger;
         contextConfig.executor = this.executor;
         contextConfig.sslContext = this.sslContext;
-        contextConfig.bufferCapacity = rcapacity;
-        contextConfig.bufferPool = bufferPool;
-        contextConfig.responsePool = responsePool;
+        contextConfig.bufferCapacity = this.bufferCapacity;
         contextConfig.maxconns = this.maxconns;
         contextConfig.maxbody = this.maxbody;
         contextConfig.charset = this.charset;
@@ -131,9 +117,31 @@ public class SncpServer extends Server<DLong, SncpContext, SncpRequest, SncpResp
         contextConfig.readTimeoutSeconds = this.readTimeoutSeconds;
         contextConfig.writeTimeoutSeconds = this.writeTimeoutSeconds;
 
-        SncpContext sncpcontext = new SncpContext(contextConfig);
-        responsePool.setCreator((Object... params) -> new SncpResponse(sncpcontext, new SncpRequest(sncpcontext)));
-        return sncpcontext;
+        return new SncpContext(contextConfig);
+    }
+
+    @Override
+    protected ObjectPool<ByteBuffer> createBufferPool(AtomicLong createCounter, AtomicLong cycleCounter, int bufferPoolSize) {
+        if (createCounter == null) createCounter = new AtomicLong();
+        if (cycleCounter == null) cycleCounter = new AtomicLong();
+        final int rcapacity = this.bufferCapacity;
+        ObjectPool<ByteBuffer> bufferPool = new ObjectPool<>(createCounter, cycleCounter, bufferPoolSize,
+            (Object... params) -> ByteBuffer.allocateDirect(rcapacity), null, (e) -> {
+                if (e == null || e.isReadOnly() || e.capacity() != rcapacity) return false;
+                e.clear();
+                return true;
+            });
+        return bufferPool;
+    }
+
+    @Override
+    protected ObjectPool<Response> createResponsePool(AtomicLong createCounter, AtomicLong cycleCounter, int responsePoolSize) {
+        return SncpResponse.createPool(createCounter, cycleCounter, responsePoolSize, null);
+    }
+
+    @Override
+    protected Creator<Response> createResponseCreator(ObjectPool<ByteBuffer> bufferPool, ObjectPool<Response> responsePool) {
+        return (Object... params) -> new SncpResponse(this.context, new SncpRequest(this.context, bufferPool), responsePool);
     }
 
 }

src/org/redkale/service/RetLabel.java

@@ -49,8 +49,8 @@ public @interface RetLabel {
             for (Field field : clazz.getFields()) {
                 if (!Modifier.isStatic(field.getModifiers())) continue;
                 if (field.getType() != int.class) continue;
-                RetLabel info = field.getAnnotation(RetLabel.class);
-                if (info == null) continue;
+                RetLabel[] infos = field.getAnnotationsByType(RetLabel.class);
+                if (infos == null || infos.length == 0) continue;
                 int value;
                 try {
                     value = field.getInt(null);
@@ -58,7 +58,9 @@ public @interface RetLabel {
                     ex.printStackTrace();
                     continue;
                 }
-                rets.computeIfAbsent(info.locale(), (k) -> new HashMap<>()).put(value, info.value());
+                for (RetLabel info : infos) {
+                    rets.computeIfAbsent(info.locale(), (k) -> new HashMap<>()).put(value, info.value());
+                }
             }
             return rets;
         }

src/org/redkale/service/RetResult.java

@@ -7,7 +7,9 @@ package org.redkale.service;
 
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import org.redkale.convert.Convert;
 import org.redkale.convert.json.*;
+import org.redkale.util.Utility;
 
 /**
  * 通用的结果对象，在常见的HTTP+JSON接口中返回的结果需要含结果码，错误信息，和实体对象。  <br>
@@ -32,6 +34,8 @@ public class RetResult<T> {
 
     protected Map<String, String> attach;
 
+    protected Convert convert;
+
     public RetResult() {
     }
 
@@ -39,6 +43,11 @@ public class RetResult<T> {
         this.result = result;
     }
 
+    public RetResult(Convert convert, T result) {
+        this.convert = convert;
+        this.result = result;
+    }
+
     public RetResult(int retcode) {
         this.retcode = retcode;
     }
@@ -54,14 +63,34 @@ public class RetResult<T> {
         this.result = result;
     }
 
+    public Convert convert() {
+        return convert;
+    }
+
+    public void convert(Convert convert) {
+        this.convert = convert;
+    }
+
     public static RetResult success() {
         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());
     }
 
+    public static RetResult<Map<String, String>> map(String... items) {
+        return new RetResult(Utility.ofMap(items));
+    }
+
+    public static <K, V> RetResult<Map<K, V>> map(Object... items) {
+        return new RetResult(Utility.ofMap(items));
+    }
+
     /**
      * 判断结果是否成功返回， retcode = 0 视为成功， 否则视为错误码
      *
@@ -203,6 +232,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 {
-     * AnyValue.DefaultAnyValue conf = new AnyValue.DefaultAnyValue();
-     * conf.addValue("node", new AnyValue.DefaultAnyValue().addValue("addr", "127.0.0.1").addValue("port", "6379"));
-     *
-     * CacheMemorySource source = new CacheMemorySource();
-     * source.defaultConvert = JsonFactory.root().getConvert();
-     * source.initValueType(String.class); //value用String类型
-     * source.initTransient(false);
-     * source.init(conf);
-     *
-     * System.out.println("------------------------------------");
-     * source.remove("key1");
-     * source.remove("key2");
-     * source.remove("300");
-     * source.set("key1", "value1");
-     * source.setString("keystr1", "strvalue1");
-     * source.setLong("keylong1", 333L);
-     * source.set("300", "4000");
-     * source.getAndRefresh("key1", 3500);
-     * System.out.println("[有值] 300 GET : " + source.get("300"));
-     * System.out.println("[有值] key1 GET : " + source.get("key1"));
-     * System.out.println("[无值] key2 GET : " + source.get("key2"));
-     * System.out.println("[有值] keylong1 GET : " + source.getLong("keylong1", 0L));
-     * System.out.println("[有值] key1 EXISTS : " + source.exists("key1"));
-     * System.out.println("[无值] key2 EXISTS : " + source.exists("key2"));
-     *
-     * source.remove("keys3");
-     * source.appendListItem("keys3", "vals1");
-     * source.appendListItem("keys3", "vals2");
-     * System.out.println("-------- keys3 追加了两个值 --------");
-     * System.out.println("[两值] keys3 VALUES : " + source.getCollection("keys3"));
-     * System.out.println("[有值] keys3 EXISTS : " + source.exists("keys3"));
-     * source.removeListItem("keys3", "vals1");
-     * System.out.println("[一值] keys3 VALUES : " + source.getCollection("keys3"));
-     * source.getCollectionAndRefresh("keys3", 3000);
-     *
-     * source.remove("sets3");
-     * source.appendSetItem("sets3", "setvals1");
-     * source.appendSetItem("sets3", "setvals2");
-     * source.appendSetItem("sets3", "setvals1");
-     * System.out.println("[两值] sets3 VALUES : " + source.getCollection("sets3"));
-     * System.out.println("[有值] sets3 EXISTS : " + source.exists("sets3"));
-     * source.removeSetItem("sets3", "setvals1");
-     * System.out.println("[一值] sets3 VALUES : " + source.getCollection("sets3"));
-     * System.out.println("sets3 大小 : " + source.getCollectionSize("sets3"));
-     * System.out.println("all keys: " + source.queryKeys());
-     * System.out.println("newnum 值 : " + source.incr("newnum"));
-     * System.out.println("newnum 值 : " + source.decr("newnum"));
-     * System.out.println("------------------------------------");
-     * source.destroy(null);
-     * source.init(null);
-     * System.out.println("all keys: " + source.queryKeys());
-     * System.out.println("[有值] keylong1 GET : " + source.getLong("keylong1", 0L));
-     * }
-     */
+    public static void main(String[] args) throws Exception {
+        AnyValue.DefaultAnyValue conf = new AnyValue.DefaultAnyValue();
+        conf.addValue("node", new AnyValue.DefaultAnyValue().addValue("addr", "127.0.0.1").addValue("port", "6379"));
+
+        CacheMemorySource source = new CacheMemorySource();
+        source.defaultConvert = JsonFactory.root().getConvert();
+        source.initValueType(String.class); //value用String类型
+        source.initTransient(false);
+        source.init(conf);
+
+        System.out.println("------------------------------------");
+        source.remove("key1");
+        source.remove("key2");
+        source.remove("300");
+        source.set("key1", "value1");
+        source.setString("keystr1", "strvalue1");
+        source.setLong("keylong1", 333L);
+        source.set("300", "4000");
+        source.getAndRefresh("key1", 3500);
+        System.out.println("[有值] 300 GET : " + source.get("300"));
+        System.out.println("[有值] key1 GET : " + source.get("key1"));
+        System.out.println("[无值] key2 GET : " + source.get("key2"));
+        System.out.println("[有值] keylong1 GET : " + source.getLong("keylong1", 0L));
+        System.out.println("[有值] key1 EXISTS : " + source.exists("key1"));
+        System.out.println("[无值] key2 EXISTS : " + source.exists("key2"));
+
+        source.remove("keys3");
+        source.appendListItem("keys3", "vals1");
+        source.appendListItem("keys3", "vals2");
+        System.out.println("-------- keys3 追加了两个值 --------");
+        System.out.println("[两值] keys3 VALUES : " + source.getCollection("keys3"));
+        System.out.println("[有值] keys3 EXISTS : " + source.exists("keys3"));
+        source.removeListItem("keys3", "vals1");
+        System.out.println("[一值] keys3 VALUES : " + source.getCollection("keys3"));
+        source.getCollectionAndRefresh("keys3", 3000);
+
+        source.remove("sets3");
+        source.appendSetItem("sets3", "setvals1");
+        source.appendSetItem("sets3", "setvals2");
+        source.appendSetItem("sets3", "setvals1");
+        System.out.println("[两值] sets3 VALUES : " + source.getCollection("sets3"));
+        System.out.println("[有值] sets3 EXISTS : " + source.exists("sets3"));
+        source.removeSetItem("sets3", "setvals1");
+        System.out.println("[一值] sets3 VALUES : " + source.getCollection("sets3"));
+        System.out.println("sets3 大小 : " + source.getCollectionSize("sets3"));
+        System.out.println("all keys: " + source.queryKeys());
+        System.out.println("newnum 值 : " + source.incr("newnum"));
+        System.out.println("newnum 值 : " + source.decr("newnum"));
+        System.out.println("------------------------------------");
+        source.destroy(null);
+        source.init(null);
+        System.out.println("all keys: " + source.queryKeys());
+        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 boolean set, 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 boolean set, 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 boolean set, 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 boolean set, final Type componentType, final String... keys) {
+        return CompletableFuture.supplyAsync(() -> getCollectionMap(set, 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 boolean set, final String... keys) {
+        return CompletableFuture.supplyAsync(() -> getStringCollectionMap(set, 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 boolean set, final String... keys) {
+        return CompletableFuture.supplyAsync(() -> getLongCollectionMap(set, 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 boolean set, 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 boolean set, 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 boolean set, 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 boolean set, 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 boolean set, 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 boolean set, 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/ColumnExpress.java

@@ -15,17 +15,29 @@ package org.redkale.source;
  */
 public enum ColumnExpress {
     /**
-     * 直接赋值 col = val
+     * 赋值 col = val
      */
     MOV,
     /**
-     * 追加值 col = col + val
+     * 加值 col = col + val
      */
     INC,
+    /**
+     * 加值 col = col - val
+     */
+    DEC,
     /**
      * 乘值 col = col * val
      */
     MUL,
+    /**
+     * 除值 col = col / val
+     */
+    DIV,
+    /**
+     * 取模 col = col % val
+     */
+    MOD,
     /**
      * 与值 col = col & val
      */

src/org/redkale/source/ColumnFuncNode.java

@@ -0,0 +1,83 @@
+/*
+ * 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 java.io.Serializable;
+
+/**
+ * 与ColumnNodeValue 组合，用于复杂的字段表达式 。
+ * String 视为 字段名
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @since 2.0.0
+ */
+public class ColumnFuncNode implements ColumnNode {
+
+    protected FilterFunc func;
+
+    protected Serializable value;//类型只能是String、ColumnNodeValue
+
+    public ColumnFuncNode() {
+    }
+
+    public ColumnFuncNode(FilterFunc func, Serializable node) {
+        if (!(node instanceof String) && !(node instanceof ColumnNodeValue)) throw new IllegalArgumentException("value must be String or ColumnNodeValue");
+        this.func = func;
+        this.value = node;
+    }
+
+    public static ColumnFuncNode create(FilterFunc func, Serializable node) {
+        return new ColumnFuncNode(func, node);
+    }
+
+    public static ColumnFuncNode avg(Serializable node) {
+        return new ColumnFuncNode(FilterFunc.AVG, node);
+    }
+
+    public static ColumnFuncNode count(Serializable node) {
+        return new ColumnFuncNode(FilterFunc.COUNT, node);
+    }
+
+    public static ColumnFuncNode distinctCount(Serializable node) {
+        return new ColumnFuncNode(FilterFunc.DISTINCTCOUNT, node);
+    }
+
+    public static ColumnFuncNode max(Serializable node) {
+        return new ColumnFuncNode(FilterFunc.MAX, node);
+    }
+
+    public static ColumnFuncNode min(Serializable node) {
+        return new ColumnFuncNode(FilterFunc.MIN, node);
+    }
+
+    public static ColumnFuncNode sum(Serializable node) {
+        return new ColumnFuncNode(FilterFunc.SUM, node);
+    }
+
+    public FilterFunc getFunc() {
+        return func;
+    }
+
+    public void setFunc(FilterFunc func) {
+        this.func = func;
+    }
+
+    public Serializable getValue() {
+        return value;
+    }
+
+    public void setValue(Serializable value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return "{\"func\":\"" + func + "\", \"value\":" + ((value instanceof CharSequence) ? ("\"" + value + "\"") : value) + "}";
+    }
+}

src/org/redkale/source/ColumnNode.java

@@ -0,0 +1,21 @@
+/*
+ * 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 java.io.Serializable;
+
+/**
+ * ColumnFuncNode与ColumnNodeValue 的接口
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @since 2.0.0
+ */
+public interface ColumnNode extends Serializable {
+
+}

src/org/redkale/source/ColumnNodeValue.java

@@ -0,0 +1,144 @@
+/*
+ * 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 java.io.Serializable;
+import static org.redkale.source.ColumnExpress.*;
+
+/**
+ * 作为ColumnValue的value字段值，用于复杂的字段表达式 。
+ * String 视为 字段名
+ * Number 视为 数值
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @since 2.0.0
+ */
+public class ColumnNodeValue implements ColumnNode {
+
+    protected Serializable left;//类型只能是String、Number、ColumnNodeValue
+
+    protected ColumnExpress express; //不能是MOV
+
+    protected Serializable right;//类型只能是String、Number、ColumnNodeValue
+
+    public ColumnNodeValue() {
+    }
+
+    public ColumnNodeValue(Serializable left, ColumnExpress express, Serializable right) {
+        if (express == null || express == ColumnExpress.MOV) {
+            throw new IllegalArgumentException("express cannot be null or MOV");
+        }
+        if (!(left instanceof String) && !(left instanceof Number) && !(left instanceof ColumnNodeValue) && !(left instanceof ColumnFuncNode)) {
+            throw new IllegalArgumentException("left value must be String, Number, ColumnFuncNode or ColumnNodeValue");
+        }
+        if (!(right instanceof String) && !(right instanceof Number) && !(right instanceof ColumnNodeValue) && !(right instanceof ColumnFuncNode)) {
+            throw new IllegalArgumentException("right value must be String, Number, ColumnFuncNode or ColumnNodeValue");
+        }
+        this.left = left;
+        this.express = express;
+        this.right = right;
+    }
+
+    public static ColumnNodeValue create(Serializable left, ColumnExpress express, Serializable right) {
+        return new ColumnNodeValue(left, express, right);
+    }
+
+    public static ColumnNodeValue inc(Serializable left, Serializable right) {
+        return new ColumnNodeValue(left, INC, right);
+    }
+
+    public static ColumnNodeValue dec(Serializable left, Serializable right) {
+        return new ColumnNodeValue(left, DEC, right);
+    }
+
+    public static ColumnNodeValue mul(Serializable left, Serializable right) {
+        return new ColumnNodeValue(left, MUL, right);
+    }
+
+    public static ColumnNodeValue div(Serializable left, Serializable right) {
+        return new ColumnNodeValue(left, DIV, right);
+    }
+
+    public static ColumnNodeValue mod(Serializable left, Serializable right) {
+        return new ColumnNodeValue(left, MOD, right);
+    }
+
+    public static ColumnNodeValue and(Serializable left, Serializable right) {
+        return new ColumnNodeValue(left, AND, right);
+    }
+
+    public static ColumnNodeValue orr(Serializable left, Serializable right) {
+        return new ColumnNodeValue(left, ORR, right);
+    }
+
+    public ColumnNodeValue inc(Serializable right) {
+        return any(INC, right);
+    }
+
+    public ColumnNodeValue dec(Serializable right) {
+        return any(DEC, right);
+    }
+
+    public ColumnNodeValue mul(Serializable right) {
+        return any(MUL, right);
+    }
+
+    public ColumnNodeValue div(Serializable right) {
+        return any(DIV, right);
+    }
+
+    public ColumnNodeValue mod(Serializable right) {
+        return any(MOD, right);
+    }
+
+    public ColumnNodeValue and(Serializable right) {
+        return any(AND, right);
+    }
+
+    public ColumnNodeValue orr(Serializable right) {
+        return any(ORR, right);
+    }
+
+    protected ColumnNodeValue any(ColumnExpress express, Serializable right) {
+        ColumnNodeValue one = new ColumnNodeValue(this.left, this.express, this.right);
+        this.left = one;
+        this.express = express;
+        this.right = right;
+        return this;
+    }
+
+    public Serializable getLeft() {
+        return left;
+    }
+
+    public void setLeft(Serializable left) {
+        this.left = left;
+    }
+
+    public ColumnExpress getExpress() {
+        return express;
+    }
+
+    public void setExpress(ColumnExpress express) {
+        this.express = express;
+    }
+
+    public Serializable getRight() {
+        return right;
+    }
+
+    public void setRight(Serializable right) {
+        this.right = right;
+    }
+
+    @Override
+    public String toString() {
+        return "{\"column\":" + ((left instanceof CharSequence) ? ("\"" + left + "\"") : left) + ", \"express\":" + express + ", \"value\":" + ((right instanceof CharSequence) ? ("\"" + right + "\"") : right) + "}";
+    }
+}

src/org/redkale/source/ColumnValue.java

@@ -74,6 +74,18 @@ public class ColumnValue {
         return new ColumnValue(column, INC, value);
     }
 
+    /**
+     * 返回 {column} = {column} - {value} 操作
+     *
+     * @param column 字段名
+     * @param value  字段值
+     *
+     * @return ColumnValue
+     */
+    public static ColumnValue dec(String column, Serializable value) {
+        return new ColumnValue(column, DEC, value);
+    }
+    
     /**
      * 返回 {column} = {column} * {value} 操作
      *
@@ -86,6 +98,31 @@ public class ColumnValue {
         return new ColumnValue(column, MUL, value);
     }
 
+    /**
+     * 返回 {column} = {column} / {value} 操作
+     *
+     * @param column 字段名
+     * @param value  字段值
+     *
+     * @return ColumnValue
+     */
+    public static ColumnValue div(String column, Serializable value) {
+        return new ColumnValue(column, DIV, value);
+    }
+    
+    /**
+     * 返回 {column} = {column} % {value} 操作
+     *
+     * @param column 字段名
+     * @param value  字段值
+     *
+     * @return ColumnValue
+     */
+      //不常用，防止开发者容易在mov时误输入mod
+//    public static ColumnValue mod(String column, Serializable value) {
+//        return new ColumnValue(column, MOD, value);
+//    }
+    
     /**
      * 返回 {column} = {column} & {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/DataCallAttribute.java

@@ -30,7 +30,6 @@ public class DataCallAttribute implements Attribute<Object, Serializable> {
                 Class cltmp = clazz;
                 do {
                     for (Field field : cltmp.getDeclaredFields()) {
-                        if (field.getAnnotation(javax.persistence.GeneratedValue.class) == null) continue;
                         try {
                             rs = Attribute.create(cltmp, field);
                             attributes.put(clazz, rs);

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;
@@ -70,16 +70,17 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
                 }
                 c = c1;
             } catch (SQLException se) {
-                if (info.tableStrategy == null || !info.isTableNotExist(se)) throw se;
-                synchronized (info.tables) {
-                    final String oldTable = info.table;
-                    final String newTable = info.getTable(values[0]);
-                    if (!info.tables.contains(newTable)) {
+                if (info.getTableStrategy() == null || !info.isTableNotExist(se)) throw se;
+                synchronized (info.disTableLock()) {
+                    final String catalog = conn.getCatalog();
+                    final String newTable = info.getTable(entitys[0]);
+                    final String tablekey = newTable.indexOf('.') > 0 ? newTable : (catalog + '.' + newTable);
+                    if (!info.containsDisTable(tablekey)) {
                         try {
                             Statement st = conn.createStatement();
-                            st.execute(info.tablecopySQL.replace("${newtable}", newTable).replace("${oldtable}", oldTable));
+                            st.execute(info.getTableCopySQL(newTable));
                             st.close();
-                            info.tables.add(newTable);
+                            info.addDisTable(tablekey);
                         } catch (SQLException sqle) { //多进程并发时可能会出现重复建表
                             if (newTable.indexOf('.') > 0 && info.isTableNotExist(se)) {
                                 Statement st;
@@ -92,20 +93,20 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
                                 }
                                 try {
                                     st = conn.createStatement();
-                                    st.execute(info.tablecopySQL.replace("${newtable}", newTable).replace("${oldtable}", oldTable));
+                                    st.execute(info.getTableCopySQL(newTable));
                                     st.close();
-                                    info.tables.add(newTable);
+                                    info.addDisTable(tablekey);
                                 } catch (SQLException sqle2) {
-                                    logger.log(Level.SEVERE, "create table2(" + info.tablecopySQL.replace("${newtable}", newTable).replace("${oldtable}", oldTable) + ") error", sqle2);
+                                    logger.log(Level.SEVERE, "create table2(" + info.getTableCopySQL(newTable) + ") error", sqle2);
                                 }
                             } else {
-                                logger.log(Level.SEVERE, "create table(" + info.tablecopySQL.replace("${newtable}", newTable).replace("${oldtable}", oldTable) + ") error", sqle);
+                                logger.log(Level.SEVERE, "create table(" + info.getTableCopySQL(newTable) + ") error", sqle);
                             }
                         }
                     }
                 }
                 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) {
@@ -113,35 +114,21 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
                 }
                 c = c1;
             }
-            if (info.autoGenerated) { //由数据库自动生成主键值
-                ResultSet set = prestmt.getGeneratedKeys();
-                int i = -1;
-                while (set.next()) {
-                    if (primaryType == int.class) {
-                        primary.set(values[++i], set.getInt(1));
-                    } else if (primaryType == long.class) {
-                        primary.set(values[++i], set.getLong(1));
-                    } else {
-                        primary.set(values[++i], set.getObject(1));
-                    }
-                }
-                set.close();
-            }
             prestmt.close();
             //------------------------------------------------------------
             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 {
-                                sb.append(FilterNode.formatToString(obj));
+                                sb.append(info.formatSQLValue(obj, sqlFormatter));
                             }
                         } else {
                             sb.append(ch);
@@ -155,40 +142,43 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
         } catch (SQLException e) {
             CompletableFuture future = new CompletableFuture();
             future.completeExceptionally(e);
-            return future;
+            return future;//return CompletableFuture.failedFuture(e);
         } finally {
             if (conn != null) writePool.offerConnection(conn);
         }
     }
 
     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);
+        final PreparedStatement prestmt = conn.prepareStatement(sql);
 
-        for (final T value : values) {
-            if (info.autouuid) info.createPrimaryValue(value);
+        for (final T value : entitys) {
             batchStatementParameters(conn, prestmt, info, attrs, value);
             prestmt.addBatch();
         }
         return prestmt;
     }
 
-    protected <T> int batchStatementParameters(Connection conn, PreparedStatement prestmt, EntityInfo<T> info, Attribute<T, Serializable>[] attrs, T value) throws SQLException {
+    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 = attr.get(value);
+            Object 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 Boolean) {
+                prestmt.setObject(++i, ((Boolean) val) ? (byte) 1 : (byte) 0);
             } 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) && !(value instanceof java.util.Date)
+            } else if (val != null && !(val instanceof Number) && !(val instanceof CharSequence) && !(val 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 if (val == null && info.isNotNullJson(attr)) {
+                prestmt.setObject(++i, "");
             } else {
                 prestmt.setObject(++i, val);
             }
@@ -212,26 +202,72 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
         } catch (SQLException e) {
             CompletableFuture future = new CompletableFuture();
             future.completeExceptionally(e);
-            return future;
+            return future;//return CompletableFuture.failedFuture(e);
         } finally {
             if (conn != null) writePool.offerConnection(conn);
         }
     }
 
     @Override
-    protected <T> CompletableFuture<Integer> updateDB(EntityInfo<T> info, T... values) {
+    protected <T> CompletableFuture<Integer> clearTableDB(EntityInfo<T> info, final String table, 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) {
+            if (info.isTableNotExist(e)) return CompletableFuture.completedFuture(-1);
+            CompletableFuture future = new CompletableFuture();
+            future.completeExceptionally(e);
+            return future;//return CompletableFuture.failedFuture(e);
+        } finally {
+            if (conn != null) writePool.offerConnection(conn);
+        }
+    }
+
+    @Override
+    protected <T> CompletableFuture<Integer> dropTableDB(EntityInfo<T> info, final String table, 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();
+            if (info.getTableStrategy() != null) {
+                String tablekey = table.indexOf('.') > 0 ? table : (conn.getCatalog() + '.' + table);
+                info.removeDisTable(tablekey);
+            }
+            return CompletableFuture.completedFuture(c);
+        } catch (SQLException e) {
+            if (info.isTableNotExist(e)) return CompletableFuture.completedFuture(-1);
+            CompletableFuture future = new CompletableFuture();
+            future.completeExceptionally(e);
+            return future;//return CompletableFuture.failedFuture(e);
+        } 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 = batchStatementParameters(conn, prestmt, info, attrs, value);
                 prestmt.setObject(++k, primary.get(value));
                 prestmt.addBatch();//------------------------------------------------------------
@@ -241,18 +277,18 @@ 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 {
-                                sb.append(FilterNode.formatToString(obj));
+                                sb.append(info.formatSQLValue(obj, sqlFormatter));
                             }
                         } else {
                             sb.append(ch);
                         }
                     }
                     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();
@@ -265,7 +301,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
         } catch (SQLException e) {
             CompletableFuture future = new CompletableFuture();
             future.completeExceptionally(e);
-            return future;
+            return future;//return CompletableFuture.failedFuture(e);
         } finally {
             if (conn != null) writePool.offerConnection(conn);
         }
@@ -299,7 +335,7 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
         } catch (SQLException e) {
             CompletableFuture future = new CompletableFuture();
             future.completeExceptionally(e);
-            return future;
+            return future;//return CompletableFuture.failedFuture(e);
         } finally {
             if (conn != null) writePool.offerConnection(conn);
         }
@@ -308,12 +344,12 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
     @Override
     protected <T, N extends Number> CompletableFuture<Map<String, N>> getNumberMapDB(EntityInfo<T> info, String sql, FilterFuncColumn... columns) {
         Connection conn = null;
+        final Map map = new HashMap<>();
         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<>();
             if (set.next()) {
                 int index = 0;
                 for (FilterFuncColumn ffc : columns) {
@@ -329,9 +365,10 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
             stmt.close();
             return CompletableFuture.completedFuture(map);
         } catch (SQLException e) {
+            if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(map);
             CompletableFuture future = new CompletableFuture();
             future.completeExceptionally(e);
-            return future;
+            return future;//return CompletableFuture.failedFuture(e);
         } finally {
             if (conn != null) readPool.offerConnection(conn);
         }
@@ -342,7 +379,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);
@@ -354,9 +391,10 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
             stmt.close();
             return CompletableFuture.completedFuture(rs);
         } catch (SQLException e) {
+            if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(defVal);
             CompletableFuture future = new CompletableFuture();
             future.completeExceptionally(e);
-            return future;
+            return future;//return CompletableFuture.failedFuture(e);
         } finally {
             if (conn != null) readPool.offerConnection(conn);
         }
@@ -365,11 +403,11 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
     @Override
     protected <T, K extends Serializable, N extends Number> CompletableFuture<Map<K, N>> queryColumnMapDB(EntityInfo<T> info, String sql, String keyColumn) {
         Connection conn = null;
+        Map<K, N> rs = new LinkedHashMap<>();
         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);
             ResultSetMetaData rsd = set.getMetaData();
             boolean smallint = rsd == null ? false : rsd.getColumnType(1) == Types.SMALLINT;
@@ -380,9 +418,52 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
             stmt.close();
             return CompletableFuture.completedFuture(rs);
         } catch (SQLException e) {
+            if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(rs);
             CompletableFuture future = new CompletableFuture();
             future.completeExceptionally(e);
-            return future;
+            return future;//return CompletableFuture.failedFuture(e);
+        } finally {
+            if (conn != null) readPool.offerConnection(conn);
+        }
+    }
+
+    @Override
+    protected <T, K extends Serializable, N extends Number> CompletableFuture<Map<K[], N[]>> queryColumnMapDB(EntityInfo<T> info, String sql, final ColumnNode[] funcNodes, final String[] groupByColumns) {
+        Connection conn = null;
+        Map rs = new LinkedHashMap<>();
+        try {
+            conn = readPool.poll();
+            //conn.setReadOnly(true);
+            final Statement stmt = conn.createStatement();
+            ResultSet set = stmt.executeQuery(sql);
+            ResultSetMetaData rsd = set.getMetaData();
+            boolean[] smallints = null;
+            while (set.next()) {
+                int index = 0;
+                Serializable[] keys = new Serializable[groupByColumns.length];
+                if (smallints == null) {
+                    smallints = new boolean[keys.length];
+                    for (int i = 0; i < keys.length; i++) {
+                        smallints[i] = rsd == null ? false : rsd.getColumnType(i + 1) == Types.SMALLINT;
+                    }
+                }
+                for (int i = 0; i < keys.length; i++) {
+                    keys[i] = (Serializable) ((smallints[i] && index == 0) ? set.getShort(++index) : set.getObject(++index));
+                }
+                Number[] vals = new Number[funcNodes.length];
+                for (int i = 0; i < vals.length; i++) {
+                    vals[i] = (Number) set.getObject(++index);
+                }
+                rs.put(keys, vals);
+            }
+            set.close();
+            stmt.close();
+            return CompletableFuture.completedFuture(rs);
+        } catch (SQLException e) {
+            if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(rs);
+            CompletableFuture future = new CompletableFuture();
+            future.completeExceptionally(e);
+            return future;//return CompletableFuture.failedFuture(e);
         } finally {
             if (conn != null) readPool.offerConnection(conn);
         }
@@ -393,19 +474,19 @@ 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);
         } catch (SQLException e) {
-            if (info.tableStrategy != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(null);
+            if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(null);
             CompletableFuture future = new CompletableFuture();
             future.completeExceptionally(e);
-            return future;
+            return future;//return CompletableFuture.failedFuture(e);
         } finally {
             if (conn != null) readPool.offerConnection(conn);
         }
@@ -416,31 +497,23 @@ 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) {
-                    Blob blob = set.getBlob(1);
-                    if (blob != null) val = blob.getBytes(1, (int) blob.length());
-                } else {
-                    val = (Serializable) set.getObject(1);
-                    if (val != null && !CharSequence.class.isAssignableFrom(attr.type()) && (val instanceof CharSequence)) {
-                        val = info.jsonConvert.convertFrom(attr.genericType(), val.toString());
-                    }
-                }
+                val = info.getFieldValue(attr, set, 1);
             }
             set.close();
             ps.close();
             return CompletableFuture.completedFuture(val == null ? defValue : val);
         } catch (SQLException e) {
-            if (info.tableStrategy != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(defValue);
+            if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(defValue);
             CompletableFuture future = new CompletableFuture();
             future.completeExceptionally(e);
-            return future;
+            return future;//return CompletableFuture.failedFuture(e);
         } finally {
             if (conn != null) readPool.offerConnection(conn);
         }
@@ -451,7 +524,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;
@@ -460,21 +533,21 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
             if (info.isLoggable(logger, Level.FINEST, sql)) logger.finest(info.getType().getSimpleName() + " exists (" + rs + ") sql=" + sql);
             return CompletableFuture.completedFuture(rs);
         } catch (SQLException e) {
-            if (info.tableStrategy != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(false);
+            if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(false);
             CompletableFuture future = new CompletableFuture();
             future.completeExceptionally(e);
-            return future;
+            return future;//return CompletableFuture.failedFuture(e);
         } finally {
             if (conn != null) readPool.offerConnection(conn);
         }
     }
 
     @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, final boolean distinct, 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();
@@ -482,22 +555,22 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
             final CharSequence where = node == null ? null : node.createSQLExpress(info, joinTabalis);
             final String dbtype = this.readPool.getDbtype();
             if ("mysql".equals(dbtype) || "postgresql".equals(dbtype)) {
-                final String listsql = "SELECT " + info.getQueryColumns("a", selects) + " FROM " + info.getTable(node) + " a" + (join == null ? "" : join)
+                final String listsql = "SELECT " + (distinct ? "DISTINCT " : "") + 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)) {
+                    final String countsql = "SELECT " + (distinct ? "DISTINCT COUNT(" + info.getQueryColumns("a", selects) + ")" : "COUNT(*)") + " FROM " + info.getTable(node) + " a" + (join == null ? "" : join) + ((where == null || where.length() == 0) ? "" : (" WHERE " + where));
+                    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);
@@ -508,12 +581,12 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
                 }
                 return CompletableFuture.completedFuture(new Sheet<>(total, list));
             }
-            final String sql = "SELECT " + info.getQueryColumns("a", selects) + " FROM " + info.getTable(node) + " a" + (join == null ? "" : join)
+            final String sql = "SELECT " + (distinct ? "DISTINCT " : "") + 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();
@@ -522,7 +595,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();
@@ -534,10 +607,10 @@ public class DataJdbcSource extends DataSqlSource<Connection> {
             ps.close();
             return CompletableFuture.completedFuture(new Sheet<>(total, list));
         } catch (SQLException e) {
-            if (info.tableStrategy != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(new Sheet<>());
+            if (info.getTableStrategy() != null && info.isTableNotExist(e)) return CompletableFuture.completedFuture(new Sheet<>(0, new ArrayList()));
             CompletableFuture future = new CompletableFuture();
             future.completeExceptionally(e);
-            return future;
+            return future;//return CompletableFuture.failedFuture(e);
         } finally {
             if (conn != null) readPool.offerConnection(conn);
         }
@@ -603,7 +676,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();