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>

bin/restart.sh

@@ -14,7 +14,7 @@ fi
 
 cd "$APP_HOME"
 
-./bin/shutdown.sh
+"$APP_HOME"/bin/shutdown.sh
 
-./bin/start.sh
+"$APP_HOME"/bin/start.sh
 

bin/start.bat

@@ -1,7 +1,7 @@
 @ECHO OFF
 
 SET APP_HOME=%~dp0
-
+ 
 IF NOT EXIST "%APP_HOME%\conf\application.xml"  SET APP_HOME=%~dp0..
 
 java -DAPP_HOME="%APP_HOME%" -classpath "%APP_HOME%"\lib\* org.redkale.boot.Application

bin/start.sh

@@ -24,5 +24,5 @@ done
 export CLASSPATH=$CLASSPATH:$lib
 
 echo "$APP_HOME"
-nohup  java -DAPP_HOME="$APP_HOME" org.redkale.boot.Application > "$APP_HOME"/log.out &
+nohup  java -DAPP_HOME="$APP_HOME" org.redkale.boot.Application > "$APP_HOME"/logs.out &
 

conf/application.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<application port="5050">     
+<application port="2121">     
     
     <!--  详细配置说明见： http://redkale.org/redkale.html#redkale_confxml  -->
     
@@ -8,14 +8,14 @@
 
     </resources> 
         
-    <server protocol="HTTP" host="0.0.0.0" port="6060" root="root">      
+    <server protocol="HTTP" port="6060">      
               
         <request>
             <remoteaddr value="request.headers.X-RemoteAddress"/>
         </request>
         
         <response>
-            <defcookie domain="" path=""/>
+            <defcookie domain="" path="/"/>
             <addheader name="Access-Control-Allow-Origin" value="request.headers.Origin" /> 
             <setheader name="Access-Control-Allow-Credentials" value="true"/> 
         </response>

conf/logging.properties

@@ -1,9 +1,10 @@
 
 
 handlers = java.util.logging.ConsoleHandler
+# handlers = java.util.logging.FileHandler
 
 ############################################################
-.level = FINER
+.level = FINEST
 
 java.level = INFO
 javax.level = INFO
@@ -14,11 +15,11 @@ jdk.level = INFO
 
 java.util.logging.FileHandler.level = FINER
 #10M
-java.util.logging.FileHandler.limit = 10485760
-java.util.logging.FileHandler.count = 10000
+java.util.logging.FileHandler.limit = 10M
+java.util.logging.FileHandler.count = 20
 java.util.logging.FileHandler.encoding = UTF-8
 java.util.logging.FileHandler.pattern = ${APP_HOME}/logs-%m/log-%d.log
 java.util.logging.FileHandler.unusual = ${APP_HOME}/logs-%m/log-warnerr-%d.log
 java.util.logging.FileHandler.append = true
 
-java.util.logging.ConsoleHandler.level = FINER
+java.util.logging.ConsoleHandler.level = FINEST

conf/persistence.xml

@@ -16,7 +16,6 @@
         <shared-cache-mode>ALL</shared-cache-mode>
         <properties>
             <property name="javax.persistence.jdbc.url" value="jdbc:oracle:thin:@localhost:1521:orcl"/>
-            <property name="javax.persistence.jdbc.driver" value="oracle.jdbc.driver.OracleDriver"/>
             <property name="javax.persistence.jdbc.user" value="system"/>
             <property name="javax.persistence.jdbc.password" value="1234"/>
         </properties>
@@ -25,8 +24,7 @@
     <persistence-unit name="user.write" transaction-type="RESOURCE_LOCAL">
         <shared-cache-mode>ALL</shared-cache-mode>
         <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/user?autoReconnect=true&amp;characterEncoding=utf8"/>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/center?characterEncoding=utf8&useSSL=false&serverTimezone=UTC&rewriteBatchedStatements=true"/>
             <property name="javax.persistence.jdbc.user" value="root"/>
             <property name="javax.persistence.jdbc.password" value="1234"/>
         </properties>

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

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

src/META-INF/application-template.xml

@@ -116,16 +116,16 @@
         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
         readTimeoutSeconds: 读操作超时秒数， 默认0， 表示永久不超时
         writeTimeoutSeconds:  写操作超时秒数， 默认0， 表示永久不超时
-        netimpl: ProtocolServer的实现类。TCP情况下值也可以是aio或nio，默认值为aio；UDP情况下值也可以是bio，默认值为bio；
+        netimpl: ProtocolServer的实现类。TCP情况下值可以是aio或nio，默认值为aio；UDP情况下值可以是bio，默认值为bio；
         interceptor: 启动/关闭NodeServer时被调用的拦截器实现类，必须是org.redkale.boot.NodeInterceptor的子类，默认为null
     -->
     <server protocol="HTTP" host="127.0.0.1" port="6060" root="root" lib=""> 

src/META-INF/logging-template.properties

@@ -11,8 +11,8 @@ javax.level = INFO
 com.sun.level = INFO
 
 #java.util.logging.FileHandler.level = FINE
-#10M
-java.util.logging.FileHandler.limit = 10485760
+
+java.util.logging.FileHandler.limit = 20M
 java.util.logging.FileHandler.count = 100
 java.util.logging.FileHandler.encoding = UTF-8
 java.util.logging.FileHandler.pattern = ${APP_HOME}/logs-%m/log-%d.log

src/META-INF/persistence-template.xml

@@ -9,7 +9,7 @@
             -->
             <property name="javax.persistence.datasource" value="org.redkale.source.DataJdbcSource"/>
             <!-- 
-                是否开启缓存(标记为@Cacheable的Entity类)，值目前只支持两种： ALL: 所有开启缓存。 NONE: 关闭所有缓存
+                是否开启缓存(标记为@Cacheable的Entity类)，值目前只支持两种： ALL: 所有开启缓存。 NONE: 关闭所有缓存， 非NONE字样统一视为ALL
             -->
             <property name="javax.persistence.cachemode" value="ALL"/>
             
@@ -20,12 +20,15 @@
                                      org.mariadb.jdbc.Driver  ——————  org.mariadb.jdbc.MySQLDataSource
                                        org.postgresql.Driver  ——————  org.postgresql.ds.PGConnectionPoolDataSource
                                        com.mysql.jdbc.Driver  ——————  com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource
+                                    com.mysql.cj.jdbc.Driver  ——————  com.mysql.cj.jdbc.MysqlConnectionPoolDataSource
                              oracle.jdbc.driver.OracleDriver  ——————  oracle.jdbc.pool.OracleConnectionPoolDataSource
                 com.microsoft.sqlserver.jdbc.SQLServerDriver  ——————  com.microsoft.sqlserver.jdbc.SQLServerConnectionPoolDataSource
+                                               org.h2.Driver  ——————  org.h2.jdbcx.JdbcDataSource
                 因此 com.mysql.jdbc.Driver 会被自动转换成 com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource
                 并且如果JDBC驱动是以上几个版本，javax.persistence.jdbc.driver属性都可以省略，Redkale会根据javax.persistence.jdbc.url的值来识别驱动
-            -->
             <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
+            <property name="javax.persistence.jdbc.source" value="com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource"/>
+            -->
             <property name="javax.persistence.jdbc.user" value="root"/>
             <property name="javax.persistence.jdbc.password" value="123456"/>
             
@@ -47,7 +50,6 @@
         <properties>
             <!-- jdbc:mysql://127.0.0.1:3306/dbim?autoReconnect=true&amp;autoReconnectForPools=true&amp;characterEncoding=utf8 -->
             <property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/dbim?characterEncoding=utf8"/>
-            <property name="javax.persistence.jdbc.driver" value="com.mysql.jdbc.Driver"/>
             <property name="javax.persistence.jdbc.user" value="root"/>
             <property name="javax.persistence.jdbc.password" value="123456"/>
         </properties>

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

@@ -10,7 +10,6 @@ module org.redkale {
     requires java.logging;
     requires java.xml;
     requires java.sql;
-    requires java.sql.rowset;
 
     requires jdk.unsupported;  //sun.misc.Unsafe
 
@@ -31,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

@@ -89,6 +89,8 @@ public final class ApiDocsService {
                         for (final Class rtype : action.results()) {
                             results.add(rtype.getName());
                             if (typesmap.containsKey(rtype.getName())) continue;
+                            if(rtype.getName().startsWith("java.")) continue;
+                            if(rtype.getName().startsWith("javax.")) continue;
                             final boolean filter = FilterBean.class.isAssignableFrom(rtype);
                             final Map<String, Map<String, Object>> typemap = new LinkedHashMap<>();
                             Class loop = rtype;
@@ -136,6 +138,8 @@ public final class ApiDocsService {
                             paramsList.add(parammap);
                             if (ptype.isPrimitive() || ptype == String.class) continue;
                             if (typesmap.containsKey(ptype.getName())) continue;
+                            if(ptype.getName().startsWith("java.")) continue;
+                            if(ptype.getName().startsWith("javax.")) continue;
 
                             final Map<String, Map<String, Object>> typemap = new LinkedHashMap<>();
                             Class loop = ptype;
@@ -192,7 +196,7 @@ public final class ApiDocsService {
         final FileOutputStream out = new FileOutputStream(new File(app.getHome(), "apidoc.json"));
         out.write(json.getBytes("UTF-8"));
         out.close();
-        File doctemplate = new File(app.getConf(), "apidoc-template.html");
+        File doctemplate = new File(app.getConfPath().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 conf;
+    private final URI confPath;
 
     //日志
     private final Logger logger;
@@ -170,21 +170,25 @@ public final class Application {
     private Application(final boolean singletonrun, final AnyValue config) {
         this.singletonrun = singletonrun;
         this.config = config;
+        System.setProperty("redkale.version", Redkale.getDotedVersion());
 
         final File root = new File(System.getProperty(RESNAME_APP_HOME));
         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.conf = 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.conf = 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();
@@ -208,11 +212,12 @@ public final class Application {
             System.setProperty(RESNAME_APP_NODE, node);
         }
         //以下是初始化日志配置
-        final File logconf = new File(conf, "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();
@@ -300,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);
@@ -315,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 {
@@ -362,12 +367,20 @@ public final class Application {
         return new ArrayList<>(servers);
     }
 
+    public List<DataSource> getDataSources() {
+        return new ArrayList<>(dataSources);
+    }
+
+    public List<CacheSource> getCacheSources() {
+        return new ArrayList<>(cacheSources);
+    }
+
     public File getHome() {
         return home;
     }
 
-    public File getConf() {
-        return conf;
+    public URI getConfPath() {
+        return confPath;
     }
 
     public long getStartTime() {
@@ -379,8 +392,6 @@ public final class Application {
     }
 
     public void init() throws Exception {
-        System.setProperty("sun.nio.ch.internalThreadPoolSize", "" + Runtime.getRuntime().availableProcessors() * 4);
-        System.setProperty("java.util.concurrent.ForkJoinPool.common.parallelism", "" + Runtime.getRuntime().availableProcessors() * 4);
         System.setProperty("net.transport.poolmaxconns", "100");
         System.setProperty("net.transport.pinginterval", "30");
         System.setProperty("net.transport.checkinterval", "30");
@@ -391,11 +402,23 @@ public final class Application {
         System.setProperty("convert.bson.writer.buffer.defsize", "4096");
         System.setProperty("convert.json.writer.buffer.defsize", "4096");
 
-        File persist = new File(this.conf, "persistence.xml");
+        final String confpath = this.confPath.toString();
         final String homepath = this.home.getCanonicalPath();
-        final String confpath = this.conf.getCanonicalPath();
-        if (persist.isFile()) System.setProperty(DataSources.DATASOURCE_CONFPATH, persist.getCanonicalPath());
-        logger.log(Level.INFO, "APP_JAVA = " + System.getProperty("java.version") + "\r\n" + RESNAME_APP_ADDR + " = " + this.localAddress.getHostAddress() + "\r\n" + RESNAME_APP_HOME + " = " + homepath + "\r\n" + RESNAME_APP_CONF + " = " + confpath);
+        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");
+            Object phobj = phclass.getMethod("current").invoke(null);
+            Object pid = phclass.getMethod("pid").invoke(phobj);
+            pidstr = "APP_PID  = " + pid + "\r\n";
+        } catch (Throwable t) {
+        }
+        logger.log(Level.INFO, pidstr + "APP_JAVA = " + System.getProperty("java.version") + "\r\n" + RESNAME_APP_ADDR + " = " + this.localAddress.getHostAddress() + "\r\n" + RESNAME_APP_HOME + " = " + homepath + "\r\n" + RESNAME_APP_CONF + " = " + confpath);
         String lib = config.getValue("lib", "${APP_HOME}/libs/*").trim().replace("${APP_HOME}", homepath);
         lib = lib.isEmpty() ? confpath : (lib + ";" + confpath);
         Server.loadLib(classLoader, logger, lib);
@@ -410,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(conf, "/" + 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));
+                            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);
+                            }
                         }
                     }
                 }
@@ -424,6 +451,7 @@ public final class Application {
                     String name = prop.getValue("name");
                     String value = prop.getValue("value");
                     if (name == null || value == null) continue;
+                    value = value.replace("${APP_HOME}", homepath);
                     if (name.startsWith("system.property.")) {
                         System.setProperty(name.substring("system.property.".length()), value);
                     } else if (name.startsWith("mimetype.property.")) {
@@ -451,7 +479,7 @@ public final class Application {
                 try {
                     Resource res = field.getAnnotation(Resource.class);
                     if (res == null) return;
-                    if (Sncp.isRemote((Service) src)) return; //远程模式不得注入 
+                    if (src instanceof Service && Sncp.isRemote((Service) src)) return; //远程模式不得注入 
                     Class type = field.getType();
                     if (type == Application.class) {
                         field.set(src, application);
@@ -542,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.conf, "application.xml");
-            confFile.renameTo(new File(this.conf, "application_" + String.format("%1$tY%1$tm%1$td%1$tH%1$tM%1$tS", System.currentTimeMillis()) + ".xml"));
+            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();
@@ -555,7 +584,7 @@ public final class Application {
         final Application application = this;
         new Thread() {
             {
-                setName("Application-Control-Thread");
+                setName("Redkale-Application-SelfServer-Thread");
             }
 
             @Override
@@ -672,19 +701,21 @@ public final class Application {
         runServers(timecd, watchs); //必须在所有服务都启动后再启动WATCH服务
         timecd.await();
         //if (!singletonrun) signalHandle();
-        if (!singletonrun) clearPersistData();
+        //if (!singletonrun) clearPersistData();
         logger.info(this.getClass().getSimpleName() + " started in " + (System.currentTimeMillis() - startTime) + " ms\r\n");
         if (!singletonrun) this.serversLatch.await();
     }
 
-    private void clearPersistData() {
-        File cachedir = new File(home, "cache");
-        if (!cachedir.isDirectory()) return;
-        for (File file : cachedir.listFiles()) {
-            if (file.getName().startsWith("persist-")) file.delete();
-        }
-    }
-
+//    private void clearPersistData() {
+//        File cachedir = new File(home, "cache");
+//        if (!cachedir.isDirectory()) return;
+//        File[] lfs = cachedir.listFiles();
+//        if (lfs != null) {
+//            for (File file : lfs) {
+//                if (file.getName().startsWith("persist-")) file.delete();
+//            }
+//        }
+//    }
 //    private void signalHandle() {
 //        //http://www.comptechdoc.org/os/linux/programming/linux_pgsignals.html
 //        String[] sigs = new String[]{"HUP", "TERM", "INT", "QUIT", "KILL", "TSTP", "USR1", "USR2", "STOP"};
@@ -724,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);
                 }
 
@@ -794,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) {
@@ -816,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) {
@@ -860,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

@@ -7,10 +7,11 @@ package org.redkale.boot;
 
 import java.io.*;
 import java.lang.annotation.*;
-import java.lang.reflect.*;
+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.*;
@@ -30,12 +31,14 @@ public final class ClassFilter<T> {
 
     private static final Logger logger = Logger.getLogger(ClassFilter.class.getName()); //日志对象
 
-    private static final boolean finer = logger.isLoggable(Level.FINER); //日志级别
+    private static final boolean finest = logger.isLoggable(Level.FINEST); //日志级别
 
     private final Set<FilterEntry<T>> entrys = new HashSet<>(); //符合条件的结果
 
     private final Set<FilterEntry<T>> expectEntrys = new HashSet<>(); //准备符合条件的结果
 
+    private Predicate<String> expectPredicate;
+
     private boolean refused; //是否拒绝所有数据,设置true，则其他规则失效,都是拒绝.
 
     private Class superClass; //符合的父类型。不为空时，扫描结果的class必须是superClass的子类
@@ -136,10 +139,11 @@ public final class ClassFilter<T> {
      *
      * @param property  AnyValue
      * @param clazzname String
+     * @param url       URL
      */
     @SuppressWarnings("unchecked")
-    public final void filter(AnyValue property, String clazzname) {
-        filter(property, clazzname, true);
+    public final void filter(AnyValue property, String clazzname, URL url) {
+        filter(property, clazzname, true, url);
     }
 
     /**
@@ -150,6 +154,18 @@ public final class ClassFilter<T> {
      * @param autoscan  为true表示自动扫描的， false表示显著调用filter， AutoLoad的注解将被忽略
      */
     public final void filter(AnyValue property, String clazzname, boolean autoscan) {
+        filter(property, clazzname, autoscan, null);
+    }
+
+    /**
+     * 过滤指定的class
+     *
+     * @param property  application.xml中对应class节点下的property属性项
+     * @param clazzname class名称
+     * @param autoscan  为true表示自动扫描的， false表示显著调用filter， AutoLoad的注解将被忽略
+     * @param url       URL
+     */
+    public final void filter(AnyValue property, String clazzname, boolean autoscan, URL url) {
         boolean r = accept0(property, clazzname);
         ClassFilter cf = r ? this : null;
         if (r && ands != null) {
@@ -165,7 +181,7 @@ public final class ClassFilter<T> {
                 }
             }
         }
-        if (cf == null || clazzname.startsWith("sun.")) return;
+        if (cf == null || clazzname.startsWith("sun.") || clazzname.contains("module-info")) return;
         try {
             Class clazz = classLoader.loadClass(clazzname);
             if (!cf.accept(property, clazz, autoscan)) return;
@@ -183,15 +199,16 @@ 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));
             }
         } catch (Throwable cfe) {
-            if (finer && !clazzname.startsWith("sun.") && !clazzname.startsWith("javax.")
-                && !clazzname.startsWith("com.sun.") && !clazzname.startsWith("jdk.")) {
-                logger.log(Level.FINEST, ClassFilter.class.getSimpleName() + " filter error", 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"))) {
+                logger.log(Level.FINEST, ClassFilter.class.getSimpleName() + " filter error for class: " + clazzname + (url == null ? "" : (" in " + url)), cfe);
             }
         }
     }
@@ -333,6 +350,14 @@ public final class ClassFilter<T> {
         this.refused = refused;
     }
 
+    public Predicate<String> getExpectPredicate() {
+        return expectPredicate;
+    }
+
+    public void setExpectPredicate(Predicate<String> predicate) {
+        this.expectPredicate = predicate;
+    }
+
     public Set<String> getPrivilegeIncludes() {
         return privilegeIncludes;
     }
@@ -347,6 +372,7 @@ public final class ClassFilter<T> {
 
     public void setPrivilegeExcludes(Set<String> privilegeExcludes) {
         this.privilegeExcludes = privilegeExcludes == null || privilegeExcludes.isEmpty() ? null : privilegeExcludes;
+
     }
 
     /**
@@ -502,7 +528,7 @@ public final class ClassFilter<T> {
                                 classes.add(classname);
                                 if (debug) debugstr.append(classname).append("\r\n");
                                 for (final ClassFilter filter : filters) {
-                                    if (filter != null) filter.filter(null, classname);
+                                    if (filter != null) filter.filter(null, classname, url);
                                 }
                             }
                         }
@@ -511,7 +537,7 @@ public final class ClassFilter<T> {
                 } else {
                     for (String classname : classes) {
                         for (final ClassFilter filter : filters) {
-                            if (filter != null) filter.filter(null, classname);
+                            if (filter != null) filter.filter(null, classname, url);
                         }
                     }
                 }
@@ -530,14 +556,14 @@ public final class ClassFilter<T> {
                         classes.add(classname);
                         if (debug) debugstr.append(classname).append("\r\n");
                         for (final ClassFilter filter : filters) {
-                            if (filter != null) filter.filter(null, classname);
+                            if (filter != null) filter.filter(null, classname, url);
                         }
                     }
                     cache.put(url, classes);
                 } else {
                     for (String classname : classes) {
                         for (final ClassFilter filter : filters) {
-                            if (filter != null) filter.filter(null, classname);
+                            if (filter != null) filter.filter(null, classname, url);
                         }
                     }
                 }
@@ -550,7 +576,9 @@ public final class ClassFilter<T> {
                 files.add(root);
             } else if (root.isDirectory()) {
                 if (exclude != null && exclude.equals(root)) return;
-                for (File f : root.listFiles()) {
+                File[] lfs = root.listFiles();
+                if (lfs == null) throw new RuntimeException("File(" + root + ") cannot listFiles()");
+                for (File f : lfs) {
                     loadClassFiles(exclude, f, files);
                 }
             }

src/org/redkale/boot/LogFileHandler.java

@@ -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);
@@ -241,7 +241,21 @@ public class LogFileHandler extends Handler {
         }
         String limitstr = manager.getProperty(cname + ".limit");
         try {
-            if (limitstr != null) this.limit = Math.abs(Integer.decode(limitstr));
+            if (limitstr != null) {
+                limitstr = limitstr.toUpperCase();
+                boolean g = limitstr.indexOf('G') > 0;
+                boolean m = limitstr.indexOf('M') > 0;
+                boolean k = limitstr.indexOf('K') > 0;
+                int ls = Math.abs(Integer.decode(limitstr.replace("G", "").replace("M", "").replace("K", "").replace("B", "")));
+                if (g) {
+                    ls *= 1024 * 1024 * 1024;
+                } else if (m) {
+                    ls *= 1024 * 1024;
+                } else if (k) {
+                    ls *= 1024;
+                }
+                this.limit = ls;
+            }
         } catch (Exception e) {
         }
         String countstr = manager.getProperty(cname + ".count");

src/org/redkale/boot/NodeHttpServer.java

@@ -9,6 +9,7 @@ import java.lang.annotation.Annotation;
 import java.lang.reflect.*;
 import java.net.*;
 import java.util.*;
+import java.util.concurrent.CountDownLatch;
 import java.util.logging.Level;
 import javax.annotation.*;
 import static org.redkale.boot.Application.RESNAME_SNCP_ADDR;
@@ -191,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();
             }
@@ -217,6 +218,7 @@ public class NodeHttpServer extends NodeServer {
         if (!rest) return;
         if (restConf == null) return; //不存在REST服务
 
+        final long starts = System.currentTimeMillis();
         String prefix0 = restConf.getValue("path", "");
         if (!prefix0.isEmpty() && prefix0.charAt(prefix0.length() - 1) == '/') prefix0 = prefix0.substring(0, prefix0.length() - 1);
         if (!prefix0.isEmpty() && prefix0.charAt(0) != '/') prefix0 = '/' + prefix0;
@@ -243,35 +245,45 @@ public class NodeHttpServer extends NodeServer {
 
             final ClassFilter restFilter = ClassFilter.create(null, restConf.getValue("includes", ""), restConf.getValue("excludes", ""), includeValues, excludeValues);
             final boolean finest = logger.isLoggable(Level.FINEST);
-            super.interceptorServices.forEach((service) -> {
-                final Class stype = Sncp.getServiceType(service);
-                final String name = Sncp.getResourceName(service);
-                RestService rs = (RestService) stype.getAnnotation(RestService.class);
-                if (rs == null || rs.ignore()) return;
+            final CountDownLatch scdl = new CountDownLatch(super.interceptorServices.size());
+            super.interceptorServices.stream().parallel().forEach((service) -> {
+                try {
+                    final Class stype = Sncp.getServiceType(service);
+                    final String name = Sncp.getResourceName(service);
+                    RestService rs = (RestService) stype.getAnnotation(RestService.class);
+                    if (rs == null || rs.ignore()) return;
 
-                final String stypename = stype.getName();
-                if (!autoload && !includeValues.contains(stypename)) return;
-                if (!restFilter.accept(stypename)) return;
-                if (restedObjects.contains(service)) {
-                    logger.log(Level.WARNING, stype.getName() + " repeat create rest servlet, so ignore");
-                    return;
-                }
-                restedObjects.add(service); //避免重复创建Rest对象
-                HttpServlet servlet = httpServer.addRestServlet(serverClassLoader, service, userType, baseServletType, prefix);
-                if (servlet == null) return; //没有HttpMapping方法的HttpServlet调用Rest.createRestServlet就会返回null 
-                String prefix2 = prefix;
-                WebServlet ws = servlet.getClass().getAnnotation(WebServlet.class);
-                if (ws != null && !ws.repair()) prefix2 = "";
-                resourceFactory.inject(servlet, NodeHttpServer.this);
-                if (finest) logger.finest(threadName + " Create RestServlet(resource.name='" + name + "') = " + servlet);
-                if (ss != null) {
-                    String[] mappings = servlet.getClass().getAnnotation(WebServlet.class).value();
-                    for (int i = 0; i < mappings.length; i++) {
-                        mappings[i] = prefix2 + mappings[i];
+                    final String stypename = stype.getName();
+                    if (!autoload && !includeValues.contains(stypename)) return;
+                    if (!restFilter.accept(stypename)) return;
+                    synchronized (restedObjects) {
+                        if (restedObjects.contains(service)) {
+                            logger.log(Level.WARNING, stype.getName() + " repeat create rest servlet, so ignore");
+                            return;
+                        }
+                        restedObjects.add(service); //避免重复创建Rest对象
                     }
-                    ss.add(new AbstractMap.SimpleEntry<>(servlet.getClass().getName(), mappings));
+                    HttpServlet servlet = httpServer.addRestServlet(serverClassLoader, service, userType, baseServletType, prefix);
+                    if (servlet == null) return; //没有HttpMapping方法的HttpServlet调用Rest.createRestServlet就会返回null 
+                    String prefix2 = prefix;
+                    WebServlet ws = servlet.getClass().getAnnotation(WebServlet.class);
+                    if (ws != null && !ws.repair()) prefix2 = "";
+                    resourceFactory.inject(servlet, NodeHttpServer.this);
+                    //if (finest) logger.finest(threadName + " Create RestServlet(resource.name='" + name + "') = " + servlet);
+                    if (ss != null) {
+                        String[] mappings = servlet.getClass().getAnnotation(WebServlet.class).value();
+                        for (int i = 0; i < mappings.length; i++) {
+                            mappings[i] = prefix2 + mappings[i];
+                        }
+                        synchronized (ss) {
+                            ss.add(new AbstractMap.SimpleEntry<>(servlet.getClass().getName() + "(rest.name='" + name + "')", mappings));
+                        }
+                    }
+                } finally {
+                    scdl.countDown();
                 }
             });
+            scdl.await();
         }
         if (webSocketFilter != null) {  //加载RestWebSocket
             final Set<String> includeValues = new HashSet<>();
@@ -328,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();
@@ -340,6 +352,7 @@ public class NodeHttpServer extends NodeServer {
                 }
                 sb.append("  mapping to  ").append(Arrays.toString(as.getValue())).append(LINE_SEPARATOR);
             }
+            sb.append(threadName).append(" All HttpServlets load cost " + (System.currentTimeMillis() - starts) + " ms" + LINE_SEPARATOR);
         }
     }
 }

src/org/redkale/boot/NodeServer.java

@@ -12,6 +12,7 @@ import java.lang.reflect.*;
 import java.net.*;
 import java.nio.file.*;
 import java.util.*;
+import java.util.AbstractMap.SimpleEntry;
 import java.util.concurrent.*;
 import java.util.function.*;
 import java.util.logging.*;
@@ -153,6 +154,20 @@ public abstract class NodeServer {
         }
 
         ClassFilter<Service> serviceFilter = createServiceClassFilter();
+        if (application.singletonrun) { //singleton模式下只加载指定的Service
+            final String ssc = System.getProperty("red" + "kale-singleton-serviceclass");
+            final String extssc = System.getProperty("red" + "kale-singleton-extserviceclasses");
+            if (ssc != null) {
+                final List<String> sscList = new ArrayList<>();
+                sscList.add(ssc);
+                if (extssc != null && !extssc.isEmpty()) {
+                    for (String s : extssc.split(",")) {
+                        if (!s.isEmpty()) sscList.add(s);
+                    }
+                }
+                serviceFilter.setExpectPredicate(c -> !sscList.contains(c));
+            }
+        }
         ClassFilter<Filter> filterFilter = createFilterClassFilter();
         ClassFilter<Servlet> servletFilter = createServletClassFilter();
         ClassFilter otherFilter = createOtherClassFilter();
@@ -161,9 +176,10 @@ public abstract class NodeServer {
         long e = System.currentTimeMillis() - s;
         logger.info(this.getClass().getSimpleName() + " load filter class in " + e + " ms");
         loadService(serviceFilter, otherFilter); //必须在servlet之前
-        loadFilter(filterFilter, otherFilter);
-        loadServlet(servletFilter, otherFilter);
-
+        if (!application.singletonrun) { //非singleton模式下才加载Filter、Servlet
+            loadFilter(filterFilter, otherFilter);
+            loadServlet(servletFilter, otherFilter);
+        }
         if (this.interceptor != null) this.resourceFactory.inject(this.interceptor);
     }
 
@@ -177,19 +193,27 @@ public abstract class NodeServer {
         final ResourceFactory appResFactory = application.getResourceFactory();
         final TransportFactory appSncpTranFactory = application.getSncpTransportFactory();
         final AnyValue resources = application.config.getAnyValue("resources");
-        final Map<String, AnyValue> cacheResource = new HashMap<>();
-        final Map<String, AnyValue> dataResources = new HashMap<>();
+        final Map<String, SimpleEntry<Class, AnyValue>> cacheResource = new HashMap<>();
+        final Map<String, SimpleEntry<Class, AnyValue>> dataResources = new HashMap<>();
         if (resources != null) {
             for (AnyValue sourceConf : resources.getAnyValues("source")) {
                 try {
                     Class type = serverClassLoader.loadClass(sourceConf.getValue("value"));
-                    if (type == DataSource.class) type = DataJdbcSource.class;
+                    if (type == DataSource.class) {
+                        type = DataMemorySource.class;
+                        for (AnyValue itemConf : sourceConf.getAnyValues("property")) {
+                            if (itemConf.getValue("name", "").contains(DataSources.JDBC_URL)) {
+                                type = DataJdbcSource.class;
+                                break;
+                            }
+                        }
+                    }
                     if (!Service.class.isAssignableFrom(type)) {
                         logger.log(Level.SEVERE, "load application source resource, but not Service error: " + sourceConf);
                     } else if (CacheSource.class.isAssignableFrom(type)) {
-                        cacheResource.put(sourceConf.getValue("name", ""), sourceConf);
+                        cacheResource.put(sourceConf.getValue("name", ""), new SimpleEntry(type, sourceConf));
                     } else if (DataSource.class.isAssignableFrom(type)) {
-                        dataResources.put(sourceConf.getValue("name", ""), sourceConf);
+                        dataResources.put(sourceConf.getValue("name", ""), new SimpleEntry(type, sourceConf));
                     } else {
                         logger.log(Level.SEVERE, "load application source resource, but not CacheSource error: " + sourceConf);
                     }
@@ -226,26 +250,31 @@ public abstract class NodeServer {
             try {
                 if (field.getAnnotation(Resource.class) == null) return;
                 if ((src instanceof Service) && Sncp.isRemote((Service) src)) return; //远程模式不得注入 DataSource
-                AnyValue sourceConf = dataResources.get(resourceName);
+                SimpleEntry<Class, AnyValue> resEntry = dataResources.get(resourceName);
+                AnyValue sourceConf = resEntry == null ? null : resEntry.getValue();
                 DataSource source = null;
                 boolean needinit = true;
                 if (sourceConf != null) {
-                    final Class sourceType = serverClassLoader.loadClass(sourceConf.getValue("value"));
-                    boolean can = false;
-                    for (Constructor cr : sourceType.getConstructors()) {
-                        if (cr.getParameterCount() == 0) {
-                            can = true;
-                            break;
+                    final Class sourceType = resEntry.getKey();
+                    if (sourceType == DataJdbcSource.class) {
+                        source = DataSources.createDataSource(resourceName, sourceConf);
+                    } else {
+                        boolean can = false;
+                        for (Constructor cr : sourceType.getConstructors()) {
+                            if (cr.getParameterCount() == 0) {
+                                can = true;
+                                break;
+                            }
+                        }
+                        if (DataSource.class.isAssignableFrom(sourceType) && can) { // 必须有空构造函数
+                            final Service srcService = (Service) src;
+                            SncpClient client = Sncp.getSncpClient(srcService);
+                            final InetSocketAddress sncpAddr = client == null ? null : client.getClientAddress();
+                            final Set<String> groups = new HashSet<>();
+                            if (client != null && client.getSameGroup() != null) groups.add(client.getSameGroup());
+                            if (client != null && client.getDiffGroups() != null) groups.addAll(client.getDiffGroups());
+                            source = (DataSource) Sncp.createLocalService(serverClassLoader, resourceName, sourceType, appResFactory, appSncpTranFactory, sncpAddr, groups, Sncp.getConf(srcService));
                         }
-                    }
-                    if (DataSource.class.isAssignableFrom(sourceType) && can) { // 必须有空构造函数
-                        final Service srcService = (Service) src;
-                        SncpClient client = Sncp.getSncpClient(srcService);
-                        final InetSocketAddress sncpAddr = client == null ? null : client.getClientAddress();
-                        final Set<String> groups = new HashSet<>();
-                        if (client != null && client.getSameGroup() != null) groups.add(client.getSameGroup());
-                        if (client != null && client.getDiffGroups() != null) groups.addAll(client.getDiffGroups());
-                        source = (DataSource) Sncp.createLocalService(serverClassLoader, resourceName, sourceType, appResFactory, appSncpTranFactory, sncpAddr, groups, Sncp.getConf(srcService));
                     }
                 }
                 if (source == null) {
@@ -284,6 +313,7 @@ public abstract class NodeServer {
             public void load(ResourceFactory rf, final Object src, final String resourceName, Field field, final Object attachment) {
                 try {
                     if (field.getAnnotation(Resource.class) == null) return;
+                    if (!(src instanceof Service)) throw new RuntimeException("CacheSource must be inject in Service, cannot " + src);
                     if ((src instanceof Service) && Sncp.isRemote((Service) src)) return; //远程模式不需要注入 CacheSource 
                     final Service srcService = (Service) src;
                     SncpClient client = Sncp.getSncpClient(srcService);
@@ -292,8 +322,12 @@ public abstract class NodeServer {
                     if (client != null && client.getSameGroup() != null) groups.add(client.getSameGroup());
                     if (client != null && client.getDiffGroups() != null) groups.addAll(client.getDiffGroups());
 
-                    AnyValue sourceConf = cacheResource.get(resourceName);
-                    if (sourceConf == null) sourceConf = dataResources.get(resourceName);
+                    SimpleEntry<Class, AnyValue> resEntry = cacheResource.get(resourceName);
+                    AnyValue sourceConf = resEntry == null ? null : resEntry.getValue();
+                    if (sourceConf == null) {
+                        SimpleEntry<Class, AnyValue> resEntry2 = dataResources.get(resourceName);
+                        sourceConf = resEntry2 == null ? null : resEntry2.getValue();
+                    }
                     final Class sourceType = sourceConf == null ? CacheMemorySource.class : serverClassLoader.loadClass(sourceConf.getValue("value"));
                     Object source = null;
                     if (CacheSource.class.isAssignableFrom(sourceType)) { // CacheSource
@@ -370,6 +404,7 @@ public abstract class NodeServer {
     @SuppressWarnings("unchecked")
     protected void loadService(ClassFilter<? extends Service> serviceFilter, ClassFilter otherFilter) throws Exception {
         if (serviceFilter == null) return;
+        final long starts = System.currentTimeMillis();
         final String threadName = "[" + Thread.currentThread().getName() + "] ";
         final Set<FilterEntry<? extends Service>> entrys = (Set) serviceFilter.getAllFilterEntrys();
         ResourceFactory regFactory = isSNCP() ? application.getResourceFactory() : resourceFactory;
@@ -401,6 +436,11 @@ public abstract class NodeServer {
             if (localed && (serviceImplClass.isInterface() || Modifier.isAbstract(serviceImplClass.getModifiers()))) continue; //本地模式不能实例化接口和抽象类的Service类
             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
+                        if (!serviceImplClass.getName().startsWith("org.redkale.")) logger.log(Level.FINE, serviceImplClass + " cannot load because not found less one public non-final method");
+                        return;
+                    }
+
                     Service service;
                     boolean ws = src instanceof WebSocketServlet;
                     if (ws || localed) { //本地模式
@@ -408,8 +448,6 @@ public abstract class NodeServer {
                     } else {
                         service = Sncp.createRemoteService(serverClassLoader, resourceName, serviceImplClass, appSncpTransFactory, NodeServer.this.sncpAddress, groups, entry.getProperty());
                     }
-                    if (SncpClient.parseMethod(serviceImplClass).isEmpty() && serviceImplClass.getAnnotation(Priority.class) == null) return; //class没有可用的方法且没有标记启动优先级的， 通常为BaseService
-
                     final Class restype = Sncp.getResourceType(service);
                     if (rf.find(resourceName, restype) == null) {
                         regFactory.register(resourceName, restype, service);
@@ -460,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());
@@ -473,24 +511,19 @@ public abstract class NodeServer {
         localServices.addAll(swlist);
         //this.loadPersistData();
         final List<String> slist = sb == null ? null : new CopyOnWriteArrayList<>();
-        CountDownLatch clds = new CountDownLatch(localServices.size());
         localServices.stream().forEach(y -> {
-            try {
-                long s = System.currentTimeMillis();
-                y.init(Sncp.getConf(y));
-                long e = System.currentTimeMillis() - s;
-                String serstr = Sncp.toSimpleString(y, maxNameLength, maxClassNameLength);
-                if (slist != null) slist.add(new StringBuilder().append(threadName).append(serstr).append(" load and init in ").append(e).append(" ms").append(LINE_SEPARATOR).toString());
-            } finally {
-                clds.countDown();
-            }
+            long s = System.currentTimeMillis();
+            y.init(Sncp.getConf(y));
+            long e = System.currentTimeMillis() - s;
+            String serstr = Sncp.toSimpleString(y, maxNameLength, maxClassNameLength);
+            if (slist != null) slist.add(new StringBuilder().append(threadName).append(serstr).append(" load and init in ").append(e).append(" ms").append(LINE_SEPARATOR).toString());
         });
-        clds.await();
         if (slist != null && sb != null) {
             List<String> wlist = new ArrayList<>(slist); //直接使用CopyOnWriteArrayList偶尔会出现莫名的异常(CopyOnWriteArrayList源码1185行)
             for (String s : wlist) {
                 sb.append(s);
             }
+            sb.append(threadName).append("All Services load cost " + (System.currentTimeMillis() - starts) + " ms" + LINE_SEPARATOR);
         }
         if (sb != null && sb.length() > 0) logger.log(Level.INFO, sb.toString());
     }

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/apidoc-template.html

@@ -41,7 +41,7 @@
                             html.push(' <tr>');
                             html.push('<td style="color:#ff00ff;">' + action.url + '</td>');
                             html.push('<td>' + action.comment + '</td>');
-                            html.push('<td class="s">模块ID: ' + servlet.moduleid + '<br/>操作ID: ' + action.actionid + '<br/>需鉴权: ' + (action.auth ? '<font style="font-weight:bold;color:green;">true</font>' : '<font color=red>false</font>') + '</td>');
+                            html.push('<td class="s" style="width:80px;">模块ID: ' + servlet.moduleid + '<br/>操作ID: ' + action.actionid + '<br/>需鉴权: ' + (action.auth ? '<font style="font-weight:bold;color:green;">true</font>' : '<font color=red>false</font>') + '</td>');
                             var paramshtml = [];
                             paramshtml.push('<table class="subtable">');
                             for (var p = 0; p < action.params.length; p++) {

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

@@ -6,6 +6,7 @@
 package org.redkale.boot.watch;
 
 import org.redkale.service.AbstractService;
+import org.redkale.util.Comment;
 import org.redkale.watch.WatchService;
 
 /**
@@ -14,4 +15,9 @@ import org.redkale.watch.WatchService;
  */
 public abstract class AbstractWatchService extends AbstractService implements WatchService {
 
+    @Comment("缺少参数")
+    public static final int RET_WATCH_PARAMS_ILLEGAL = 1600_0001;
+
+    @Comment("执行异常")
+    public static final int RET_WATCH_RUN_EXCEPTION = 1600_0002;
 }

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

@@ -33,7 +33,7 @@ public class FilterWatchService extends AbstractWatchService {
     public static final int RET_FILTER_JAR_ILLEGAL = 1601_0005;
 
     @Resource
-    private Application application;
+    protected Application application;
 
     @RestMapping(name = "addfilter", auth = false, comment = "动态增加Filter")
     public RetResult addFilter(@RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameReg = "\\.jar$") byte[] jar,
@@ -47,4 +47,34 @@ public class FilterWatchService extends AbstractWatchService {
         }
         return RetResult.success();
     }
+
+    @RestMapping(name = "test1", auth = false, comment = "预留")
+    public RetResult test1() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test2", auth = false, comment = "预留")
+    public RetResult test2() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test3", auth = false, comment = "预留")
+    public RetResult test3() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test4", auth = false, comment = "预留")
+    public RetResult test4() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test5", auth = false, comment = "预留")
+    public RetResult test5() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test6", auth = false, comment = "预留")
+    public RetResult test6() {
+        return RetResult.success();
+    }
 }

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

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

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

@@ -5,10 +5,14 @@
  */
 package org.redkale.boot.watch;
 
+import java.lang.reflect.*;
+import java.util.*;
 import javax.annotation.Resource;
-import org.redkale.boot.Application;
-import org.redkale.net.TransportFactory;
+import org.redkale.boot.*;
+import org.redkale.convert.json.JsonConvert;
 import org.redkale.net.http.*;
+import org.redkale.service.RetResult;
+import org.redkale.util.*;
 
 /**
  * <p>
@@ -19,21 +23,177 @@ import org.redkale.net.http.*;
 @RestService(name = "service", catalog = "watch", repair = false)
 public class ServiceWatchService extends AbstractWatchService {
 
-    @Resource
-    private Application application;
+    @Comment("没有找到目标Service")
+    public static final int RET_SERVICE_DEST_NOT_EXISTS = 1603_0001;
 
     @Resource
-    private TransportFactory transportFactory;
+    protected Application application;
 
-//    @RestMapping(name = "load", auth = false, comment = "动态增加Service")
-//    public RetResult loadService(String type, @RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameReg = "\\.jar$") byte[] jar) {
-//        //待开发
-//        return RetResult.success();
-//    }
-//
-//    @RestMapping(name = "stop", auth = false, comment = "动态停止Service")
-//    public RetResult stopService(String name, String type) {
-//        //待开发
-//        return RetResult.success();
-//    }
+    @RestConvert(type = void.class)
+    @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) {
+        if (name == null) name = "";
+        if (type == null) type = "";
+        if (field == null) field = "";
+        type = type.trim();
+        field = field.trim();
+        if (type.isEmpty()) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param `type`");
+        if (field.isEmpty()) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param `field`");
+        Object dest = findService(name, type);
+        Class clazz = dest.getClass();
+        Throwable t = null;
+        try {
+            Field fieldObj = null;
+            do {
+                try {
+                    fieldObj = clazz.getDeclaredField(field);
+                    break;
+                } catch (Exception e) {
+                    if (t == null) t = e;
+                }
+            } while ((clazz = clazz.getSuperclass()) != Object.class);
+            if (fieldObj == null) return new RetResult(RET_WATCH_RUN_EXCEPTION, "run exception (" + String.valueOf(t) + ")");
+            fieldObj.setAccessible(true);
+            fieldObj.set(dest, JsonConvert.root().convertFrom(fieldObj.getGenericType(), value));
+            return RetResult.success();
+        } catch (Throwable t2) {
+            return new RetResult(RET_WATCH_RUN_EXCEPTION, "run exception (" + t2.toString() + ")");
+        }
+    }
+
+    @RestConvert(type = void.class)
+    @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 = "";
+        if (type == null) type = "";
+        if (field == null) field = "";
+        type = type.trim();
+        field = field.trim();
+        if (type.isEmpty()) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param `type`");
+        if (field.isEmpty()) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param `field`");
+        Object dest = findService(name, type);
+        Class clazz = dest.getClass();
+        Throwable t = null;
+        try {
+            Field fieldObj = null;
+            do {
+                try {
+                    fieldObj = clazz.getDeclaredField(field);
+                    break;
+                } catch (Exception e) {
+                    if (t == null) t = e;
+                }
+            } while ((clazz = clazz.getSuperclass()) != Object.class);
+            if (fieldObj == null) return new RetResult(RET_WATCH_RUN_EXCEPTION, "run exception (" + String.valueOf(t) + ")");
+            fieldObj.setAccessible(true);
+            return new RetResult(fieldObj.get(dest));
+        } catch (Throwable t2) {
+            return new RetResult(RET_WATCH_RUN_EXCEPTION, "run exception (" + t2.toString() + ")");
+        }
+    }
+
+    @RestConvert(type = void.class)
+    @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,
+        @RestParam(name = "paramtypes", comment = "方法的参数数据类型") List<String> paramtypes) {
+        if (name == null) name = "";
+        if (type == null) type = "";
+        if (method == null) method = "";
+        type = type.trim();
+        method = method.trim();
+        if (type.isEmpty()) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param `type`");
+        if (method.isEmpty()) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param `method`");
+        Object dest = findService(name, type);
+        Class clazz = dest.getClass();
+        Throwable t = null;
+        final int paramcount = params == null ? 0 : params.size();
+        if (paramtypes != null && paramcount != paramtypes.size()) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "params.size not equals to paramtypes.size");
+        try {
+            Method methodObj = null;
+            do {
+                try {
+                    for (Method m : clazz.getDeclaredMethods()) {
+                        if (m.getName().equals(method) && m.getParameterCount() == paramcount) {
+                            boolean flag = true;
+                            if (paramtypes != null) {
+                                Class[] pts = m.getParameterTypes();
+                                for (int i = 0; i < pts.length; i++) {
+                                    if (!pts[i].getName().endsWith(paramtypes.get(i))) {
+                                        flag = false;
+                                        break;
+                                    }
+                                }
+                            }
+                            if (flag) {
+                                methodObj = m;
+                                break;
+                            }
+                        }
+                    }
+                    if (methodObj != null) break;
+                } catch (Exception e) {
+                    if (t == null) t = e;
+                }
+            } while ((clazz = clazz.getSuperclass()) != Object.class);
+            if (methodObj == null) return new RetResult(RET_WATCH_RUN_EXCEPTION, "run exception (" + (t == null ? ("not found method(" + method + ")") : String.valueOf(t)) + ")");
+            methodObj.setAccessible(true);
+            if (paramcount < 1) return new RetResult(methodObj.invoke(dest));
+            Object[] paramObjs = new Object[paramcount];
+            Type[] pts = methodObj.getGenericParameterTypes();
+            for (int i = 0; i < paramObjs.length; i++) {
+                paramObjs[i] = JsonConvert.root().convertFrom(pts[i], params.get(i));
+            }
+            return new RetResult(methodObj.invoke(dest, paramObjs));
+        } catch (Throwable t2) {
+            return new RetResult(RET_WATCH_RUN_EXCEPTION, "run exception (" + t2.toString() + ")");
+        }
+    }
+
+    protected Object findService(String name, String type) {
+        Object dest = null;
+        for (NodeServer ns : application.getNodeServers()) {
+            ResourceFactory resFactory = ns.getResourceFactory();
+            List list = resFactory.query((n, s) -> name.equals(n) && s != null && s.getClass().getName().endsWith(type));
+            if (list == null || list.isEmpty()) continue;
+            dest = list.get(0);
+        }
+        if (dest == null) return new RetResult(RET_SERVICE_DEST_NOT_EXISTS, "not found servie (name=" + name + ", type=" + type + ")");
+        return dest;
+    }
+
+    @RestMapping(name = "load", 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")
+    public RetResult reloadService(@RestParam(name = "name", comment = "Service的资源名") String name,
+        @RestParam(name = "type", comment = "Service的类名") String type) {
+        //待开发
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "stop", auth = false, comment = "动态停止Service")
+    public RetResult stopService(@RestParam(name = "name", comment = "Service的资源名") String name,
+        @RestParam(name = "type", comment = "Service的类名") String type) {
+        //待开发
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "find", auth = false, comment = "查找Service")
+    public RetResult find(@RestParam(name = "name", comment = "Service的资源名") String name,
+        @RestParam(name = "type", comment = "Service的类名") String type) {
+        //待开发
+        return RetResult.success();
+    }
 }

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

@@ -20,10 +20,10 @@ import org.redkale.net.http.*;
 public class ServletWatchService extends AbstractWatchService {
 
     @Resource
-    private Application application;
+    protected Application application;
 
     @Resource
-    private TransportFactory transportFactory;
+    protected TransportFactory transportFactory;
 //
 //    @RestMapping(name = "load", auth = false, comment = "动态增加Servlet")
 //    public RetResult loadServlet(String type, @RestUploadFile(maxLength = 10 * 1024 * 1024, fileNameReg = "\\.jar$") byte[] jar) {

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

@@ -5,22 +5,118 @@
  */
 package org.redkale.boot.watch;
 
+import java.io.*;
+import java.lang.reflect.Method;
+import java.util.*;
 import javax.annotation.Resource;
 import org.redkale.boot.Application;
-import org.redkale.net.TransportFactory;
-import org.redkale.net.http.RestService;
+import org.redkale.net.http.*;
+import org.redkale.service.*;
+import org.redkale.source.*;
+import org.redkale.util.*;
 
 /**
+ * WATCH服务, 操作DataSource源
  *
  * @author zhangjx
  */
 @RestService(name = "source", catalog = "watch", repair = false)
 public class SourceWatchService extends AbstractWatchService {
 
-    @Resource
-    private Application application;
+    @Comment("不存在的Source")
+    public static final int RET_SOURCE_NOT_EXISTS = 1605_0001;
+
+    @Comment("Source不支持getReadPoolSource/getWritePoolSource方法")
+    public static final int RET_SOURCE_CHANGE_METHOD_NOT_EXISTS = 1605_0002;
+
+    @Comment("PoolSource调用change方法失败")
+    public static final int RET_SOURCE_METHOD_INVOKE_NOT_EXISTS = 1605_0003;
+
+    @Resource(name = "APP_HOME")
+    protected File home;
 
     @Resource
-    private TransportFactory transportFactory;
+    protected Application application;
 
+    @RestMapping(name = "change", auth = false, comment = "动态更改DataSource的配置")
+    public RetResult addNode(@RestParam(name = "name", comment = "DataSource的标识") final String name,
+        @RestParam(name = "properties", comment = "配置") Properties properties,
+        @RestParam(name = "xmlpath", comment = "配置文件路径") String xmlpath) throws IOException {
+        if (name == null) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param (name)");
+        if (properties == null && xmlpath != null) {
+            File f = new File(xmlpath);
+            if (!f.isFile()) f = new File(home, xmlpath);
+            if (!f.isFile()) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found file (" + xmlpath + ")");
+            FileInputStream in = new FileInputStream(f);
+            Map<String, Properties> map = DataSources.loadPersistenceXml(in);
+            properties = map.get(name);
+        }
+        if (properties == null) return new RetResult(RET_WATCH_PARAMS_ILLEGAL, "not found param (properties)");
+        DataSource source = null;
+        for (DataSource s : application.getDataSources()) {
+            String resName = ((Resourcable) s).resourceName();
+            if (resName == null) continue;
+            if (!resName.equals(name)) continue;
+            source = s;
+            break;
+        }
+        if (source == null) return new RetResult(RET_SOURCE_NOT_EXISTS, "not found source (name = " + name + ")");
+        Method readPoolMethod = null;
+        Method writePoolMethod = null;
+        Class stype = source.getClass();
+        do {
+            for (Method m : stype.getDeclaredMethods()) {
+                if (!PoolSource.class.isAssignableFrom(m.getReturnType())) continue;
+                if (m.getParameterCount() != 0) continue;
+                if (m.getName().equals("getReadPoolSource")) {
+                    readPoolMethod = m;
+                } else if (m.getName().equals("getWritePoolSource")) {
+                    writePoolMethod = m;
+                }
+            }
+        } while ((stype = stype.getSuperclass()) != Object.class);
+        if (readPoolMethod == null) return new RetResult(RET_SOURCE_CHANGE_METHOD_NOT_EXISTS, "not found source method(getReadPoolSource)");
+        if (writePoolMethod == null) return new RetResult(RET_SOURCE_CHANGE_METHOD_NOT_EXISTS, "not found source method(getWritePoolSource)");
+        readPoolMethod.setAccessible(true);
+        writePoolMethod.setAccessible(true);
+        try {
+            PoolSource readPoolSource = (PoolSource) readPoolMethod.invoke(source);
+            PoolSource writePoolSource = (PoolSource) writePoolMethod.invoke(source);
+            readPoolSource.change(properties);
+            writePoolSource.change(properties);
+            return RetResult.success();
+        } catch (Exception e) {
+            return new RetResult(RET_SOURCE_METHOD_INVOKE_NOT_EXISTS, "poolsource invoke method('change') error");
+        }
+    }
+
+    @RestMapping(name = "test1", auth = false, comment = "预留")
+    public RetResult test1() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test2", auth = false, comment = "预留")
+    public RetResult test2() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test3", auth = false, comment = "预留")
+    public RetResult test3() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test4", auth = false, comment = "预留")
+    public RetResult test4() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test5", auth = false, comment = "预留")
+    public RetResult test5() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test6", auth = false, comment = "预留")
+    public RetResult test6() {
+        return RetResult.success();
+    }
 }

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

@@ -36,10 +36,10 @@ public class TransportWatchService extends AbstractWatchService {
     public static final int RET_TRANSPORT_ADDR_EXISTS = 1606_0003;
 
     @Resource
-    private Application application;
+    protected Application application;
 
     @Resource
-    private TransportFactory transportFactory;
+    protected TransportFactory transportFactory;
 
     @RestMapping(name = "listnodes", auth = false, comment = "获取所有Node节点")
     public List<TransportGroupInfo> listNodes() {
@@ -135,4 +135,24 @@ public class TransportWatchService extends AbstractWatchService {
         }
         return RetResult.success();
     }
+
+    @RestMapping(name = "test1", auth = false, comment = "预留")
+    public RetResult test1() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test2", auth = false, comment = "预留")
+    public RetResult test2() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test3", auth = false, comment = "预留")
+    public RetResult test3() {
+        return RetResult.success();
+    }
+
+    @RestMapping(name = "test4", auth = false, comment = "预留")
+    public RetResult test4() {
+        return RetResult.success();
+    }
 }

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

@@ -42,16 +42,17 @@ public final class AnyEncoder<T> implements Encodeable<Writer, T> {
             out.writeNull();
         } else {
             int count = values.length - values.length % 2;
-            out.writeMapB(count / 2);
-            for (int i = 0; i < count; i += 2) {
-                if (i > 0) out.writeArrayMark();
-                this.convertTo(out, (T) values[i]);
-                out.writeMapMark();
-                Object val = values[i + 1];
-                if (val instanceof CompletableFuture) {
-                    this.convertTo(out, (T) ((CompletableFuture) val).join());
-                } else {
-                    this.convertTo(out, (T) val);
+            if (out.writeMapB(count / 2, (Encodeable) this, (Encodeable) this, values) < 0) {
+                for (int i = 0; i < count; i += 2) {
+                    if (i > 0) out.writeArrayMark();
+                    this.convertTo(out, (T) values[i]);
+                    out.writeMapMark();
+                    Object val = values[i + 1];
+                    if (val instanceof CompletableFuture) {
+                        this.convertTo(out, (T) ((CompletableFuture) val).join());
+                    } else {
+                        this.convertTo(out, (T) val);
+                    }
                 }
             }
             out.writeMapE();

src/org/redkale/convert/ArrayDecoder.java

@@ -20,19 +20,19 @@ import java.util.*;
  * @param <T> 反解析的数组元素类型
  */
 @SuppressWarnings("unchecked")
-public final class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
+public class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
 
-    private final Type type;
+    protected final Type type;
 
-    private final Type componentType;
+    protected final Type componentType;
 
-    private final Class componentClass;
+    protected final Class componentClass;
 
-    protected final Decodeable<Reader, T> decoder;
+    protected final Decodeable<Reader, T> componentDecoder;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
-    private final Object lock = new Object();
+    protected final Object lock = new Object();
 
     public ArrayDecoder(final ConvertFactory factory, final Type type) {
         this.type = type;
@@ -51,7 +51,7 @@ public final class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
                 this.componentClass = (Class) this.componentType;
             }
             factory.register(type, this);
-            this.decoder = factory.loadDecoder(this.componentType);
+            this.componentDecoder = factory.loadDecoder(this.componentType);
         } finally {
             inited = true;
             synchronized (lock) {
@@ -62,9 +62,19 @@ public final class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
 
     @Override
     public T[] convertFrom(Reader in) {
-        final int len = in.readArrayB();
+        return convertFrom(in, null);
+    }
+
+    public T[] convertFrom(Reader in, DeMember member) {
+        byte[] typevals = new byte[1];
+        int len = in.readArrayB(member, typevals, componentDecoder);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
-        if (this.decoder == null) {
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(member, componentDecoder);
+            len = Reader.SIGN_NOLENGTH;
+        }
+        if (this.componentDecoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -75,11 +85,16 @@ public final class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
                 }
             }
         }
-        final Decodeable<Reader, T> localdecoder = this.decoder;
+        final Decodeable<Reader, T> localdecoder = getComponentDecoder(this.componentDecoder, typevals);
         final List<T> result = new ArrayList();
+        boolean first = true;
         if (len == Reader.SIGN_NOLENGTH) {
-            while (in.hasNext()) {
-                result.add(localdecoder.convertFrom(in));
+            int startPosition = in.position();
+            while (hasNext(in, member, startPosition, contentLength, first)) {
+                Reader itemReader = getItemReader(in, member, first);
+                if (itemReader == null) break;
+                result.add(readMemberValue(itemReader, member, localdecoder, first));
+                first = false;
             }
         } else {
             for (int i = 0; i < len; i++) {
@@ -91,9 +106,25 @@ public final class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
         return result.toArray(rs);
     }
 
+    protected boolean hasNext(Reader in, DeMember member, int startPosition, int contentLength, boolean first) {
+        return in.hasNext(startPosition, contentLength);
+    }
+
+    protected Decodeable<Reader, T> getComponentDecoder(Decodeable<Reader, T> decoder, byte[] typevals) {
+        return decoder;
+    }
+
+    protected Reader getItemReader(Reader in, DeMember member, boolean first) {
+        return in;
+    }
+
+    protected T readMemberValue(Reader in, DeMember member, Decodeable<Reader, T> decoder, boolean first) {
+        return decoder.convertFrom(in);
+    }
+
     @Override
     public String toString() {
-        return this.getClass().getSimpleName() + "{componentType:" + this.componentType + ", decoder:" + this.decoder + "}";
+        return this.getClass().getSimpleName() + "{componentType:" + this.componentType + ", decoder:" + this.componentDecoder + "}";
     }
 
     @Override
@@ -101,4 +132,12 @@ public final class ArrayDecoder<T> implements Decodeable<Reader, T[]> {
         return type;
     }
 
+    public Type getComponentType() {
+        return componentType;
+    }
+
+    public Decodeable<Reader, T> getComponentDecoder() {
+        return componentDecoder;
+    }
+
 }

src/org/redkale/convert/ArrayEncoder.java

@@ -19,19 +19,19 @@ import java.lang.reflect.*;
  * @param <T> 序列化的数组元素类型
  */
 @SuppressWarnings("unchecked")
-public final class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
+public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
 
-    private final Type type;
+    protected final Type type;
 
-    private final Type componentType;
+    protected final Type componentType;
 
-    private final Encodeable anyEncoder;
+    protected final Encodeable anyEncoder;
 
-    private final Encodeable<Writer, Object> encoder;
+    protected final Encodeable<Writer, Object> componentEncoder;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
-    private final Object lock = new Object();
+    protected final Object lock = new Object();
 
     public ArrayEncoder(final ConvertFactory factory, final Type type) {
         this.type = type;
@@ -45,7 +45,7 @@ public final class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
                 throw new ConvertException("(" + type + ") is not a array type");
             }
             factory.register(type, this);
-            this.encoder = factory.loadEncoder(this.componentType);
+            this.componentEncoder = factory.loadEncoder(this.componentType);
             this.anyEncoder = factory.getAnyEncoder();
         } finally {
             inited = true;
@@ -57,16 +57,20 @@ public final class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
 
     @Override
     public void convertTo(Writer out, T[] value) {
+        convertTo(out, null, value);
+    }
+
+    public void convertTo(Writer out, EnMember member, T[] value) {
         if (value == null) {
             out.writeNull();
             return;
         }
         if (value.length == 0) {
-            out.writeArrayB(0);
+            out.writeArrayB(0, componentEncoder, value);
             out.writeArrayE();
             return;
         }
-        if (this.encoder == null) {
+        if (this.componentEncoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -77,24 +81,38 @@ public final class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
                 }
             }
         }
-        out.writeArrayB(value.length);
-        final Type comp = this.componentType;
-        boolean first = true;
-        for (Object v : value) {
-            if (!first) out.writeArrayMark();
-            ((v != null && v.getClass() == comp) ? encoder : anyEncoder).convertTo(out, v);
-            if (first) first = false;
+        if (out.writeArrayB(value.length, componentEncoder, value) < 0) {
+            final Type comp = this.componentType;
+            boolean first = true;
+            for (Object v : value) {
+                if (!first) out.writeArrayMark();
+                writeMemberValue(out, member, ((v != null && (v.getClass() == comp || out.specify() == comp)) ? componentEncoder : anyEncoder), v, first);
+                if (first) first = false;
+            }
         }
         out.writeArrayE();
     }
 
+    protected void writeMemberValue(Writer out, EnMember member, Encodeable<Writer, Object> encoder, Object value, boolean first) {
+        encoder.convertTo(out, value);
+    }
+
     @Override
     public String toString() {
-        return this.getClass().getSimpleName() + "{componentType:" + this.componentType + ", encoder:" + this.encoder + "}";
+        return this.getClass().getSimpleName() + "{componentType:" + this.componentType + ", encoder:" + this.componentEncoder + "}";
     }
 
     @Override
     public Type getType() {
         return type;
     }
+
+    public Type getComponentType() {
+        return componentType;
+    }
+
+    public Encodeable<Writer, Object> getComponentEncoder() {
+        return componentEncoder;
+    }
+
 }

src/org/redkale/convert/CollectionDecoder.java

@@ -8,7 +8,7 @@ package org.redkale.convert;
 import org.redkale.util.Creator;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
-import java.util.Collection;
+import java.util.*;
 
 /**
  * Collection的反序列化操作类  <br>
@@ -21,19 +21,19 @@ import java.util.Collection;
  * @param <T> 反解析的集合元素类型
  */
 @SuppressWarnings("unchecked")
-public final class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
+public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
 
-    private final Type type;
+    protected final Type type;
 
-    private final Type componentType;
+    protected final Type componentType;
 
     protected Creator<Collection<T>> creator;
 
-    protected final Decodeable<Reader, T> decoder;
+    protected final Decodeable<Reader, T> componentDecoder;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
-    private final Object lock = new Object();
+    protected final Object lock = new Object();
 
     public CollectionDecoder(final ConvertFactory factory, final Type type) {
         this.type = type;
@@ -43,12 +43,12 @@ public final class CollectionDecoder<T> implements Decodeable<Reader, Collection
                 this.componentType = pt.getActualTypeArguments()[0];
                 this.creator = factory.loadCreator((Class) pt.getRawType());
                 factory.register(type, this);
-                this.decoder = factory.loadDecoder(this.componentType);
-            } else if(factory.isReversible()){
+                this.componentDecoder = factory.loadDecoder(this.componentType);
+            } else if (factory.isReversible()) {
                 this.componentType = Object.class;
-                this.creator = factory.loadCreator(Object.class);
+                this.creator = factory.loadCreator(type instanceof Class ? (Class) type : Collection.class);
                 factory.register(type, this);
-                this.decoder = factory.loadDecoder(this.componentType);
+                this.componentDecoder = factory.loadDecoder(this.componentType);
             } else {
                 throw new ConvertException("CollectionDecoder not support the type (" + type + ")");
             }
@@ -60,11 +60,32 @@ public final class CollectionDecoder<T> implements Decodeable<Reader, Collection
         }
     }
 
+    //仅供类似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) {
-        final int len = in.readArrayB();
+        return convertFrom(in, null);
+    }
+
+    public Collection<T> convertFrom(Reader in, DeMember member) {
+        byte[] typevals = new byte[1];
+        int len = in.readArrayB(member, typevals, componentDecoder);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
-        if (this.decoder == null) {
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(member, componentDecoder);
+            len = Reader.SIGN_NOLENGTH;
+        }
+        if (this.componentDecoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -75,11 +96,16 @@ public final class CollectionDecoder<T> implements Decodeable<Reader, Collection
                 }
             }
         }
-        final Decodeable<Reader, T> localdecoder = this.decoder;
+        final Decodeable<Reader, T> localdecoder = getComponentDecoder(this.componentDecoder, typevals);
         final Collection<T> result = this.creator.create();
+        boolean first = true;
         if (len == Reader.SIGN_NOLENGTH) {
-            while (in.hasNext()) {
-                result.add(localdecoder.convertFrom(in));
+            int startPosition = in.position();
+            while (hasNext(in, member, startPosition, contentLength, first)) {
+                Reader itemReader = getItemReader(in, member, first);
+                if (itemReader == null) break;
+                result.add(readMemberValue(itemReader, member, localdecoder, first));
+                first = false;
             }
         } else {
             for (int i = 0; i < len; i++) {
@@ -90,9 +116,33 @@ public final class CollectionDecoder<T> implements Decodeable<Reader, Collection
         return result;
     }
 
+    protected boolean hasNext(Reader in, DeMember member, int startPosition, int contentLength, boolean first) {
+        return in.hasNext(startPosition, contentLength);
+    }
+
+    protected Decodeable<Reader, T> getComponentDecoder(Decodeable<Reader, T> decoder, byte[] typevals) {
+        return decoder;
+    }
+
+    protected Reader getItemReader(Reader in, DeMember member, boolean first) {
+        return in;
+    }
+
+    protected T readMemberValue(Reader in, DeMember member, Decodeable<Reader, T> decoder, boolean first) {
+        return decoder.convertFrom(in);
+    }
+
     @Override
     public Type getType() {
         return type;
     }
 
+    public Type getComponentType() {
+        return componentType;
+    }
+
+    public Decodeable<Reader, T> getComponentDecoder() {
+        return componentDecoder;
+    }
+
 }

src/org/redkale/convert/CollectionEncoder.java

@@ -19,15 +19,15 @@ import java.util.Collection;
  * @param <T> 序列化的集合元素类型
  */
 @SuppressWarnings("unchecked")
-public final class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
+public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
 
-    private final Type type;
+    protected final Type type;
 
-    private final Encodeable<Writer, Object> encoder;
+    protected final Encodeable<Writer, Object> componentEncoder;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
-    private final Object lock = new Object();
+    protected final Object lock = new Object();
 
     public CollectionEncoder(final ConvertFactory factory, final Type type) {
         this.type = type;
@@ -35,12 +35,12 @@ public final class CollectionEncoder<T> implements Encodeable<Writer, Collection
             if (type instanceof ParameterizedType) {
                 Type t = ((ParameterizedType) type).getActualTypeArguments()[0];
                 if (t instanceof TypeVariable) {
-                    this.encoder = factory.getAnyEncoder();
+                    this.componentEncoder = factory.getAnyEncoder();
                 } else {
-                    this.encoder = factory.loadEncoder(t);
+                    this.componentEncoder = factory.loadEncoder(t);
                 }
             } else {
-                this.encoder = factory.getAnyEncoder();
+                this.componentEncoder = factory.getAnyEncoder();
             }
         } finally {
             inited = true;
@@ -52,16 +52,20 @@ public final class CollectionEncoder<T> implements Encodeable<Writer, Collection
 
     @Override
     public void convertTo(Writer out, Collection<T> value) {
+        convertTo(out, null, value);
+    }
+
+    public void convertTo(Writer out, EnMember member, Collection<T> value) {
         if (value == null) {
             out.writeNull();
             return;
         }
         if (value.isEmpty()) {
-            out.writeArrayB(0);
+            out.writeArrayB(0, componentEncoder, value);
             out.writeArrayE();
             return;
         }
-        if (this.encoder == null) {
+        if (this.componentEncoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -72,18 +76,31 @@ public final class CollectionEncoder<T> implements Encodeable<Writer, Collection
                 }
             }
         }
-        out.writeArrayB(value.size());
-        boolean first = true;
-        for (Object v : value) {
-            if (!first) out.writeArrayMark();
-            encoder.convertTo(out, v);
-            if (first) first = false;
+        if (out.writeArrayB(value.size(), componentEncoder, value) < 0) {
+            boolean first = true;
+            for (Object v : value) {
+                if (!first) out.writeArrayMark();
+                writeValue(out, member, v);
+                if (first) first = false;
+            }
         }
         out.writeArrayE();
     }
 
+    protected void writeValue(Writer out, EnMember member, Object value) {
+        componentEncoder.convertTo(out, value);
+    }
+
     @Override
     public Type getType() {
         return type;
     }
+
+    public Encodeable<Writer, Object> getComponentEncoder() {
+        return componentEncoder;
+    }
+
+    public Type getComponentType() {
+        return componentEncoder == null ? null : componentEncoder.getType();
+    }
 }

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

@@ -45,6 +45,8 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
 
     private final ConcurrentHashMap<String, Class> entitys = new ConcurrentHashMap();
 
+    private final ConcurrentHashMap<Type, Map<String, SimpledCoder<R, W, ?>>> fieldCoders = new ConcurrentHashMap();
+
     private final ConcurrentHashMap<Type, Decodeable<R, ?>> decoders = new ConcurrentHashMap();
 
     private final ConcurrentHashMap<Type, Encodeable<W, ?>> encoders = new ConcurrentHashMap();
@@ -89,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);
@@ -128,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) {
+            }
         }
     }
 
@@ -139,10 +192,56 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
 
     public abstract boolean isReversible(); //是否可逆的
 
+    public abstract boolean isFieldSort(); //当ConvertColumn.index相同时是否按字段名称排序
+
     public abstract ConvertFactory createChild();
 
     public abstract ConvertFactory createChild(boolean tiny);
 
+    protected SimpledCoder createEnumSimpledCoder(Class enumClass) {
+        return new EnumSimpledCoder(enumClass);
+    }
+
+    protected ObjectDecoder createObjectDecoder(Type type) {
+        return new ObjectDecoder(type);
+    }
+
+    protected ObjectEncoder createObjectEncoder(Type type) {
+        return new ObjectEncoder(type);
+    }
+
+    protected <E> Decodeable<R, E> createMapDecoder(Type type) {
+        return new MapDecoder(this, type);
+    }
+
+    protected <E> Encodeable<W, E> createMapEncoder(Type type) {
+        return new MapEncoder(this, type);
+    }
+
+    protected <E> Decodeable<R, E> createArrayDecoder(Type type) {
+        return new ArrayDecoder(this, type);
+    }
+
+    protected <E> Encodeable<W, E> createArrayEncoder(Type type) {
+        return new ArrayEncoder(this, type);
+    }
+
+    protected <E> Decodeable<R, E> createCollectionDecoder(Type type) {
+        return new CollectionDecoder(this, type);
+    }
+
+    protected <E> Encodeable<W, E> createCollectionEncoder(Type type) {
+        return new CollectionEncoder(this, type);
+    }
+
+    protected <E> Decodeable<R, E> createStreamDecoder(Type type) {
+        return new StreamDecoder(this, type);
+    }
+
+    protected <E> Encodeable<W, E> createStreamEncoder(Type type) {
+        return new StreamEncoder(this, type);
+    }
+
     public Convert getConvert() {
         return convert;
     }
@@ -171,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);
@@ -206,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);
@@ -215,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;
             }
@@ -358,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) {
@@ -449,6 +568,29 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
         encoders.put(clazz, encoder);
     }
 
+    //coder = null表示删除该字段的指定SimpledCoder
+    public final <E> void register(final Class clazz, final String field, final SimpledCoder<R, W, E> coder) {
+        if (field == null || clazz == null) return;
+        try {
+            clazz.getDeclaredField(field);
+        } catch (Exception e) {
+            throw new RuntimeException(clazz + " not found field(" + field + ")");
+        }
+        if (coder == null) {
+            Map map = this.fieldCoders.get(clazz);
+            if (map != null) map.remove(field);
+        } else {
+            this.fieldCoders.computeIfAbsent(clazz, c -> new ConcurrentHashMap<>()).put(field, coder);
+        }
+    }
+
+    public final <E> SimpledCoder<R, W, E> findFieldCoder(final Type clazz, final String field) {
+        if (field == null) return null;
+        Map<String, SimpledCoder<R, W, ?>> map = this.fieldCoders.get(clazz);
+        if (map == null) return parent == null ? null : parent.findFieldCoder(clazz, field);
+        return (SimpledCoder) map.get(field);
+    }
+
     public final <E> Decodeable<R, E> findDecoder(final Type type) {
         Decodeable<R, E> rs = (Decodeable<R, E>) decoders.get(type);
         if (rs != null) return rs;
@@ -464,7 +606,7 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
     public final <E> Decodeable<R, E> loadDecoder(final Type type) {
         Decodeable<R, E> decoder = findDecoder(type);
         if (decoder != null) return decoder;
-        if (type instanceof GenericArrayType) return new ArrayDecoder(this, type);
+        if (type instanceof GenericArrayType) return createArrayDecoder(type);
         Class clazz;
         if (type instanceof ParameterizedType) {
             final ParameterizedType pts = (ParameterizedType) type;
@@ -517,22 +659,23 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
         Decodeable<R, E> decoder = null;
         ObjectDecoder od = null;
         if (clazz.isEnum()) {
-            decoder = new EnumSimpledCoder(clazz);
+            decoder = createEnumSimpledCoder(clazz);
         } else if (clazz.isArray()) {
-            decoder = new ArrayDecoder(this, type);
+            decoder = createArrayDecoder(type);
         } else if (Collection.class.isAssignableFrom(clazz)) {
-            decoder = new CollectionDecoder(this, type);
+            decoder = createCollectionDecoder(type);
         } else if (Stream.class.isAssignableFrom(clazz)) {
-            decoder = new StreamDecoder(this, type);
+            decoder = createStreamDecoder(type);
         } else if (Map.class.isAssignableFrom(clazz)) {
-            decoder = new MapDecoder(this, type);
+            decoder = createMapDecoder(type);
         } else if (Optional.class == clazz) {
             decoder = new OptionalCoder(this, type);
         } else if (clazz == Object.class) {
-            od = new ObjectDecoder(type);
+            od = createObjectDecoder(type);
             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()) {
@@ -549,7 +692,7 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
                 }
             }
             if (simpleCoder == null) {
-                od = new ObjectDecoder(type);
+                od = createObjectDecoder(type);
                 decoder = od;
             } else {
                 decoder = simpleCoder;
@@ -564,7 +707,7 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
     public final <E> Encodeable<W, E> loadEncoder(final Type type) {
         Encodeable<W, E> encoder = findEncoder(type);
         if (encoder != null) return encoder;
-        if (type instanceof GenericArrayType) return new ArrayEncoder(this, type);
+        if (type instanceof GenericArrayType) return createArrayEncoder(type);
         Class clazz;
         if (type instanceof ParameterizedType) {
             final ParameterizedType pts = (ParameterizedType) type;
@@ -603,20 +746,21 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
         Encodeable<W, E> encoder = null;
         ObjectEncoder oe = null;
         if (clazz.isEnum()) {
-            encoder = new EnumSimpledCoder(clazz);
+            encoder = createEnumSimpledCoder(clazz);
         } else if (clazz.isArray()) {
-            encoder = new ArrayEncoder(this, type);
+            encoder = createArrayEncoder(type);
         } else if (Collection.class.isAssignableFrom(clazz)) {
-            encoder = new CollectionEncoder(this, type);
+            encoder = createCollectionEncoder(type);
         } else if (Stream.class.isAssignableFrom(clazz)) {
-            encoder = new StreamEncoder(this, type);
+            encoder = createStreamEncoder(type);
         } else if (Map.class.isAssignableFrom(clazz)) {
-            encoder = new MapEncoder(this, type);
+            encoder = createMapEncoder(type);
         } else if (Optional.class == clazz) {
             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;
@@ -632,7 +776,7 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
                 }
             }
             if (simpleCoder == null) {
-                oe = new ObjectEncoder(type);
+                oe = createObjectEncoder(type);
                 encoder = oe;
             } else {
                 encoder = simpleCoder;

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

@@ -20,10 +20,12 @@ import org.redkale.util.Attribute;
  * @param <F> 字段的数据类型
  */
 @SuppressWarnings("unchecked")
-public final class DeMember<R extends Reader, T, F> implements Comparable<DeMember<R, T, F>> {
+public final class DeMember<R extends Reader, T, F> {
 
     protected int index;
 
+    protected int position; //从1开始
+
     protected final Attribute<T, F> attribute;
 
     protected Decodeable<R, F> decoder;
@@ -70,15 +72,23 @@ public final class DeMember<R extends Reader, T, F> implements Comparable<DeMemb
         return this.attribute;
     }
 
+    public Decodeable<R, F> getDecoder() {
+        return decoder;
+    }
+
     public int getIndex() {
         return this.index;
     }
 
-    @Override
-    public final int compareTo(DeMember<R, T, F> o) {
+    public int getPosition() {
+        return this.position;
+    }
+
+    public int compareTo(boolean fieldSort, DeMember<R, T, F> o) {
         if (o == null) return -1;
         if (this.index != o.index) return (this.index == 0 ? Integer.MAX_VALUE : this.index) - (o.index == 0 ? Integer.MAX_VALUE : o.index);
-        return this.attribute.field().compareTo(o.attribute.field());
+        if (this.index != 0) throw new RuntimeException("fields (" + attribute.field() + ", " + o.attribute.field() + ") have same ConvertColumn.index(" + this.index + ") in " + attribute.declaringClass());
+        return fieldSort ? this.attribute.field().compareTo(o.attribute.field()) : 0;
     }
 
     @Override
@@ -86,7 +96,7 @@ public final class DeMember<R extends Reader, T, F> implements Comparable<DeMemb
         if (this == obj) return true;
         if (!(obj instanceof DeMember)) return false;
         DeMember other = (DeMember) obj;
-        return compareTo(other) == 0;
+        return compareTo(true, other) == 0;
     }
 
     @Override

src/org/redkale/convert/EnMember.java

@@ -20,7 +20,7 @@ import org.redkale.util.Attribute;
  * @param <F> 字段的数据类型
  */
 @SuppressWarnings("unchecked")
-public final class EnMember<W extends Writer, T, F> implements Comparable<EnMember<W, T, F>> {
+public final class EnMember<W extends Writer, T, F> {
 
     final Attribute<T, F> attribute;
 
@@ -33,6 +33,8 @@ public final class EnMember<W extends Writer, T, F> implements Comparable<EnMemb
 
     protected int index;
 
+    protected int position; //从1开始
+
     public EnMember(Attribute<T, F> attribute, Encodeable<W, F> encoder) {
         this.attribute = attribute;
         this.encoder = encoder;
@@ -63,15 +65,35 @@ public final class EnMember<W extends Writer, T, F> implements Comparable<EnMemb
         return attribute.field().equals(name);
     }
 
+    public Attribute<T, F> getAttribute() {
+        return attribute;
+    }
+
+    public Encodeable<W, F> getEncoder() {
+        return encoder;
+    }
+
+    public boolean isStringType() {
+        return istring;
+    }
+
+    public boolean isBoolType() {
+        return isbool;
+    }
+
     public int getIndex() {
         return this.index;
     }
 
-    @Override
-    public final int compareTo(EnMember<W, T, F> o) {
+    public int getPosition() {
+        return this.position;
+    }
+
+    public int compareTo(boolean fieldSort, EnMember<W, T, F> o) {
         if (o == null) return -1;
         if (this.index != o.index) return (this.index == 0 ? Integer.MAX_VALUE : this.index) - (o.index == 0 ? Integer.MAX_VALUE : o.index);
-        return this.attribute.field().compareTo(o.attribute.field());
+        if (this.index != 0) throw new RuntimeException("fields (" + attribute.field() + ", " + o.attribute.field() + ") have same ConvertColumn.index(" + this.index + ") in " + attribute.declaringClass());
+        return fieldSort ? this.attribute.field().compareTo(o.attribute.field()) : 0;
     }
 
     @Override
@@ -79,7 +101,7 @@ public final class EnMember<W extends Writer, T, F> implements Comparable<EnMemb
         if (this == obj) return true;
         if (!(obj instanceof EnMember)) return false;
         EnMember other = (EnMember) obj;
-        return compareTo(other) == 0;
+        return compareTo(true, other) == 0;
     }
 
     @Override

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>
@@ -21,13 +21,13 @@ import java.util.Map;
  * @param <V> Map value的数据类型
  */
 @SuppressWarnings("unchecked")
-public final class MapDecoder<K, V> implements Decodeable<Reader, Map<K, V>> {
+public class MapDecoder<K, V> implements Decodeable<Reader, Map<K, V>> {
 
-    private final Type type;
+    protected final Type type;
 
-    private final Type keyType;
+    protected final Type keyType;
 
-    private final Type valueType;
+    protected final Type valueType;
 
     protected Creator<Map<K, V>> creator;
 
@@ -35,14 +35,21 @@ public final class MapDecoder<K, V> implements Decodeable<Reader, Map<K, V>> {
 
     protected final Decodeable<Reader, V> valueDecoder;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
-    private final Object lock = new Object();
+    protected final Object lock = new Object();
 
     public MapDecoder(final ConvertFactory factory, final Type type) {
         this.type = type;
         try {
-            if (type instanceof ParameterizedType) {
+            if (type == java.util.Properties.class) {
+                this.keyType = String.class;
+                this.valueType = String.class;
+                this.creator = factory.loadCreator(java.util.Properties.class);
+                factory.register(type, this);
+                this.keyDecoder = factory.loadDecoder(String.class);
+                this.valueDecoder = factory.loadDecoder(String.class);
+            } else if (type instanceof ParameterizedType) {
                 final ParameterizedType pt = (ParameterizedType) type;
                 this.keyType = pt.getActualTypeArguments()[0];
                 this.valueType = pt.getActualTypeArguments()[1];
@@ -67,8 +74,26 @@ public final 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);
+    }
+
+    public Map<K, V> convertFrom(Reader in, DeMember member) {
         if (this.keyDecoder == null || this.valueDecoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
@@ -80,31 +105,85 @@ public final class MapDecoder<K, V> implements Decodeable<Reader, Map<K, V>> {
                 }
             }
         }
-        final int len = in.readMapB();
+        byte[] typevals = new byte[2];
+        int len = in.readMapB(member, typevals, this.keyDecoder, this.valueDecoder);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(member, null);
+            len = Reader.SIGN_NOLENGTH;
+        }
         final Map<K, V> result = this.creator.create();
+        boolean first = true;
+        Decodeable<Reader, K> kdecoder = getKeyDecoder(this.keyDecoder, typevals);
+        Decodeable<Reader, V> vdecoder = getValueDecoder(this.valueDecoder, typevals);
         if (len == Reader.SIGN_NOLENGTH) {
-            while (in.hasNext()) {
-                K key = keyDecoder.convertFrom(in);
-                in.readBlank();
-                V value = valueDecoder.convertFrom(in);
+            int startPosition = in.position();
+            while (hasNext(in, member, startPosition, contentLength, first)) {
+                Reader entryReader = getEntryReader(in, member, first);
+                if (entryReader == null) break;
+                K key = readKeyMember(entryReader, member, kdecoder, first);
+                entryReader.readBlank();
+                V value = readValueMember(entryReader, member, vdecoder, first);
                 result.put(key, value);
+                first = false;
             }
         } else {
             for (int i = 0; i < len; i++) {
-                K key = keyDecoder.convertFrom(in);
+                K key = readKeyMember(in, member, kdecoder, first);
                 in.readBlank();
-                V value = valueDecoder.convertFrom(in);
+                V value = readValueMember(in, member, vdecoder, first);
                 result.put(key, value);
+                first = false;
             }
         }
         in.readMapE();
         return result;
     }
 
+    protected boolean hasNext(Reader in, DeMember member, int startPosition, int contentLength, boolean first) {
+        return in.hasNext(startPosition, contentLength);
+    }
+
+    protected Decodeable<Reader, K> getKeyDecoder(Decodeable<Reader, K> decoder, byte[] typevals) {
+        return decoder;
+    }
+
+    protected Decodeable<Reader, V> getValueDecoder(Decodeable<Reader, V> decoder, byte[] typevals) {
+        return decoder;
+    }
+
+    protected Reader getEntryReader(Reader in, DeMember member, boolean first) {
+        return in;
+    }
+
+    protected K readKeyMember(Reader in, DeMember member, Decodeable<Reader, K> decoder, boolean first) {
+        return decoder.convertFrom(in);
+    }
+
+    protected V readValueMember(Reader in, DeMember member, Decodeable<Reader, V> decoder, boolean first) {
+        return decoder.convertFrom(in);
+    }
+
     @Override
     public Type getType() {
         return this.type;
     }
 
+    public Type getKeyType() {
+        return keyType;
+    }
+
+    public Type getValueType() {
+        return valueType;
+    }
+
+    public Decodeable<Reader, K> getKeyDecoder() {
+        return keyDecoder;
+    }
+
+    public Decodeable<Reader, V> getValueDecoder() {
+        return valueDecoder;
+    }
+
 }

src/org/redkale/convert/MapEncoder.java

@@ -20,28 +20,28 @@ import java.util.Map;
  * @param <V> Map value的数据类型
  */
 @SuppressWarnings("unchecked")
-public final class MapEncoder<K, V> implements Encodeable<Writer, Map<K, V>> {
+public class MapEncoder<K, V> implements Encodeable<Writer, Map<K, V>> {
 
-    private final Type type;
+    protected final Type type;
 
-    private final Encodeable<Writer, K> keyencoder;
+    protected final Encodeable<Writer, K> keyEncoder;
 
-    private final Encodeable<Writer, V> valencoder;
+    protected final Encodeable<Writer, V> valueEncoder;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
-    private final Object lock = new Object();
+    protected final Object lock = new Object();
 
     public MapEncoder(final ConvertFactory factory, final Type type) {
         this.type = type;
         try {
             if (type instanceof ParameterizedType) {
                 final Type[] pt = ((ParameterizedType) type).getActualTypeArguments();
-                this.keyencoder = factory.loadEncoder(pt[0]);
-                this.valencoder = factory.loadEncoder(pt[1]);
+                this.keyEncoder = factory.loadEncoder(pt[0]);
+                this.valueEncoder = factory.loadEncoder(pt[1]);
             } else {
-                this.keyencoder = factory.getAnyEncoder();
-                this.valencoder = factory.getAnyEncoder();
+                this.keyEncoder = factory.getAnyEncoder();
+                this.valueEncoder = factory.getAnyEncoder();
             }
         } finally {
             inited = true;
@@ -53,13 +53,17 @@ public final class MapEncoder<K, V> implements Encodeable<Writer, Map<K, V>> {
 
     @Override
     public void convertTo(Writer out, Map<K, V> value) {
+        convertTo(out, null, value);
+    }
+
+    public void convertTo(Writer out, EnMember member, Map<K, V> value) {
         final Map<K, V> values = value;
         if (values == null) {
             out.writeNull();
             return;
         }
 
-        if (this.keyencoder == null || this.valencoder == null) {
+        if (this.keyEncoder == null || this.valueEncoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -70,20 +74,42 @@ public final class MapEncoder<K, V> implements Encodeable<Writer, Map<K, V>> {
                 }
             }
         }
-        out.writeMapB(values.size());
-        boolean first = true;
-        for (Map.Entry<K, V> en : values.entrySet()) {
-            if (!first) out.writeArrayMark();
-            this.keyencoder.convertTo(out, en.getKey());
-            out.writeMapMark();
-            this.valencoder.convertTo(out, en.getValue());
-            if (first) first = false;
+        if (out.writeMapB(values.size(), (Encodeable) keyEncoder, (Encodeable) valueEncoder, value) < 0) {
+            boolean first = true;
+            for (Map.Entry<K, V> en : values.entrySet()) {
+                if (!first) out.writeArrayMark();
+                writeMemberValue(out, member, en.getKey(), en.getValue(), first);
+                if (first) first = false;
+            }
         }
         out.writeMapE();
     }
 
+    protected void writeMemberValue(Writer out, EnMember member, K key, V value, boolean first) {
+        keyEncoder.convertTo(out, key);
+        out.writeMapMark();
+        valueEncoder.convertTo(out, value);
+    }
+
     @Override
     public Type getType() {
         return type;
     }
+
+    public Type getKeyType() {
+        return keyEncoder == null ? null : keyEncoder.getType();
+    }
+
+    public Type getValueType() {
+        return valueEncoder == null ? null : valueEncoder.getType();
+    }
+
+    public Encodeable<Writer, K> getKeyEncoder() {
+        return keyEncoder;
+    }
+
+    public Encodeable<Writer, V> getValueEncoder() {
+        return valueEncoder;
+    }
+
 }

src/org/redkale/convert/ObjectDecoder.java

@@ -7,9 +7,7 @@ package org.redkale.convert;
 
 import org.redkale.util.Creator;
 import java.lang.reflect.*;
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
+import java.util.*;
 import org.redkale.util.*;
 
 /**
@@ -23,7 +21,7 @@ import org.redkale.util.*;
  * @param <T> 反解析的数据类型
  */
 @SuppressWarnings("unchecked")
-public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
+public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
 
     protected final Type type;
 
@@ -33,13 +31,13 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
 
     protected DeMember<R, T, ?>[] creatorConstructorMembers = new DeMember[0];
 
-    protected DeMember<R, T, ?>[] members;
+    protected DeMember[] members;
 
     protected ConvertFactory factory;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
-    private final Object lock = new Object();
+    protected final Object lock = new Object();
 
     protected ObjectDecoder(Type type) {
         this.type = ((type instanceof Class) && ((Class) type).isInterface()) ? Object.class : type;
@@ -63,7 +61,10 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
     public void init(final ConvertFactory factory) {
         this.factory = factory;
         try {
-            if (type == Object.class) return;
+            if (type == Object.class) {
+                this.creatorConstructorMembers = null;
+                return;
+            }
 
             Class clazz = null;
             if (type instanceof ParameterizedType) {
@@ -86,17 +87,21 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                 this.creator = factory.loadCreator(clazz);
                 if (this.creator == null) throw new ConvertException("Cannot create a creator for " + clazz);
             }
-            final Set<DeMember> list = new HashSet();
+            final Set<DeMember> list = new LinkedHashSet();
             final String[] cps = ObjectEncoder.findConstructorProperties(this.creator);
             try {
                 ConvertColumnEntry ref;
                 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;
-                    Type t = TypeToken.createClassType(TypeToken.getGenericType(field.getGenericType(), this.type), this.type);
-                    DeMember member = new DeMember(ObjectEncoder.createAttribute(factory, clazz, field, null, null), factory.loadDecoder(t));
+                    Decodeable<R, ?> fieldCoder = factory.findFieldCoder(clazz, field.getName());
+                    if (fieldCoder == null) {
+                        Type t = TypeToken.createClassType(TypeToken.getGenericType(field.getGenericType(), this.type), this.type);
+                        fieldCoder = factory.loadDecoder(t);
+                    }
+                    DeMember member = new DeMember(ObjectEncoder.createAttribute(factory, clazz, field, null, null), fieldCoder);
                     if (ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
@@ -118,10 +123,15 @@ public final 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;
-                    Type t = TypeToken.createClassType(TypeToken.getGenericType(method.getGenericParameterTypes()[0], this.type), this.type);
-                    DeMember member = new DeMember(ObjectEncoder.createAttribute(factory, clazz, null, null, method), factory.loadDecoder(t));
+
+                    Decodeable<R, ?> fieldCoder = factory.findFieldCoder(clazz, ConvertFactory.readGetSetFieldName(method));
+                    if (fieldCoder == null) {
+                        Type t = TypeToken.createClassType(TypeToken.getGenericType(method.getGenericParameterTypes()[0], this.type), this.type);
+                        fieldCoder = factory.loadDecoder(t);
+                    }
+                    DeMember member = new DeMember(ObjectEncoder.createAttribute(factory, clazz, null, null, method), fieldCoder);
                     if (ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
@@ -156,7 +166,20 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                     }
                 }
                 this.members = list.toArray(new DeMember[list.size()]);
-                Arrays.sort(this.members);
+                Arrays.sort(this.members, (a, b) -> a.compareTo(factory.isFieldSort(), b));
+                Set<Integer> pos = new HashSet<>();
+                for (int i = 0; i < this.members.length; i++) {
+                    if (this.members[i].index > 0) pos.add(this.members[i].index);
+                }
+                int pidx = 0;
+                for (DeMember member : this.members) {
+                    if (member.index > 0) {
+                        member.position = member.index;
+                    } else {
+                        while (pos.contains(++pidx));
+                        member.position = pidx;
+                    }
+                }
 
                 if (cps != null) {
                     final String[] fields = cps;
@@ -190,7 +213,7 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
      * @return 反解析后的对象结果
      */
     @Override
-    public final T convertFrom(final R in) {
+    public T convertFrom(final R in) {
         final String clazz = in.readObjectB(typeClass);
         if (clazz == null) return null;
         if (!clazz.isEmpty()) return (T) factory.loadDecoder(factory.getEntityAlias(clazz)).convertFrom(in);
@@ -209,15 +232,17 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
             }
         }
         if (this.creatorConstructorMembers == null) {  //空构造函数
-            final T result = this.creator.create();
-            while (in.hasNext()) {
+            final T result = this.creator == null ? null : this.creator.create();
+            boolean first = true;
+            while (hasNext(in, first)) {
                 DeMember member = in.readFieldName(members);
                 in.readBlank();
                 if (member == null) {
                     in.skipValue(); //跳过不存在的属性的值
                 } else {
-                    member.read(in, result);
+                    readMemberValue(in, member, result, first);
                 }
+                first = false;
             }
             in.readObjectE(typeClass);
             return result;
@@ -226,13 +251,14 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
             final Object[] constructorParams = new Object[fields.length];
             final Object[][] otherParams = new Object[this.members.length][2];
             int oc = 0;
-            while (in.hasNext()) {
+            boolean first = true;
+            while (hasNext(in, first)) {
                 DeMember member = in.readFieldName(members);
                 in.readBlank();
                 if (member == null) {
                     in.skipValue(); //跳过不存在的属性的值
                 } else {
-                    Object val = member.read(in);
+                    Object val = readMemberValue(in, member, first);
                     boolean flag = true;
                     for (int i = 0; i < fields.length; i++) {
                         if (member == fields[i]) {
@@ -242,9 +268,12 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
                         }
                     }
                     if (flag) otherParams[oc++] = new Object[]{member.attribute, val};
+
                 }
+                first = false;
             }
             in.readObjectE(typeClass);
+            if (this.creator == null) return null;
             final T result = this.creator.create(constructorParams);
             for (int i = 0; i < oc; i++) {
                 ((Attribute) otherParams[i][0]).set(result, otherParams[i][1]);
@@ -253,11 +282,27 @@ public final class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T
         }
     }
 
+    protected boolean hasNext(R in, boolean first) {
+        return in.hasNext();
+    }
+
+    protected Object readMemberValue(R in, DeMember member, boolean first) {
+        return member.read(in);
+    }
+
+    protected void readMemberValue(R in, DeMember member, T result, boolean first) {
+        member.read(in, result);
+    }
+
     @Override
-    public final Type getType() {
+    public Type getType() {
         return this.type;
     }
 
+    public DeMember[] getMembers() {
+        return Arrays.copyOf(members, members.length);
+    }
+
     @Override
     public String toString() {
         return "ObjectDecoder{" + "type=" + type + ", members=" + Arrays.toString(members) + '}';

src/org/redkale/convert/ObjectEncoder.java

@@ -20,7 +20,7 @@ import org.redkale.util.*;
  * @param <T> 序列化的数据类型
  */
 @SuppressWarnings("unchecked")
-public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
+public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
 
     static final Type[] TYPEZERO = new Type[0];
 
@@ -32,9 +32,9 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
 
     protected ConvertFactory factory;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
-    private final Object lock = new Object();
+    protected final Object lock = new Object();
 
     protected ObjectEncoder(Type type) {
         this.type = type;
@@ -61,7 +61,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
             if (type == Object.class) return;
             //if (!(type instanceof Class)) throw new ConvertException("[" + type + "] is no a class");
             final Class clazz = this.typeClass;
-            final Set<EnMember> list = new HashSet();
+            final Set<EnMember> list = new LinkedHashSet();
             final boolean reversible = factory.isReversible();
             Creator creator = null;
             try {
@@ -75,10 +75,14 @@ public final 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;
-                    Type t = TypeToken.createClassType(TypeToken.getGenericType(field.getGenericType(), this.type), this.type);
-                    EnMember member = new EnMember(createAttribute(factory, clazz, field, null, null), factory.loadEncoder(t));
+                    Encodeable<W, ?> fieldCoder = factory.findFieldCoder(clazz, field.getName());
+                    if (fieldCoder == null) {
+                        Type t = TypeToken.createClassType(TypeToken.getGenericType(field.getGenericType(), this.type), this.type);
+                        fieldCoder = factory.loadEncoder(t);
+                    }
+                    EnMember member = new EnMember(createAttribute(factory, clazz, field, null, null), fieldCoder);
                     if (ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
@@ -100,15 +104,32 @@ public final 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;
-                    Type t = TypeToken.createClassType(TypeToken.getGenericType(method.getGenericReturnType(), this.type), this.type);
-                    EnMember member = new EnMember(createAttribute(factory, clazz, null, method, null), factory.loadEncoder(t));
+                    Encodeable<W, ?> fieldCoder = factory.findFieldCoder(clazz, ConvertFactory.readGetSetFieldName(method));
+                    if (fieldCoder == null) {
+                        Type t = TypeToken.createClassType(TypeToken.getGenericType(method.getGenericReturnType(), this.type), this.type);
+                        fieldCoder = factory.loadEncoder(t);
+                    }
+                    EnMember member = new EnMember(createAttribute(factory, clazz, null, method, null), fieldCoder);
                     if (ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
                 this.members = list.toArray(new EnMember[list.size()]);
-                Arrays.sort(this.members);
+                Arrays.sort(this.members, (a, b) -> a.compareTo(factory.isFieldSort(), b));
+                Set<Integer> pos = new HashSet<>();
+                for (int i = 0; i < this.members.length; i++) {
+                    if (this.members[i].index > 0) pos.add(this.members[i].index);
+                }
+                int pidx = 0;
+                for (EnMember member : this.members) {
+                    if (member.index > 0) {
+                        member.position = member.index;
+                    } else {
+                        while (pos.contains(++pidx));
+                        member.position = pidx;
+                    }
+                }
 
             } catch (Exception ex) {
                 throw new ConvertException(ex);
@@ -122,7 +143,7 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
     }
 
     @Override
-    public final void convertTo(W out, T value) {
+    public void convertTo(W out, T value) {
         if (value == null) {
             out.writeObjectNull(null);
             return;
@@ -136,24 +157,42 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
                 }
             }
         }
-        if (value.getClass() != this.typeClass) {
+        if (value.getClass() != this.typeClass && !this.type.equals(out.specify())) {
             final Class clz = value.getClass();
             if (out.needWriteClassName()) out.writeClassName(factory.getEntityAlias(clz));
             factory.loadEncoder(clz).convertTo(out, value);
             return;
         }
-        out.writeObjectB(value);
-        for (EnMember member : members) {
-            out.writeObjectField(member, value);
+        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);
     }
 
     @Override
-    public final Type getType() {
+    public Type getType() {
         return this.type;
     }
 
+    public EnMember[] getMembers() {
+        return Arrays.copyOf(members, members.length);
+    }
+
     @Override
     public String toString() {
         return "ObjectEncoder{" + "type=" + type + ", members=" + Arrays.toString(members) + '}';
@@ -227,24 +266,24 @@ public final class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T
     static Attribute createAttribute(final ConvertFactory factory, Class clazz, final Field field, final Method getter, final Method setter) {
         String fieldalias;
         if (field != null) { // public field
-            ConvertColumnEntry ref = factory.findRef(field);
+            ConvertColumnEntry ref = factory.findRef(clazz, field);
             fieldalias = ref == null || ref.name().isEmpty() ? field.getName() : ref.name();
         } else if (getter != null) {
-            ConvertColumnEntry ref = factory.findRef(getter);
+            ConvertColumnEntry ref = factory.findRef(clazz, getter);
             String mfieldname = ConvertFactory.readGetSetFieldName(getter);
             if (ref == null) {
                 try {
-                    ref = factory.findRef(clazz.getDeclaredField(mfieldname));
+                    ref = factory.findRef(clazz, clazz.getDeclaredField(mfieldname));
                 } catch (Exception e) {
                 }
             }
             fieldalias = ref == null || ref.name().isEmpty() ? mfieldname : ref.name();
         } else { // setter != null
-            ConvertColumnEntry ref = factory.findRef(setter);
+            ConvertColumnEntry ref = factory.findRef(clazz, setter);
             String mfieldname = ConvertFactory.readGetSetFieldName(setter);
             if (ref == null) {
                 try {
-                    ref = factory.findRef(clazz.getDeclaredField(mfieldname));
+                    ref = factory.findRef(clazz, clazz.getDeclaredField(mfieldname));
                 } catch (Exception e) {
                 }
             }

src/org/redkale/convert/OptionalCoder.java

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

src/org/redkale/convert/Reader.java

@@ -15,6 +15,10 @@ package org.redkale.convert;
  */
 public abstract class Reader {
 
+    public static enum ValueType {
+        STRING, ARRAY, MAP;
+    }
+
     //当前对象字段名的游标
     protected int fieldIndex;
 
@@ -22,12 +26,46 @@ public abstract class Reader {
 
     public static final short SIGN_NOLENGTH = -2;
 
+    public static final short SIGN_NOLENBUTBYTES = -3; //目前只适合于protobuf的boolean[]...double[]类型
+
     /**
-     * 是否还存在下个元素或字段
+     * 是否还存在下个元素或字段 <br>
+     * 注意: 主要用于Array、Collection、Stream或Map等集合对象
+     *
+     * @param startPosition 起始位置
+     * @param contentLength 内容大小， 不确定的传-1
      *
      * @return 是否还存在下个元素或字段
      */
-    public abstract boolean hasNext();
+    public abstract boolean hasNext(int startPosition, int contentLength);
+
+    /**
+     * 是否还存在下个元素或字段
+     *
+     *
+     * @return 是否还存在下个元素或字段
+     */
+    public boolean hasNext() {
+        return hasNext(-1, -1);
+    }
+
+    /**
+     * 获取当前位置
+     *
+     * @return 当前位置
+     */
+    public abstract int position();
+
+    /**
+     * 读取字段值内容的字节数 <br>
+     * 只有在readXXXB方法返回SIGN_NOLENBUTBYTES值才会调用此方法
+     *
+     * @param member  DeMember
+     * @param decoder Decodeable
+     *
+     * @return 内容大小， 不确定返回-1
+     */
+    public abstract int readMemberContentLength(DeMember member, Decodeable decoder);
 
     /**
      * 跳过值(不包含值前面的字段)
@@ -39,6 +77,13 @@ public abstract class Reader {
      */
     public abstract void readBlank();
 
+    /**
+     * 读取下个值的类型
+     *
+     * @return ValueType
+     */
+    public abstract ValueType readType();
+
     /**
      * 读取对象的类名， 返回 null 表示对象为null， 返回空字符串表示当前class与返回的class一致，返回非空字符串表示class是当前class的子类。
      *
@@ -61,9 +106,13 @@ public abstract class Reader {
     /**
      * 读取数组的开头并返回数组的长度
      *
+     * @param member           DeMember
+     * @param typevals         byte[]
+     * @param componentDecoder Decodeable
+     *
      * @return 返回数组的长度
      */
-    public abstract int readArrayB();
+    public abstract int readArrayB(DeMember member, byte[] typevals, Decodeable componentDecoder);
 
     /**
      * 读取数组的尾端
@@ -74,9 +123,14 @@ public abstract class Reader {
     /**
      * 读取map的开头并返回map的size
      *
+     * @param member       DeMember
+     * @param typevals     byte[]
+     * @param keyDecoder   Decodeable
+     * @param valueDecoder Decodeable
+     *
      * @return 返回map的size
      */
-    public abstract int readMapB();
+    public abstract int readMapB(DeMember member, byte[] typevals, Decodeable keyDecoder, Decodeable valueDecoder);
 
     /**
      * 读取数组的尾端
@@ -107,6 +161,13 @@ public abstract class Reader {
      */
     public abstract byte readByte();
 
+    /**
+     * 读取byte[]
+     *
+     * @return byte[]
+     */
+    public abstract byte[] readByteArray();
+
     /**
      * 读取一个char值
      *

src/org/redkale/convert/SimpledCoder.java

@@ -22,7 +22,7 @@ import java.lang.reflect.Type;
  */
 public abstract class SimpledCoder<R extends Reader, W extends Writer, T> implements Decodeable<R, T>, Encodeable<W, T> {
 
-    private Type type;
+    protected Type type;
 
     @Override
     public abstract void convertTo(final W out, final T value);

src/org/redkale/convert/StreamDecoder.java

@@ -22,19 +22,19 @@ import java.util.stream.Stream;
  * @param <T> 反解析的集合元素类型
  */
 @SuppressWarnings("unchecked")
-public final class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
+public class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
 
-    private final Type type;
+    protected final Type type;
 
-    private final Type componentType;
+    protected final Type componentType;
 
     protected Creator<Stream<T>> creator;
 
-    protected final Decodeable<Reader, T> decoder;
+    protected final Decodeable<Reader, T> componentDecoder;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
-    private final Object lock = new Object();
+    protected final Object lock = new Object();
 
     public StreamDecoder(final ConvertFactory factory, final Type type) {
         this.type = type;
@@ -44,7 +44,7 @@ public final class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
                 this.componentType = pt.getActualTypeArguments()[0];
                 this.creator = factory.loadCreator((Class) pt.getRawType());
                 factory.register(type, this);
-                this.decoder = factory.loadDecoder(this.componentType);
+                this.componentDecoder = factory.loadDecoder(this.componentType);
             } else {
                 throw new ConvertException("StreamDecoder not support the type (" + type + ")");
             }
@@ -58,9 +58,19 @@ public final class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
 
     @Override
     public Stream<T> convertFrom(Reader in) {
-        final int len = in.readArrayB();
+        return convertFrom(in, null);
+    }
+
+    public Stream<T> convertFrom(Reader in, DeMember member) {
+        byte[] typevals = new byte[1];
+        int len = in.readArrayB(member, typevals, this.componentDecoder);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
-        if (this.decoder == null) {
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(member, this.componentDecoder);
+            len = Reader.SIGN_NOLENGTH;
+        }
+        if (this.componentDecoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -71,11 +81,16 @@ public final class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
                 }
             }
         }
-        final Decodeable<Reader, T> localdecoder = this.decoder;
+        final Decodeable<Reader, T> localdecoder = getComponentDecoder(this.componentDecoder, typevals);
         final List<T> result = new ArrayList();
+        boolean first = true;
         if (len == Reader.SIGN_NOLENGTH) {
-            while (in.hasNext()) {
-                result.add(localdecoder.convertFrom(in));
+            int startPosition = in.position();
+            while (hasNext(in, member, startPosition, contentLength, first)) {
+                Reader itemReader = getItemReader(in, member, first);
+                if (itemReader == null) break;
+                result.add(readMemberValue(itemReader, member, localdecoder, first));
+                first = false;
             }
         } else {
             for (int i = 0; i < len; i++) {
@@ -86,9 +101,33 @@ public final class StreamDecoder<T> implements Decodeable<Reader, Stream<T>> {
         return result.stream();
     }
 
+    protected boolean hasNext(Reader in, DeMember member, int startPosition, int contentLength, boolean first) {
+        return in.hasNext(startPosition, contentLength);
+    }
+
+    protected Decodeable<Reader, T> getComponentDecoder(Decodeable<Reader, T> decoder, byte[] typevals) {
+        return decoder;
+    }
+
+    protected Reader getItemReader(Reader in, DeMember member, boolean first) {
+        return in;
+    }
+
+    protected T readMemberValue(Reader in, DeMember member, Decodeable<Reader, T> decoder, boolean first) {
+        return decoder.convertFrom(in);
+    }
+
     @Override
     public Type getType() {
         return type;
     }
 
+    public Type getComponentType() {
+        return componentType;
+    }
+
+    public Decodeable<Reader, T> getComponentDecoder() {
+        return componentDecoder;
+    }
+
 }

src/org/redkale/convert/StreamEncoder.java

@@ -19,15 +19,15 @@ import java.util.stream.Stream;
  * @param <T> 序列化的集合元素类型
  */
 @SuppressWarnings("unchecked")
-public final class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
+public class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
 
-    private final Type type;
+    protected final Type type;
 
-    private final Encodeable<Writer, Object> encoder;
+    protected final Encodeable<Writer, Object> componentEncoder;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
-    private final Object lock = new Object();
+    protected final Object lock = new Object();
 
     public StreamEncoder(final ConvertFactory factory, final Type type) {
         this.type = type;
@@ -35,12 +35,12 @@ public final class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
             if (type instanceof ParameterizedType) {
                 Type t = ((ParameterizedType) type).getActualTypeArguments()[0];
                 if (t instanceof TypeVariable) {
-                    this.encoder = factory.getAnyEncoder();
+                    this.componentEncoder = factory.getAnyEncoder();
                 } else {
-                    this.encoder = factory.loadEncoder(t);
+                    this.componentEncoder = factory.loadEncoder(t);
                 }
             } else {
-                this.encoder = factory.getAnyEncoder();
+                this.componentEncoder = factory.getAnyEncoder();
             }
         } finally {
             inited = true;
@@ -52,17 +52,21 @@ public final class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
 
     @Override
     public void convertTo(Writer out, Stream<T> value) {
+        convertTo(out, null, value);
+    }
+
+    public void convertTo(Writer out, EnMember member, Stream<T> value) {
         if (value == null) {
             out.writeNull();
             return;
         }
         Object[] array = value.toArray();
         if (array.length == 0) {
-            out.writeArrayB(0);
+            out.writeArrayB(0, componentEncoder, array);
             out.writeArrayE();
             return;
         }
-        if (this.encoder == null) {
+        if (this.componentEncoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -73,18 +77,31 @@ public final class StreamEncoder<T> implements Encodeable<Writer, Stream<T>> {
                 }
             }
         }
-        out.writeArrayB(array.length);
-        boolean first = true;
-        for (Object v : array) {
-            if (!first) out.writeArrayMark();
-            encoder.convertTo(out, v);
-            if (first) first = false;
+        if (out.writeArrayB(array.length, componentEncoder, array) < 0) {
+            boolean first = true;
+            for (Object v : array) {
+                if (!first) out.writeArrayMark();
+                writeMemberValue(out, member, v, first);
+                if (first) first = false;
+            }
         }
         out.writeArrayE();
     }
 
+    protected void writeMemberValue(Writer out, EnMember member, Object value, boolean first) {
+        componentEncoder.convertTo(out, value);
+    }
+
     @Override
     public Type getType() {
         return type;
     }
+
+    public Encodeable<Writer, Object> getComponentEncoder() {
+        return componentEncoder;
+    }
+
+    public Type getComponentType() {
+        return componentEncoder == null ? null : componentEncoder.getType();
+    }
 }

src/org/redkale/convert/Writer.java

@@ -5,7 +5,9 @@
  */
 package org.redkale.convert;
 
-import org.redkale.util.Attribute;
+import java.lang.reflect.*;
+import java.util.function.*;
+import org.redkale.util.*;
 
 /**
  * 序列化的数据输出流
@@ -20,6 +22,44 @@ public abstract class Writer {
     //当前对象输出字段名之前是否需要分隔符， JSON字段间的分隔符为,逗号
     protected boolean comma;
 
+    //convertTo时是否以指定Type的ObjectEncoder进行处理
+    protected Type specify;
+
+    //对某个字段值进行动态处理
+    protected BiFunction<Attribute, Object, Object> objFieldFunc;
+
+    //对某个对象进行动态扩展字段值处理
+    protected Function<Object, ConvertField[]> objExtFunc;
+
+    /**
+     * 设置specify
+     *
+     * @param value Type
+     */
+    public void specify(Type value) {
+        if (value instanceof GenericArrayType) {
+            this.specify = ((GenericArrayType) value).getGenericComponentType();
+        } else if (value instanceof Class && ((Class) value).isArray()) {
+            this.specify = ((Class) value).getComponentType();
+        } else {
+            this.specify = value;
+        }
+    }
+
+    protected boolean recycle() {
+        this.objFieldFunc = null;
+        return true;
+    }
+
+    /**
+     * 返回specify
+     *
+     * @return int
+     */
+    public Type specify() {
+        return this.specify;
+    }
+
     /**
      * 当tiny=true时， 字符串为空、boolean为false的字段值都会被跳过， 不会输出。
      *
@@ -51,9 +91,12 @@ public abstract class Writer {
      * 注： 覆盖此方法必须要先调用父方法 super.writeObjectB(obj);
      *
      * @param obj 写入的对象
+     *
+     * @return 返回-1表示还没有写入对象内容，大于-1表示已写入对象内容，返回对象内容大小
      */
-    public void writeObjectB(Object obj) {
+    public int writeObjectB(Object obj) {
         this.comma = false;
+        return -1;
     }
 
     /**
@@ -74,8 +117,13 @@ public abstract class Writer {
      * @param obj    写入的对象
      */
     @SuppressWarnings("unchecked")
-    public final void writeObjectField(final EnMember member, Object obj) {
-        Object value = member.attribute.get(obj);
+    public void writeObjectField(final EnMember member, Object 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) {
@@ -84,11 +132,49 @@ public abstract class Writer {
                 if (!((Boolean) value)) return;
             }
         }
-        this.writeFieldName(member.attribute);
+        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());
+    }
+
     /**
      * 输出一个对象后的操作
      *
@@ -99,9 +185,13 @@ public abstract class Writer {
     /**
      * 输出一个数组前的操作
      *
-     * @param size 数组长度
+     * @param size             数组长度
+     * @param componentEncoder Encodeable
+     * @param obj              对象, 不一定是数组、Collection对象，也可能是伪Collection对象
+     *
+     * @return 返回-1表示还没有写入对象内容，大于-1表示已写入对象内容，返回对象内容大小
      */
-    public abstract void writeArrayB(int size);
+    public abstract int writeArrayB(int size, Encodeable<Writer, Object> componentEncoder, Object obj);
 
     /**
      * 输出数组元素间的间隔符
@@ -118,9 +208,14 @@ public abstract class Writer {
     /**
      * 输出一个Map前的操作
      *
-     * @param size map大小
+     * @param size         map大小
+     * @param keyEncoder   Encodeable
+     * @param valueEncoder Encodeable
+     * @param obj          对象, 不一定是Map对象，也可能是伪Map对象
+     *
+     * @return 返回-1表示还没有写入对象内容，大于-1表示已写入对象内容，返回对象内容大小
      */
-    public abstract void writeMapB(int size);
+    public abstract int writeMapB(int size, Encodeable<Writer, Object> keyEncoder, Encodeable<Writer, Object> valueEncoder, Object obj);
 
     /**
      * 输出一个Map中key与value间的间隔符
@@ -137,9 +232,11 @@ public abstract class Writer {
     /**
      * 输出一个字段名
      *
-     * @param attribute 字段的Attribute对象
+     * @param fieldName 字段名称
+     * @param fieldType 字段类型
+     * @param fieldPos  字段顺序
      */
-    public abstract void writeFieldName(Attribute attribute);
+    public abstract void writeFieldName(String fieldName, Type fieldType, int fieldPos);
 
     /**
      * 写入一个boolean值
@@ -155,6 +252,13 @@ public abstract class Writer {
      */
     public abstract void writeByte(byte value);
 
+    /**
+     * 写入byte[]
+     *
+     * @param values byte[]
+     */
+    public abstract void writeByteArray(byte[] values);
+
     /**
      * 写入一个char值
      *
@@ -210,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/BsonByteBufferReader.java

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

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

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

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

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

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

@@ -93,53 +93,27 @@ public class BsonReader extends Reader {
         final byte val = this.typeval;
         this.typeval = 0;
         switch (val) {
-            case 1: readBoolean();
+            case 11: readBoolean();
                 break;
-            case 2: readByte();
+            case 12: readByte();
                 break;
-            case 3: readShort();
+            case 13: readShort();
                 break;
-            case 4: readChar();
+            case 14: readChar();
                 break;
-            case 5: readInt();
+            case 15: readInt();
                 break;
-            case 6: readLong();
+            case 16: readLong();
                 break;
-            case 7: readFloat();
+            case 17: readFloat();
                 break;
-            case 8: readDouble();
+            case 18: readDouble();
                 break;
-            case 9: readString();
+            case 19: readString();
                 break;
-            case 101:
-                BoolArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 102:
-                ByteArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 103:
-                ShortArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 104:
-                CharArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 105:
-                IntArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 106:
-                LongArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 107:
-                FloatArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 108:
-                DoubleArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 109:
-                StringArraySimpledCoder.instance.convertFrom(this);
-                break;
-            case 127:
-                BsonFactory.objectDecoder.convertFrom(this);
+            default:
+                Decodeable decoder = BsonFactory.typeEnum(val);
+                if (decoder != null) decoder.convertFrom(this);
                 break;
         }
     }
@@ -171,8 +145,17 @@ public class BsonReader extends Reader {
     }
 
     @Override
-    public final int readMapB() {
-        return readArrayB();
+    public int readMapB(DeMember member, byte[] typevals, Decodeable keyDecoder, Decodeable valueDecoder) {
+        short bt = readShort();
+        if (bt == Reader.SIGN_NULL) return bt;
+        int rs = (bt & 0xffff) << 16 | ((content[++this.position] & 0xff) << 8) | (content[++this.position] & 0xff);
+        byte kt = readByte();
+        byte vt = readByte();
+        if (typevals != null) {
+            typevals[0] = kt;
+            typevals[1] = vt;
+        }
+        return rs;
     }
 
     @Override
@@ -185,10 +168,15 @@ public class BsonReader extends Reader {
      * @return 数组长度或SIGN_NULL
      */
     @Override
-    public int readArrayB() {
+    public int readArrayB(DeMember member, byte[] typevals, Decodeable componentDecoder) { //componentDecoder可能为null
         short bt = readShort();
         if (bt == Reader.SIGN_NULL) return bt;
-        return (bt & 0xffff) << 16 | ((content[++this.position] & 0xff) << 8) | (content[++this.position] & 0xff);
+        int rs = (bt & 0xffff) << 16 | ((content[++this.position] & 0xff) << 8) | (content[++this.position] & 0xff);
+        if (componentDecoder != null && componentDecoder != ByteSimpledCoder.instance) {
+            byte comval = readByte();
+            if (typevals != null) typevals[0] = comval;
+        }
+        return rs;
     }
 
     @Override
@@ -202,13 +190,26 @@ public class BsonReader extends Reader {
     public final void readBlank() {
     }
 
+    @Override
+    public int position() {
+        return this.position;
+    }
+
+    @Override
+    public int readMemberContentLength(DeMember member, Decodeable decoder) {
+        return -1;
+    }
+
     /**
      * 判断对象是否存在下一个属性或者数组是否存在下一个元素
      *
+     * @param startPosition 起始位置
+     * @param contentLength 内容大小， 不确定的传-1
+     *
      * @return 是否存在
      */
     @Override
-    public final boolean hasNext() {
+    public boolean hasNext(int startPosition, int contentLength) {
         byte b = readByte();
         if (b == SIGN_HASNEXT) return true;
         if (b != SIGN_NONEXT) throw new ConvertException("hasNext option must be (" + (SIGN_HASNEXT)
@@ -248,6 +249,41 @@ public class BsonReader extends Reader {
         return content[++this.position];
     }
 
+    @Override
+    public final byte[] readByteArray() {
+        int len = readArrayB(null, null, null);
+        int contentLength = -1;
+        if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = readMemberContentLength(null, null);
+            len = Reader.SIGN_NOLENGTH;
+        }
+        if (len == Reader.SIGN_NOLENGTH) {
+            int size = 0;
+            byte[] data = new byte[8];
+            int startPosition = position();
+            while (hasNext(startPosition, contentLength)) {
+                if (size >= data.length) {
+                    byte[] newdata = new byte[data.length + 4];
+                    System.arraycopy(data, 0, newdata, 0, size);
+                    data = newdata;
+                }
+                data[size++] = readByte();
+            }
+            readArrayE();
+            byte[] newdata = new byte[size];
+            System.arraycopy(data, 0, newdata, 0, size);
+            return newdata;
+        } else {
+            byte[] values = new byte[len];
+            for (int i = 0; i < values.length; i++) {
+                values[i] = readByte();
+            }
+            readArrayE();
+            return values;
+        }
+    }
+
     @Override
     public char readChar() {
         return (char) ((0xff00 & (content[++this.position] << 8)) | (0xff & content[++this.position]));
@@ -310,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,8 +5,10 @@
  */
 package org.redkale.convert.bson;
 
+import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
 import org.redkale.convert.*;
+import org.redkale.convert.ext.ByteSimpledCoder;
 import org.redkale.util.*;
 
 /**
@@ -42,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() {
@@ -96,9 +98,12 @@ public class BsonWriter extends Writer {
         count += len;
     }
 
+    @Override
     protected boolean recycle() {
+        super.recycle();
         this.count = 0;
-        if (this.content.length > defaultSize) {
+        this.specify = null;
+        if (this.content != null && this.content.length > defaultSize) {
             this.content = new byte[defaultSize];
         }
         return true;
@@ -124,6 +129,22 @@ public class BsonWriter extends Writer {
         writeTo(value);
     }
 
+    @Override
+    public final void writeByteArray(byte[] values) {
+        if (values == null) {
+            writeNull();
+            return;
+        }
+        writeArrayB(values.length, null, values);
+        boolean flag = false;
+        for (byte v : values) {
+            if (flag) writeArrayMark();
+            writeByte(v);
+            flag = true;
+        }
+        writeArrayE();
+    }
+
     @Override
     public final void writeChar(final char value) {
         writeTo((byte) ((value & 0xFF00) >> 8), (byte) (value & 0xFF));
@@ -166,10 +187,11 @@ public class BsonWriter extends Writer {
     }
 
     @Override
-    public final void writeObjectB(Object obj) {
+    public final int writeObjectB(Object obj) {
         super.writeObjectB(obj);
         writeSmallString("");
         writeShort(BsonReader.SIGN_OBJECTB);
+        return -1;
     }
 
     @Override
@@ -179,49 +201,10 @@ public class BsonWriter extends Writer {
     }
 
     @Override
-    public final void writeFieldName(Attribute attribute) {
+    public final void writeFieldName(String fieldName, Type fieldType, int fieldPos) {
         writeByte(BsonReader.SIGN_HASNEXT);
-        writeSmallString(attribute.field());
-        byte typeval = 127;  //字段的类型值
-        final Class type = attribute.type();
-        if (type == boolean.class || type == Boolean.class) {
-            typeval = 1;
-        } else if (type == byte.class || type == Byte.class) {
-            typeval = 2;
-        } else if (type == short.class || type == Short.class) {
-            typeval = 3;
-        } else if (type == char.class || type == Character.class) {
-            typeval = 4;
-        } else if (type == int.class || type == Integer.class) {
-            typeval = 5;
-        } else if (type == long.class || type == Long.class) {
-            typeval = 6;
-        } else if (type == float.class || type == Float.class) {
-            typeval = 7;
-        } else if (type == double.class || type == Double.class) {
-            typeval = 8;
-        } else if (type == String.class) {
-            typeval = 9;
-        } else if (type == boolean[].class || type == Boolean[].class) {
-            typeval = 101;
-        } else if (type == byte[].class || type == Byte[].class) {
-            typeval = 102;
-        } else if (type == short[].class || type == Short[].class) {
-            typeval = 103;
-        } else if (type == char[].class || type == Character[].class) {
-            typeval = 104;
-        } else if (type == int[].class || type == Integer[].class) {
-            typeval = 105;
-        } else if (type == long[].class || type == Long[].class) {
-            typeval = 106;
-        } else if (type == float[].class || type == Float[].class) {
-            typeval = 107;
-        } else if (type == double[].class || type == Double[].class) {
-            typeval = 108;
-        } else if (type == String[].class) {
-            typeval = 109;
-        }
-        writeByte(typeval);
+        writeSmallString(fieldName);
+        writeByte(BsonFactory.typeEnum(fieldType));
     }
 
     /**
@@ -260,14 +243,23 @@ 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);
     }
 
     @Override
-    public final void writeArrayB(int size) {
+    public final int writeArrayB(int size, Encodeable<Writer, Object> componentEncoder, Object obj) {
         writeInt(size);
+        if (componentEncoder != null && componentEncoder != ByteSimpledCoder.instance) {
+            writeByte(BsonFactory.typeEnum(componentEncoder.getType()));
+        }
+        return -1;
     }
 
     @Override
@@ -279,8 +271,11 @@ public class BsonWriter extends Writer {
     }
 
     @Override
-    public void writeMapB(int size) {
-        writeArrayB(size);
+    public int writeMapB(int size, Encodeable<Writer, Object> keyEncoder, Encodeable<Writer, Object> valueEncoder, Object obj) {
+        writeInt(size);
+        writeByte(BsonFactory.typeEnum(keyEncoder.getType()));
+        writeByte(BsonFactory.typeEnum(valueEncoder.getType()));
+        return -1;
     }
 
     @Override

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

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

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

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

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

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

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

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

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

@@ -29,24 +29,31 @@ public final class BoolArraySimpledCoder<R extends Reader, W extends Writer> ext
             out.writeNull();
             return;
         }
-        out.writeArrayB(values.length);
-        boolean flag = false;
-        for (boolean v : values) {
-            if (flag) out.writeArrayMark();
-            out.writeBoolean(v);
-            flag = true;
+        if (out.writeArrayB(values.length, BoolSimpledCoder.instance, values) < 0) {
+            boolean flag = false;
+            for (boolean v : values) {
+                if (flag) out.writeArrayMark();
+                out.writeBoolean(v);
+                flag = true;
+            }
         }
         out.writeArrayE();
     }
 
     @Override
     public boolean[] convertFrom(R in) {
-        int len = in.readArrayB();
+        int len = in.readArrayB(null, null, BoolSimpledCoder.instance);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(null, BoolSimpledCoder.instance);
+            len = Reader.SIGN_NOLENGTH;
+        }
         if (len == Reader.SIGN_NOLENGTH) {
             int size = 0;
             boolean[] data = new boolean[8];
-            while (in.hasNext()) {
+            int startPosition = in.position();
+            while (in.hasNext(startPosition, contentLength)) {
                 if (size >= data.length) {
                     boolean[] newdata = new boolean[data.length + 4];
                     System.arraycopy(data, 0, newdata, 0, size);

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

@@ -11,7 +11,7 @@ import org.redkale.convert.Writer;
 
 /**
  * byte[] 的SimpledCoder实现
- * 
+ *
  * <p>
  * 详情见: https://redkale.org
  *
@@ -25,47 +25,12 @@ public final class ByteArraySimpledCoder<R extends Reader, W extends Writer> ext
 
     @Override
     public void convertTo(W out, byte[] values) {
-        if (values == null) {
-            out.writeNull();
-            return;
-        }
-        out.writeArrayB(values.length);
-        boolean flag = false;
-        for (byte v : values) {
-            if (flag) out.writeArrayMark();
-            out.writeByte(v);
-            flag = true;
-        }
-        out.writeArrayE();
+        out.writeByteArray(values);
     }
 
     @Override
     public byte[] convertFrom(R in) {
-        int len = in.readArrayB();
-        if (len == Reader.SIGN_NULL) return null;
-        if (len == Reader.SIGN_NOLENGTH) {
-            int size = 0;
-            byte[] data = new byte[8];
-            while (in.hasNext()) {
-                if (size >= data.length) {
-                    byte[] newdata = new byte[data.length + 4];
-                    System.arraycopy(data, 0, newdata, 0, size);
-                    data = newdata;
-                }
-                data[size++] = in.readByte();
-            }
-            in.readArrayE();
-            byte[] newdata = new byte[size];
-            System.arraycopy(data, 0, newdata, 0, size);
-            return newdata;
-        } else {
-            byte[] values = new byte[len];
-            for (int i = 0; i < values.length; i++) {
-                values[i] = in.readByte();
-            }
-            in.readArrayE();
-            return values;
-        }
+        return in.readByteArray();
     }
 
 }

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

@@ -30,24 +30,31 @@ public final class ByteBufferSimpledCoder<R extends Reader, W extends Writer> ex
             out.writeNull();
             return;
         }
-        out.writeArrayB(value.remaining());
-        boolean flag = false;
-        for (byte v : value.array()) {
-            if (flag) out.writeArrayMark();
-            out.writeByte(v);
-            flag = true;
+        if (out.writeArrayB(value.remaining(), ByteSimpledCoder.instance, value) < 0) {
+            boolean flag = false;
+            for (byte v : value.array()) {
+                if (flag) out.writeArrayMark();
+                out.writeByte(v);
+                flag = true;
+            }
         }
         out.writeArrayE();
     }
 
     @Override
     public ByteBuffer convertFrom(R in) {
-        int len = in.readArrayB();
+        int len = in.readArrayB(null, null, ByteSimpledCoder.instance);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(null, ByteSimpledCoder.instance);
+            len = Reader.SIGN_NOLENGTH;
+        }
         if (len == Reader.SIGN_NOLENGTH) {
             int size = 0;
             byte[] data = new byte[8];
-            while (in.hasNext()) {
+            int startPosition = in.position();
+            while (in.hasNext(startPosition, contentLength)) {
                 if (size >= data.length) {
                     byte[] newdata = new byte[data.length + 4];
                     System.arraycopy(data, 0, newdata, 0, size);

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

@@ -12,7 +12,9 @@ import org.redkale.convert.Writer;
 /**
  * char[] 的SimpledCoder实现
  *
- * <p> 详情见: https://redkale.org
+ * <p>
+ * 详情见: https://redkale.org
+ *
  * @author zhangjx
  * @param <R> Reader输入的子类型
  * @param <W> Writer输出的子类型
@@ -27,24 +29,31 @@ public final class CharArraySimpledCoder<R extends Reader, W extends Writer> ext
             out.writeNull();
             return;
         }
-        out.writeArrayB(values.length);
-        boolean flag = false;
-        for (char v : values) {
-            if (flag) out.writeArrayMark();
-            out.writeChar(v);
-            flag = true;
+        if (out.writeArrayB(values.length, CharSimpledCoder.instance, values) < 0) {
+            boolean flag = false;
+            for (char v : values) {
+                if (flag) out.writeArrayMark();
+                out.writeChar(v);
+                flag = true;
+            }
         }
         out.writeArrayE();
     }
 
     @Override
     public char[] convertFrom(R in) {
-        int len = in.readArrayB();
+        int len = in.readArrayB(null, null, CharSimpledCoder.instance);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(null, CharSimpledCoder.instance);
+            len = Reader.SIGN_NOLENGTH;
+        }
         if (len == Reader.SIGN_NOLENGTH) {
             int size = 0;
             char[] data = new char[8];
-            while (in.hasNext()) {
+            int startPosition = in.position();
+            while (in.hasNext(startPosition, contentLength)) {
                 if (size >= data.length) {
                     char[] newdata = new char[data.length + 4];
                     System.arraycopy(data, 0, newdata, 0, size);

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

@@ -30,24 +30,31 @@ public final class DoubleArraySimpledCoder<R extends Reader, W extends Writer> e
             out.writeNull();
             return;
         }
-        out.writeArrayB(values.length);
-        boolean flag = false;
-        for (double v : values) {
-            if (flag) out.writeArrayMark();
-            out.writeDouble(v);
-            flag = true;
+        if (out.writeArrayB(values.length, DoubleSimpledCoder.instance, values) < 0) {
+            boolean flag = false;
+            for (double v : values) {
+                if (flag) out.writeArrayMark();
+                out.writeDouble(v);
+                flag = true;
+            }
         }
         out.writeArrayE();
     }
 
     @Override
     public double[] convertFrom(R in) {
-        int len = in.readArrayB();
+        int len = in.readArrayB(null, null, DoubleSimpledCoder.instance);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(null, DoubleSimpledCoder.instance);
+            len = Reader.SIGN_NOLENGTH;
+        }
         if (len == Reader.SIGN_NOLENGTH) {
             int size = 0;
             double[] data = new double[8];
-            while (in.hasNext()) {
+            int startPosition = in.position();
+            while (in.hasNext(startPosition, contentLength)) {
                 if (size >= data.length) {
                     double[] newdata = new double[data.length + 4];
                     System.arraycopy(data, 0, newdata, 0, size);

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

@@ -45,4 +45,8 @@ public final class EnumSimpledCoder<R extends Reader, W extends Writer, E extend
         return (E) Enum.valueOf(type, value);
     }
 
+    @Override
+    public Class<E> getType() {
+        return type;
+    }
 }

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

@@ -12,7 +12,9 @@ import org.redkale.convert.Writer;
 /**
  * float[] 的SimpledCoder实现
  *
- * <p> 详情见: https://redkale.org
+ * <p>
+ * 详情见: https://redkale.org
+ *
  * @author zhangjx
  * @param <R> Reader输入的子类型
  * @param <W> Writer输出的子类型
@@ -27,24 +29,31 @@ public final class FloatArraySimpledCoder<R extends Reader, W extends Writer> ex
             out.writeNull();
             return;
         }
-        out.writeArrayB(values.length);
-        boolean flag = false;
-        for (float v : values) {
-            if (flag) out.writeArrayMark();
-            out.writeFloat(v);
-            flag = true;
+        if (out.writeArrayB(values.length, FloatSimpledCoder.instance, values) < 0) {
+            boolean flag = false;
+            for (float v : values) {
+                if (flag) out.writeArrayMark();
+                out.writeFloat(v);
+                flag = true;
+            }
         }
         out.writeArrayE();
     }
 
     @Override
     public float[] convertFrom(R in) {
-        int len = in.readArrayB();
+        int len = in.readArrayB(null, null, FloatSimpledCoder.instance);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(null, FloatSimpledCoder.instance);
+            len = Reader.SIGN_NOLENGTH;
+        }
         if (len == Reader.SIGN_NOLENGTH) {
             int size = 0;
             float[] data = new float[8];
-            while (in.hasNext()) {
+            int startPosition = in.position();
+            while (in.hasNext(startPosition, contentLength)) {
                 if (size >= data.length) {
                     float[] newdata = new float[data.length + 4];
                     System.arraycopy(data, 0, newdata, 0, size);

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

@@ -30,24 +30,31 @@ public final class IntArraySimpledCoder<R extends Reader, W extends Writer> exte
             out.writeNull();
             return;
         }
-        out.writeArrayB(values.length);
-        boolean flag = false;
-        for (int v : values) {
-            if (flag) out.writeArrayMark();
-            out.writeInt(v);
-            flag = true;
+        if (out.writeArrayB(values.length, IntSimpledCoder.instance, values) < 0) {
+            boolean flag = false;
+            for (int v : values) {
+                if (flag) out.writeArrayMark();
+                out.writeInt(v);
+                flag = true;
+            }
         }
         out.writeArrayE();
     }
 
     @Override
     public int[] convertFrom(R in) {
-        int len = in.readArrayB();
+        int len = in.readArrayB(null, null, IntSimpledCoder.instance);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(null, IntSimpledCoder.instance);
+            len = Reader.SIGN_NOLENGTH;
+        }
         if (len == Reader.SIGN_NOLENGTH) {
             int size = 0;
             int[] data = new int[8];
-            while (in.hasNext()) {
+            int startPosition = in.position();
+            while (in.hasNext(startPosition, contentLength)) {
                 if (size >= data.length) {
                     int[] newdata = new int[data.length + 4];
                     System.arraycopy(data, 0, newdata, 0, size);

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

@@ -30,24 +30,31 @@ public final class LongArraySimpledCoder<R extends Reader, W extends Writer> ext
             out.writeNull();
             return;
         }
-        out.writeArrayB(values.length);
-        boolean flag = false;
-        for (long v : values) {
-            if (flag) out.writeArrayMark();
-            out.writeLong(v);
-            flag = true;
+        if (out.writeArrayB(values.length, LongSimpledCoder.instance, values) < 0) {
+            boolean flag = false;
+            for (long v : values) {
+                if (flag) out.writeArrayMark();
+                out.writeLong(v);
+                flag = true;
+            }
         }
         out.writeArrayE();
     }
 
     @Override
     public long[] convertFrom(R in) {
-        int len = in.readArrayB();
+        int len = in.readArrayB(null, null, LongSimpledCoder.instance);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(null, LongSimpledCoder.instance);
+            len = Reader.SIGN_NOLENGTH;
+        }
         if (len == Reader.SIGN_NOLENGTH) {
             int size = 0;
             long[] data = new long[8];
-            while (in.hasNext()) {
+            int startPosition = in.position();
+            while (in.hasNext(startPosition, contentLength)) {
                 if (size >= data.length) {
                     long[] newdata = new long[data.length + 4];
                     System.arraycopy(data, 0, newdata, 0, size);

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

@@ -12,7 +12,9 @@ import org.redkale.convert.Writer;
 /**
  * short[] 的SimpledCoder实现
  *
- * <p> 详情见: https://redkale.org
+ * <p>
+ * 详情见: https://redkale.org
+ *
  * @author zhangjx
  * @param <R> Reader输入的子类型
  * @param <W> Writer输出的子类型
@@ -27,24 +29,31 @@ public final class ShortArraySimpledCoder<R extends Reader, W extends Writer> ex
             out.writeNull();
             return;
         }
-        out.writeArrayB(values.length);
-        boolean flag = false;
-        for (short v : values) {
-            if (flag) out.writeArrayMark();
-            out.writeShort(v);
-            flag = true;
+        if (out.writeArrayB(values.length, ShortSimpledCoder.instance, values) < 0) {
+            boolean flag = false;
+            for (short v : values) {
+                if (flag) out.writeArrayMark();
+                out.writeShort(v);
+                flag = true;
+            }
         }
         out.writeArrayE();
     }
 
     @Override
     public short[] convertFrom(R in) {
-        int len = in.readArrayB();
+        int len = in.readArrayB(null, null, ShortSimpledCoder.instance);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(null, ShortSimpledCoder.instance);
+            len = Reader.SIGN_NOLENGTH;
+        }
         if (len == Reader.SIGN_NOLENGTH) {
             int size = 0;
             short[] data = new short[8];
-            while (in.hasNext()) {
+            int startPosition = in.position();
+            while (in.hasNext(startPosition, contentLength)) {
                 if (size >= data.length) {
                     short[] newdata = new short[data.length + 4];
                     System.arraycopy(data, 0, newdata, 0, size);

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

@@ -5,14 +5,14 @@
  */
 package org.redkale.convert.ext;
 
-import org.redkale.convert.Reader;
-import org.redkale.convert.SimpledCoder;
-import org.redkale.convert.Writer;
+import org.redkale.convert.*;
 
 /**
  * String[] 的SimpledCoder实现
  *
- * <p> 详情见: https://redkale.org
+ * <p>
+ * 详情见: https://redkale.org
+ *
  * @author zhangjx
  * @param <R> Reader输入的子类型
  * @param <W> Writer输出的子类型
@@ -27,24 +27,35 @@ public final class StringArraySimpledCoder<R extends Reader, W extends Writer> e
             out.writeNull();
             return;
         }
-        out.writeArrayB(values.length);
-        boolean flag = false;
-        for (String v : values) {
-            if (flag) out.writeArrayMark();
-            out.writeString(v);
-            flag = true;
+        if (out.writeArrayB(values.length, StringSimpledCoder.instance, values) < 0) {
+            boolean flag = false;
+            for (String v : values) {
+                if (flag) out.writeArrayMark();
+                out.writeString(v);
+                flag = true;
+            }
         }
         out.writeArrayE();
     }
 
     @Override
     public String[] convertFrom(R in) {
-        int len = in.readArrayB();
+        return convertFrom(in, null);
+    }
+
+    public String[] convertFrom(R in, DeMember member) {
+        int len = in.readArrayB(member, null, StringSimpledCoder.instance);
+        int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = in.readMemberContentLength(null, StringSimpledCoder.instance);
+            len = Reader.SIGN_NOLENGTH;
+        }
         if (len == Reader.SIGN_NOLENGTH) {
             int size = 0;
             String[] data = new String[8];
-            while (in.hasNext()) {
+            int startPosition = in.position();
+            while (in.hasNext(startPosition, contentLength)) {
                 if (size >= data.length) {
                     String[] newdata = new String[data.length + 4];
                     System.arraycopy(data, 0, newdata, 0, size);

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

@@ -126,21 +126,39 @@ public class JsonByteBufferReader extends JsonReader {
         if (ch == '{') return "";
         if (ch == 'n' && nextChar() == 'u' && nextChar() == 'l' && nextChar() == 'l') return null;
         if (ch == 'N' && nextChar() == 'U' && nextChar() == 'L' && nextChar() == 'L') return null;
-        throw new ConvertException("a json object text must begin with '{' (position = " + position + ") but '" + ch + "'");
+        StringBuilder sb = new StringBuilder();
+        sb.append(ch);
+        char one;
+        try {
+            while ((one = nextChar()) != 0) sb.append(one);
+        } catch (Exception e) {
+        }
+        throw new ConvertException("a json object text must begin with '{' (position = " + position + ") but '" + ch + "' in (" + sb + ")");
     }
 
     /**
      * 判断下一个非空白字符是否为[
      *
+     * @param member   DeMember
+     * @param typevals byte[]
+     * @param decoder  Decodeable
+     *
      * @return SIGN_NOLENGTH 或 SIGN_NULL
      */
     @Override
-    public final int readArrayB() {
+    public final int readArrayB(DeMember member, byte[] typevals, Decodeable decoder) {
         char ch = nextGoodChar();
         if (ch == '[' || ch == '{') return SIGN_NOLENGTH;
         if (ch == 'n' && nextChar() == 'u' && nextChar() == 'l' && nextChar() == 'l') return SIGN_NULL;
         if (ch == 'N' && nextChar() == 'U' && nextChar() == 'L' && nextChar() == 'L') return SIGN_NULL;
-        throw new ConvertException("a json array text must begin with '[' (position = " + position + ") but '" + ch + "'");
+        StringBuilder sb = new StringBuilder();
+        sb.append(ch);
+        char one;
+        try {
+            while ((one = nextChar()) != 0) sb.append(one);
+        } catch (Exception e) {
+        }
+        throw new ConvertException("a json array text must begin with '[' (position = " + position + ") but '" + ch + "' in (" + sb + ")");
     }
 
     /**
@@ -150,16 +168,26 @@ public class JsonByteBufferReader extends JsonReader {
     public final void readBlank() {
         char ch = nextGoodChar();
         if (ch == ':') return;
-        throw new ConvertException("expected a ':' but '" + ch + "'(position = " + position + ")");
+        StringBuilder sb = new StringBuilder();
+        sb.append(ch);
+        char one;
+        try {
+            while ((one = nextChar()) != 0) sb.append(one);
+        } catch (Exception e) {
+        }
+        throw new ConvertException("expected a ':' but '" + ch + "'(position = " + position + ") in (" + sb + ")");
     }
 
     /**
      * 判断对象是否存在下一个属性或者数组是否存在下一个元素
      *
+     * @param startPosition 起始位置
+     * @param contentLength 内容大小， 不确定的传-1
+     *
      * @return 是否存在
      */
     @Override
-    public final boolean hasNext() {
+    public boolean hasNext(int startPosition, int contentLength) {
         char ch = nextGoodChar();
         if (ch == ',') return true;
         if (ch == '}' || ch == ']' || ch == 0) return false;
@@ -272,8 +300,10 @@ public class JsonByteBufferReader extends JsonReader {
     @Override
     public final int readInt() {
         char firstchar = nextGoodChar();
+        boolean quote = false;
         if (firstchar == '"' || firstchar == '\'') {
-            firstchar = nextChar();
+            quote = true;
+            firstchar = nextGoodChar();
             if (firstchar == '"' || firstchar == '\'') return 0;
         }
         int value = 0;
@@ -288,6 +318,7 @@ public class JsonByteBufferReader extends JsonReader {
             if (ch >= '0' && ch <= '9') {
                 value = (value << 3) + (value << 1) + (ch - '0');
             } else if (ch == '"' || ch == '\'') {
+            } else if (quote && ch <= ' ') {
             } else if (ch == ',' || ch == '}' || ch == ']' || ch <= ' ' || ch == ':') {
                 backChar(ch);
                 break;
@@ -306,8 +337,10 @@ public class JsonByteBufferReader extends JsonReader {
     @Override
     public final long readLong() {
         char firstchar = nextGoodChar();
+        boolean quote = false;
         if (firstchar == '"' || firstchar == '\'') {
-            firstchar = nextChar();
+            quote = true;
+            firstchar = nextGoodChar();
             if (firstchar == '"' || firstchar == '\'') return 0L;
         }
         long value = 0;
@@ -322,6 +355,7 @@ public class JsonByteBufferReader extends JsonReader {
             if (ch >= '0' && ch <= '9') {
                 value = (value << 3) + (value << 1) + (ch - '0');
             } else if (ch == '"' || ch == '\'') {
+            } else if (quote && ch <= ' ') {
             } else if (ch == ',' || ch == '}' || ch == ']' || ch <= ' ' || ch == ':') {
                 backChar(ch);
                 break;

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

@@ -48,7 +48,9 @@ public class JsonByteBufferWriter extends JsonWriter {
 
     @Override
     protected boolean recycle() {
+        super.recycle();
         this.index = 0;
+        this.specify = null;
         this.charset = null;
         this.buffers = null;
         return false;
@@ -113,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();
@@ -132,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)));
@@ -153,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()) {
@@ -167,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;
@@ -223,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;
             }
         }
@@ -287,7 +291,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;
@@ -305,6 +310,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,26 +80,32 @@ 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 out) {
-        if (out != null) writerPool.accept(out);
+    public void offerJsonWriter(final JsonWriter writer) {
+        if (writer != null) writerPool.accept(writer);
     }
 
     //------------------------------ 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,26 +206,27 @@ 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 out = writerPool.get().tiny(tiny);
-        factory.loadEncoder(type).convertTo(out, value);
-        String result = out.toString();
-        writerPool.accept(out);
+        final JsonWriter writer = pollJsonWriter();
+        writer.specify(type);
+        factory.loadEncoder(type).convertTo(writer, value);
+        String result = writer.toString();
+        writerPool.accept(writer);
         return result;
     }
 
     @Override
     public String convertMapTo(final Object... values) {
         if (values == null) return "null";
-        final JsonWriter out = writerPool.get().tiny(tiny);
-        ((AnyEncoder) factory.getAnyEncoder()).convertMapTo(out, values);
-        String result = out.toString();
-        writerPool.accept(out);
+        final JsonWriter writer = pollJsonWriter();
+        ((AnyEncoder) factory.getAnyEncoder()).convertMapTo(writer, values);
+        String result = writer.toString();
+        writerPool.accept(writer);
         return result;
     }
 
     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);
         }
@@ -167,9 +235,10 @@ 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();
             writerPool.accept(writer);
@@ -183,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);
@@ -200,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 {
@@ -212,10 +281,11 @@ 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 {
+            out.specify(type);
             factory.loadEncoder(type).convertTo(out, value);
         }
         return out.toBuffers();
@@ -224,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 {
@@ -246,6 +316,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
         if (value == null) {
             writer.writeNull();
         } else {
+            writer.specify(type);
             factory.loadEncoder(type).convertTo(writer, value);
         }
     }
@@ -265,14 +336,15 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
 
     public JsonWriter convertToWriter(final Type type, final Object value) {
         if (type == null) return null;
-        final JsonWriter out = writerPool.get().tiny(tiny);
-        factory.loadEncoder(type).convertTo(out, value);
-        return out;
+        final JsonWriter writer = pollJsonWriter();
+        writer.specify(type);
+        factory.loadEncoder(type).convertTo(writer, value);
+        return writer;
     }
 
     public JsonWriter convertMapToWriter(final Object... values) {
-        final JsonWriter out = writerPool.get().tiny(tiny);
-        ((AnyEncoder) factory.getAnyEncoder()).convertMapTo(out, values);
-        return out;
+        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
@@ -85,4 +88,9 @@ public final class JsonFactory extends ConvertFactory<JsonReader, JsonWriter> {
     public boolean isReversible() {
         return false;
     }
+
+    @Override
+    public boolean isFieldSort() {
+        return true;
+    }
 }

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

@@ -158,6 +158,21 @@ public class JsonReader extends Reader {
         this.position--;
     }
 
+    @Override
+    public final ValueType readType() {
+        char ch = nextGoodChar();
+        if (ch == '{') {
+            backChar(ch);
+            return ValueType.MAP;
+        }
+        if (ch == '[') {
+            backChar(ch);
+            return ValueType.ARRAY;
+        }
+        backChar(ch);
+        return ValueType.STRING;
+    }
+
     /**
      * 判断下一个非空白字符是否为{
      *
@@ -168,6 +183,7 @@ public class JsonReader extends Reader {
     @Override
     public String readObjectB(final Class clazz) {
         this.fieldIndex = 0; //必须要重置为0
+        if (this.text.length == 0) return null;
         char ch = this.text[++this.position];
         if (ch == '{') return "";
         if (ch <= ' ') {
@@ -189,11 +205,16 @@ public class JsonReader extends Reader {
     /**
      * 判断下一个非空白字符是否为{
      *
+     * @param member       DeMember
+     * @param typevals     byte[]
+     * @param keyDecoder   Decodeable
+     * @param valuedecoder Decodeable
+     *
      * @return SIGN_NOLENGTH 或 SIGN_NULL
      */
     @Override
-    public final int readMapB() {
-        return readArrayB();
+    public final int readMapB(DeMember member, byte[] typevals, Decodeable keyDecoder, Decodeable valuedecoder) {
+        return readArrayB(member, typevals, keyDecoder);
     }
 
     @Override
@@ -203,10 +224,15 @@ public class JsonReader extends Reader {
     /**
      * 判断下一个非空白字符是否为[
      *
+     * @param member           DeMember
+     * @param typevals         byte[]
+     * @param componentDecoder Decodeable
+     *
      * @return SIGN_NOLENGTH 或 SIGN_NULL
      */
     @Override
-    public int readArrayB() {
+    public int readArrayB(DeMember member, byte[] typevals, Decodeable componentDecoder) {
+        if (this.text.length == 0) return SIGN_NULL;
         char ch = this.text[++this.position];
         if (ch == '[') return SIGN_NOLENGTH;
         if (ch == '{') return SIGN_NOLENGTH;
@@ -244,13 +270,26 @@ public class JsonReader extends Reader {
         throw new ConvertException("'" + new String(text) + "'expected a ':' but '" + ch + "'(position = " + position + ") in (" + new String(this.text) + ")");
     }
 
+    @Override
+    public int position() {
+        return this.position;
+    }
+
+    @Override
+    public int readMemberContentLength(DeMember member, Decodeable decoder) {
+        return -1;
+    }
+
     /**
      * 判断对象是否存在下一个属性或者数组是否存在下一个元素
      *
+     * @param startPosition 起始位置
+     * @param contentLength 内容大小， 不确定的传-1
+     *
      * @return 是否存在
      */
     @Override
-    public boolean hasNext() {
+    public boolean hasNext(int startPosition, int contentLength) {
         char ch = this.text[++this.position];
         if (ch == ',') return true;
         if (ch == '}' || ch == ']') return false;
@@ -314,7 +353,7 @@ public class JsonReader extends Reader {
             }
             this.position = currpos - 1;
             if (len == 4 && text0[start] == 'n' && text0[start + 1] == 'u' && text0[start + 2] == 'l' && text0[start + 3] == 'l') return null;
-            return new String(text0, start, len);
+            return new String(text0, start, len == eof ? (len + 1) : len);
         }
     }
 
@@ -335,8 +374,16 @@ public class JsonReader extends Reader {
                 if (firstchar > ' ') break;
             }
         }
+        boolean quote = false;
         if (firstchar == '"' || firstchar == '\'') {
+            quote = true;
             firstchar = text0[++currpos];
+            if (firstchar <= ' ') {
+                for (;;) {
+                    firstchar = text0[++currpos];
+                    if (firstchar > ' ') break;
+                }
+            }
             if (firstchar == '"' || firstchar == '\'') {
                 this.position = currpos;
                 return 0;
@@ -352,7 +399,8 @@ public class JsonReader extends Reader {
             if (currpos == eof) break;
             char ch = text0[++currpos];
             int val = digits[ch];
-            if (val == -3) break;
+            if (quote && val == -3) continue;
+            if (val <= -3) break;
             if (val == -1) throw new ConvertException("illegal escape(" + ch + ") (position = " + currpos + ") but '" + ch + "' in (" + new String(this.text) + ")");
             if (val != -2) value = value * 10 + val;
         }
@@ -377,8 +425,16 @@ public class JsonReader extends Reader {
                 if (firstchar > ' ') break;
             }
         }
+        boolean quote = false;
         if (firstchar == '"' || firstchar == '\'') {
+            quote = true;
             firstchar = text0[++currpos];
+            if (firstchar <= ' ') {
+                for (;;) {
+                    firstchar = text0[++currpos];
+                    if (firstchar > ' ') break;
+                }
+            }
             if (firstchar == '"' || firstchar == '\'') {
                 this.position = currpos;
                 return 0L;
@@ -394,7 +450,8 @@ public class JsonReader extends Reader {
             if (currpos == eof) break;
             char ch = text0[++currpos];
             int val = digits[ch];
-            if (val == -3) break;
+            if (quote && val == -3) continue;
+            if (val <= -3) break;
             if (val == -1) throw new ConvertException("illegal escape(" + ch + ") (position = " + currpos + ") but '" + ch + "' in (" + new String(this.text) + ")");
             if (val != -2) value = value * 10 + val;
         }
@@ -435,6 +492,41 @@ public class JsonReader extends Reader {
         return (byte) readInt();
     }
 
+    @Override
+    public final byte[] readByteArray() {
+        int len = readArrayB(null, null, null);
+        int contentLength = -1;
+        if (len == Reader.SIGN_NULL) return null;
+        if (len == Reader.SIGN_NOLENBUTBYTES) {
+            contentLength = readMemberContentLength(null, null);
+            len = Reader.SIGN_NOLENGTH;
+        }
+        if (len == Reader.SIGN_NOLENGTH) {
+            int size = 0;
+            byte[] data = new byte[8];
+            int startPosition = position();
+            while (hasNext(startPosition, contentLength)) {
+                if (size >= data.length) {
+                    byte[] newdata = new byte[data.length + 4];
+                    System.arraycopy(data, 0, newdata, 0, size);
+                    data = newdata;
+                }
+                data[size++] = readByte();
+            }
+            readArrayE();
+            byte[] newdata = new byte[size];
+            System.arraycopy(data, 0, newdata, 0, size);
+            return newdata;
+        } else {
+            byte[] values = new byte[len];
+            for (int i = 0; i < values.length; i++) {
+                values[i] = readByte();
+            }
+            readArrayE();
+            return values;
+        }
+    }
+
     @Override
     public final char readChar() {
         return (char) readInt();
@@ -448,6 +540,7 @@ public class JsonReader extends Reader {
     @Override
     public final float readFloat() {
         String chars = readSmallString();
+        if (chars != null) chars = chars.trim();
         if (chars == null || chars.isEmpty()) return 0.f;
         return Float.parseFloat(chars);
     }
@@ -455,6 +548,7 @@ public class JsonReader extends Reader {
     @Override
     public final double readDouble() {
         String chars = readSmallString();
+        if (chars != null) chars = chars.trim();
         if (chars == null || chars.isEmpty()) return 0.0;
         return Double.parseDouble(chars);
     }
@@ -590,7 +684,8 @@ public class JsonReader extends Reader {
             digits[i] = i - 'A' + 10;
         }
         digits['"'] = digits['\''] = -2; //-2 跳过 
-        digits[','] = digits['}'] = digits[']'] = digits[' '] = digits['\t'] = digits['\r'] = digits['\n'] = digits[':'] = -3; //-3退出
+        digits[' '] = digits['\t'] = digits['\r'] = digits['\n'] = -3; //-3可能跳过
+        digits[','] = digits['}'] = digits[']'] = digits[':'] = -4; //-4退出
 
     }
 }

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

@@ -5,8 +5,9 @@
  */
 package org.redkale.convert.json;
 
+import java.lang.reflect.Type;
 import java.nio.ByteBuffer;
-import org.redkale.convert.Writer;
+import org.redkale.convert.*;
 import org.redkale.util.*;
 
 /**
@@ -97,9 +98,12 @@ public class JsonWriter extends Writer {
         if (quote) content[count++] = '"';
     }
 
+    @Override
     protected boolean recycle() {
+        super.recycle();
         this.count = 0;
-        if (this.content.length > defaultSize) {
+        this.specify = null;
+        if (this.content != null && this.content.length > defaultSize) {
             this.content = new char[defaultSize];
         }
         return true;
@@ -156,9 +160,9 @@ public class JsonWriter extends Writer {
     }
 
     @Override
-    public final void writeFieldName(Attribute attribute) {
+    public final void writeFieldName(String fieldName, Type fieldType, int fieldPos) {
         if (this.comma) writeTo(',');
-        writeTo(true, attribute.field());
+        writeTo(true, fieldName);
         writeTo(':');
     }
 
@@ -187,6 +191,22 @@ public class JsonWriter extends Writer {
         writeInt(value);
     }
 
+    @Override
+    public final void writeByteArray(byte[] values) {
+        if (values == null) {
+            writeNull();
+            return;
+        }
+        writeArrayB(values.length, null, values);
+        boolean flag = false;
+        for (byte v : values) {
+            if (flag) writeArrayMark();
+            writeByte(v);
+            flag = true;
+        }
+        writeArrayE();
+    }
+
     @Override
     public final void writeChar(char value) {
         writeInt(value);
@@ -302,6 +322,11 @@ public class JsonWriter extends Writer {
         writeTo(false, String.valueOf(value));
     }
 
+    @Override
+    public final void writeWrapper(StringWrapper value) {
+        writeTo(false, String.valueOf(value));
+    }
+
     @Override
     public final boolean needWriteClassName() {
         return false;
@@ -312,9 +337,10 @@ public class JsonWriter extends Writer {
     }
 
     @Override
-    public final void writeObjectB(Object obj) {
+    public final int writeObjectB(Object obj) {
         super.writeObjectB(obj);
         writeTo('{');
+        return -1;
     }
 
     @Override
@@ -328,8 +354,9 @@ public class JsonWriter extends Writer {
     }
 
     @Override
-    public final void writeArrayB(int size) {
+    public final int writeArrayB(int size, Encodeable<Writer, Object> componentEncoder, Object obj) {
         writeTo('[');
+        return -1;
     }
 
     @Override
@@ -343,8 +370,9 @@ public class JsonWriter extends Writer {
     }
 
     @Override
-    public final void writeMapB(int size) {
+    public final int writeMapB(int size, Encodeable<Writer, Object> keyEncoder, Encodeable<Writer, Object> valueEncoder, Object obj) {
         writeTo('{');
+        return -1;
     }
 
     @Override

src/org/redkale/net/AsyncConnection.java

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

src/org/redkale/net/Context.java

@@ -5,13 +5,9 @@
  */
 package org.redkale.net;
 
-import java.io.IOException;
 import java.net.*;
-import java.nio.*;
-import java.nio.channels.AsynchronousChannelGroup;
 import java.nio.charset.*;
 import java.util.concurrent.*;
-import java.util.function.*;
 import java.util.logging.*;
 import javax.net.ssl.SSLContext;
 import org.redkale.convert.bson.*;
@@ -40,36 +36,9 @@ 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;
 
-    //服务的监听地址
-    private final InetSocketAddress address;
-
-    //字符集
-    protected final Charset charset;
-
-    //最大连接数, 为0表示没限制
-    protected final int maxconns;
-
-    //请求内容的大小上限, 默认64K
-    protected final int maxbody;
-
-    //keep alive IO读取的超时时间
-    protected final int aliveTimeoutSeconds;
-
-    //IO读取的超时时间
-    protected final int readTimeoutSeconds;
-
-    //IO写入的超时时间
-    protected final int writeTimeoutSeconds;
-
     //日志Logger
     protected final Logger logger;
 
@@ -82,24 +51,41 @@ public class Context {
     //依赖注入工厂类
     protected final ResourceFactory resourceFactory;
 
+    //最大连接数, 为0表示没限制
+    protected int maxconns;
+
+    //请求内容的大小上限, 默认64K
+    protected int maxbody;
+
+    //keep alive IO读取的超时时间
+    protected int aliveTimeoutSeconds;
+
+    //IO读取的超时时间
+    protected int readTimeoutSeconds;
+
+    //IO写入的超时时间
+    protected int writeTimeoutSeconds;
+
+    //服务的监听地址
+    protected InetSocketAddress address;
+
+    //字符集
+    protected Charset charset;
+
     public Context(ContextConfig config) {
         this(config.serverStartTime, config.logger, config.executor, config.sslContext,
-            config.bufferCapacity, config.bufferPool, config.responsePool, config.maxconns, config.maxbody,
-            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;
@@ -145,41 +131,22 @@ public class Context {
         return executor.submit(r);
     }
 
-    public AsynchronousChannelGroup createAsynchronousChannelGroup() throws IOException {
-        return AsynchronousChannelGroup.withThreadPool(executor);
-    }
-
     public void runAsync(Runnable r) {
         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;
-    }
-
-    protected Consumer<ByteBuffer> getBufferConsumer() {
-        return bufferPool;
-    }
-
-    public ByteBuffer pollBuffer() {
-        return bufferPool.get();
-    }
-
-    protected void offerBuffer(ByteBuffer buffer) {
-        bufferPool.accept(buffer);
-    }
-
-    protected void offerBuffer(ByteBuffer... buffers) {
-        if (buffers == null) return;
-        for (ByteBuffer buffer : buffers) {
-            bufferPool.accept(buffer);
-        }
-    }
-
     public Logger getLogger() {
         return logger;
     }
@@ -218,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/PrepareRunner.java

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

src/org/redkale/net/PrepareServlet.java

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

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

src/org/redkale/net/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;
@@ -31,6 +34,10 @@ public abstract class Request<C extends Context> {
 
     protected boolean keepAlive;
 
+    protected boolean more; //pipeline模式
+
+    protected ByteBuffer moredata; //pipeline模式
+
     protected AsyncConnection channel;
 
     protected ByteBuffer readBuffer;
@@ -43,17 +50,27 @@ 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();
     }
 
+    protected void setMoredata(ByteBuffer buffer) {
+        this.moredata = buffer;
+    }
+
+    protected ByteBuffer removeMoredata() {
+        ByteBuffer rs = this.moredata;
+        this.moredata = null;
+        return rs;
+    }
+
     protected ByteBuffer pollReadBuffer() {
         ByteBuffer buffer = this.readBuffer;
         this.readBuffer = null;
-        if (buffer == null) buffer = context.pollBuffer();
+        if (buffer == null) buffer = bufferPool.get();
         return buffer;
     }
 
@@ -63,7 +80,7 @@ public abstract class Request<C extends Context> {
             buffer.clear();
             this.readBuffer = buffer;
         } else {
-            context.offerBuffer(buffer);
+            bufferPool.accept(buffer);
         }
     }
 
@@ -90,6 +107,8 @@ public abstract class Request<C extends Context> {
     protected void recycle() {
         createtime = 0;
         keepAlive = false;
+        more = false;
+        moredata = null;
         attributes.clear();
         channel = null; // close it by response
     }

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,6 +27,10 @@ public abstract class Response<C extends Context, R extends Request<C>> {
 
     protected final C context;
 
+    protected final ObjectPool<ByteBuffer> bufferPool;
+
+    protected final ObjectPool<Response> responsePool;
+
     protected final R request;
 
     protected AsyncConnection channel;
@@ -34,7 +39,7 @@ public abstract class Response<C extends Context, R extends Request<C>> {
 
     protected ByteBuffer writeBodyBuffer;
 
-    private boolean inited = true;
+    private volatile boolean inited = true;
 
     protected Object output; //输出的结果对象
 
@@ -66,15 +71,15 @@ public abstract class Response<C extends Context, R extends Request<C>> {
 
         private void offerResponseBuffer(ByteBuffer attachment) {
             if (writeHeadBuffer == null) {
-                if (context.bufferPool.getRecyclerPredicate().test(attachment)) {
+                if (bufferPool.getRecyclerPredicate().test(attachment)) {
                     writeHeadBuffer = attachment;
                 }
             } else if (writeBodyBuffer == null) {
-                if (context.bufferPool.getRecyclerPredicate().test(attachment)) {
+                if (bufferPool.getRecyclerPredicate().test(attachment)) {
                     writeBodyBuffer = attachment;
                 }
             } else {
-                context.offerBuffer(attachment);
+                bufferPool.accept(attachment);
             }
         }
 
@@ -108,31 +113,33 @@ public abstract class Response<C extends Context, R extends Request<C>> {
         private void offerResponseBuffer(ByteBuffer[] attachments) {
             int start = 0;
             if (writeHeadBuffer == null && attachments.length > start) {
-                if (context.bufferPool.getRecyclerPredicate().test(attachments[start])) {
+                if (bufferPool.getRecyclerPredicate().test(attachments[start])) {
                     writeHeadBuffer = attachments[start];
                     start++;
                 }
             }
             if (writeBodyBuffer == null && attachments.length > start) {
-                if (context.bufferPool.getRecyclerPredicate().test(attachments[start])) {
+                if (bufferPool.getRecyclerPredicate().test(attachments[start])) {
                     writeBodyBuffer = attachments[start];
                     start++;
                 }
             }
             for (int i = start; i < attachments.length; i++) {
-                context.offerBuffer(attachments[i]);
+                bufferPool.accept(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.bufferPool = request.bufferPool;
+        this.responsePool = responsePool;
+        this.writeHeadBuffer = bufferPool.get();
+        this.writeBodyBuffer = bufferPool.get();
         this.bodyBufferSupplier = () -> {
             ByteBuffer buffer = writeBodyBuffer;
-            if (buffer == null) return context.pollBuffer();
+            if (buffer == null) return bufferPool.get();
             writeBodyBuffer = null;
             return buffer;
         };
@@ -141,14 +148,14 @@ public abstract class Response<C extends Context, R extends Request<C>> {
     protected ByteBuffer pollWriteReadBuffer() {
         ByteBuffer buffer = this.writeHeadBuffer;
         this.writeHeadBuffer = null;
-        if (buffer == null) buffer = context.pollBuffer();
+        if (buffer == null) buffer = bufferPool.get();
         return buffer;
     }
 
     protected ByteBuffer pollWriteBodyBuffer() {
         ByteBuffer buffer = this.writeBodyBuffer;
         this.writeBodyBuffer = null;
-        if (buffer == null) buffer = context.pollBuffer();
+        if (buffer == null) buffer = bufferPool.get();
         return buffer;
     }
 
@@ -157,7 +164,9 @@ public abstract class Response<C extends Context, R extends Request<C>> {
     }
 
     protected void offerBuffer(ByteBuffer... buffers) {
-        context.offerBuffer(buffers);
+        for (ByteBuffer buffer : buffers) {
+            bufferPool.accept(buffer);
+        }
     }
 
     protected AsyncConnection removeChannel() {
@@ -251,24 +260,25 @@ public abstract class Response<C extends Context, R extends Request<C>> {
             }
             this.recycleListener = null;
         }
-        if (request.keepAlive && channel != null) {
+        if (request.more) removeChannel();
+        if (request.keepAlive && !request.more && channel != null) {
             if (channel.isOpen()) {
                 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 = this.bufferPool.get();
             buffer.put(bs);
             buffer.flip();
             this.finish(buffer);
@@ -279,24 +289,44 @@ public abstract class Response<C extends Context, R extends Request<C>> {
 
     public void finish(ByteBuffer buffer) {
         if (!this.inited) return; //避免重复关闭
-        this.channel.write(buffer, buffer, finishHandler);
+        ByteBuffer data = this.request.removeMoredata();
+        final AsyncConnection conn = this.channel;
+        final boolean more = data != null && this.request.keepAlive;
+        this.request.more = more;
+        conn.write(buffer, buffer, finishHandler);
+        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();
-        this.channel.write(buffer, buffer, finishHandler);
+        ByteBuffer data = this.request.removeMoredata();
+        final AsyncConnection conn = this.channel;
+        final boolean more = data != null && this.request.keepAlive;
+        this.request.more = more;
+        conn.write(buffer, buffer, finishHandler);
+        if (more) new PrepareRunner(this.context, this.responsePool, conn, data, null).run();
     }
 
     public void finish(ByteBuffer... buffers) {
         if (!this.inited) return; //避免重复关闭
-        this.channel.write(buffers, buffers, finishHandler2);
+        final AsyncConnection conn = this.channel;
+        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, this.responsePool, conn, data, null).run();
     }
 
     public void finish(boolean kill, ByteBuffer... buffers) {
         if (!this.inited) return; //避免重复关闭
         if (kill) refuseAlive();
-        this.channel.write(buffers, buffers, finishHandler2);
+        final AsyncConnection conn = this.channel;
+        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, this.responsePool, conn, data, null).run();
     }
 
     protected <A> void send(final ByteBuffer buffer, final A attachment, final CompletionHandler<Integer, A> handler) {
@@ -307,14 +337,14 @@ public abstract class Response<C extends Context, R extends Request<C>> {
                 if (buffer.hasRemaining()) {
                     channel.write(buffer, attachment, this);
                 } else {
-                    context.offerBuffer(buffer);
+                    bufferPool.accept(buffer);
                     if (handler != null) handler.completed(result, attachment);
                 }
             }
 
             @Override
             public void failed(Throwable exc, A attachment) {
-                context.offerBuffer(buffer);
+                bufferPool.accept(buffer);
                 if (handler != null) handler.failed(exc, attachment);
             }
 
@@ -332,7 +362,7 @@ public abstract class Response<C extends Context, R extends Request<C>> {
                         index = i;
                         break;
                     }
-                    context.offerBuffer(buffers[i]);
+                    bufferPool.accept(buffers[i]);
                 }
                 if (index == 0) {
                     channel.write(buffers, attachment, this);
@@ -346,7 +376,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);
+                    bufferPool.accept(buffer);
                 }
                 if (handler != null) handler.failed(exc, attachment);
             }

src/org/redkale/net/Server.java

@@ -7,12 +7,13 @@ 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.logging.Logger;
+import java.util.concurrent.atomic.*;
+import java.util.logging.*;
 import javax.net.ssl.SSLContext;
 import org.redkale.util.*;
 
@@ -126,9 +127,9 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
         this.writeTimeoutSeconds = config.getIntValue("writeTimeoutSeconds", 0);
         this.backlog = parseLenth(config.getValue("backlog"), 8 * 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());
@@ -152,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;
         });
     }
@@ -280,15 +281,96 @@ 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);
+        final InetSocketAddress oldAddress = context.address;
+        final ProtocolServer oldServerChannel = this.serverChannel;
+        context.address = addr;
+        ProtocolServer newServerChannel = null;
+        try {
+            newServerChannel = ProtocolServer.create(this.protocol, context, this.serverClassLoader, config == null ? null : config.getValue("netimpl"));
+            newServerChannel.open(config);
+            newServerChannel.bind(addr, backlog);
+            newServerChannel.accept(this);
+        } catch (IOException e) {
+            context.address = oldAddress;
+            throw e;
+        }
+        this.address = context.address;
+        this.serverChannel = newServerChannel;
+        final String threadName = "[" + Thread.currentThread().getName() + "] ";
+        logger.info(threadName + this.getClass().getSimpleName() + ("TCP".equalsIgnoreCase(protocol) ? "" : ("." + protocol))
+            + " change address listen: " + address + ", started in " + (System.currentTimeMillis() - s) + " ms");
+        if (oldServerChannel != null) {
+            new Thread() {
+
+                @Override
+                public void run() {
+                    try {
+                        Thread.sleep(10_000);
+                        oldServerChannel.close();
+                    } catch (Exception e) {
+                        logger.log(Level.WARNING, "Server.changeInetSocketAddress(addr=" + addr + ") error", e);
+                    }
+                }
+            }.start();
+        }
+    }
+
+    public void changeMaxconns(final int newmaxconns) {
+        this.maxconns = newmaxconns;
+        if (this.context != null) this.context.maxconns = newmaxconns;
+        if (this.serverChannel != null) this.serverChannel.maxconns = newmaxconns;
+    }
+
+    public void changeCharset(final Charset newcharset) {
+        this.charset = newcharset;
+        if (this.context != null) this.context.charset = newcharset;
+    }
+
+    public void changeMaxbody(final int newmaxbody) {
+        this.maxbody = newmaxbody;
+        if (this.context != null) this.context.maxbody = newmaxbody;
+    }
+
+    public void changeReadTimeoutSeconds(final int newReadTimeoutSeconds) {
+        this.readTimeoutSeconds = newReadTimeoutSeconds;
+        if (this.context != null) this.context.readTimeoutSeconds = newReadTimeoutSeconds;
+    }
+
+    public void changeWriteTimeoutSeconds(final int newWriteTimeoutSeconds) {
+        this.writeTimeoutSeconds = newWriteTimeoutSeconds;
+        if (this.context != null) this.context.writeTimeoutSeconds = newWriteTimeoutSeconds;
+    }
+
+    public void changeAliveTimeoutSeconds(final int newAliveTimeoutSeconds) {
+        this.aliveTimeoutSeconds = newAliveTimeoutSeconds;
+        if (this.context != null) this.context.aliveTimeoutSeconds = newAliveTimeoutSeconds;
+    }
+
     protected abstract C createContext();
 
+    //必须在 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");
@@ -396,7 +478,9 @@ public abstract class Server<K extends Serializable, C extends Context, R extend
             if (s.endsWith("*")) {
                 File root = new File(s.substring(0, s.length() - 1));
                 if (root.isDirectory()) {
-                    for (File f : root.listFiles()) {
+                    File[] lfs = root.listFiles();
+                    if (lfs == null) throw new RuntimeException("File(" + root + ") cannot listFiles()");
+                    for (File f : lfs) {
                         set.add(f.toURI().toURL());
                     }
                 }
@@ -410,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

@@ -12,6 +12,7 @@ import java.nio.channels.*;
 import java.util.Set;
 import java.util.concurrent.*;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.function.*;
 import javax.net.ssl.SSLContext;
 
 /**
@@ -35,11 +36,12 @@ public class TcpAioAsyncConnection extends AsyncConnection {
 
     private BlockingQueue<WriteEntry> writeQueue;
 
-    public TcpAioAsyncConnection(final AsynchronousSocketChannel ch, SSLContext sslContext,
-        final SocketAddress addr0, final int readTimeoutSeconds, final int writeTimeoutSeconds,
+    public TcpAioAsyncConnection(Supplier<ByteBuffer> bufferSupplier, Consumer<ByteBuffer> bufferConsumer,
+        final AsynchronousSocketChannel ch, final SSLContext sslContext, final SocketAddress addr0,
+        final int readTimeoutSeconds, final int writeTimeoutSeconds,
         final AtomicLong livingCounter, final AtomicLong closedCounter) {
+        super(bufferSupplier, bufferConsumer, sslContext);
         this.channel = ch;
-        this.sslContext = sslContext;
         this.readTimeoutSeconds = readTimeoutSeconds;
         this.writeTimeoutSeconds = writeTimeoutSeconds;
         SocketAddress addr = addr0;
@@ -91,24 +93,31 @@ public class TcpAioAsyncConnection extends AsyncConnection {
     }
 
     @Override
-    public <A> void read(ByteBuffer dst, A attachment, CompletionHandler<Integer, ? super A> handler) {
+    public void read(CompletionHandler<Integer, ByteBuffer> handler) {
         this.readtime = System.currentTimeMillis();
+        ByteBuffer dst = pollReadBuffer();
         if (readTimeoutSeconds > 0) {
-            channel.read(dst, readTimeoutSeconds, TimeUnit.SECONDS, attachment, handler);
+            channel.read(dst, readTimeoutSeconds, TimeUnit.SECONDS, dst, handler);
         } else {
-            channel.read(dst, attachment, handler);
+            channel.read(dst, dst, handler);
         }
     }
 
-    @Override
-    public <A> void read(ByteBuffer dst, long timeout, TimeUnit unit, A attachment, CompletionHandler<Integer, ? super A> handler) {
-        this.readtime = System.currentTimeMillis();
-        channel.read(dst, timeout < 0 ? 0 : timeout, unit, attachment, handler);
-    }
-
-    private <A> void nextWrite(A attachment) {
+    private <A> void nextWrite(Throwable exc, A attachment) {
         BlockingQueue<WriteEntry> queue = this.writeQueue;
+        if (queue != null && exc != null && !isOpen()) {
+            WriteEntry entry;
+            while ((entry = queue.poll()) != null) {
+                try {
+                    entry.writeHandler.failed(exc, entry.writeAttachment);
+                } catch (Throwable e) {
+                    e.printStackTrace(System.err);
+                }
+            }
+            return;
+        }
         WriteEntry entry = queue == null ? null : queue.poll();
+
         if (entry != null) {
             try {
                 if (entry.writeOneBuffer == null) {
@@ -147,10 +156,14 @@ public class TcpAioAsyncConnection extends AsyncConnection {
             return;
         }
         this.writetime = System.currentTimeMillis();
-        if (writeTimeoutSeconds > 0) {
-            channel.write(src, writeTimeoutSeconds, TimeUnit.SECONDS, attachment, newHandler);
-        } else {
-            channel.write(src, attachment, newHandler);
+        try {
+            if (writeTimeoutSeconds > 0) {
+                channel.write(src, writeTimeoutSeconds, TimeUnit.SECONDS, attachment, newHandler);
+            } else {
+                channel.write(src, attachment, newHandler);
+            }
+        } catch (Exception e) {
+            newHandler.failed(e, attachment);
         }
     }
 
@@ -177,7 +190,11 @@ public class TcpAioAsyncConnection extends AsyncConnection {
             return;
         }
         this.writetime = System.currentTimeMillis();
-        channel.write(srcs, offset, length, writeTimeoutSeconds > 0 ? writeTimeoutSeconds : 60, TimeUnit.SECONDS, attachment, newHandler);
+        try {
+            channel.write(srcs, offset, length, writeTimeoutSeconds > 0 ? writeTimeoutSeconds : 60, TimeUnit.SECONDS, attachment, newHandler);
+        } catch (Exception e) {
+            newHandler.failed(e, attachment);
+        }
     }
 
     @Override
@@ -215,13 +232,21 @@ public class TcpAioAsyncConnection extends AsyncConnection {
     }
 
     @Override
-    public final Future<Integer> read(ByteBuffer dst) {
-        return channel.read(dst);
+    public final int read(ByteBuffer dst) throws IOException {
+        try {
+            return channel.read(dst).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException(e);
+        }
     }
 
     @Override
-    public final Future<Integer> write(ByteBuffer src) {
-        return channel.write(src);
+    public final int write(ByteBuffer src) throws IOException {
+        try {
+            return channel.write(src).get();
+        } catch (InterruptedException | ExecutionException e) {
+            throw new IOException(e);
+        }
     }
 
     @Override
@@ -292,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);
+            }
         }
 
     }
@@ -330,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
@@ -32,7 +34,8 @@ public class TcpAioProtocolServer extends ProtocolServer {
 
     @Override
     public void open(AnyValue config) throws IOException {
-        group = AsynchronousChannelGroup.withThreadPool(context.executor);
+        //group = AsynchronousChannelGroup.withThreadPool(context.executor);
+        group = AsynchronousChannelGroup.withFixedThreadPool(context.executor.getCorePoolSize(), context.executor.getThreadFactory());
         this.serverChannel = AsynchronousServerSocketChannel.open(group);
 
         final Set<SocketOption<?>> options = this.serverChannel.supportedOptions();
@@ -69,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>() {
 
@@ -91,13 +101,13 @@ public class TcpAioProtocolServer extends ProtocolServer {
                     channel.setOption(StandardSocketOptions.SO_REUSEADDR, true);
                     channel.setOption(StandardSocketOptions.SO_RCVBUF, 16 * 1024);
                     channel.setOption(StandardSocketOptions.SO_SNDBUF, 16 * 1024);
-                } catch (IOException e) {
-                    context.logger.log(Level.INFO, channel + " setOption error", e);
+
+                    AsyncConnection conn = new TcpAioAsyncConnection(bufferPool, bufferPool, channel,
+                        context.getSSLContext(), null, context.readTimeoutSeconds, context.writeTimeoutSeconds, livingCounter, closedCounter);
+                    context.runAsync(new PrepareRunner(context, responsePool, conn, null, null));
+                } catch (Throwable e) {
+                    context.logger.log(Level.INFO, channel + " accept error", e);
                 }
-                AsyncConnection conn = new TcpAioAsyncConnection(channel, context.sslContext, null, context.readTimeoutSeconds, context.writeTimeoutSeconds, null, null);
-                conn.livingCounter = livingCounter;
-                conn.closedCounter = closedCounter;
-                context.runAsync(new PrepareRunner(context, conn, null, null));
             }
 
             @Override

src/org/redkale/net/TcpBioAsyncConnection.java

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

src/org/redkale/net/TcpNioAsyncConnection.java

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

src/org/redkale/net/TcpNioProtocolServer.java

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

src/org/redkale/net/Transport.java

@@ -29,41 +29,41 @@ import org.redkale.util.*;
  * @author zhangjx
  */
 public final class Transport {
-    
+
     public static final String DEFAULT_PROTOCOL = "TCP";
-    
+
     protected final AtomicInteger seq = new AtomicInteger(-1);
-    
+
     protected final TransportFactory factory;
-    
+
     protected final String name; //即<group>的name属性
 
     protected final String subprotocol; //即<group>的subprotocol属性
 
     protected final boolean tcp;
-    
+
     protected final String protocol;
-    
+
     protected final AsynchronousChannelGroup group;
-    
+
     protected final InetSocketAddress clientAddress;
 
     //不可能为null
     protected TransportNode[] transportNodes = new TransportNode[0];
-    
+
     protected final ObjectPool<ByteBuffer> bufferPool;
-    
+
     protected final SSLContext sslContext;
 
     //负载均衡策略
     protected final TransportStrategy strategy;
-    
+
     protected Transport(String name, String subprotocol, TransportFactory factory, final ObjectPool<ByteBuffer> transportBufferPool,
         final AsynchronousChannelGroup transportChannelGroup, final SSLContext sslContext, final InetSocketAddress clientAddress,
         final Collection<InetSocketAddress> addresses, final TransportStrategy strategy) {
         this(name, DEFAULT_PROTOCOL, subprotocol, factory, transportBufferPool, transportChannelGroup, sslContext, clientAddress, addresses, strategy);
     }
-    
+
     protected Transport(String name, String protocol, String subprotocol,
         final TransportFactory factory, final ObjectPool<ByteBuffer> transportBufferPool,
         final AsynchronousChannelGroup transportChannelGroup, final SSLContext sslContext, final InetSocketAddress clientAddress,
@@ -81,7 +81,7 @@ public final class Transport {
         this.strategy = strategy;
         updateRemoteAddresses(addresses);
     }
-    
+
     public final InetSocketAddress[] updateRemoteAddresses(final Collection<InetSocketAddress> addresses) {
         final TransportNode[] oldNodes = this.transportNodes;
         synchronized (this) {
@@ -109,7 +109,7 @@ public final class Transport {
         }
         return rs;
     }
-    
+
     public final boolean addRemoteAddresses(final InetSocketAddress addr) {
         if (addr == null) return false;
         if (clientAddress != null && clientAddress.equals(addr)) return false;
@@ -125,7 +125,7 @@ public final class Transport {
             return true;
         }
     }
-    
+
     public final boolean removeRemoteAddresses(InetSocketAddress addr) {
         if (addr == null) return false;
         synchronized (this) {
@@ -133,15 +133,15 @@ public final class Transport {
         }
         return true;
     }
-    
+
     public String getName() {
         return name;
     }
-    
+
     public String getSubprotocol() {
         return subprotocol;
     }
-    
+
     public void close() {
         TransportNode[] nodes = this.transportNodes;
         if (nodes == null) return;
@@ -149,22 +149,22 @@ public final class Transport {
             if (node != null) node.dispose();
         }
     }
-    
+
     public InetSocketAddress getClientAddress() {
         return clientAddress;
     }
-    
+
     public TransportNode[] getTransportNodes() {
         return transportNodes;
     }
-    
+
     public TransportNode findTransportNode(SocketAddress addr) {
         for (TransportNode node : this.transportNodes) {
             if (node.address.equals(addr)) return node;
         }
         return null;
     }
-    
+
     public InetSocketAddress[] getRemoteAddresses() {
         InetSocketAddress[] rs = new InetSocketAddress[transportNodes.length];
         for (int i = 0; i < rs.length; i++) {
@@ -172,36 +172,36 @@ public final class Transport {
         }
         return rs;
     }
-    
+
     @Override
     public String toString() {
         return Transport.class.getSimpleName() + "{name = " + name + ", protocol = " + protocol + ", clientAddress = " + clientAddress + ", remoteNodes = " + Arrays.toString(transportNodes) + "}";
     }
-    
+
     public ByteBuffer pollBuffer() {
         return bufferPool.get();
     }
-    
+
     public Supplier<ByteBuffer> getBufferSupplier() {
         return bufferPool;
     }
-    
+
     public void offerBuffer(ByteBuffer buffer) {
         bufferPool.accept(buffer);
     }
-    
+
     public void offerBuffer(ByteBuffer... buffers) {
         for (ByteBuffer buffer : buffers) offerBuffer(buffer);
     }
-    
+
     public AsynchronousChannelGroup getTransportChannelGroup() {
         return group;
     }
-    
+
     public boolean isTCP() {
         return tcp;
     }
-    
+
     public CompletableFuture<AsyncConnection> pollConnection(SocketAddress addr0) {
         if (this.strategy != null) return strategy.pollConnection(addr0, this);
         final TransportNode[] nodes = this.transportNodes;
@@ -215,12 +215,12 @@ public final class Transport {
                 DatagramChannel channel = DatagramChannel.open();
                 channel.configureBlocking(true);
                 channel.connect(udpaddr);
-                return CompletableFuture.completedFuture(AsyncConnection.create(channel, udpaddr, true, factory.readTimeoutSeconds, factory.writeTimeoutSeconds));
+                return CompletableFuture.completedFuture(AsyncConnection.create(bufferPool, channel, sslContext, udpaddr, true, factory.readTimeoutSeconds, factory.writeTimeoutSeconds));
             }
             if (!rand) { //指定地址
                 TransportNode node = findTransportNode(addr);
                 if (node == null) {
-                    return AsyncConnection.createTCP(group, sslContext, addr, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
+                    return AsyncConnection.createTCP(bufferPool, group, sslContext, addr, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
                 }
                 final BlockingQueue<AsyncConnection> queue = node.conns;
                 if (!queue.isEmpty()) {
@@ -233,7 +233,7 @@ public final class Transport {
                         }
                     }
                 }
-                return AsyncConnection.createTCP(group, sslContext, addr, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
+                return AsyncConnection.createTCP(bufferPool, group, sslContext, addr, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
             }
 
             //---------------------随机取地址------------------------
@@ -266,14 +266,14 @@ public final class Transport {
                     @Override
                     public void completed(Void result, TransportNode attachment) {
                         attachment.disabletime = 0;
-                        AsyncConnection asyncConn = AsyncConnection.create(channel, attachment.address, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
+                        AsyncConnection asyncConn = AsyncConnection.create(bufferPool, channel, attachment.address, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
                         if (future.isDone()) {
                             if (!attachment.conns.offer(asyncConn)) asyncConn.dispose();
                         } else {
                             future.complete(asyncConn);
                         }
                     }
-                    
+
                     @Override
                     public void failed(Throwable exc, TransportNode attachment) {
                         attachment.disabletime = now;
@@ -289,7 +289,7 @@ public final class Transport {
                                     future.complete(r);
                                 }
                             });
-                            
+
                         } catch (Exception e) {
                             future.completeExceptionally(e);
                         }
@@ -302,7 +302,7 @@ public final class Transport {
             throw new RuntimeException("transport address = " + addr, ex);
         }
     }
-    
+
     private CompletableFuture<AsyncConnection> pollConnection0(TransportNode[] nodes, TransportNode exclude, long now) throws IOException {
         //从可用/不可用的地址列表中创建连接
         AtomicInteger count = new AtomicInteger(nodes.length);
@@ -319,17 +319,17 @@ public final class Transport {
                 public void completed(Void result, TransportNode attachment) {
                     try {
                         attachment.disabletime = 0;
-                        AsyncConnection asyncConn = AsyncConnection.create(channel, attachment.address, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
+                        AsyncConnection asyncConn = AsyncConnection.create(bufferPool, channel, attachment.address, factory.readTimeoutSeconds, factory.writeTimeoutSeconds);
                         if (future.isDone()) {
                             if (!attachment.conns.offer(asyncConn)) asyncConn.dispose();
                         } else {
                             future.complete(asyncConn);
                         }
                     } catch (Exception e) {
-                        failed(e, attachment); 
+                        failed(e, attachment);
                     }
                 }
-                
+
                 @Override
                 public void failed(Throwable exc, TransportNode attachment) {
                     attachment.disabletime = now;
@@ -345,7 +345,7 @@ public final class Transport {
         }
         return future;
     }
-    
+
     public void offerConnection(final boolean forceClose, AsyncConnection conn) {
         if (this.strategy != null && strategy.offerConnection(forceClose, conn)) return;
         if (!forceClose && conn.isTCP()) {
@@ -359,7 +359,7 @@ public final class Transport {
             conn.dispose();
         }
     }
-    
+
     public <A> void async(SocketAddress addr, final ByteBuffer buffer, A att, final CompletionHandler<Integer, A> handler) {
         pollConnection(addr).whenComplete((conn, ex) -> {
             if (ex != null) {
@@ -367,118 +367,119 @@ public final class Transport {
                 return;
             }
             conn.write(buffer, buffer, new CompletionHandler<Integer, ByteBuffer>() {
-                
+
                 @Override
                 public void completed(Integer result, ByteBuffer attachment) {
                     buffer.clear();
-                    conn.read(buffer, buffer, new CompletionHandler<Integer, ByteBuffer>() {
-                        
+                    conn.setReadBuffer(buffer);
+                    conn.read(new CompletionHandler<Integer, ByteBuffer>() {
+
                         @Override
                         public void completed(Integer result, ByteBuffer attachment) {
                             if (handler != null) handler.completed(result, att);
-                            offerBuffer(buffer);
+                            conn.offerBuffer(attachment);
                             offerConnection(false, conn);
                         }
-                        
+
                         @Override
                         public void failed(Throwable exc, ByteBuffer attachment) {
-                            offerBuffer(buffer);
+                            conn.offerBuffer(attachment);
                             offerConnection(true, conn);
                         }
                     });
-                    
+
                 }
-                
+
                 @Override
                 public void failed(Throwable exc, ByteBuffer attachment) {
-                    offerBuffer(buffer);
+                    conn.offerBuffer(attachment);
                     offerConnection(true, conn);
                 }
             });
         });
     }
-    
+
     public static class TransportNode {
-        
+
         protected InetSocketAddress address;
-        
+
         protected volatile long disabletime; //不可用时的时间, 为0表示可用
 
         protected final BlockingQueue<AsyncConnection> conns;
-        
+
         protected final ConcurrentHashMap<String, Object> attributes = new ConcurrentHashMap<>();
-        
+
         public TransportNode(int poolmaxconns, InetSocketAddress address) {
             this.address = address;
             this.disabletime = 0;
             this.conns = new ArrayBlockingQueue<>(poolmaxconns);
         }
-        
+
         @ConstructorParameters({"poolmaxconns", "address", "disabletime"})
         public TransportNode(int poolmaxconns, InetSocketAddress address, long disabletime) {
             this.address = address;
             this.disabletime = disabletime;
             this.conns = new LinkedBlockingQueue<>(poolmaxconns);
         }
-        
+
         public int getPoolmaxconns() {
             return this.conns.remainingCapacity() + this.conns.size();
         }
-        
+
         public <T> T setAttribute(String name, T value) {
             attributes.put(name, value);
             return value;
         }
-        
+
         @SuppressWarnings("unchecked")
         public <T> T getAttribute(String name) {
             return (T) attributes.get(name);
         }
-        
+
         @SuppressWarnings("unchecked")
         public <T> T removeAttribute(String name) {
             return (T) attributes.remove(name);
         }
-        
+
         public TransportNode clearAttributes() {
             attributes.clear();
             return this;
         }
-        
+
         public ConcurrentHashMap<String, Object> getAttributes() {
             return attributes;
         }
-        
+
         public void setAttributes(ConcurrentHashMap<String, Object> map) {
             attributes.clear();
             if (map != null) attributes.putAll(map);
         }
-        
+
         public InetSocketAddress getAddress() {
             return address;
         }
-        
+
         public long getDisabletime() {
             return disabletime;
         }
-        
+
         @ConvertDisabled
         public BlockingQueue<AsyncConnection> getConns() {
             return conns;
         }
-        
+
         public void dispose() {
             AsyncConnection conn;
             while ((conn = conns.poll()) != null) {
                 conn.dispose();
             }
         }
-        
+
         @Override
         public int hashCode() {
             return this.address.hashCode();
         }
-        
+
         @Override
         public boolean equals(Object obj) {
             if (this == obj) return true;
@@ -487,7 +488,7 @@ public final class Transport {
             final TransportNode other = (TransportNode) obj;
             return this.address.equals(other.address);
         }
-        
+
         @Override
         public String toString() {
             return JsonConvert.root().convertTo(this);

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