Redkale 2.2.0 结束

README.md

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

bin/command.bat

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

bin/command.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+export LC_ALL="zh_CN.UTF-8"
+
+APP_HOME=`dirname "$0"`
+
+cd "$APP_HOME"/..
+
+APP_HOME=`pwd`
+
+if [ ! -f "$APP_HOME"/conf/application.xml ]; then 
+     APP_HOME="$APP_HOME"/..  
+fi
+
+lib="$APP_HOME"/lib
+for jar in `ls $APP_HOME/lib/*.jar`
+do
+    lib=$lib:$jar
+done
+export CLASSPATH=$CLASSPATH:$lib
+
+echo "$APP_HOME"
+java -DCMD=$1  -DAPP_HOME="$APP_HOME"  org.redkale.boot.Application

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 nodeid="10000" 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/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

@@ -6,7 +6,7 @@
     <packaging>jar</packaging>
     <url>http://redkale.org</url>
     <description>redkale -- java framework</description>
-    <version>1.6.2</version>
+    <version>2.2.0</version>
     <licenses>     
         <license>      
             <name>Apache 2</name>       
@@ -37,8 +37,8 @@
     
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <maven.compiler.source>1.8</maven.compiler.source>
-        <maven.compiler.target>1.8</maven.compiler.target>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
     </properties>
     <name>Redkale</name>
     <distributionManagement>
@@ -61,12 +61,12 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>                                
+                <version>3.8.0</version>                                
                 <configuration>
+					<compilerArgument>-parameters</compilerArgument>
                     <encoding>UTF-8</encoding>
                     <compilerArguments>
                         <verbose />
-                        <bootclasspath>${java.home}/lib/rt.jar</bootclasspath>
                     </compilerArguments>
                 </configuration>    
             </plugin>
@@ -74,9 +74,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
+                <version>3.2.0</version>
                 <configuration>
                     <archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
                         <manifest>
                             <mainClass>org.redkale.boot.Application</mainClass>
                         </manifest>
@@ -101,7 +102,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -113,7 +114,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>3.2.0</version>
                 <executions>
                     <execution>
                         <goals>
@@ -126,7 +127,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>   
-                <version>3.0.0</version>
+                <version>3.2.0</version>
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>   

src/META-INF/application-template.xml

@@ -19,11 +19,13 @@
   serviceid1_name1  serviceid1_name2   serviceid2_name1  serviceid2_name2    
 -->
 <!--     
-    address:  本地局域网的IP地址， 默认值为默认网卡的ip，当不使用默认值需要指定值，如192.168.1.22
+    nodeid: int     进程的节点ID，用于分布式环境，一个系统中节点ID必须全局唯一，使用cluster时框架会进行唯一性校验
+    name:           进程的名称，用于监控识别，命名规则: 字母、数字、下划线
+    address:        本地局域网的IP地址， 默认值为默认网卡的ip，当不使用默认值需要指定值，如192.168.1.22
     port: required  程序的管理Server的端口，用于关闭或者与监管系统进行数据交互
-    lib:  加上额外的lib路径,多个路径用分号;隔开； 默认为空。  例如: ${APP_HOME}/lib/a.jar;${APP_HOME}/lib2/b.jar;
+    lib:            加上额外的lib路径,多个路径用分号;隔开； 默认为空。  例如: ${APP_HOME}/lib/a.jar;${APP_HOME}/lib2/b.jar;
 -->
-<application port="6560" lib="">  
+<application nodeid="1000" port="6560" lib="">  
     
     <!-- 
         【节点全局唯一】
@@ -34,21 +36,61 @@
         <!--
             【节点全局唯一】
             transport节点只能有一个，用于配置所有Transport的池参数，没配置该节点将自动创建一个。
-            threads： 线程总数， 默认: <group>节点数*CPU核数*2
-            bufferCapacity: ByteBuffer的初始化大小， 默认: 32K; 
-            bufferPoolSize： ByteBuffer池的大小，默认: 线程总数*4
-            readTimeoutSeconds: TCP读取超时秒数, 默认为6秒， 为0表示无超时限制
+            threads：            线程总数， 默认: <group>节点数*CPU核数*2
+            bufferCapacity:      ByteBuffer的初始化大小， 默认: 32K; 
+            bufferPoolSize：     ByteBuffer池的大小，默认: 线程总数*4
+            readTimeoutSeconds:  TCP读取超时秒数, 默认为6秒， 为0表示无超时限制
             writeTimeoutSeconds: TCP写入超时秒数, 默认为6秒， 为0表示无超时限制
-            strategy: 远程请求的负载均衡策略， 必须是org.redkale.net.TransportStrategy的实现类
+            strategy:            远程请求的负载均衡策略， 必须是org.redkale.net.TransportStrategy的实现类
         -->
         <transport bufferCapacity="32K" bufferPoolSize="32" threads="32" readTimeoutSeconds="6" writeTimeoutSeconds="6"/>
         
+        <!--
+           【节点全局唯一】
+            自动扫描时排除部分包路径
+            value：    排除lib.path与excludes中的正则表达式匹配的路径, 多个正则表达式用分号;隔开
+        -->
+        <excludelibs value="^.*mysql.*$;^.*kafka.*$"/>
+        
+        <!--
+           【节点全局唯一】
+            第三方服务发现管理接口
+            value：    类名，必须是org.redkale.cluster.ClusterAgent的子类
+            waits:     注销服务后是否需要等待检查周期时间后再进行Service销毁，默认值为：false
+                       当一个Service进行服务注销后，不能立刻销毁Service，因为健康检测是有间隔时间差的，
+                       需要等待一个健康检测周期时间，让其他进程都更新完服务列表。
+                       如果使用MQ，可以设置为false，如果对服务健壮性要求高，建议设置为true
+            protocols: 服务发现可以处理的协议， 默认值为: SNCP, 多个协议用分号;隔开
+            ports:     服务发现可以处理的端口， 多个端口用分号;隔开
+        -->
+        <!--
+        <cluster value="org.redkalex.cluster.consul.ConsulClusterAgent" waits="false" protocols="SNCP" ports="7070;7071">
+            <property name="xxxxxx" value="XXXXXXXX"/>
+        </cluster>
+        -->
+        <!--
+            MQ管理接口配置
+            不同MQ节点所配置的MQ集群不能重复。
+            name:   服务的名称，用于监控识别，多个mq节点时只能有一个name为空的节点，mq.name不能重复,命名规则: 字母、数字、下划线
+            value： 实现类名，必须是org.redkale.mq.MessageAgent的子类
+            MQ节点下的子节点配置没有固定格式, 根据MessageAgent实现方的定义来配置
+        -->
+        <!--
+        <mq name="" value="org.redkalex.mq.kafka.KafkaMessageAgent">
+            <servers value="127.0.0.1:9101"/>
+            <consumer>
+                <property name="xxxxxx" value="XXXXXXXX"/>
+            </consumer>
+            <producer>
+                <property name="xxxxxx" value="XXXXXXXX"/>
+            </producer>
+        </mq>
+        -->
         <!--
             一个组包含多个node， 同一Service服务可以由多个进程提供，这些进程称为一个GROUP，且同一GROUP内的进程必须在同一机房或局域网内
             一个group节点对应一个 Transport 对象。
-            name: 服务组ID，长度不能超过11个字节. 默认为空字符串。 注意: name不能包含$符号。
-            protocol：值范围：UDP TCP， 默认TCP
-            subprotocol: 子协议，预留字段。默认值为空
+            name:         服务组ID，长度不能超过11个字节. 默认为空字符串。 注意: name不能包含$符号。
+            protocol：    值范围：UDP TCP， 默认TCP
             注意: 一个node只能所属一个group。只要存在protocol=SNCP的Server节点信息， 就必须有group节点信息。
         -->
         <group name="" protocol="TCP">
@@ -63,10 +105,10 @@
         
         <!--
             全局的数据源设置, 可以是CacheSource、DataSource， JDBC的DataSource通常通过persistence.xml配置，此处多用于CacheSource的配置
-            name:  资源名，用于依赖注入。
-            value：类名，必须是CacheSource或DataSource的子类，且必须实现Service接口。如果是DataSource.class，系统自动映射成DataJdbcSource.class
-            groups: 指定groups。
-            xxx: 其他属性与子节点通过Service.init方法传入的AnyValue获取。
+            name:    资源名，用于依赖注入。
+            value：  类名，必须是CacheSource或DataSource的子类，且必须实现Service接口。如果是DataSource.class，系统自动映射成DataJdbcSource.class
+            groups:  指定groups。
+            xxx:     其他属性与子节点通过Service.init方法传入的AnyValue获取。
         -->
         <source name="redis" value="org.redkalex.cache.RedisCacheSource" xxx="16">
             <node addr="127.0.0.1" port="7070"/>
@@ -88,12 +130,9 @@
                System.setProperty("net.transport.poolmaxconns", "100");
                System.setProperty("net.transport.pinginterval", "30");
                System.setProperty("net.transport.checkinterval", "30");
-               System.setProperty("convert.json.tiny", "true");
-               System.setProperty("convert.bson.tiny", "true");
-               System.setProperty("convert.json.pool.size", "128");
-               System.setProperty("convert.bson.pool.size", "128");
-               System.setProperty("convert.json.writer.buffer.defsize", "4096");
-               System.setProperty("convert.bson.writer.buffer.defsize", "4096");
+               System.setProperty("convert.tiny", "true");
+               System.setProperty("convert.pool.size", "128");
+               System.setProperty("convert.writer.buffer.defsize", "4096");
                
             <properties>节点下也可包含非<property>节点.
             非<property>其节点可以通过@Resource(name="properties.xxxxxx")进行注入, 被注解的字段类型只能是AnyValue、AnyValue[]
@@ -107,35 +146,35 @@
                 
     </resources> 
     <!--
-        protocol: required  server所启动的协议，Redkale内置的有HTTP、SNCP、WATCH。协议均使用TCP实现; WATCH服务只能存在一个。
-        name: 服务的名称，用于监控识别，一个配置文件中的server.name不能重复,命名规则: 字母、数字、下划线
-        host:  服务所占address ， 默认: 0.0.0.0
-        port:  required 服务所占端口 
-        root:  如果是web类型服务，则包含页面  默认:{APP_HOME}/root
-        lib: server额外的class目录， 默认为${APP_HOME}/libs/*; 
-        excludelibs: 排除lib.path与excludes中的正则表达式匹配的路径, 多个正则表达式用分号;隔开
-        charset: 文本编码， 默认: UTF-8
-        backlog:  默认10K
-        threads： 线程数， 默认: CPU核数*32
-        maxconns：最大连接数, 小于1表示无限制， 默认: 0
-        maxbody: request.body最大值， 默认: 64K
-        bufferCapacity: ByteBuffer的初始化大小， 默认: 32K;  (HTTP 2.0、WebSocket，必须要16k以上)
-        bufferPoolSize： ByteBuffer池的大小，默认: 线程数*4
-        responsePoolSize： Response池的大小，默认: 线程数*2
+        protocol: required   server所启动的协议，Redkale内置的有HTTP、SNCP、WATCH。协议均使用TCP实现; WATCH服务只能存在一个。
+        name:                服务的名称，用于监控识别，一个配置文件中的server.name不能重复,命名规则: 字母、数字、下划线
+        host:                服务所占address ， 默认: 0.0.0.0
+        port:                required 服务所占端口 
+        root:                如果是web类型服务，则包含页面  默认:{APP_HOME}/root
+        lib:                 server额外的class目录， 默认为${APP_HOME}/libs/*; 
+        excludelibs:         排除lib.path与excludes中的正则表达式匹配的路径, 多个正则表达式用分号;隔开
+        charset:             文本编码， 默认: UTF-8
+        backlog:             默认10K
+        threads：            线程数， 默认: CPU核数*2，最小8个
+        maxconns：           最大连接数, 小于1表示无限制， 默认: 0
+        maxbody:             request.body最大值， 默认: 64K
+        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；
-        interceptor: 启动/关闭NodeServer时被调用的拦截器实现类，必须是org.redkale.boot.NodeInterceptor的子类，默认为null
+        readTimeoutSeconds:  读操作超时秒数， 默认0， 表示永久不超时
+        writeTimeoutSeconds: 写操作超时秒数， 默认0， 表示永久不超时
+        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=""> 
         
         <!-- 
            【节点在<server>中唯一】
            value: 创建SSLContext的实现类, 可自定义，必须是org.redkale.net.SSLCreator的子类
-           clientauth: true/false/want
-           keystorepass: KEY密码
-           keystorefile: KEY文件
+           clientauth:     true/false/want
+           keystorepass:   KEY密码
+           keystorefile:   KEY文件
            truststorepass: TRUST密码
            truststorefile: TRUST文件
         -->
@@ -146,11 +185,13 @@
            在同一个进程中同一个name同一类型的Service将共用同一个实例
            autoload="true"  默认值. 自动加载classpath下所有的Service类  
            autoload="false" 需要显著的指定Service类
+           mq:        所属的MQ管理器，当 protocol == SNCP 时该值才有效, 存在该属性表示Service的SNCP协议采用消息总线代理模式
            includes： 当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
            excludes： 当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开           
-           groups:   所属组的节点,多个节点值用;隔开，如果配置文件中存在多个SNCP协议的Server节点，需要显式指定group属性.
-                    当 protocol == SNCP 时 group表示当前Server与哪些节点组关联。
-                    当 protocol != SNCP 时 group只能是空或者一个group的节点值，不能为多个节点值。
+           groups:    所属组的节点,多个节点值用;隔开，如果配置文件中存在多个SNCP协议的Server节点，需要显式指定group属性.
+                         当 protocol == SNCP 时 group表示当前Server与哪些节点组关联。
+                         当 protocol != SNCP 时 group只能是空或者一个group的节点值，不能为多个节点值。
+                         特殊值"$cluster", 视为通过第三方服务注册发现管理工具来获取远程模式的ip端口信息
         -->
         <services autoload="true" includes="" excludes="">
 
@@ -174,8 +215,8 @@
            加载所有的Filter服务;
            autoload="true"  默认值.  
            autoload="false" 需要显著的指定Filter类
-           includes： 当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
-           excludes： 当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开    
+           includes：       当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
+           excludes：       当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开    
         -->
         <filters autoload="true" includes="" excludes="">
             
@@ -198,8 +239,9 @@
         <!-- 
            REST的核心配置项
            当Server为HTTP协议时, rest节点才有效。存在[rest]节点则Server启动时会加载REST服务, 节点可以多个,(WATCH协议不需要设置，系统会自动生成)
-           path:     servlet的ContextPath前缀 默认为空
+           path:     servlet的ContextPath前缀 默认为空 【注: 开启MQ时,该字段失效】
            base:     REST服务的BaseServlet，必须是 org.redkale.net.http.HttpServlet 的子类，且子类必须标记@HttpUserType。
+           mq:        所属的MQ管理器, 存在该属性表示RestService的请求来自于消息总线 【注: 开启MQ时,path字段失效】
            autoload：默认值"true"  默认值. 加载当前server所能使用的Servce对象;    
            includes：当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
            excludes：当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
@@ -263,21 +305,21 @@
            当Server为HTTP协议时，ResourceServlet才有效. 默认存在一个有默认属性的resource-servlet节点
            webroot: web资源的根目录, 默认取server节点中的root值
            servlet: 静态资源HttpServlet的实现，默认使用HttpResourceServlet
-           index : 启始页，默认值：index.html
+           index :  启始页，默认值：index.html
         -->
         <resource-servlet webroot="root" index="index.html">
             <!--
                 【节点在<resource-servlet>中唯一】
                 资源缓存的配置, 默认存在一个含默认属性的caches节点
-                limit:  资源缓存最大容量， 默认: 0, 为0表示不缓存， 单位可以是B、K、M、G，不区分大小写
+                limit:     资源缓存最大容量， 默认: 0, 为0表示不缓存， 单位可以是B、K、M、G，不区分大小写
                 lengthmax: 可缓存的文件大小上限， 默认: 1M（超过1M的文件不会被缓存）
-                watch: 是否监控缓存文件的变化， 默认为false，不监控
+                watch:     是否监控缓存文件的变化， 默认为false，不监控
             -->
             <cache  limit="0M" lengthmax="1M" watch="false"/>
             <!--
                支持类似nginx中的rewrite， 目前只支持静态资源对静态资源的跳转。
-               type: 匹配的类型, 目前只支持location(匹配requestURI), 默认: location
-               match: 匹配的正则表达式
+               type:    匹配的类型, 目前只支持location(匹配requestURI), 默认: location
+               match:   匹配的正则表达式
                forward: 需跳转后的资源链接
                例如下面例子是将/xxx-yyy.html的页面全部跳转到/xxx.html
             -->
@@ -285,11 +327,11 @@
         </resource-servlet>
         <!-- 
            加载所有的Servlet服务;
-           path:  servlet的ContextPath前缀 默认为空
+           path:            servlet的ContextPath前缀 默认为空
            autoload="true"  默认值. 自动加载classpath下所有的Servlet类 
            autoload="false" 需要显著的指定Service类
-           includes： 当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
-           excludes： 当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
+           includes：       当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
+           excludes：       当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
         -->
         <servlets path="/pipes" autoload="true" includes="" excludes="">
             <!-- 

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
 
@@ -23,6 +22,7 @@ module org.redkale {
     exports org.redkale.convert.bson;
     exports org.redkale.convert.ext;
     exports org.redkale.convert.json;
+    exports org.redkale.mq;
     exports org.redkale.net;
     exports org.redkale.net.http;
     exports org.redkale.net.sncp;
@@ -31,5 +31,10 @@ module org.redkale {
     exports org.redkale.util;
     exports org.redkale.watch;
     
+    uses org.redkale.cluster.ClusterAgent;
+    uses org.redkale.mq.MessageAgent;
+    uses org.redkale.source.CacheSource;
+    uses org.redkale.source.SourceLoader;
+    uses org.redkale.util.ResourceInjectLoader;
 }
 */

src/org/redkale/asm/AnnotationVisitor.java

@@ -60,8 +60,8 @@ package org.redkale.asm;
 
 /**
  * A visitor to visit a Java annotation. The methods of this class must be
- * called in the following order: ( <tt>visit</tt> | <tt>visitEnum</tt> |
- * <tt>visitAnnotation</tt> | <tt>visitArray</tt> )* <tt>visitEnd</tt>.
+ * called in the following order: ( <code>visit</code> | <code>visitEnum</code> |
+ * <code>visitAnnotation</code> | <code>visitArray</code> )* <code>visitEnd</code>.
  *
  * @author Eric Bruneton
  * @author Eugene Kuleshov
@@ -151,7 +151,7 @@ public abstract class AnnotationVisitor {
      * @param desc
      *            the class descriptor of the nested annotation class.
      * @return a visitor to visit the actual nested annotation value, or
-     *         <tt>null</tt> if this visitor is not interested in visiting this
+     *         <code>null</code> if this visitor is not interested in visiting this
      *         nested annotation. <i>The nested annotation value must be fully
      *         visited before calling other methods on this annotation
      *         visitor</i>.
@@ -172,7 +172,7 @@ public abstract class AnnotationVisitor {
      * @param name
      *            the value name.
      * @return a visitor to visit the actual array value elements, or
-     *         <tt>null</tt> if this visitor is not interested in visiting these
+     *         <code>null</code> if this visitor is not interested in visiting these
      *         values. The 'name' parameters passed to the methods of this
      *         visitor are ignored. <i>All the array values must be visited
      *         before calling other methods on this annotation visitor</i>.

src/org/redkale/asm/AnnotationWriter.java

@@ -77,7 +77,7 @@ final class AnnotationWriter extends AnnotationVisitor {
     private int size;
 
     /**
-     * <tt>true<tt> if values are named, <tt>false</tt> otherwise. Annotation
+     * <code>true<code> if values are named, <code>false</code> otherwise. Annotation
      * writers used for annotation default and annotation arrays use unnamed
      * values.
      */
@@ -122,13 +122,13 @@ final class AnnotationWriter extends AnnotationVisitor {
      * @param cw
      *            the class writer to which this annotation must be added.
      * @param named
-     *            <tt>true<tt> if values are named, <tt>false</tt> otherwise.
+     *            <code>true<code> if values are named, <code>false</code> otherwise.
      * @param bv
      *            where the annotation values must be stored.
      * @param parent
      *            where the number of annotation values must be stored.
      * @param offset
-     *            where in <tt>parent</tt> the number of annotation values must
+     *            where in <code>parent</code> the number of annotation values must
      *            be stored.
      */
     AnnotationWriter(final ClassWriter cw, final boolean named,
@@ -354,7 +354,7 @@ final class AnnotationWriter extends AnnotationVisitor {
      * @param typePath
      *            the path to the annotated type argument, wildcard bound, array
      *            element type, or static inner type within 'typeRef'. May be
-     *            <tt>null</tt> if the annotation targets 'typeRef' as a whole.
+     *            <code>null</code> if the annotation targets 'typeRef' as a whole.
      * @param out
      *            where the type reference and type path must be put.
      */

src/org/redkale/asm/Attribute.java

@@ -77,7 +77,7 @@ class Attribute {
     byte[] value;
 
     /**
-     * The next attribute in this attribute list. May be <tt>null</tt>.
+     * The next attribute in this attribute list. May be <code>null</code>.
      */
     Attribute next;
 
@@ -92,19 +92,19 @@ class Attribute {
     }
 
     /**
-     * Returns <tt>true</tt> if this type of attribute is unknown. The default
-     * implementation of this method always returns <tt>true</tt>.
+     * Returns <code>true</code> if this type of attribute is unknown. The default
+     * implementation of this method always returns <code>true</code>.
      *
-     * @return <tt>true</tt> if this type of attribute is unknown.
+     * @return <code>true</code> if this type of attribute is unknown.
      */
     public boolean isUnknown() {
         return true;
     }
 
     /**
-     * Returns <tt>true</tt> if this type of attribute is a code attribute.
+     * Returns <code>true</code> if this type of attribute is a code attribute.
      *
-     * @return <tt>true</tt> if this type of attribute is a code attribute.
+     * @return <code>true</code> if this type of attribute is a code attribute.
      */
     public boolean isCodeAttribute() {
         return false;
@@ -113,7 +113,7 @@ class Attribute {
     /**
      * Returns the labels corresponding to this attribute.
      *
-     * @return the labels corresponding to this attribute, or <tt>null</tt> if
+     * @return the labels corresponding to this attribute, or <code>null</code> if
      *         this attribute is not a code attribute that contains labels.
      */
     protected Label[] getLabels() {
@@ -123,7 +123,7 @@ class Attribute {
     /**
      * Reads a {@link #type type} attribute. This method must return a
      * <i>new</i> {@link Attribute} object, of type {@link #type type},
-     * corresponding to the <tt>len</tt> bytes starting at the given offset, in
+     * corresponding to the <code>len</code> bytes starting at the given offset, in
      * the given class reader.
      *
      * @param cr
@@ -146,7 +146,7 @@ class Attribute {
      *            containing the type and the length of the attribute, are not
      *            taken into account here.
      * @param labels
-     *            the labels of the method's code, or <tt>null</tt> if the
+     *            the labels of the method's code, or <code>null</code> if the
      *            attribute to be read is not a code attribute.
      * @return a <i>new</i> {@link Attribute} object corresponding to the given
      *         bytes.
@@ -169,11 +169,11 @@ class Attribute {
      *            class the items that corresponds to this attribute.
      * @param code
      *            the bytecode of the method corresponding to this code
-     *            attribute, or <tt>null</tt> if this attribute is not a code
+     *            attribute, or <code>null</code> if this attribute is not a code
      *            attributes.
      * @param len
      *            the length of the bytecode of the method corresponding to this
-     *            code attribute, or <tt>null</tt> if this attribute is not a
+     *            code attribute, or <code>null</code> if this attribute is not a
      *            code attribute.
      * @param maxStack
      *            the maximum stack size of the method corresponding to this
@@ -216,11 +216,11 @@ class Attribute {
      *            byte arrays, with the {@link #write write} method.
      * @param code
      *            the bytecode of the method corresponding to these code
-     *            attributes, or <tt>null</tt> if these attributes are not code
+     *            attributes, or <code>null</code> if these attributes are not code
      *            attributes.
      * @param len
      *            the length of the bytecode of the method corresponding to
-     *            these code attributes, or <tt>null</tt> if these attributes
+     *            these code attributes, or <code>null</code> if these attributes
      *            are not code attributes.
      * @param maxStack
      *            the maximum stack size of the method corresponding to these
@@ -254,11 +254,11 @@ class Attribute {
      *            byte arrays, with the {@link #write write} method.
      * @param code
      *            the bytecode of the method corresponding to these code
-     *            attributes, or <tt>null</tt> if these attributes are not code
+     *            attributes, or <code>null</code> if these attributes are not code
      *            attributes.
      * @param len
      *            the length of the bytecode of the method corresponding to
-     *            these code attributes, or <tt>null</tt> if these attributes
+     *            these code attributes, or <code>null</code> if these attributes
      *            are not code attributes.
      * @param maxStack
      *            the maximum stack size of the method corresponding to these

src/org/redkale/asm/ByteVector.java

@@ -332,7 +332,7 @@ public class ByteVector {
      * automatically enlarged if necessary.
      *
      * @param b
-     *            an array of bytes. May be <tt>null</tt> to put <tt>len</tt>
+     *            an array of bytes. May be <code>null</code> to put <code>len</code>
      *            null bytes into this byte vector.
      * @param off
      *            index of the fist byte of b that must be copied.

src/org/redkale/asm/ClassReader.java

@@ -267,7 +267,7 @@ public class ClassReader {
      * {@link Type#getInternalName() getInternalName}). For interfaces, the
      * super class is {@link Object}.
      *
-     * @return the internal name of super class, or <tt>null</tt> for
+     * @return the internal name of super class, or <code>null</code> for
      *         {@link Object} class.
      *
      * @see ClassVisitor#visit(int, int, String, String, String, String[])
@@ -281,7 +281,7 @@ public class ClassReader {
      * {@link Type#getInternalName() getInternalName}).
      *
      * @return the array of internal names for all implemented interfaces or
-     *         <tt>null</tt>.
+     *         <code>null</code>.
      *
      * @see ClassVisitor#visit(int, int, String, String, String, String[])
      */
@@ -1932,7 +1932,7 @@ public class ClassReader {
      * @param v
      *            start offset in {@link #b b} of the annotations to be read.
      * @param visible
-     *            <tt>true</tt> if the annotations to be read are visible at
+     *            <code>true</code> if the annotations to be read are visible at
      *            runtime.
      */
     private void readParameterAnnotations(final MethodVisitor mv,
@@ -2474,9 +2474,9 @@ public class ClassReader {
      *            and the length of the attribute, are not taken into account
      *            here.
      * @param labels
-     *            the labels of the method's code, or <tt>null</tt> if the
+     *            the labels of the method's code, or <code>null</code> if the
      *            attribute to be read is not a code attribute.
-     * @return the attribute that has been read, or <tt>null</tt> to skip this
+     * @return the attribute that has been read, or <code>null</code> to skip this
      *         attribute.
      */
     private Attribute readAttribute(final Attribute[] attrs, final String type,

src/org/redkale/asm/ClassVisitor.java

@@ -60,11 +60,11 @@ package org.redkale.asm;
 
 /**
  * A visitor to visit a Java class. The methods of this class must be called in
- * the following order: <tt>visit</tt> [ <tt>visitSource</tt> ] [
- * <tt>visitModule</tt> ][ <tt>visitOuterClass</tt> ] ( <tt>visitAnnotation</tt> |
- * <tt>visitTypeAnnotation</tt> | <tt>visitAttribute</tt> )* (
- * <tt>visitInnerClass</tt> | <tt>visitField</tt> | <tt>visitMethod</tt> )*
- * <tt>visitEnd</tt>.
+ * the following order: <code>visit</code> [ <code>visitSource</code> ] [
+ * <code>visitModule</code> ][ <code>visitOuterClass</code> ] ( <code>visitAnnotation</code> |
+ * <code>visitTypeAnnotation</code> | <code>visitAttribute</code> )* (
+ * <code>visitInnerClass</code> | <code>visitField</code> | <code>visitMethod</code> )*
+ * <code>visitEnd</code>.
  *
  * @author Eric Bruneton
  */
@@ -120,18 +120,18 @@ public abstract class ClassVisitor {
      *            the internal name of the class (see
      *            {@link Type#getInternalName() getInternalName}).
      * @param signature
-     *            the signature of this class. May be <tt>null</tt> if the class
+     *            the signature of this class. May be <code>null</code> if the class
      *            is not a generic one, and does not extend or implement generic
      *            classes or interfaces.
      * @param superName
      *            the internal of name of the super class (see
      *            {@link Type#getInternalName() getInternalName}). For
      *            interfaces, the super class is {@link Object}. May be
-     *            <tt>null</tt>, but only for the {@link Object} class.
+     *            <code>null</code>, but only for the {@link Object} class.
      * @param interfaces
      *            the internal names of the class's interfaces (see
      *            {@link Type#getInternalName() getInternalName}). May be
-     *            <tt>null</tt>.
+     *            <code>null</code>.
      */
     public void visit(int version, int access, String name, String signature,
             String superName, String[] interfaces) {
@@ -145,11 +145,11 @@ public abstract class ClassVisitor {
      *
      * @param source
      *            the name of the source file from which the class was compiled.
-     *            May be <tt>null</tt>.
+     *            May be <code>null</code>.
      * @param debug
      *            additional debug information to compute the correspondance
      *            between source and compiled elements of the class. May be
-     *            <tt>null</tt>.
+     *            <code>null</code>.
      */
     public void visitSource(String source, String debug) {
         if (cv != null) {
@@ -166,7 +166,7 @@ public abstract class ClassVisitor {
      *            and {@code ACC_MANDATED}.
      * @param version
      *            module version or null.
-     * @return a visitor to visit the module values, or <tt>null</tt> if
+     * @return a visitor to visit the module values, or <code>null</code> if
      *         this visitor is not interested in visiting this module.
      */
     public ModuleVisitor visitModule(String name, int access, String version) {
@@ -187,11 +187,11 @@ public abstract class ClassVisitor {
      *            internal name of the enclosing class of the class.
      * @param name
      *            the name of the method that contains the class, or
-     *            <tt>null</tt> if the class is not enclosed in a method of its
+     *            <code>null</code> if the class is not enclosed in a method of its
      *            enclosing class.
      * @param desc
      *            the descriptor of the method that contains the class, or
-     *            <tt>null</tt> if the class is not enclosed in a method of its
+     *            <code>null</code> if the class is not enclosed in a method of its
      *            enclosing class.
      */
     public void visitOuterClass(String owner, String name, String desc) {
@@ -206,8 +206,8 @@ public abstract class ClassVisitor {
      * @param desc
      *            the class descriptor of the annotation class.
      * @param visible
-     *            <tt>true</tt> if the annotation is visible at runtime.
-     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *            <code>true</code> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <code>null</code> if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
@@ -231,12 +231,12 @@ public abstract class ClassVisitor {
      * @param typePath
      *            the path to the annotated type argument, wildcard bound, array
      *            element type, or static inner type within 'typeRef'. May be
-     *            <tt>null</tt> if the annotation targets 'typeRef' as a whole.
+     *            <code>null</code> if the annotation targets 'typeRef' as a whole.
      * @param desc
      *            the class descriptor of the annotation class.
      * @param visible
-     *            <tt>true</tt> if the annotation is visible at runtime.
-     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *            <code>true</code> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <code>null</code> if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitTypeAnnotation(int typeRef,
@@ -269,10 +269,10 @@ public abstract class ClassVisitor {
      * @param outerName
      *            the internal name of the class to which the inner class
      *            belongs (see {@link Type#getInternalName() getInternalName}).
-     *            May be <tt>null</tt> for not member classes.
+     *            May be <code>null</code> for not member classes.
      * @param innerName
      *            the (simple) name of the inner class inside its enclosing
-     *            class. May be <tt>null</tt> for anonymous inner classes.
+     *            class. May be <code>null</code> for anonymous inner classes.
      * @param access
      *            the access flags of the inner class as originally declared in
      *            the enclosing class.
@@ -295,20 +295,20 @@ public abstract class ClassVisitor {
      * @param desc
      *            the field's descriptor (see {@link Type Type}).
      * @param signature
-     *            the field's signature. May be <tt>null</tt> if the field's
+     *            the field's signature. May be <code>null</code> if the field's
      *            type does not use generic types.
      * @param value
      *            the field's initial value. This parameter, which may be
-     *            <tt>null</tt> if the field does not have an initial value,
+     *            <code>null</code> if the field does not have an initial value,
      *            must be an {@link Integer}, a {@link Float}, a {@link Long}, a
-     *            {@link Double} or a {@link String} (for <tt>int</tt>,
-     *            <tt>float</tt>, <tt>long</tt> or <tt>String</tt> fields
+     *            {@link Double} or a {@link String} (for <code>int</code>,
+     *            <code>float</code>, <code>long</code> or <code>String</code> fields
      *            respectively). <i>This parameter is only used for static
      *            fields</i>. Its value is ignored for non static fields, which
      *            must be initialized through bytecode instructions in
      *            constructors or methods.
      * @return a visitor to visit field annotations and attributes, or
-     *         <tt>null</tt> if this class visitor is not interested in visiting
+     *         <code>null</code> if this class visitor is not interested in visiting
      *         these annotations and attributes.
      */
     public FieldVisitor visitField(int access, String name, String desc,
@@ -321,7 +321,7 @@ public abstract class ClassVisitor {
 
     /**
      * Visits a method of the class. This method <i>must</i> return a new
-     * {@link MethodVisitor} instance (or <tt>null</tt>) each time it is called,
+     * {@link MethodVisitor} instance (or <code>null</code>) each time it is called,
      * i.e., it should not return a previously returned visitor.
      *
      * @param access
@@ -333,14 +333,14 @@ public abstract class ClassVisitor {
      * @param desc
      *            the method's descriptor (see {@link Type Type}).
      * @param signature
-     *            the method's signature. May be <tt>null</tt> if the method
+     *            the method's signature. May be <code>null</code> if the method
      *            parameters, return type and exceptions do not use generic
      *            types.
      * @param exceptions
      *            the internal names of the method's exception classes (see
      *            {@link Type#getInternalName() getInternalName}). May be
-     *            <tt>null</tt>.
-     * @return an object to visit the byte code of the method, or <tt>null</tt>
+     *            <code>null</code>.
+     * @return an object to visit the byte code of the method, or <code>null</code>
      *         if this class visitor is not interested in visiting the code of
      *         this method.
      */

src/org/redkale/asm/ClassWriter.java

@@ -391,8 +391,8 @@ public class ClassWriter extends ClassVisitor {
      * A type table used to temporarily store internal names that will not
      * necessarily be stored in the constant pool. This type table is used by
      * the control flow and data flow analysis algorithm used to compute stack
-     * map frames from scratch. This array associates to each index <tt>i</tt>
-     * the Item whose index is <tt>i</tt>. All Item objects stored in this array
+     * map frames from scratch. This array associates to each index <code>i</code>
+     * the Item whose index is <code>i</code>. All Item objects stored in this array
      * are also stored in the {@link #items} hash table. These two arrays allow
      * to retrieve an Item from its index or, conversely, to get the index of an
      * Item from its value. Each Item stores an internal name in its
@@ -556,7 +556,7 @@ public class ClassWriter extends ClassVisitor {
     private int compute;
 
     /**
-     * <tt>true</tt> if some methods have wide forward jumps using ASM pseudo
+     * <code>true</code> if some methods have wide forward jumps using ASM pseudo
      * instructions, which need to be expanded into sequences of standard
      * bytecode instructions. In this case the class is re-read and re-written
      * with a ClassReader -> ClassWriter chain to perform this transformation.
@@ -1486,7 +1486,7 @@ public class ClassWriter extends ClassVisitor {
      * @param desc
      *            the method's descriptor.
      * @param itf
-     *            <tt>true</tt> if <tt>owner</tt> is an interface.
+     *            <code>true</code> if <code>owner</code> is an interface.
      * @return a new or already existing method reference item.
      */
     Item newMethodItem(final String owner, final String name,
@@ -1515,7 +1515,7 @@ public class ClassWriter extends ClassVisitor {
      * @param desc
      *            the method's descriptor.
      * @param itf
-     *            <tt>true</tt> if <tt>owner</tt> is an interface.
+     *            <code>true</code> if <code>owner</code> is an interface.
      * @return the index of a new or already existing method reference item.
      */
     public int newMethod(final String owner, final String name,
@@ -1778,7 +1778,7 @@ public class ClassWriter extends ClassVisitor {
      * @param key
      *            a constant pool item.
      * @return the constant pool's hash table item which is equal to the given
-     *         item, or <tt>null</tt> if there is no such item.
+     *         item, or <code>null</code> if there is no such item.
      */
     private Item get(final Item key) {
         Item i = items[key.hashCode % items.length];

src/org/redkale/asm/FieldVisitor.java

@@ -60,8 +60,8 @@ package org.redkale.asm;
 
 /**
  * A visitor to visit a Java field. The methods of this class must be called in
- * the following order: ( <tt>visitAnnotation</tt> |
- * <tt>visitTypeAnnotation</tt> | <tt>visitAttribute</tt> )* <tt>visitEnd</tt>.
+ * the following order: ( <code>visitAnnotation</code> |
+ * <code>visitTypeAnnotation</code> | <code>visitAttribute</code> )* <code>visitEnd</code>.
  *
  * @author Eric Bruneton
  */
@@ -111,8 +111,8 @@ public abstract class FieldVisitor {
      * @param desc
      *            the class descriptor of the annotation class.
      * @param visible
-     *            <tt>true</tt> if the annotation is visible at runtime.
-     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *            <code>true</code> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <code>null</code> if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
@@ -132,12 +132,12 @@ public abstract class FieldVisitor {
      * @param typePath
      *            the path to the annotated type argument, wildcard bound, array
      *            element type, or static inner type within 'typeRef'. May be
-     *            <tt>null</tt> if the annotation targets 'typeRef' as a whole.
+     *            <code>null</code> if the annotation targets 'typeRef' as a whole.
      * @param desc
      *            the class descriptor of the annotation class.
      * @param visible
-     *            <tt>true</tt> if the annotation is visible at runtime.
-     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *            <code>true</code> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <code>null</code> if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitTypeAnnotation(int typeRef,

src/org/redkale/asm/FieldWriter.java

@@ -100,28 +100,28 @@ final class FieldWriter extends FieldVisitor {
     private int value;
 
     /**
-     * The runtime visible annotations of this field. May be <tt>null</tt>.
+     * The runtime visible annotations of this field. May be <code>null</code>.
      */
     private AnnotationWriter anns;
 
     /**
-     * The runtime invisible annotations of this field. May be <tt>null</tt>.
+     * The runtime invisible annotations of this field. May be <code>null</code>.
      */
     private AnnotationWriter ianns;
 
     /**
-     * The runtime visible type annotations of this field. May be <tt>null</tt>.
+     * The runtime visible type annotations of this field. May be <code>null</code>.
      */
     private AnnotationWriter tanns;
 
     /**
      * The runtime invisible type annotations of this field. May be
-     * <tt>null</tt>.
+     * <code>null</code>.
      */
     private AnnotationWriter itanns;
 
     /**
-     * The non standard attributes of this field. May be <tt>null</tt>.
+     * The non standard attributes of this field. May be <code>null</code>.
      */
     private Attribute attrs;
 
@@ -141,9 +141,9 @@ final class FieldWriter extends FieldVisitor {
      * @param desc
      *            the field's descriptor (see {@link Type}).
      * @param signature
-     *            the field's signature. May be <tt>null</tt>.
+     *            the field's signature. May be <code>null</code>.
      * @param value
-     *            the field's constant value. May be <tt>null</tt>.
+     *            the field's constant value. May be <code>null</code>.
      */
     FieldWriter(final ClassWriter cw, final int access, final String name,
             final String desc, final String signature, final Object value) {

src/org/redkale/asm/Frame.java

@@ -1403,7 +1403,7 @@ class Frame {
 
     /**
      * Merges the input frame of the given basic block with the input and output
-     * frames of this basic block. Returns <tt>true</tt> if the input frame of
+     * frames of this basic block. Returns <code>true</code> if the input frame of
      * the given label has been changed by this operation.
      *
      * @param cw
@@ -1413,7 +1413,7 @@ class Frame {
      * @param edge
      *            the kind of the {@link Edge} between this label and 'label'.
      *            See {@link Edge#info}.
-     * @return <tt>true</tt> if the input frame of the given label has been
+     * @return <code>true</code> if the input frame of the given label has been
      *         changed by this operation.
      */
     final boolean merge(final ClassWriter cw, final Frame frame, final int edge) {
@@ -1511,7 +1511,7 @@ class Frame {
 
     /**
      * Merges the type at the given index in the given type array with the given
-     * type. Returns <tt>true</tt> if the type array has been modified by this
+     * type. Returns <code>true</code> if the type array has been modified by this
      * operation.
      *
      * @param cw
@@ -1522,7 +1522,7 @@ class Frame {
      *            an array of types.
      * @param index
      *            the index of the type that must be merged in 'types'.
-     * @return <tt>true</tt> if the type array has been modified by this
+     * @return <code>true</code> if the type array has been modified by this
      *         operation.
      */
     private static boolean merge(final ClassWriter cw, int t,

src/org/redkale/asm/Handler.java

@@ -82,7 +82,7 @@ class Handler {
 
     /**
      * Internal name of the type of exceptions handled by this handler, or
-     * <tt>null</tt> to catch any exceptions.
+     * <code>null</code> to catch any exceptions.
      */
     String desc;
 

src/org/redkale/asm/Item.java

@@ -306,8 +306,8 @@ final class Item {
      * @param i
      *            the item to be compared to this one. Both items must have the
      *            same {@link #type}.
-     * @return <tt>true</tt> if the given item if equal to this one,
-     *         <tt>false</tt> otherwise.
+     * @return <code>true</code> if the given item if equal to this one,
+     *         <code>false</code> otherwise.
      */
     boolean isEqualTo(final Item i) {
         switch (type) {

src/org/redkale/asm/Label.java

@@ -325,8 +325,8 @@ public class Label {
      *            the position of first byte of the bytecode instruction that
      *            contains this label.
      * @param wideOffset
-     *            <tt>true</tt> if the reference must be stored in 4 bytes, or
-     *            <tt>false</tt> if it must be stored with 2 bytes.
+     *            <code>true</code> if the reference must be stored in 4 bytes, or
+     *            <code>false</code> if it must be stored with 2 bytes.
      * @throws IllegalArgumentException
      *             if this label has not been created by the given code writer.
      */
@@ -389,7 +389,7 @@ public class Label {
      *            the position of this label in the bytecode.
      * @param data
      *            the bytecode of the method.
-     * @return <tt>true</tt> if a blank that was left for this label was too
+     * @return <code>true</code> if a blank that was left for this label was too
      *         small to store the offset. In such a case the corresponding jump
      *         instruction is replaced with a pseudo instruction (using unused
      *         opcodes) using an unsigned two bytes offset. These pseudo

src/org/redkale/asm/MethodVisitor.java

@@ -60,24 +60,24 @@ package org.redkale.asm;
 
 /**
  * A visitor to visit a Java method. The methods of this class must be called in
- * the following order: ( <tt>visitParameter</tt> )* [
- * <tt>visitAnnotationDefault</tt> ] ( <tt>visitAnnotation</tt> |
- * <tt>visitParameterAnnotation</tt> <tt>visitTypeAnnotation</tt> |
- * <tt>visitAttribute</tt> )* [ <tt>visitCode</tt> ( <tt>visitFrame</tt> |
- * <tt>visit<i>X</i>Insn</tt> | <tt>visitLabel</tt> |
- * <tt>visitInsnAnnotation</tt> | <tt>visitTryCatchBlock</tt> |
- * <tt>visitTryCatchAnnotation</tt> | <tt>visitLocalVariable</tt> |
- * <tt>visitLocalVariableAnnotation</tt> | <tt>visitLineNumber</tt> )*
- * <tt>visitMaxs</tt> ] <tt>visitEnd</tt>. In addition, the
- * <tt>visit<i>X</i>Insn</tt> and <tt>visitLabel</tt> methods must be called in
+ * the following order: ( <code>visitParameter</code> )* [
+ * <code>visitAnnotationDefault</code> ] ( <code>visitAnnotation</code> |
+ * <code>visitParameterAnnotation</code> <code>visitTypeAnnotation</code> |
+ * <code>visitAttribute</code> )* [ <code>visitCode</code> ( <code>visitFrame</code> |
+ * <code>visit<i>X</i>Insn</code> | <code>visitLabel</code> |
+ * <code>visitInsnAnnotation</code> | <code>visitTryCatchBlock</code> |
+ * <code>visitTryCatchAnnotation</code> | <code>visitLocalVariable</code> |
+ * <code>visitLocalVariableAnnotation</code> | <code>visitLineNumber</code> )*
+ * <code>visitMaxs</code> ] <code>visitEnd</code>. In addition, the
+ * <code>visit<i>X</i>Insn</code> and <code>visitLabel</code> methods must be called in
  * the sequential order of the bytecode instructions of the visited code,
- * <tt>visitInsnAnnotation</tt> must be called <i>after</i> the annotated
- * instruction, <tt>visitTryCatchBlock</tt> must be called <i>before</i> the
+ * <code>visitInsnAnnotation</code> must be called <i>after</i> the annotated
+ * instruction, <code>visitTryCatchBlock</code> must be called <i>before</i> the
  * labels passed as arguments have been visited,
- * <tt>visitTryCatchBlockAnnotation</tt> must be called <i>after</i> the
+ * <code>visitTryCatchBlockAnnotation</code> must be called <i>after</i> the
  * corresponding try catch block has been visited, and the
- * <tt>visitLocalVariable</tt>, <tt>visitLocalVariableAnnotation</tt> and
- * <tt>visitLineNumber</tt> methods must be called <i>after</i> the labels
+ * <code>visitLocalVariable</code>, <code>visitLocalVariableAnnotation</code> and
+ * <code>visitLineNumber</code> methods must be called <i>after</i> the labels
  * passed as arguments have been visited.
  *
  * @author Eric Bruneton
@@ -132,8 +132,8 @@ public abstract class MethodVisitor {
      * @param name
      *            parameter name or null if none is provided.
      * @param access
-     *            the parameter's access flags, only <tt>ACC_FINAL</tt>,
-     *            <tt>ACC_SYNTHETIC</tt> or/and <tt>ACC_MANDATED</tt> are
+     *            the parameter's access flags, only <code>ACC_FINAL</code>,
+     *            <code>ACC_SYNTHETIC</code> or/and <code>ACC_MANDATED</code> are
      *            allowed (see {@link Opcodes}).
      */
     public void visitParameter(String name, int access) {
@@ -146,7 +146,7 @@ public abstract class MethodVisitor {
      * Visits the default value of this annotation interface method.
      *
      * @return a visitor to the visit the actual default value of this
-     *         annotation interface method, or <tt>null</tt> if this visitor is
+     *         annotation interface method, or <code>null</code> if this visitor is
      *         not interested in visiting this default value. The 'name'
      *         parameters passed to the methods of this annotation visitor are
      *         ignored. Moreover, exacly one visit method must be called on this
@@ -165,8 +165,8 @@ public abstract class MethodVisitor {
      * @param desc
      *            the class descriptor of the annotation class.
      * @param visible
-     *            <tt>true</tt> if the annotation is visible at runtime.
-     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *            <code>true</code> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <code>null</code> if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitAnnotation(String desc, boolean visible) {
@@ -193,12 +193,12 @@ public abstract class MethodVisitor {
      * @param typePath
      *            the path to the annotated type argument, wildcard bound, array
      *            element type, or static inner type within 'typeRef'. May be
-     *            <tt>null</tt> if the annotation targets 'typeRef' as a whole.
+     *            <code>null</code> if the annotation targets 'typeRef' as a whole.
      * @param desc
      *            the class descriptor of the annotation class.
      * @param visible
-     *            <tt>true</tt> if the annotation is visible at runtime.
-     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *            <code>true</code> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <code>null</code> if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitTypeAnnotation(int typeRef,
@@ -217,8 +217,8 @@ public abstract class MethodVisitor {
      * @param desc
      *            the class descriptor of the annotation class.
      * @param visible
-     *            <tt>true</tt> if the annotation is visible at runtime.
-     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *            <code>true</code> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <code>null</code> if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitParameterAnnotation(int parameter,
@@ -569,7 +569,7 @@ public abstract class MethodVisitor {
      *            the constant to be loaded on the stack. This parameter must be
      *            a non null {@link Integer}, a {@link Float}, a {@link Long}, a
      *            {@link Double}, a {@link String}, a {@link Type} of OBJECT or
-     *            ARRAY sort for <tt>.class</tt> constants, for classes whose
+     *            ARRAY sort for <code>.class</code> constants, for classes whose
      *            version is 49.0, a {@link Type} of METHOD sort or a
      *            {@link Handle} for MethodType and MethodHandle constants, for
      *            classes whose version is 51.0.
@@ -604,8 +604,8 @@ public abstract class MethodVisitor {
      * @param dflt
      *            beginning of the default handler block.
      * @param labels
-     *            beginnings of the handler blocks. <tt>labels[i]</tt> is the
-     *            beginning of the handler block for the <tt>min + i</tt> key.
+     *            beginnings of the handler blocks. <code>labels[i]</code> is the
+     *            beginning of the handler block for the <code>min + i</code> key.
      */
     public void visitTableSwitchInsn(int min, int max, Label dflt,
             Label... labels) {
@@ -622,8 +622,8 @@ public abstract class MethodVisitor {
      * @param keys
      *            the values of the keys.
      * @param labels
-     *            beginnings of the handler blocks. <tt>labels[i]</tt> is the
-     *            beginning of the handler block for the <tt>keys[i]</tt> key.
+     *            beginnings of the handler blocks. <code>labels[i]</code> is the
+     *            beginning of the handler block for the <code>keys[i]</code> key.
      */
     public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
         if (mv != null) {
@@ -668,12 +668,12 @@ public abstract class MethodVisitor {
      * @param typePath
      *            the path to the annotated type argument, wildcard bound, array
      *            element type, or static inner type within 'typeRef'. May be
-     *            <tt>null</tt> if the annotation targets 'typeRef' as a whole.
+     *            <code>null</code> if the annotation targets 'typeRef' as a whole.
      * @param desc
      *            the class descriptor of the annotation class.
      * @param visible
-     *            <tt>true</tt> if the annotation is visible at runtime.
-     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *            <code>true</code> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <code>null</code> if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitInsnAnnotation(int typeRef,
@@ -699,7 +699,7 @@ public abstract class MethodVisitor {
      *            beginning of the exception handler's code.
      * @param type
      *            internal name of the type of exceptions handled by the
-     *            handler, or <tt>null</tt> to catch any exceptions (for
+     *            handler, or <code>null</code> to catch any exceptions (for
      *            "finally" blocks).
      * @throws IllegalArgumentException
      *             if one of the labels has already been visited by this visitor
@@ -725,12 +725,12 @@ public abstract class MethodVisitor {
      * @param typePath
      *            the path to the annotated type argument, wildcard bound, array
      *            element type, or static inner type within 'typeRef'. May be
-     *            <tt>null</tt> if the annotation targets 'typeRef' as a whole.
+     *            <code>null</code> if the annotation targets 'typeRef' as a whole.
      * @param desc
      *            the class descriptor of the annotation class.
      * @param visible
-     *            <tt>true</tt> if the annotation is visible at runtime.
-     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *            <code>true</code> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <code>null</code> if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitTryCatchAnnotation(int typeRef,
@@ -750,7 +750,7 @@ public abstract class MethodVisitor {
      *            the type descriptor of this local variable.
      * @param signature
      *            the type signature of this local variable. May be
-     *            <tt>null</tt> if the local variable type does not use generic
+     *            <code>null</code> if the local variable type does not use generic
      *            types.
      * @param start
      *            the first instruction corresponding to the scope of this local
@@ -782,7 +782,7 @@ public abstract class MethodVisitor {
      * @param typePath
      *            the path to the annotated type argument, wildcard bound, array
      *            element type, or static inner type within 'typeRef'. May be
-     *            <tt>null</tt> if the annotation targets 'typeRef' as a whole.
+     *            <code>null</code> if the annotation targets 'typeRef' as a whole.
      * @param start
      *            the fist instructions corresponding to the continuous ranges
      *            that make the scope of this local variable (inclusive).
@@ -796,8 +796,8 @@ public abstract class MethodVisitor {
      * @param desc
      *            the class descriptor of the annotation class.
      * @param visible
-     *            <tt>true</tt> if the annotation is visible at runtime.
-     * @return a visitor to visit the annotation values, or <tt>null</tt> if
+     *            <code>true</code> if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or <code>null</code> if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitLocalVariableAnnotation(int typeRef,
@@ -819,7 +819,7 @@ public abstract class MethodVisitor {
      * @param start
      *            the first instruction corresponding to this line number.
      * @throws IllegalArgumentException
-     *             if <tt>start</tt> has not already been visited by this
+     *             if <code>start</code> has not already been visited by this
      *             visitor (by the {@link #visitLabel visitLabel} method).
      */
     public void visitLineNumber(int line, Label start) {

src/org/redkale/asm/MethodWriter.java

@@ -218,41 +218,41 @@ class MethodWriter extends MethodVisitor {
     int[] exceptions;
 
     /**
-     * The annotation default attribute of this method. May be <tt>null</tt>.
+     * The annotation default attribute of this method. May be <code>null</code>.
      */
     private ByteVector annd;
 
     /**
-     * The runtime visible annotations of this method. May be <tt>null</tt>.
+     * The runtime visible annotations of this method. May be <code>null</code>.
      */
     private AnnotationWriter anns;
 
     /**
-     * The runtime invisible annotations of this method. May be <tt>null</tt>.
+     * The runtime invisible annotations of this method. May be <code>null</code>.
      */
     private AnnotationWriter ianns;
 
     /**
-     * The runtime visible type annotations of this method. May be <tt>null</tt>
+     * The runtime visible type annotations of this method. May be <code>null</code>
      * .
      */
     private AnnotationWriter tanns;
 
     /**
      * The runtime invisible type annotations of this method. May be
-     * <tt>null</tt>.
+     * <code>null</code>.
      */
     private AnnotationWriter itanns;
 
     /**
      * The runtime visible parameter annotations of this method. May be
-     * <tt>null</tt>.
+     * <code>null</code>.
      */
     private AnnotationWriter[] panns;
 
     /**
      * The runtime invisible parameter annotations of this method. May be
-     * <tt>null</tt>.
+     * <code>null</code>.
      */
     private AnnotationWriter[] ipanns;
 
@@ -381,12 +381,12 @@ class MethodWriter extends MethodVisitor {
     private int lastCodeOffset;
 
     /**
-     * The runtime visible type annotations of the code. May be <tt>null</tt>.
+     * The runtime visible type annotations of the code. May be <code>null</code>.
      */
     private AnnotationWriter ctanns;
 
     /**
-     * The runtime invisible type annotations of the code. May be <tt>null</tt>.
+     * The runtime invisible type annotations of the code. May be <code>null</code>.
      */
     private AnnotationWriter ictanns;
 
@@ -446,7 +446,7 @@ class MethodWriter extends MethodVisitor {
      * is relative to the beginning of the current basic block, i.e., the true
      * stack size after the last visited instruction is equal to the
      * {@link Label#inputStackTop beginStackSize} of the current basic block
-     * plus <tt>stackSize</tt>.
+     * plus <code>stackSize</code>.
      */
     private int stackSize;
 
@@ -455,7 +455,7 @@ class MethodWriter extends MethodVisitor {
      * This size is relative to the beginning of the current basic block, i.e.,
      * the true maximum stack size after the last visited instruction is equal
      * to the {@link Label#inputStackTop beginStackSize} of the current basic
-     * block plus <tt>stackSize</tt>.
+     * block plus <code>stackSize</code>.
      */
     private int maxStackSize;
 
@@ -475,10 +475,10 @@ class MethodWriter extends MethodVisitor {
      * @param desc
      *            the method's descriptor (see {@link Type}).
      * @param signature
-     *            the method's signature. May be <tt>null</tt>.
+     *            the method's signature. May be <code>null</code>.
      * @param exceptions
      *            the internal names of the method's exceptions. May be
-     *            <tt>null</tt>.
+     *            <code>null</code>.
      * @param compute
      *            Indicates what must be automatically computed (see #compute).
      */

src/org/redkale/asm/ModuleVisitor.java

@@ -60,9 +60,9 @@ package org.redkale.asm;
 
 /**
  * A visitor to visit a Java module. The methods of this class must be called in
- * the following order: <tt>visitMainClass</tt> | ( <tt>visitPackage</tt> |
- * <tt>visitRequire</tt> | <tt>visitExport</tt> | <tt>visitOpen</tt> |
- * <tt>visitUse</tt> | <tt>visitProvide</tt> )* <tt>visitEnd</tt>.
+ * the following order: <code>visitMainClass</code> | ( <code>visitPackage</code> |
+ * <code>visitRequire</code> | <code>visitExport</code> | <code>visitOpen</code> |
+ * <code>visitUse</code> | <code>visitProvide</code> )* <code>visitEnd</code>.
  *
  * The methods {@link #visitRequire(String, int, String)}, {@link #visitExport(String, int, String...)},
  * {@link #visitOpen(String, int, String...)} and {@link #visitPackage(String)}
@@ -157,7 +157,7 @@ public abstract class ModuleVisitor {
      *        {@code ACC_MANDATED}.
      * @param modules the qualified names of the modules that can access to
      *        the public classes of the exported package or
-     *        <tt>null</tt>.
+     *        <code>null</code>.
      */
     public void visitExport(String packaze, int access, String... modules) {
         if (mv != null) {
@@ -174,7 +174,7 @@ public abstract class ModuleVisitor {
      *        {@code ACC_MANDATED}.
      * @param modules the qualified names of the modules that can use deep
      *        reflection to the classes of the open package or
-     *        <tt>null</tt>.
+     *        <code>null</code>.
      */
     public void visitOpen(String packaze, int access, String... modules) {
         if (mv != null) {

src/org/redkale/asm/Type.java

@@ -71,47 +71,47 @@ import java.lang.reflect.Method;
 public class Type {
 
     /**
-     * The sort of the <tt>void</tt> type. See {@link #getSort getSort}.
+     * The sort of the <code>void</code> type. See {@link #getSort getSort}.
      */
     public static final int VOID = 0;
 
     /**
-     * The sort of the <tt>boolean</tt> type. See {@link #getSort getSort}.
+     * The sort of the <code>boolean</code> type. See {@link #getSort getSort}.
      */
     public static final int BOOLEAN = 1;
 
     /**
-     * The sort of the <tt>char</tt> type. See {@link #getSort getSort}.
+     * The sort of the <code>char</code> type. See {@link #getSort getSort}.
      */
     public static final int CHAR = 2;
 
     /**
-     * The sort of the <tt>byte</tt> type. See {@link #getSort getSort}.
+     * The sort of the <code>byte</code> type. See {@link #getSort getSort}.
      */
     public static final int BYTE = 3;
 
     /**
-     * The sort of the <tt>short</tt> type. See {@link #getSort getSort}.
+     * The sort of the <code>short</code> type. See {@link #getSort getSort}.
      */
     public static final int SHORT = 4;
 
     /**
-     * The sort of the <tt>int</tt> type. See {@link #getSort getSort}.
+     * The sort of the <code>int</code> type. See {@link #getSort getSort}.
      */
     public static final int INT = 5;
 
     /**
-     * The sort of the <tt>float</tt> type. See {@link #getSort getSort}.
+     * The sort of the <code>float</code> type. See {@link #getSort getSort}.
      */
     public static final int FLOAT = 6;
 
     /**
-     * The sort of the <tt>long</tt> type. See {@link #getSort getSort}.
+     * The sort of the <code>long</code> type. See {@link #getSort getSort}.
      */
     public static final int LONG = 7;
 
     /**
-     * The sort of the <tt>double</tt> type. See {@link #getSort getSort}.
+     * The sort of the <code>double</code> type. See {@link #getSort getSort}.
      */
     public static final int DOUBLE = 8;
 
@@ -131,55 +131,55 @@ public class Type {
     public static final int METHOD = 11;
 
     /**
-     * The <tt>void</tt> type.
+     * The <code>void</code> type.
      */
     public static final Type VOID_TYPE = new Type(VOID, null, ('V' << 24)
             | (5 << 16) | (0 << 8) | 0, 1);
 
     /**
-     * The <tt>boolean</tt> type.
+     * The <code>boolean</code> type.
      */
     public static final Type BOOLEAN_TYPE = new Type(BOOLEAN, null, ('Z' << 24)
             | (0 << 16) | (5 << 8) | 1, 1);
 
     /**
-     * The <tt>char</tt> type.
+     * The <code>char</code> type.
      */
     public static final Type CHAR_TYPE = new Type(CHAR, null, ('C' << 24)
             | (0 << 16) | (6 << 8) | 1, 1);
 
     /**
-     * The <tt>byte</tt> type.
+     * The <code>byte</code> type.
      */
     public static final Type BYTE_TYPE = new Type(BYTE, null, ('B' << 24)
             | (0 << 16) | (5 << 8) | 1, 1);
 
     /**
-     * The <tt>short</tt> type.
+     * The <code>short</code> type.
      */
     public static final Type SHORT_TYPE = new Type(SHORT, null, ('S' << 24)
             | (0 << 16) | (7 << 8) | 1, 1);
 
     /**
-     * The <tt>int</tt> type.
+     * The <code>int</code> type.
      */
     public static final Type INT_TYPE = new Type(INT, null, ('I' << 24)
             | (0 << 16) | (0 << 8) | 1, 1);
 
     /**
-     * The <tt>float</tt> type.
+     * The <code>float</code> type.
      */
     public static final Type FLOAT_TYPE = new Type(FLOAT, null, ('F' << 24)
             | (2 << 16) | (2 << 8) | 1, 1);
 
     /**
-     * The <tt>long</tt> type.
+     * The <code>long</code> type.
      */
     public static final Type LONG_TYPE = new Type(LONG, null, ('J' << 24)
             | (1 << 16) | (1 << 8) | 2, 1);
 
     /**
-     * The <tt>double</tt> type.
+     * The <code>double</code> type.
      */
     public static final Type DOUBLE_TYPE = new Type(DOUBLE, null, ('D' << 24)
             | (3 << 16) | (3 << 8) | 2, 1);
@@ -439,8 +439,8 @@ public class Type {
      * @return the size of the arguments of the method (plus one for the
      *         implicit this argument), argSize, and the size of its return
      *         value, retSize, packed into a single int i =
-     *         <tt>(argSize &lt;&lt; 2) | retSize</tt> (argSize is therefore equal to
-     *         <tt>i &gt;&gt; 2</tt>, and retSize to <tt>i &amp; 0x03</tt>).
+     *         <code>(argSize &lt;&lt; 2) | retSize</code> (argSize is therefore equal to
+     *         <code>i &gt;&gt; 2</code>, and retSize to <code>i &amp; 0x03</code>).
      */
     public static int getArgumentsAndReturnSizes(final String desc) {
         int n = 1;
@@ -645,9 +645,9 @@ public class Type {
      * @return the size of the arguments (plus one for the implicit this
      *         argument), argSize, and the size of the return value, retSize,
      *         packed into a single
-     *         int i = <tt>(argSize &lt;&lt; 2) | retSize</tt>
-     *         (argSize is therefore equal to <tt>i &gt;&gt; 2</tt>,
-     *         and retSize to <tt>i &amp; 0x03</tt>).
+     *         int i = <code>(argSize &lt;&lt; 2) | retSize</code>
+     *         (argSize is therefore equal to <code>i &gt;&gt; 2</code>,
+     *         and retSize to <code>i &amp; 0x03</code>).
      */
     public int getArgumentsAndReturnSizes() {
         return getArgumentsAndReturnSizes(getDescriptor());
@@ -838,8 +838,8 @@ public class Type {
      * Returns the size of values of this type. This method must not be used for
      * method types.
      *
-     * @return the size of values of this type, i.e., 2 for <tt>long</tt> and
-     *         <tt>double</tt>, 0 for <tt>void</tt> and 1 otherwise.
+     * @return the size of values of this type, i.e., 2 for <code>long</code> and
+     *         <code>double</code>, 0 for <code>void</code> and 1 otherwise.
      */
     public int getSize() {
         // the size is in byte 0 of 'off' for primitive types (buf == null)
@@ -855,8 +855,8 @@ public class Type {
      *            ISTORE, IALOAD, IASTORE, IADD, ISUB, IMUL, IDIV, IREM, INEG,
      *            ISHL, ISHR, IUSHR, IAND, IOR, IXOR and IRETURN.
      * @return an opcode that is similar to the given opcode, but adapted to
-     *         this Java type. For example, if this type is <tt>float</tt> and
-     *         <tt>opcode</tt> is IRETURN, this method returns FRETURN.
+     *         this Java type. For example, if this type is <code>float</code> and
+     *         <code>opcode</code> is IRETURN, this method returns FRETURN.
      */
     public int getOpcode(final int opcode) {
         if (opcode == Opcodes.IALOAD || opcode == Opcodes.IASTORE) {
@@ -879,7 +879,7 @@ public class Type {
      *
      * @param o
      *            the object to be compared to this type.
-     * @return <tt>true</tt> if the given object is equal to this type.
+     * @return <code>true</code> if the given object is equal to this type.
      */
     @Override
     public boolean equals(final Object o) {

src/org/redkale/boot/ApiDocsService.java

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

src/org/redkale/boot/Application.java

@@ -5,6 +5,7 @@
  */
 package org.redkale.boot;
 
+import org.redkale.cluster.ClusterAgent;
 import org.redkale.util.RedkaleClassLoader;
 import org.redkale.net.TransportGroupInfo;
 import java.io.*;
@@ -23,9 +24,10 @@ import javax.xml.parsers.*;
 import org.redkale.boot.ClassFilter.FilterEntry;
 import org.redkale.convert.Convert;
 import org.redkale.convert.bson.BsonFactory;
-import org.redkale.convert.json.JsonFactory;
+import org.redkale.convert.json.*;
+import org.redkale.mq.*;
 import org.redkale.net.*;
-import org.redkale.net.http.MimeType;
+import org.redkale.net.http.*;
 import org.redkale.net.sncp.*;
 import org.redkale.service.Service;
 import org.redkale.source.*;
@@ -57,12 +59,17 @@ public final class Application {
     public static final String RESNAME_APP_TIME = "APP_TIME";
 
     /**
-     * 当前进程的根目录， 类型：String、File、Path
+     * 当前进程的名称， 类型：String
+     */
+    public static final String RESNAME_APP_NAME = "APP_NAME";
+
+    /**
+     * 当前进程的根目录， 类型：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";
 
@@ -72,12 +79,12 @@ public final class Application {
     public static final String RESNAME_APP_GRES = "APP_GRES";
 
     /**
-     * 当前进程节点的name， 类型：String
+     * 当前进程节点的nodeid， 类型：int
      */
-    public static final String RESNAME_APP_NODE = "APP_NODE";
+    public static final String RESNAME_APP_NODEID = "APP_NODEID";
 
     /**
-     * 当前进程节点的IP地址， 类型：InetAddress、String
+     * 当前进程节点的IP地址， 类型：InetSocketAddress、InetAddress、String
      */
     public static final String RESNAME_APP_ADDR = "APP_ADDR";
 
@@ -106,8 +113,14 @@ public final class Application {
      */
     public static final String RESNAME_SERVER_RESFACTORY = Server.RESNAME_SERVER_RESFACTORY;
 
+    //本进程节点ID
+    final int nodeid;
+
+    //本进程节点ID
+    final String name;
+
     //本地IP地址
-    final InetAddress localAddress;
+    final InetSocketAddress localAddress;
 
     //CacheSource 资源
     final List<CacheSource> cacheSources = new CopyOnWriteArrayList<>();
@@ -115,18 +128,29 @@ public final class Application {
     //DataSource 资源
     final List<DataSource> dataSources = new CopyOnWriteArrayList<>();
 
-    //NodeServer 资源
+    //NodeServer 资源, 顺序必须是sncps, others, watchs
     final List<NodeServer> servers = new CopyOnWriteArrayList<>();
 
     //SNCP传输端的TransportFactory, 注意： 只给SNCP使用
     final TransportFactory sncpTransportFactory;
 
+    //第三方服务发现管理接口
+    //@since 2.1.0
+    final ClusterAgent clusterAgent;
+
+    //MQ管理接口
+    //@since 2.1.0
+    final MessageAgent[] messageAgents;
+
     //全局根ResourceFactory
     final ResourceFactory resourceFactory = ResourceFactory.root();
 
     //服务配置项
     final AnyValue config;
 
+    //排除的jar路径
+    final String excludelibs;
+
     //临时计数器
     CountDownLatch servicecdl;  //会出现两次赋值
 
@@ -135,7 +159,7 @@ public final class Application {
 
     //--------------------------------------------------------------------------------------------    
     //是否用于main方法运行
-    private final boolean singletonrun;
+    final boolean singletonrun;
 
     //根WatchFactory
     //private final WatchFactory watchFactory = WatchFactory.root();
@@ -143,7 +167,7 @@ public final class Application {
     private final File home;
 
     //配置文件目录
-    private final File conf;
+    private final URI confPath;
 
     //日志
     private final Logger logger;
@@ -171,50 +195,51 @@ public final class Application {
         this.singletonrun = singletonrun;
         this.config = config;
         System.setProperty("redkale.version", Redkale.getDotedVersion());
-        System.setProperty("sun.nio.ch.maxCompletionHandlersOnStack", String.valueOf(Math.max(256, Runtime.getRuntime().availableProcessors() * 8)));
 
         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();
-        this.localAddress = localaddr.isEmpty() ? Utility.localInetAddress() : new InetSocketAddress(localaddr, config.getIntValue("port")).getAddress();
-        this.resourceFactory.register(RESNAME_APP_ADDR, this.localAddress.getHostAddress());
-        this.resourceFactory.register(RESNAME_APP_ADDR, InetAddress.class, this.localAddress);
+        InetAddress addr = localaddr.isEmpty() ? Utility.localInetAddress() : new InetSocketAddress(localaddr, config.getIntValue("port")).getAddress();
+        this.localAddress = new InetSocketAddress(addr, config.getIntValue("port"));
+        this.resourceFactory.register(RESNAME_APP_ADDR, addr.getHostAddress());
+        this.resourceFactory.register(RESNAME_APP_ADDR, InetAddress.class, addr);
+        this.resourceFactory.register(RESNAME_APP_ADDR, InetSocketAddress.class, this.localAddress);
+
         {
-            String node = config.getValue("node", "").trim();
-            if (node.isEmpty()) {
-                StringBuilder sb = new StringBuilder();
-                byte[] bs = this.localAddress.getAddress();
-                int v1 = bs[bs.length - 2] & 0xff;
-                int v2 = bs[bs.length - 1] & 0xff;
-                if (v1 <= 0xf) sb.append('0');
-                sb.append(Integer.toHexString(v1));
-                if (v2 <= 0xf) sb.append('0');
-                sb.append(Integer.toHexString(v2));
-                node = sb.toString();
-            }
-            this.resourceFactory.register(RESNAME_APP_NODE, node);
-            System.setProperty(RESNAME_APP_NODE, node);
+            int nid = config.getIntValue("nodeid", 0);
+            this.nodeid = nid;
+            this.resourceFactory.register(RESNAME_APP_NODEID, nid);
+            System.setProperty(RESNAME_APP_NODEID, "" + nid);
+        }
+        {
+            this.name = checkName(config.getValue("name", ""));
+            this.resourceFactory.register(RESNAME_APP_NAME, name);
+            System.setProperty(RESNAME_APP_NAME, name);
         }
         //以下是初始化日志配置
-        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();
@@ -268,6 +293,9 @@ public final class Application {
         AsynchronousChannelGroup transportGroup = null;
         final AnyValue resources = config.getAnyValue("resources");
         TransportStrategy strategy = null;
+        String excludelib0 = null;
+        ClusterAgent cluster = null;
+        MessageAgent[] mqs = null;
         int bufferCapacity = 32 * 1024;
         int bufferPoolSize = Runtime.getRuntime().availableProcessors() * 8;
         int readTimeoutSeconds = TransportFactory.DEFAULT_READTIMEOUTSECONDS;
@@ -275,6 +303,8 @@ public final class Application {
         AtomicLong createBufferCounter = new AtomicLong();
         AtomicLong cycleBufferCounter = new AtomicLong();
         if (resources != null) {
+            AnyValue excludelibConf = resources.getAnyValue("excludelibs");
+            if (excludelibConf != null) excludelib0 = excludelibConf.getValue("value");
             AnyValue transportConf = resources.getAnyValue("transport");
             int groupsize = resources.getAnyValues("group").length;
             if (groupsize > 0 && transportConf == null) transportConf = new DefaultAnyValue();
@@ -302,7 +332,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);
@@ -311,13 +341,87 @@ public final class Application {
                 }
                 logger.log(Level.INFO, Transport.class.getSimpleName() + " configure bufferCapacity = " + bufferCapacity / 1024 + "K; bufferPoolSize = " + bufferPoolSize + "; threads = " + threads + ";");
             }
+
+            AnyValue clusterConf = resources.getAnyValue("cluster");
+            if (clusterConf != null) {
+                try {
+                    String classval = clusterConf.getValue("value");
+                    if (classval == null || classval.isEmpty()) {
+                        Iterator<ClusterAgent> it = ServiceLoader.load(ClusterAgent.class, classLoader).iterator();
+                        while (it.hasNext()) {
+                            ClusterAgent agent = it.next();
+                            if (agent.match(clusterConf)) {
+                                cluster = agent;
+                                cluster.setConfig(clusterConf);
+                                break;
+                            }
+                        }
+                        if (cluster == null) logger.log(Level.SEVERE, "load application cluster resource, but not found name='value' value error: " + clusterConf);
+                    } else {
+                        Class type = classLoader.loadClass(clusterConf.getValue("value"));
+                        if (!ClusterAgent.class.isAssignableFrom(type)) {
+                            logger.log(Level.SEVERE, "load application cluster resource, but not found " + ClusterAgent.class.getSimpleName() + " implements class error: " + clusterConf);
+                        } else {
+                            cluster = (ClusterAgent) type.getDeclaredConstructor().newInstance();
+                            cluster.setConfig(clusterConf);
+                        }
+                    }
+                } catch (Exception e) {
+                    logger.log(Level.SEVERE, "load application cluster resource error: " + clusterConf, e);
+                }
+            }
+
+            AnyValue[] mqConfs = resources.getAnyValues("mq");
+            if (mqConfs != null && mqConfs.length > 0) {
+                mqs = new MessageAgent[mqConfs.length];
+                Set<String> mqnames = new HashSet<>();
+                for (int i = 0; i < mqConfs.length; i++) {
+                    AnyValue mqConf = mqConfs[0];
+                    String mqname = mqConf.getValue("name", "");
+                    if (mqnames.contains(mqname)) throw new RuntimeException("mq.name(" + mqname + ") is repeat");
+                    mqnames.add(mqname);
+                    String namex = mqConf.getValue("names");
+                    if (namex != null && !namex.isEmpty()) {
+                        for (String n : namex.split(";")) {
+                            if (n.trim().isEmpty()) continue;
+                            if (mqnames.contains(n.trim())) throw new RuntimeException("mq.name(" + n.trim() + ") is repeat");
+                            mqnames.add(n.trim());
+                        }
+                    }
+                    try {
+                        String classval = mqConf.getValue("value");
+                        if (classval == null || classval.isEmpty()) {
+                            Iterator<MessageAgent> it = ServiceLoader.load(MessageAgent.class, classLoader).iterator();
+                            while (it.hasNext()) {
+                                MessageAgent messageAgent = it.next();
+                                if (messageAgent.match(mqConf)) {
+                                    mqs[i] = messageAgent;
+                                    mqs[i].setConfig(mqConf);
+                                    break;
+                                }
+                            }
+                            if (mqs[i] == null) logger.log(Level.SEVERE, "load application mq resource, but not found name='value' value error: " + mqConf);
+                        } else {
+                            Class type = classLoader.loadClass(classval);
+                            if (!MessageAgent.class.isAssignableFrom(type)) {
+                                logger.log(Level.SEVERE, "load application mq resource, but not found " + MessageAgent.class.getSimpleName() + " implements class error: " + mqConf);
+                            } else {
+                                mqs[i] = (MessageAgent) type.getDeclaredConstructor().newInstance();
+                                mqs[i].setConfig(mqConf);
+                            }
+                        }
+                    } catch (Exception e) {
+                        logger.log(Level.SEVERE, "load application mq resource error: " + mqs[i], e);
+                    }
+                }
+            }
         }
         if (transportGroup == null) {
             final AtomicInteger counter = new AtomicInteger();
             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 {
@@ -335,15 +439,29 @@ public final class Application {
                     return true;
                 });
         }
+        this.excludelibs = excludelib0;
         this.sncpTransportFactory = TransportFactory.create(transportExec, transportPool, transportGroup, (SSLContext) null, readTimeoutSeconds, writeTimeoutSeconds, strategy);
-        DefaultAnyValue tarnsportConf = DefaultAnyValue.create(TransportFactory.NAME_POOLMAXCONNS, System.getProperty("net.transport.poolmaxconns", "100"))
-            .addValue(TransportFactory.NAME_PINGINTERVAL, System.getProperty("net.transport.pinginterval", "30"))
-            .addValue(TransportFactory.NAME_CHECKINTERVAL, System.getProperty("net.transport.checkinterval", "30"));
+        DefaultAnyValue tarnsportConf = DefaultAnyValue.create(TransportFactory.NAME_POOLMAXCONNS, System.getProperty("net.transport.pool.maxconns", "100"))
+            .addValue(TransportFactory.NAME_PINGINTERVAL, System.getProperty("net.transport.ping.interval", "30"))
+            .addValue(TransportFactory.NAME_CHECKINTERVAL, System.getProperty("net.transport.check.interval", "30"));
         this.sncpTransportFactory.init(tarnsportConf, Sncp.PING_BUFFER, Sncp.PONG_BUFFER.remaining());
+        this.clusterAgent = cluster;
+        this.messageAgents = mqs;
         Thread.currentThread().setContextClassLoader(this.classLoader);
         this.serverClassLoader = new RedkaleClassLoader(this.classLoader);
     }
 
+    private String checkName(String name) {  //不能含特殊字符
+        if (name.isEmpty()) return name;
+        if (name.charAt(0) >= '0' && name.charAt(0) <= '9') throw new RuntimeException("name only 0-9 a-z A-Z _ cannot begin 0-9");
+        for (char ch : name.toCharArray()) {
+            if (!((ch >= '0' && ch <= '9') || ch == '_' || (ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z'))) { //不能含特殊字符
+                throw new RuntimeException("name only 0-9 a-z A-Z _ cannot begin 0-9");
+            }
+        }
+        return name;
+    }
+
     public ResourceFactory getResourceFactory() {
         return resourceFactory;
     }
@@ -352,6 +470,22 @@ public final class Application {
         return sncpTransportFactory;
     }
 
+    public ClusterAgent getClusterAgent() {
+        return clusterAgent;
+    }
+
+    public MessageAgent getMessageAgent(String name) {
+        if (messageAgents == null) return null;
+        for (MessageAgent agent : messageAgents) {
+            if (agent.getName().equals(name)) return agent;
+        }
+        return null;
+    }
+
+    public MessageAgent[] getMessageAgents() {
+        return messageAgents;
+    }
+
     public RedkaleClassLoader getClassLoader() {
         return classLoader;
     }
@@ -372,12 +506,20 @@ public final class Application {
         return new ArrayList<>(cacheSources);
     }
 
+    public int getNodeid() {
+        return nodeid;
+    }
+
+    public String getName() {
+        return name;
+    }
+
     public File getHome() {
         return home;
     }
 
-    public File getConf() {
-        return conf;
+    public URI getConfPath() {
+        return confPath;
     }
 
     public long getStartTime() {
@@ -389,22 +531,30 @@ public final class Application {
     }
 
     public void init() throws Exception {
-        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");
-        System.setProperty("convert.bson.tiny", "true");
-        System.setProperty("convert.json.tiny", "true");
-        System.setProperty("convert.bson.pool.size", "128");
-        System.setProperty("convert.json.pool.size", "128");
-        System.setProperty("convert.bson.writer.buffer.defsize", "4096");
-        System.setProperty("convert.json.writer.buffer.defsize", "4096");
+        System.setProperty("convert.tiny", "true");
+        System.setProperty("convert.pool.size", "128");
+        System.setProperty("convert.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_NODEID + " = " + this.nodeid + "\r\n" + RESNAME_APP_ADDR + " = " + this.localAddress.getHostString() + ":" + this.localAddress.getPort() + "\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);
@@ -419,13 +569,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);
+                            }
                         }
                     }
                 }
@@ -433,6 +587,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.")) {
@@ -460,7 +615,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);
@@ -515,6 +670,41 @@ public final class Application {
 
         }, Application.class, ResourceFactory.class, TransportFactory.class, NodeSncpServer.class, NodeHttpServer.class, NodeWatchServer.class);
         //--------------------------------------------------------------------------
+        if (this.clusterAgent != null) {
+            if (logger.isLoggable(Level.FINER)) logger.log(Level.FINER, "ClusterAgent initing");
+            long s = System.currentTimeMillis();
+            clusterAgent.setTransportFactory(this.sncpTransportFactory);
+            this.resourceFactory.inject(clusterAgent);
+            clusterAgent.init(clusterAgent.getConfig());
+            this.resourceFactory.register(ClusterAgent.class, clusterAgent);
+            logger.info("ClusterAgent init in " + (System.currentTimeMillis() - s) + " ms");
+        }
+        if (this.messageAgents != null) {
+            if (logger.isLoggable(Level.FINER)) logger.log(Level.FINER, "MessageAgent initing");
+            long s = System.currentTimeMillis();
+            for (MessageAgent agent : this.messageAgents) {
+                this.resourceFactory.inject(agent);
+                agent.init(agent.getConfig());
+                this.resourceFactory.register(agent.getName(), MessageAgent.class, agent);
+                this.resourceFactory.register(agent.getName(), HttpMessageClient.class, agent.getHttpMessageClient());
+                //this.resourceFactory.register(agent.getName(), SncpMessageClient.class, agent.getSncpMessageClient()); //不需要给开发者使用
+            }
+            logger.info("MessageAgent init in " + (System.currentTimeMillis() - s) + " ms");
+
+        }
+        //------------------------------------- 注册 DataSource --------------------------------------------------------        
+        resourceFactory.register((ResourceFactory rf, final Object src, String resourceName, Field field, final Object attachment) -> {
+            try {
+                if (field.getAnnotation(Resource.class) == null) return;
+                if (clusterAgent == null) return;
+                HttpMessageClient messageClient = new HttpMessageClusterClient(clusterAgent);
+                field.set(src, messageClient);
+                rf.inject(messageClient, null); // 给其可能包含@Resource的字段赋值;
+                rf.register(resourceName, HttpMessageClient.class, messageClient);
+            } catch (Exception e) {
+                logger.log(Level.SEVERE, "[" + Thread.currentThread().getName() + "] DataSource inject error", e);
+            }
+        }, HttpMessageClient.class);
         initResources();
     }
 
@@ -529,7 +719,7 @@ public final class Application {
                 if (!"TCP".equalsIgnoreCase(protocol) && !"UDP".equalsIgnoreCase(protocol)) {
                     throw new RuntimeException("Not supported Transport Protocol " + conf.getValue("protocol"));
                 }
-                TransportGroupInfo ginfo = new TransportGroupInfo(group, protocol, conf.getValue("subprotocol", ""), new LinkedHashSet<>());
+                TransportGroupInfo ginfo = new TransportGroupInfo(group, protocol, new LinkedHashSet<>());
                 for (AnyValue node : conf.getAnyValues("node")) {
                     final InetSocketAddress addr = new InetSocketAddress(node.getValue("addr"), node.getIntValue("port"));
                     ginfo.putAddress(addr);
@@ -543,6 +733,7 @@ public final class Application {
                 if (!ApplicationListener.class.isAssignableFrom(clazz)) continue;
                 @SuppressWarnings("unchecked")
                 ApplicationListener listener = (ApplicationListener) clazz.getDeclaredConstructor().newInstance();
+                resourceFactory.inject(listener);
                 listener.init(config);
                 this.listeners.add(listener);
             }
@@ -551,9 +742,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();
@@ -564,7 +756,7 @@ public final class Application {
         final Application application = this;
         new Thread() {
             {
-                setName("Application-Control-Thread");
+                setName("Redkale-Application-SelfServer-Thread");
             }
 
             @Override
@@ -582,7 +774,8 @@ public final class Application {
                         buffer.flip();
                         byte[] bytes = new byte[buffer.remaining()];
                         buffer.get(bytes);
-                        if ("SHUTDOWN".equalsIgnoreCase(new String(bytes))) {
+                        final String cmd = new String(bytes);
+                        if ("SHUTDOWN".equalsIgnoreCase(cmd)) {
                             try {
                                 long s = System.currentTimeMillis();
                                 logger.info(application.getClass().getSimpleName() + " shutdowning");
@@ -602,7 +795,7 @@ public final class Application {
                                 buffer.flip();
                                 channel.send(buffer, address);
                             }
-                        } else if ("APIDOC".equalsIgnoreCase(new String(bytes))) {
+                        } else if ("APIDOC".equalsIgnoreCase(cmd)) {
                             try {
                                 new ApiDocsService(application).run();
                                 buffer.clear();
@@ -615,6 +808,16 @@ public final class Application {
                                 buffer.flip();
                                 channel.send(buffer, address);
                             }
+                        } else {
+                            long s = System.currentTimeMillis();
+                            logger.info(application.getClass().getSimpleName() + " command " + cmd);
+                            application.command(cmd);
+                            buffer.clear();
+                            buffer.put("COMMAND OK".getBytes());
+                            buffer.flip();
+                            channel.send(buffer, address);
+                            long e = System.currentTimeMillis() - s;
+                            logger.info(application.getClass().getSimpleName() + " command in " + e + " ms");
                         }
                     }
                 } catch (Exception e) {
@@ -625,10 +828,10 @@ public final class Application {
         }.start();
     }
 
-    private void sendCommand(String command) throws Exception {
+    private static void sendCommand(Logger logger, int port, String command) throws Exception {
         final DatagramChannel channel = DatagramChannel.open();
         channel.configureBlocking(true);
-        channel.connect(new InetSocketAddress("127.0.0.1", config.getIntValue("port")));
+        channel.connect(new InetSocketAddress("127.0.0.1", port));
         ByteBuffer buffer = ByteBuffer.allocate(128);
         buffer.put(command.getBytes());
         buffer.flip();
@@ -641,7 +844,7 @@ public final class Application {
             byte[] bytes = new byte[buffer.remaining()];
             buffer.get(bytes);
             channel.close();
-            logger.info("Send: " + command + ", Reply: " + new String(bytes));
+            if (logger != null) logger.info("Send: " + command + ", Reply: " + new String(bytes));
             Thread.sleep(1000);
         } catch (Exception e) {
             if (e instanceof PortUnreachableException) {
@@ -650,7 +853,7 @@ public final class Application {
                     application.init();
                     application.start();
                     new ApiDocsService(application).run();
-                    logger.info("APIDOC OK");
+                    if (logger != null) logger.info("APIDOC OK");
                     return;
                 }
             }
@@ -659,6 +862,9 @@ public final class Application {
     }
 
     public void start() throws Exception {
+        if (!singletonrun && this.clusterAgent != null) {
+            this.clusterAgent.register(this);
+        }
         final AnyValue[] entrys = config.getAnyValues("server");
         CountDownLatch timecd = new CountDownLatch(entrys.length);
         final List<AnyValue> sncps = new ArrayList<>();
@@ -680,12 +886,43 @@ public final class Application {
         runServers(timecd, others);
         runServers(timecd, watchs); //必须在所有服务都启动后再启动WATCH服务
         timecd.await();
+        if (this.clusterAgent != null) this.clusterAgent.start();
+        if (this.messageAgents != null) {
+            if (logger.isLoggable(Level.FINER)) logger.log(Level.FINER, "MessageAgent starting");
+            long s = System.currentTimeMillis();
+            final StringBuffer sb = new StringBuffer();
+            Set<String> names = new HashSet<>();
+            for (MessageAgent agent : this.messageAgents) {
+                names.add(agent.getName());
+                Map<String, Long> map = agent.start().join();
+                AtomicInteger maxlen = new AtomicInteger();
+                map.keySet().forEach(str -> {
+                    if (str.length() > maxlen.get()) maxlen.set(str.length());
+                });
+                new TreeMap<>(map).forEach((topic, ms) -> sb.append("MessageConsumer(topic=").append(alignString(topic, maxlen.get())).append(") init and start in ").append(ms).append(" ms\r\n")
+                );
+            }
+            if (sb.length() > 0) logger.info(sb.toString().trim());
+            logger.info("MessageAgent(names=" + JsonConvert.root().convertTo(names) + ") start in " + (System.currentTimeMillis() - s) + " ms");
+        }
         //if (!singletonrun) signalHandle();
         //if (!singletonrun) clearPersistData();
         logger.info(this.getClass().getSimpleName() + " started in " + (System.currentTimeMillis() - startTime) + " ms\r\n");
+        for (ApplicationListener listener : this.listeners) {
+            listener.postStart(this);
+        }
         if (!singletonrun) this.serversLatch.await();
     }
 
+    private static String alignString(String value, int maxlen) {
+        StringBuilder sb = new StringBuilder(maxlen);
+        sb.append(value);
+        for (int i = 0; i < maxlen - value.length(); i++) {
+            sb.append(' ');
+        }
+        return sb.toString();
+    }
+
 //    private void clearPersistData() {
 //        File cachedir = new File(home, "cache");
 //        if (!cachedir.isDirectory()) return;
@@ -735,7 +972,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);
                 }
 
@@ -764,20 +1001,18 @@ public final class Application {
                                 synchronized (nodeClasses) {
                                     if (!inited.getAndSet(true)) { //加载自定义的协议，如：SOCKS
                                         ClassFilter profilter = new ClassFilter(classLoader, NodeProtocol.class, NodeServer.class, (Class[]) null);
-                                        ClassFilter.Loader.load(home, serconf.getValue("excludelibs", "").split(";"), profilter);
+                                        ClassFilter.Loader.load(home, ((excludelibs != null ? (excludelibs + ";") : "") + serconf.getValue("excludelibs", "")).split(";"), profilter);
                                         final Set<FilterEntry<NodeServer>> entrys = profilter.getFilterEntrys();
                                         for (FilterEntry<NodeServer> entry : entrys) {
                                             final Class<? extends NodeServer> type = entry.getType();
                                             NodeProtocol pros = type.getAnnotation(NodeProtocol.class);
-                                            for (String p : pros.value()) {
-                                                p = p.toUpperCase();
-                                                if ("SNCP".equals(p) || "HTTP".equals(p)) continue;
-                                                final Class<? extends NodeServer> old = nodeClasses.get(p);
-                                                if (old != null && old != type) {
-                                                    throw new RuntimeException("Protocol(" + p + ") had NodeServer-Class(" + old.getName() + ") but repeat NodeServer-Class(" + type.getName() + ")");
-                                                }
-                                                nodeClasses.put(p, type);
+                                            String p = pros.value().toUpperCase();
+                                            if ("SNCP".equals(p) || "HTTP".equals(p)) continue;
+                                            final Class<? extends NodeServer> old = nodeClasses.get(p);
+                                            if (old != null && old != type) {
+                                                throw new RuntimeException("Protocol(" + p + ") had NodeServer-Class(" + old.getName() + ") but repeat NodeServer-Class(" + type.getName() + ")");
                                             }
+                                            nodeClasses.put(p, type);
                                         }
                                     }
                                 }
@@ -805,13 +1040,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) {
@@ -824,30 +1068,34 @@ public final class Application {
     }
 
     public static Application create(final boolean singleton) throws IOException {
+        return new Application(singleton, loadAppXml());
+    }
+
+    private static AnyValue loadAppXml() throws IOException {
         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 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) {
-            application.sendCommand(System.getProperty("CMD"));
-            return;
-        } else if (System.getProperty("SHUTDOWN") != null) { //兼容旧接口
-            application.sendCommand("SHUTDOWN");
+            AnyValue config = loadAppXml();
+            Application.sendCommand(null, config.getIntValue("port"), System.getProperty("CMD"));
             return;
         }
+        final Application application = Application.create(false);
         application.init();
         application.startSelfServer();
         try {
@@ -871,7 +1119,18 @@ public final class Application {
         return null;
     }
 
-    private void shutdown() throws Exception {
+    public void command(String cmd) {
+        List<NodeServer> localServers = new ArrayList<>(servers); //顺序sncps, others, watchs        
+        localServers.stream().forEach((server) -> {
+            try {
+                server.command(cmd);
+            } catch (Exception t) {
+                logger.log(Level.WARNING, " command server(" + server.getSocketAddress() + ") error", t);
+            }
+        });
+    }
+
+    public void shutdown() throws Exception {
         for (ApplicationListener listener : this.listeners) {
             try {
                 listener.preShutdown(this);
@@ -879,8 +1138,26 @@ public final class Application {
                 logger.log(Level.WARNING, listener.getClass() + " preShutdown erroneous", e);
             }
         }
-
-        servers.stream().forEach((server) -> {
+        List<NodeServer> localServers = new ArrayList<>(servers); //顺序sncps, others, watchs
+        Collections.reverse(localServers); //倒序， 必须让watchs先关闭，watch包含服务发现和注销逻辑
+        if (this.messageAgents != null) {
+            Set<String> names = new HashSet<>();
+            if (logger.isLoggable(Level.FINER)) logger.log(Level.FINER, "MessageAgent stopping");
+            long s = System.currentTimeMillis();
+            for (MessageAgent agent : this.messageAgents) {
+                names.add(agent.getName());
+                agent.stop().join();
+            }
+            logger.info("MessageAgent(names=" + JsonConvert.root().convertTo(names) + ") stop in " + (System.currentTimeMillis() - s) + " ms");
+        }
+        if (clusterAgent != null) {
+            if (logger.isLoggable(Level.FINER)) logger.log(Level.FINER, "ClusterAgent destroying");
+            long s = System.currentTimeMillis();
+            clusterAgent.deregister(this);
+            clusterAgent.destroy(clusterAgent.getConfig());
+            logger.info("ClusterAgent destroy in " + (System.currentTimeMillis() - s) + " ms");
+        }
+        localServers.stream().forEach((server) -> {
             try {
                 server.shutdown();
             } catch (Exception t) {
@@ -889,7 +1166,16 @@ public final class Application {
                 serversLatch.countDown();
             }
         });
-
+        if (this.messageAgents != null) {
+            Set<String> names = new HashSet<>();
+            if (logger.isLoggable(Level.FINER)) logger.log(Level.FINER, "MessageAgent destroying");
+            long s = System.currentTimeMillis();
+            for (MessageAgent agent : this.messageAgents) {
+                names.add(agent.getName());
+                agent.destroy(agent.getConfig());
+            }
+            logger.info("MessageAgent(names=" + JsonConvert.root().convertTo(names) + ") destroy in " + (System.currentTimeMillis() - s) + " ms");
+        }
         for (DataSource source : dataSources) {
             if (source == null) continue;
             try {

src/org/redkale/boot/ApplicationListener.java

@@ -35,6 +35,14 @@ public interface ApplicationListener {
     default void preStart(Application application) {
     }
 
+    /**
+     * Application 在运行start后调用
+     *
+     * @param application Application
+     */
+    default void postStart(Application application) {
+    }
+
     /**
      * Application 在运行shutdown前调用
      *

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) {
@@ -159,13 +175,14 @@ public final class ClassFilter<T> {
         }
         if (!r && ors != null) {
             for (ClassFilter filter : ors) {
-                if (filter.accept(property, clazzname)) {
+                if (filter.accept(filter.conf, clazzname)) {
                     cf = filter;
+                    property = cf.conf;
                     break;
                 }
             }
         }
-        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;
@@ -173,25 +190,28 @@ public final class ClassFilter<T> {
                 if (property == null) {
                     property = cf.conf;
                 } else if (property instanceof DefaultAnyValue) {
-                    ((DefaultAnyValue) property).addAll(cf.conf);
+                    ((DefaultAnyValue) property).addAllStringSet(cf.conf);
                 } else {
                     DefaultAnyValue dav = new DefaultAnyValue();
-                    dav.addAll(property);
-                    dav.addAll(cf.conf);
+                    dav.addAllStringSet(property);
+                    dav.addAllStringSet(cf.conf);
                     property = dav;
                 }
             }
 
             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")
+                && !clazzname.startsWith("com.mysql.") && !clazzname.startsWith("com.microsoft.")
+                && !clazzname.startsWith("org.redkale") && (clazzname.contains("Service") || clazzname.contains("Servlet"))) {
+                //&& (!(cfe instanceof NoClassDefFoundError) || (cfe instanceof UnsupportedClassVersionError) || ((NoClassDefFoundError) cfe).getMessage().startsWith("java.lang.NoClassDefFoundError: java"))) {
+                logger.log(Level.FINEST, ClassFilter.class.getSimpleName() + " filter error for class: " + clazzname + (url == null ? "" : (" in " + url)), cfe);
             }
         }
     }
@@ -224,7 +244,7 @@ public final class ClassFilter<T> {
         }
         if (!r && ors != null) {
             for (ClassFilter filter : ors) {
-                if (filter.accept(property, classname)) return true;
+                if (filter.accept(filter.conf, classname)) return true;
             }
         }
         return r;
@@ -333,6 +353,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 +375,7 @@ public final class ClassFilter<T> {
 
     public void setPrivilegeExcludes(Set<String> privilegeExcludes) {
         this.privilegeExcludes = privilegeExcludes == null || privilegeExcludes.isEmpty() ? null : privilegeExcludes;
+
     }
 
     /**
@@ -379,7 +408,7 @@ public final class ClassFilter<T> {
                 str = str.trim();
                 if (str.endsWith(";")) str = str.substring(0, str.length() - 1);
             }
-            if (str != null) groups.addAll(Arrays.asList(str.split(";")));
+            if (str != null) this.groups.addAll(Arrays.asList(str.split(";")));
             this.property = property;
             this.autoload = autoload;
             this.expect = expect;
@@ -389,7 +418,7 @@ public final class ClassFilter<T> {
         @Override
         public String toString() {
             return this.getClass().getSimpleName() + "[thread=" + Thread.currentThread().getName()
-                + ", type=" + this.type.getSimpleName() + ", name=" + name + ", groups=" + groups + "]";
+                + ", type=" + this.type.getSimpleName() + ", name=" + name + ", groups=" + this.groups + "]";
         }
 
         @Override
@@ -416,6 +445,10 @@ public final class ClassFilter<T> {
             return property;
         }
 
+        public boolean containsGroup(String group) {
+            return groups != null && groups.contains(group);
+        }
+
         public boolean isEmptyGroups() {
             return groups == null || groups.isEmpty();
         }
@@ -467,7 +500,7 @@ public final class ClassFilter<T> {
                     boolean skip = false;
                     for (Pattern p : excludePatterns) {
                         if (p.matcher(url.toString()).matches()) {
-                            skip = false;
+                            skip = true;
                             break;
                         }
                     }
@@ -502,7 +535,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 +544,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 +563,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);
                         }
                     }
                 }

src/org/redkale/boot/LogFileHandler.java

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

src/org/redkale/boot/NodeHttpServer.java

@@ -9,10 +9,13 @@ 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;
 import org.redkale.boot.ClassFilter.FilterEntry;
+import org.redkale.cluster.ClusterAgent;
+import org.redkale.mq.MessageAgent;
 import org.redkale.net.*;
 import org.redkale.net.http.*;
 import org.redkale.net.sncp.Sncp;
@@ -29,7 +32,7 @@ import org.redkale.watch.*;
  *
  * @author zhangjx
  */
-@NodeProtocol({"HTTP"})
+@NodeProtocol("HTTP")
 public class NodeHttpServer extends NodeServer {
 
     protected final boolean rest; //是否加载REST服务， 为true加载rest节点信息并将所有可REST化的Service生成RestServlet
@@ -119,7 +122,15 @@ public class NodeHttpServer extends NodeServer {
                         resourceFactory.register(RESNAME_SNCP_ADDR, String.class, sncpResFactory.find(RESNAME_SNCP_ADDR, String.class));
                     }
                     if (nodeService == null) {
-                        nodeService = Sncp.createLocalService(serverClassLoader, resourceName, WebSocketNodeService.class, application.getResourceFactory(), application.getSncpTransportFactory(), (InetSocketAddress) null, (Set<String>) null, (AnyValue) null);
+                        MessageAgent messageAgent = null;
+                        try {
+                            Field c = WebSocketServlet.class.getDeclaredField("messageAgent");
+                            c.setAccessible(true);
+                            messageAgent = (MessageAgent) c.get(src);
+                        } catch (Exception ex) {
+                            logger.log(Level.WARNING, "WebSocketServlet getMessageAgent error", ex);
+                        }
+                        nodeService = Sncp.createLocalService(serverClassLoader, resourceName, WebSocketNodeService.class, messageAgent, application.getResourceFactory(), application.getSncpTransportFactory(), (InetSocketAddress) null, (Set<String>) null, (AnyValue) null);
                         regFactory.register(resourceName, WebSocketNode.class, nodeService);
                     }
                     resourceFactory.inject(nodeService, self);
@@ -135,7 +146,7 @@ public class NodeHttpServer extends NodeServer {
     @SuppressWarnings("unchecked")
     protected void loadHttpFilter(final AnyValue filtersConf, final ClassFilter<? extends Filter> classFilter) throws Exception {
         final StringBuilder sb = logger.isLoggable(Level.INFO) ? new StringBuilder() : null;
-        final String threadName = "[" + Thread.currentThread().getName() + "] ";
+        final String localThreadName = "[" + Thread.currentThread().getName() + "] ";
         List<FilterEntry<? extends Filter>> list = new ArrayList(classFilter.getFilterEntrys());
         for (FilterEntry<? extends Filter> en : list) {
             Class<HttpFilter> clazz = (Class<HttpFilter>) en.getType();
@@ -144,7 +155,7 @@ public class NodeHttpServer extends NodeServer {
             resourceFactory.inject(filter, this);
             DefaultAnyValue filterConf = (DefaultAnyValue) en.getProperty();
             this.httpServer.addHttpFilter(filter, filterConf);
-            if (sb != null) sb.append(threadName).append(" Load ").append(clazz.getName()).append(LINE_SEPARATOR);
+            if (sb != null) sb.append(localThreadName).append(" Load ").append(clazz.getName()).append(LINE_SEPARATOR);
         }
         if (sb != null && sb.length() > 0) logger.log(Level.INFO, sb.toString());
     }
@@ -157,7 +168,7 @@ public class NodeHttpServer extends NodeServer {
         if (!prefix0.isEmpty() && prefix0.charAt(prefix0.length() - 1) == '/') prefix0 = prefix0.substring(0, prefix0.length() - 1);
         if (!prefix0.isEmpty() && prefix0.charAt(0) != '/') prefix0 = '/' + prefix0;
         final String prefix = prefix0;
-        final String threadName = "[" + Thread.currentThread().getName() + "] ";
+        final String localThreadName = "[" + Thread.currentThread().getName() + "] ";
         List<FilterEntry<? extends Servlet>> list = new ArrayList(servletFilter.getFilterEntrys());
         list.sort((FilterEntry<? extends Servlet> o1, FilterEntry<? extends Servlet> o2) -> {  //必须保证WebSocketServlet优先加载， 因为要确保其他的HttpServlet可以注入本地模式的WebSocketNode
             boolean ws1 = WebSocketServlet.class.isAssignableFrom(o1.getType());
@@ -175,7 +186,11 @@ public class NodeHttpServer extends NodeServer {
             Class<HttpServlet> clazz = (Class<HttpServlet>) en.getType();
             if (Modifier.isAbstract(clazz.getModifiers())) continue;
             WebServlet ws = clazz.getAnnotation(WebServlet.class);
-            if (ws == null || ws.value().length == 0) continue;
+            if (ws == null) continue;
+            if (ws.value().length == 0) {
+                logger.log(Level.INFO, "not found @WebServlet.value in " + clazz.getName());
+                continue;
+            }
             final HttpServlet servlet = clazz.getDeclaredConstructor().newInstance();
             resourceFactory.inject(servlet, this);
             final String[] mappings = ws.value();
@@ -191,12 +206,12 @@ 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();
             }
             for (AbstractMap.SimpleEntry<String, String[]> as : ss) {
-                sb.append(threadName).append(" Load ").append(as.getKey());
+                sb.append(localThreadName).append(" Load ").append(as.getKey());
                 for (int i = 0; i < max - as.getKey().length(); i++) {
                     sb.append(' ');
                 }
@@ -217,14 +232,22 @@ 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;
-        final String prefix = prefix0;
 
-        final String threadName = "[" + Thread.currentThread().getName() + "] ";
+        final String localThreadName = "[" + Thread.currentThread().getName() + "] ";
         final List<AbstractMap.SimpleEntry<String, String[]>> ss = sb == null ? null : new ArrayList<>();
-
+        String mqname = restConf.getValue("mq");
+        MessageAgent agent0 = null;
+        if (mqname != null) {
+            agent0 = application.getMessageAgent(mqname);
+            if (agent0 == null) throw new RuntimeException("not found " + MessageAgent.class.getSimpleName() + " config for (name=" + mqname + ")");
+        }
+        final MessageAgent messageAgent = agent0;
+        if (messageAgent != null) prefix0 = ""; //开启MQ时,prefix字段失效
+        final String prefix = prefix0;
         final boolean autoload = restConf.getBoolValue("autoload", true);
         {  //加载RestService
             String userTypeStr = restConf.getValue("usertype");
@@ -243,35 +266,47 @@ 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);
+                    dynServletMap.put(service, servlet);
+                    if (messageAgent != null) messageAgent.putService(this, service, servlet);
+                    //if (finest) logger.finest(localThreadName + " 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<>();
@@ -310,13 +345,13 @@ public class NodeHttpServer extends NodeServer {
                     return;
                 }
                 restedObjects.add(stype); //避免重复创建Rest对象
-                HttpServlet servlet = httpServer.addRestWebSocketServlet(serverClassLoader, stype, prefix, en.getProperty());
+                WebSocketServlet servlet = httpServer.addRestWebSocketServlet(serverClassLoader, stype, messageAgent, prefix, en.getProperty());
                 if (servlet == null) return; //没有RestOnMessage方法的HttpServlet调用Rest.createRestWebSocketServlet就会返回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 + " " + stype.getName() + " create a RestWebSocketServlet");
+                if (finest) logger.finest(localThreadName + " " + stype.getName() + " create a RestWebSocketServlet");
                 if (ss != null) {
                     String[] mappings = servlet.getClass().getAnnotation(WebServlet.class).value();
                     for (int i = 0; i < mappings.length; i++) {
@@ -326,20 +361,39 @@ public class NodeHttpServer extends NodeServer {
                 }
             }
         }
+        if (messageAgent != null) this.messageAgents.put(messageAgent.getName(), messageAgent);
         //输出信息
         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();
             }
             for (AbstractMap.SimpleEntry<String, String[]> as : ss) {
-                sb.append(threadName).append(" Load ").append(as.getKey());
+                sb.append(localThreadName).append(" Load ").append(as.getKey());
                 for (int i = 0; i < max - as.getKey().length(); i++) {
                     sb.append(' ');
                 }
                 sb.append("  mapping to  ").append(Arrays.toString(as.getValue())).append(LINE_SEPARATOR);
             }
+            sb.append(localThreadName).append(" All HttpServlets load cost ").append(System.currentTimeMillis() - starts).append(" ms").append(LINE_SEPARATOR);
         }
     }
+
+    @Override //loadServlet执行之后调用
+    protected void postLoadServlets() {
+        final ClusterAgent cluster = application.clusterAgent;
+        if (cluster != null) {
+            NodeProtocol pros = getClass().getAnnotation(NodeProtocol.class);
+            String protocol = pros.value().toUpperCase();
+            if (!cluster.containsProtocol(protocol)) return;
+            if (!cluster.containsPort(server.getSocketAddress().getPort())) return;
+            cluster.register(this, protocol, dynServletMap.keySet(), new HashSet<>());
+        }
+    }
+
+    @Override
+    protected void afterClusterDeregisterOnPreDestroyServices(ClusterAgent cluster, String protocol) {
+        cluster.deregister(this, protocol, dynServletMap.keySet(), new HashSet<>());
+    }
 }

src/org/redkale/boot/NodeProtocol.java

@@ -20,5 +20,5 @@ import java.lang.annotation.*;
 @Documented
 public @interface NodeProtocol {
 
-    String[] value();
+    String value();
 }

src/org/redkale/boot/NodeServer.java

@@ -5,6 +5,8 @@
  */
 package org.redkale.boot;
 
+import org.redkale.cluster.ClusterAgent;
+import org.redkale.mq.MessageAgent;
 import org.redkale.util.RedkaleClassLoader;
 import java.io.*;
 import java.lang.annotation.Annotation;
@@ -12,6 +14,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.*;
@@ -26,7 +29,6 @@ import org.redkale.net.sncp.*;
 import org.redkale.service.*;
 import org.redkale.source.*;
 import org.redkale.util.*;
-import org.redkale.util.AnyValue.DefaultAnyValue;
 
 /**
  * Server节点的初始化配置类
@@ -66,11 +68,13 @@ public abstract class NodeServer {
     private InetSocketAddress sncpAddress;
 
     //加载Service时的处理函数
-    protected Consumer<Service> consumer;
+    protected BiConsumer<MessageAgent, Service> consumer;
 
     //server节点的配置
     protected AnyValue serverConf;
 
+    protected final String threadName;
+
     //加载server节点后的拦截器
     protected NodeInterceptor interceptor;
 
@@ -83,11 +87,20 @@ public abstract class NodeServer {
     //远程模式的Service对象集合
     protected final Set<Service> remoteServices = new LinkedHashSet<>();
 
+    protected final Map<Service, Servlet> dynServletMap = new LinkedHashMap<>();
+
+    //MessageAgent对象集合
+    protected final Map<String, MessageAgent> messageAgents = new HashMap<>();
+
+    //需要远程模式Service的MessageAgent对象集合
+    protected final Map<String, MessageAgent> sncpRemoteAgents = new HashMap<>();
+
     private volatile int maxClassNameLength = 0;
 
     private volatile int maxNameLength = 0;
 
     public NodeServer(Application application, Server server) {
+        this.threadName = Thread.currentThread().getName();
         this.application = application;
         this.server = server;
         this.resourceFactory = server.getResourceFactory();
@@ -110,7 +123,7 @@ public abstract class NodeServer {
         this.serverConf = config == null ? AnyValue.create() : config;
         if (isSNCP()) { // SNCP协议
             String host = this.serverConf.getValue("host", isWATCH() ? "127.0.0.1" : "0.0.0.0").replace("0.0.0.0", "");
-            this.sncpAddress = new InetSocketAddress(host.isEmpty() ? application.localAddress.getHostAddress() : host, this.serverConf.getIntValue("port"));
+            this.sncpAddress = new InetSocketAddress(host.isEmpty() ? application.localAddress.getAddress().getHostAddress() : host, this.serverConf.getIntValue("port"));
             this.sncpGroup = application.sncpTransportFactory.findGroupName(this.sncpAddress);
             //单向SNCP服务不需要对等group
             //if (this.sncpGroup == null) throw new RuntimeException("Server (" + String.valueOf(config).replaceAll("\\s+", " ") + ") not found <group> info");
@@ -141,9 +154,9 @@ public abstract class NodeServer {
         //必须要进行初始化， 构建Service时需要使用Context中的ExecutorService
         server.init(this.serverConf);
         //init之后才有Executor
-        resourceFactory.register(Server.RESNAME_SERVER_EXECUTOR, Executor.class, server.getExecutor());
-        resourceFactory.register(Server.RESNAME_SERVER_EXECUTOR, ExecutorService.class, server.getExecutor());
-        resourceFactory.register(Server.RESNAME_SERVER_EXECUTOR, ThreadPoolExecutor.class, server.getExecutor());
+        resourceFactory.register(Server.RESNAME_SERVER_EXECUTOR, Executor.class, server.getWorkExecutor());
+        resourceFactory.register(Server.RESNAME_SERVER_EXECUTOR, ExecutorService.class, server.getWorkExecutor());
+        resourceFactory.register(Server.RESNAME_SERVER_EXECUTOR, ThreadPoolExecutor.class, server.getWorkExecutor());
 
         initResource(); //给 DataSource、CacheSource 注册依赖注入时的监听回调事件。
         String interceptorClass = this.serverConf.getValue("interceptor", "");
@@ -153,17 +166,33 @@ 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();
         long s = System.currentTimeMillis();
-        ClassFilter.Loader.load(application.getHome(), serverConf.getValue("excludelibs", "").split(";"), serviceFilter, filterFilter, servletFilter, otherFilter);
+        ClassFilter.Loader.load(application.getHome(), ((application.excludelibs != null ? (application.excludelibs + ";") : "") + serverConf.getValue("excludelibs", "")).split(";"), serviceFilter, filterFilter, servletFilter, otherFilter);
         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);
+            postLoadServlets();
+        }
         if (this.interceptor != null) this.resourceFactory.inject(this.interceptor);
     }
 
@@ -177,19 +206,40 @@ 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;
+                    String classval = sourceConf.getValue("value");
+                    Class type = null;
+                    if (classval == null || classval.isEmpty()) {
+                        Iterator<CacheSource> it = ServiceLoader.load(CacheSource.class, serverClassLoader).iterator();
+                        while (it.hasNext()) {
+                            CacheSource s = it.next();
+                            if (s.match(sourceConf)) {
+                                type = s.getClass();
+                                break;
+                            }
+                        }
+                    } else {
+                        type = serverClassLoader.loadClass(classval);
+                    }
+                    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 +276,29 @@ 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<>();
+                            source = (DataSource) Sncp.createLocalService(serverClassLoader, resourceName, sourceType, client == null ? null : client.getMessageAgent(), 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) {
@@ -255,26 +308,12 @@ public abstract class NodeServer {
                 application.dataSources.add(source);
                 appResFactory.register(resourceName, DataSource.class, source);
 
-                SncpClient client = Sncp.getSncpClient((Service) src);
-                final InetSocketAddress sncpAddr = client == null ? null : client.getClientAddress();
-                if ((src instanceof DataSource) && sncpAddr != null && resourceFactory.find(resourceName, DataCacheListener.class) == null) { //只有DataSourceService 才能赋值 DataCacheListener   
-                    final NodeSncpServer sncpServer = application.findNodeSncpServer(sncpAddr);
-                    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());
-                    Service cacheListenerService = Sncp.createLocalService(serverClassLoader, resourceName, DataCacheListenerService.class, appResFactory, appSncpTranFactory, sncpAddr, groups, Sncp.getConf((Service) src));
-                    appResFactory.register(resourceName, DataCacheListener.class, cacheListenerService);
-                    localServices.add(cacheListenerService);
-                    sncpServer.consumerAccept(cacheListenerService);
-                    rf.inject(cacheListenerService, self);
-                    logger.info("[" + Thread.currentThread().getName() + "] Load Service " + cacheListenerService);
-                }
                 field.set(src, source);
                 rf.inject(source, self); // 给其可能包含@Resource的字段赋值;
                 //NodeServer.this.watchFactory.inject(src);
                 if (source instanceof Service && needinit) ((Service) source).init(sourceConf);
             } catch (Exception e) {
-                logger.log(Level.SEVERE, "DataSource inject error", e);
+                logger.log(Level.SEVERE, "[" + Thread.currentThread().getName() + "] DataSource inject to " + src + " error", e);
             }
         }, DataSource.class);
 
@@ -284,20 +323,37 @@ 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);
                     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());
-
-                    AnyValue sourceConf = cacheResource.get(resourceName);
-                    if (sourceConf == null) sourceConf = dataResources.get(resourceName);
-                    final Class sourceType = sourceConf == null ? CacheMemorySource.class : serverClassLoader.loadClass(sourceConf.getValue("value"));
+                    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();
+                    }
+                    Class sourceType0 = CacheMemorySource.class;
+                    if (sourceConf != null) {
+                        String classval = sourceConf.getValue("value");
+                        if (classval == null || classval.isEmpty()) {
+                            Iterator<CacheSource> it = ServiceLoader.load(CacheSource.class, serverClassLoader).iterator();
+                            while (it.hasNext()) {
+                                CacheSource s = it.next();
+                                if (s.match(sourceConf)) {
+                                    sourceType0 = s.getClass();
+                                    break;
+                                }
+                            }
+                        } else {
+                            sourceType0 = serverClassLoader.loadClass(classval);
+                        }
+                    }
+                    final Class sourceType = sourceType0;
                     Object source = null;
                     if (CacheSource.class.isAssignableFrom(sourceType)) { // CacheSource
-                        source = (CacheSource) Sncp.createLocalService(serverClassLoader, resourceName, sourceType, appResFactory, appSncpTranFactory, sncpAddr, groups, Sncp.getConf(srcService));
+                        source = Modifier.isFinal(sourceType.getModifiers()) ? sourceType.getConstructor().newInstance() : (CacheSource) Sncp.createLocalService(serverClassLoader, resourceName, sourceType, client == null ? null : client.getMessageAgent(), appResFactory, appSncpTranFactory, sncpAddr, null, Sncp.getConf(srcService));
                         Type genericType = field.getGenericType();
                         ParameterizedType pt = (genericType instanceof ParameterizedType) ? (ParameterizedType) genericType : null;
                         Type valType = pt == null ? null : pt.getActualTypeArguments()[0];
@@ -342,18 +398,21 @@ public abstract class NodeServer {
                     if (nodeService == null) {
                         final HashSet<String> groups = new HashSet<>();
                         if (groups.isEmpty() && isSNCP() && NodeServer.this.sncpGroup != null) groups.add(NodeServer.this.sncpGroup);
-                        nodeService = Sncp.createLocalService(serverClassLoader, resourceName, WebSocketNodeService.class, application.getResourceFactory(), application.getSncpTransportFactory(), NodeServer.this.sncpAddress, groups, (AnyValue) null);
+                        nodeService = Sncp.createLocalService(serverClassLoader, resourceName, WebSocketNodeService.class, Sncp.getMessageAgent((Service) src), application.getResourceFactory(), application.getSncpTransportFactory(), NodeServer.this.sncpAddress, groups, (AnyValue) null);
                         (isSNCP() ? appResFactory : resourceFactory).register(resourceName, WebSocketNode.class, nodeService);
+                        ((WebSocketNodeService) nodeService).setName(resourceName);
                     }
                     resourceFactory.inject(nodeService, self);
+                    MessageAgent messageAgent = Sncp.getMessageAgent((Service) src);
+                    if (messageAgent != null && Sncp.getMessageAgent(nodeService) == null) Sncp.setMessageAgent(nodeService, messageAgent);
                     field.set(src, nodeService);
                     if (Sncp.isRemote(nodeService)) {
                         remoteServices.add(nodeService);
                     } else {
-                        if (field != null) rf.inject(nodeService); //动态加载的Service也存在按需加载的注入资源
+                        rf.inject(nodeService); //动态加载的Service也存在按需加载的注入资源
                         localServices.add(nodeService);
                         interceptorServices.add(nodeService);
-                        if (consumer != null) consumer.accept(nodeService);
+                        if (consumer != null) consumer.accept(null, nodeService);
                     }
                 } catch (Exception e) {
                     logger.log(Level.SEVERE, "WebSocketNode inject error", e);
@@ -370,7 +429,8 @@ public abstract class NodeServer {
     @SuppressWarnings("unchecked")
     protected void loadService(ClassFilter<? extends Service> serviceFilter, ClassFilter otherFilter) throws Exception {
         if (serviceFilter == null) return;
-        final String threadName = "[" + Thread.currentThread().getName() + "] ";
+        final long starts = System.currentTimeMillis();
+        final String localThreadName = "[" + Thread.currentThread().getName() + "] ";
         final Set<FilterEntry<? extends Service>> entrys = (Set) serviceFilter.getAllFilterEntrys();
         ResourceFactory regFactory = isSNCP() ? application.getResourceFactory() : resourceFactory;
         final ResourceFactory appResourceFactory = application.getResourceFactory();
@@ -383,12 +443,11 @@ public abstract class NodeServer {
                 if (Modifier.isAbstract(serviceImplClass.getModifiers())) continue; //修饰abstract的类跳过
                 if (DataSource.class.isAssignableFrom(serviceImplClass)) continue;
                 if (CacheSource.class.isAssignableFrom(serviceImplClass)) continue;
-                if (DataCacheListener.class.isAssignableFrom(serviceImplClass)) continue;
             }
             if (entry.getName().contains("$")) throw new RuntimeException("<name> value cannot contains '$' in " + entry.getProperty());
             Service oldother = resourceFactory.find(entry.getName(), serviceImplClass);
             if (oldother != null) { //Server加载Service时需要判断是否已经加载过了。
-                interceptorServices.add(oldother);
+                if (!Sncp.isRemote(oldother)) interceptorServices.add(oldother);
                 continue;
             }
             final HashSet<String> groups = entry.getGroups(); //groups.isEmpty()表示<services>没有配置groups属性。
@@ -401,15 +460,30 @@ 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 {
-                    Service service;
-                    boolean ws = src instanceof WebSocketServlet;
-                    if (ws || localed) { //本地模式
-                        service = Sncp.createLocalService(serverClassLoader, resourceName, serviceImplClass, appResourceFactory, appSncpTransFactory, NodeServer.this.sncpAddress, groups, entry.getProperty());
-                    } else {
-                        service = Sncp.createRemoteService(serverClassLoader, resourceName, serviceImplClass, appSncpTransFactory, NodeServer.this.sncpAddress, groups, entry.getProperty());
+                    if (SncpClient.parseMethod(serviceImplClass).isEmpty() && serviceImplClass.getAnnotation(Priority.class) == null) {  //class没有可用的方法且没有标记启动优先级的， 通常为BaseService
+                        if (!serviceImplClass.getName().startsWith("org.redkale.") && !serviceImplClass.getSimpleName().contains("Base")) {
+                            logger.log(Level.FINE, serviceImplClass + " cannot load because not found less one public non-final method");
+                        }
+                        return;
                     }
-                    if (SncpClient.parseMethod(serviceImplClass).isEmpty() && serviceImplClass.getAnnotation(Priority.class) == null) return; //class没有可用的方法且没有标记启动优先级的， 通常为BaseService
 
+                    MessageAgent agent = null;
+                    if (entry.getProperty() != null && entry.getProperty().getValue("mq") != null) {
+                        agent = application.getMessageAgent(entry.getProperty().getValue("mq"));
+                        if (agent != null) messageAgents.put(agent.getName(), agent);
+                    }
+
+                    Service service;
+                    final boolean ws = src instanceof WebSocketServlet;
+                    if (ws || localed) { //本地模式
+                        service = Sncp.createLocalService(serverClassLoader, resourceName, serviceImplClass, agent, appResourceFactory, appSncpTransFactory, NodeServer.this.sncpAddress, groups, entry.getProperty());
+                    } else {
+                        service = Sncp.createRemoteService(serverClassLoader, resourceName, serviceImplClass, agent, appSncpTransFactory, NodeServer.this.sncpAddress, groups, entry.getProperty());
+                    }
+                    if (service instanceof WebSocketNodeService) {
+                        ((WebSocketNodeService) service).setName(resourceName);
+                        if (agent != null) Sncp.setMessageAgent(service, agent);
+                    }
                     final Class restype = Sncp.getResourceType(service);
                     if (rf.find(resourceName, restype) == null) {
                         regFactory.register(resourceName, restype, service);
@@ -418,11 +492,12 @@ public abstract class NodeServer {
                     }
                     if (Sncp.isRemote(service)) {
                         remoteServices.add(service);
+                        if (agent != null) sncpRemoteAgents.put(agent.getName(), agent);
                     } else {
                         if (field != null) rf.inject(service); //动态加载的Service也存在按需加载的注入资源
                         localServices.add(service);
                         interceptorServices.add(service);
-                        if (consumer != null) consumer.accept(service);
+                        if (consumer != null) consumer.accept(agent, service);
                     }
                 } catch (RuntimeException ex) {
                     throw ex;
@@ -455,12 +530,18 @@ public abstract class NodeServer {
 
         if (sb != null) {
             remoteServices.forEach(y -> {
-                sb.append(threadName).append(Sncp.toSimpleString(y, maxNameLength, maxClassNameLength)).append(" load and inject").append(LINE_SEPARATOR);
+                sb.append(localThreadName).append(Sncp.toSimpleString(y, maxNameLength, maxClassNameLength)).append(" load and inject").append(LINE_SEPARATOR);
+            });
+        }
+        if (isSNCP() && !sncpRemoteAgents.isEmpty()) {
+            sncpRemoteAgents.values().forEach(agent -> {
+                // agent.putSncpResp((NodeSncpServer) this);
+                //  agent.startSncpRespConsumer();
             });
         }
         //----------------- 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());
@@ -472,26 +553,25 @@ public abstract class NodeServer {
         localServices.clear();
         localServices.addAll(swlist);
         //this.loadPersistData();
+        long preinits = System.currentTimeMillis();
+        preInitServices(localServices, remoteServices);
+        long preinite = System.currentTimeMillis() - preinits;
         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(localThreadName).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(localThreadName).append("All Services load cost ").append(System.currentTimeMillis() - starts).append(" ms" + LINE_SEPARATOR);
         }
+        if (sb != null && preinite > 10) sb.append(localThreadName).append(ClusterAgent.class.getSimpleName()).append(" register ").append(preinite).append(" ms" + LINE_SEPARATOR);
         if (sb != null && sb.length() > 0) logger.log(Level.INFO, sb.toString());
     }
 
@@ -500,6 +580,44 @@ public abstract class NodeServer {
         maxClassNameLength = Math.max(maxClassNameLength, Sncp.getResourceType(y).getName().length() + 1);
     }
 
+    //Service.init执行之前调用
+    protected void preInitServices(Set<Service> localServices, Set<Service> remoteServices) {
+        final ClusterAgent cluster = application.clusterAgent;
+        if (cluster == null) return;
+        NodeProtocol pros = getClass().getAnnotation(NodeProtocol.class);
+        String protocol = pros.value().toUpperCase();
+        if (!cluster.containsProtocol(protocol)) return;
+        if (!cluster.containsPort(server.getSocketAddress().getPort())) return;
+        cluster.register(this, protocol, localServices, remoteServices);
+    }
+
+    //loadServlet执行之后调用
+    protected void postLoadServlets() {
+
+    }
+
+    //Service.destroy执行之前调用
+    protected void preDestroyServices(Set<Service> localServices, Set<Service> remoteServices) {
+        if (application.clusterAgent != null) { //服务注销
+            final ClusterAgent cluster = application.clusterAgent;
+            NodeProtocol pros = getClass().getAnnotation(NodeProtocol.class);
+            String protocol = pros.value().toUpperCase();
+            if (cluster.containsProtocol(protocol) && cluster.containsPort(server.getSocketAddress().getPort())) {
+                cluster.deregister(this, protocol, localServices, remoteServices);
+                afterClusterDeregisterOnPreDestroyServices(cluster, protocol);
+            }
+        }
+        if (!this.messageAgents.isEmpty()) { //MQ
+        }
+    }
+
+    protected void afterClusterDeregisterOnPreDestroyServices(ClusterAgent cluster, String protocol) {
+    }
+
+    //Server.start执行之后调用
+    protected void postStartServer(Set<Service> localServices, Set<Service> remoteServices) {
+    }
+
     protected abstract ClassFilter<Filter> createFilterClassFilter();
 
     protected abstract ClassFilter<Servlet> createServletClassFilter();
@@ -530,22 +648,24 @@ public abstract class NodeServer {
         }
         cf = null;
         for (AnyValue list : proplist) {
-            DefaultAnyValue prop = null;
+            AnyValue.DefaultAnyValue prop = null;
             String sc = list.getValue("groups");
+            String mq = list.getValue("mq");
             if (sc != null) {
                 sc = sc.trim();
                 if (sc.endsWith(";")) sc = sc.substring(0, sc.length() - 1);
             }
             if (sc == null) sc = localGroup;
-            if (sc != null) {
+            if (sc != null || mq != null) {
                 prop = new AnyValue.DefaultAnyValue();
-                prop.addValue("groups", sc);
+                if (sc != null) prop.addValue("groups", sc);
+                if (mq != null) prop.addValue("mq", mq);
             }
             ClassFilter filter = new ClassFilter(this.serverClassLoader, ref, inter, excludeSuperClasses, prop);
             for (AnyValue av : list.getAnyValues(property)) { // <service>、<filter>、<servlet> 节点
                 final AnyValue[] items = av.getAnyValues("property");
-                if (av instanceof DefaultAnyValue && items.length > 0) { //存在 <property>节点
-                    DefaultAnyValue dav = DefaultAnyValue.create();
+                if (av instanceof AnyValue.DefaultAnyValue && items.length > 0) { //存在 <property>节点
+                    AnyValue.DefaultAnyValue dav = AnyValue.DefaultAnyValue.create();
                     final AnyValue.Entry<String>[] strings = av.getStringEntrys();
                     if (strings != null) {  //将<service>、<filter>、<servlet>节点的属性值传给dav
                         for (AnyValue.Entry<String> en : strings) {
@@ -558,7 +678,7 @@ public abstract class NodeServer {
                             if (!"property".equals(en.name)) dav.addValue(en.name, en.getValue());
                         }
                     }
-                    DefaultAnyValue ps = DefaultAnyValue.create();
+                    AnyValue.DefaultAnyValue ps = AnyValue.DefaultAnyValue.create();
                     for (AnyValue item : items) {
                         ps.addValue(item.getValue("name"), item.getValue("value"));
                     }
@@ -594,6 +714,10 @@ public abstract class NodeServer {
         return false;
     }
 
+    public Application getApplication() {
+        return application;
+    }
+
     public ResourceFactory getResourceFactory() {
         return resourceFactory;
     }
@@ -627,12 +751,14 @@ public abstract class NodeServer {
     public void start() throws IOException {
         if (interceptor != null) interceptor.preStart(this);
         server.start();
+        postStartServer(localServices, remoteServices);
     }
 
     public void shutdown() throws IOException {
         if (interceptor != null) interceptor.preShutdown(this);
         final StringBuilder sb = logger.isLoggable(Level.INFO) ? new StringBuilder() : null;
         final boolean finest = logger.isLoggable(Level.FINEST);
+        preDestroyServices(localServices, remoteServices);
         localServices.forEach(y -> {
             long s = System.currentTimeMillis();
             if (finest) logger.finest(y + " is destroying");
@@ -647,6 +773,42 @@ public abstract class NodeServer {
         server.shutdown();
     }
 
+    public void command(String cmd) throws IOException {
+        final StringBuilder sb = logger.isLoggable(Level.INFO) ? new StringBuilder() : null;
+        final boolean finest = logger.isLoggable(Level.FINEST);
+        localServices.forEach(y -> {
+            Set<Method> methods = new HashSet<>();
+            Class loop = y.getClass();
+            //do {   public方法不用递归
+            for (Method m : loop.getMethods()) {
+                Command c = m.getAnnotation(Command.class);
+                if (c == null) continue;
+                if (Modifier.isStatic(m.getModifiers())) continue;
+                if (m.getReturnType() != void.class) continue;
+                if (m.getParameterCount() != 1) continue;
+                if (m.getParameterTypes()[0] != String.class) continue;
+                methods.add(m);
+            }
+            //} while ((loop = loop.getSuperclass()) != Object.class);
+            if (methods.isEmpty()) return;
+            long s = System.currentTimeMillis();
+            Method one = null;
+            try {
+                for (Method method : methods) {
+                    one = method;
+                    method.invoke(y, cmd);
+                }
+            } catch (Exception ex) {
+                logger.log(Level.SEVERE, one + " run error, cmd = " + cmd, ex);
+            }
+            long e = System.currentTimeMillis() - s;
+            if (e > 10 && sb != null) {
+                sb.append(Sncp.toSimpleString(y, maxNameLength, maxClassNameLength)).append(" command (").append(cmd).append(") ").append(e).append("ms").append(LINE_SEPARATOR);
+            }
+        });
+        if (sb != null && sb.length() > 0) logger.log(Level.INFO, sb.toString());
+    }
+
     public <T extends Server> T getServer() {
         return (T) server;
     }
@@ -663,4 +825,7 @@ public abstract class NodeServer {
         return new LinkedHashSet<>(remoteServices);
     }
 
+    public String getThreadName() {
+        return this.threadName;
+    }
 }

src/org/redkale/boot/NodeSncpServer.java

@@ -10,9 +10,10 @@ import java.net.*;
 import java.util.*;
 import java.util.logging.Level;
 import org.redkale.boot.ClassFilter.FilterEntry;
+import org.redkale.mq.MessageAgent;
 import org.redkale.net.*;
 import org.redkale.net.sncp.*;
-import org.redkale.service.Service;
+import org.redkale.service.*;
 import org.redkale.util.*;
 import org.redkale.util.AnyValue.DefaultAnyValue;
 
@@ -24,7 +25,7 @@ import org.redkale.util.AnyValue.DefaultAnyValue;
  *
  * @author zhangjx
  */
-@NodeProtocol({"SNCP"})
+@NodeProtocol("SNCP")
 public class NodeSncpServer extends NodeServer {
 
     protected final SncpServer sncpServer;
@@ -32,14 +33,15 @@ 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 : (agent, x) -> {//singleton模式下不生成SncpServlet
+            if (x.getClass().getAnnotation(Local.class) != null) return;
+            SncpDynServlet servlet = sncpServer.addSncpServlet(x);
+            dynServletMap.put(x, servlet);
+            if (agent != null) agent.putService(this, x, servlet);
+        };
     }
 
     public static NodeServer createNodeServer(Application application, AnyValue serconf) {
-        if (serconf != null && serconf.getAnyValue("rest") != null) {
-            ((AnyValue.DefaultAnyValue) serconf).addValue("_$sncp", "true");
-            return new NodeHttpServer(application, serconf);
-        }
         return new NodeSncpServer(application, serconf);
     }
 
@@ -52,8 +54,8 @@ public class NodeSncpServer extends NodeServer {
         return sncpServer == null ? null : sncpServer.getSocketAddress();
     }
 
-    public void consumerAccept(Service service) {
-        if (this.consumer != null) this.consumer.accept(service);
+    public void consumerAccept(MessageAgent messageAgent, Service service) {
+        if (this.consumer != null) this.consumer.accept(messageAgent, service);
     }
 
     @Override
@@ -62,11 +64,11 @@ public class NodeSncpServer extends NodeServer {
         //-------------------------------------------------------------------
         if (sncpServer == null) return; //调试时server才可能为null
         final StringBuilder sb = logger.isLoggable(Level.FINE) ? new StringBuilder() : null;
-        final String threadName = "[" + Thread.currentThread().getName() + "] ";
+        final String localThreadName = "[" + Thread.currentThread().getName() + "] ";
         List<SncpServlet> servlets = sncpServer.getSncpServlets();
         Collections.sort(servlets);
         for (SncpServlet en : servlets) {
-            if (sb != null) sb.append(threadName).append(" Load ").append(en).append(LINE_SEPARATOR);
+            if (sb != null) sb.append(localThreadName).append(" Load ").append(en).append(LINE_SEPARATOR);
         }
         if (sb != null && sb.length() > 0) logger.log(Level.FINE, sb.toString());
     }
@@ -88,7 +90,7 @@ public class NodeSncpServer extends NodeServer {
     @SuppressWarnings("unchecked")
     protected void loadSncpFilter(final AnyValue servletsConf, final ClassFilter<? extends Filter> classFilter) throws Exception {
         final StringBuilder sb = logger.isLoggable(Level.INFO) ? new StringBuilder() : null;
-        final String threadName = "[" + Thread.currentThread().getName() + "] ";
+        final String localThreadName = "[" + Thread.currentThread().getName() + "] ";
         List<FilterEntry<? extends Filter>> list = new ArrayList(classFilter.getFilterEntrys());
         for (FilterEntry<? extends Filter> en : list) {
             Class<SncpFilter> clazz = (Class<SncpFilter>) en.getType();
@@ -97,7 +99,7 @@ public class NodeSncpServer extends NodeServer {
             resourceFactory.inject(filter, this);
             DefaultAnyValue filterConf = (DefaultAnyValue) en.getProperty();
             this.sncpServer.addSncpFilter(filter, filterConf);
-            if (sb != null) sb.append(threadName).append(" Load ").append(clazz.getName()).append(LINE_SEPARATOR);
+            if (sb != null) sb.append(localThreadName).append(" Load ").append(clazz.getName()).append(LINE_SEPARATOR);
         }
         if (sb != null && sb.length() > 0) logger.log(Level.INFO, sb.toString());
     }

src/org/redkale/boot/NodeWatchServer.java

@@ -16,7 +16,7 @@ import org.redkale.watch.*;
  *
  * @author zhangjx
  */
-@NodeProtocol({"WATCH"})
+@NodeProtocol("WATCH")
 public class NodeWatchServer extends NodeHttpServer {
 
     public NodeWatchServer(Application application, AnyValue serconf) {

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

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

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

@@ -5,7 +5,10 @@
  */
 package org.redkale.boot.watch;
 
+import java.io.IOException;
+import java.net.InetSocketAddress;
 import java.util.*;
+import java.util.stream.Stream;
 import javax.annotation.Resource;
 import org.redkale.boot.*;
 import org.redkale.net.Server;
@@ -23,18 +26,16 @@ public class ServerWatchService extends AbstractWatchService {
     @Comment("不存在的Server节点")
     public static final int RET_SERVER_NOT_EXISTS = 1602_0001;
 
+    @Comment("更改Server监听地址端口失败")
+    public static final int RET_SERVER_CHANGEPORT_ERROR = 1602_0002;
+
     @Resource
     protected Application application;
 
     @RestMapping(name = "info", comment = "单个Server信息查询")
-    public RetResult info(@RestParam(name = "#port:") int port) {
-        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<>();
@@ -61,7 +81,7 @@ public class ServerWatchService extends AbstractWatchService {
             protocol += "/HTTP";
         } else {
             NodeProtocol np = node.getClass().getAnnotation(NodeProtocol.class);
-            if (np != null && np.value().length > 0) protocol += "/" + np.value()[0];
+            protocol += "/" + np.value();
         }
         rs.put("name", server.getName());
         rs.put("protocol", protocol);

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

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

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

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

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

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

@@ -72,15 +72,6 @@ public class TransportWatchService extends AbstractWatchService {
                     if (client.getRemoteGroups() != null && client.getRemoteGroups().contains(group)) {
                         client.getRemoteGroupTransport().addRemoteAddresses(address);
                     }
-                } else {
-                    if (group.equals(client.getSameGroup())) {
-                        client.getSameGroupTransport().addRemoteAddresses(address);
-                    }
-                    if (client.getDiffGroups() != null && client.getDiffGroups().contains(group)) {
-                        for (Transport transport : client.getDiffGroupTransports()) {
-                            transport.addRemoteAddresses(address);
-                        }
-                    }
                 }
             }
             DefaultAnyValue node = DefaultAnyValue.create("addr", addr).addValue("port", port);
@@ -114,15 +105,6 @@ public class TransportWatchService extends AbstractWatchService {
                     if (client.getRemoteGroups() != null && client.getRemoteGroups().contains(group)) {
                         client.getRemoteGroupTransport().removeRemoteAddresses(address);
                     }
-                } else {
-                    if (group.equals(client.getSameGroup())) {
-                        client.getSameGroupTransport().removeRemoteAddresses(address);
-                    }
-                    if (client.getDiffGroups() != null && client.getDiffGroups().contains(group)) {
-                        for (Transport transport : client.getDiffGroupTransports()) {
-                            transport.removeRemoteAddresses(address);
-                        }
-                    }
                 }
             }
             for (AnyValue groupconf : application.getAppConfig().getAnyValue("resources").getAnyValues("group")) {

src/org/redkale/cluster/ClusterAgent.java

@@ -0,0 +1,333 @@
+/*
+ * 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.cluster;
+
+import java.lang.ref.WeakReference;
+import java.net.InetSocketAddress;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.logging.Logger;
+import javax.annotation.Resource;
+import org.redkale.boot.*;
+import static org.redkale.boot.Application.*;
+import org.redkale.convert.json.JsonConvert;
+import org.redkale.mq.MessageMultiConsumer;
+import org.redkale.net.*;
+import org.redkale.net.http.*;
+import org.redkale.net.sncp.*;
+import org.redkale.service.*;
+import org.redkale.util.*;
+
+/**
+ * 第三方服务发现管理接口cluster
+ *
+ *
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ *
+ * @since 2.1.0
+ */
+public abstract class ClusterAgent {
+
+    protected final Logger logger = Logger.getLogger(this.getClass().getSimpleName());
+
+    @Resource(name = RESNAME_APP_NODEID)
+    protected int nodeid;
+
+    @Resource(name = RESNAME_APP_NAME)
+    protected String appName = "";
+
+    @Resource(name = RESNAME_APP_ADDR)
+    protected InetSocketAddress appAddress;
+
+    protected String name;
+
+    protected boolean waits;
+
+    protected String[] protocols; //必须全大写
+
+    protected int[] ports;
+
+    protected AnyValue config;
+
+    protected TransportFactory transportFactory;
+
+    protected final ConcurrentHashMap<String, ClusterEntry> localEntrys = new ConcurrentHashMap<>();
+
+    protected final ConcurrentHashMap<String, ClusterEntry> remoteEntrys = new ConcurrentHashMap<>();
+
+    public void init(AnyValue config) {
+        this.config = config;
+        this.name = config.getValue("name", "");
+        this.waits = config.getBoolValue("waits", false);
+        {
+            String ps = config.getValue("protocols", "").toUpperCase();
+            if (ps == null || ps.isEmpty()) ps = "SNCP;HTTP";
+            this.protocols = ps.split(";");
+        }
+        String ts = config.getValue("ports", "");
+        if (ts != null && !ts.isEmpty()) {
+            String[] its = ts.split(";");
+            List<Integer> list = new ArrayList<>();
+            for (String str : its) {
+                if (str.trim().isEmpty()) continue;
+                list.add(Integer.parseInt(str.trim()));
+            }
+            if (!list.isEmpty()) this.ports = list.stream().mapToInt(x -> x).toArray();
+        }
+    }
+
+    public void destroy(AnyValue config) {
+    }
+
+    //ServiceLoader时判断配置是否符合当前实现类
+    public abstract boolean match(AnyValue config);
+
+    public boolean containsProtocol(String protocol) {
+        if (protocol == null || protocol.isEmpty()) return false;
+        return protocols == null || Utility.contains(protocols, protocol.toUpperCase());
+    }
+
+    public boolean containsPort(int port) {
+        if (ports == null || ports.length == 0) return true;
+        return Utility.contains(ports, port);
+    }
+
+    public abstract void register(Application application);
+
+    public abstract void deregister(Application application);
+
+    //注册服务, 在NodeService调用Service.init方法之前调用
+    public void register(NodeServer ns, String protocol, Set<Service> localServices, Set<Service> remoteServices) {
+        if (localServices.isEmpty()) return;
+        //注册本地模式
+        for (Service service : localServices) {
+            if (!canRegister(protocol, service)) continue;
+            register(ns, protocol, service);
+            ClusterEntry htentry = new ClusterEntry(ns, protocol, service);
+            localEntrys.put(htentry.serviceid, htentry);
+            if (protocol.toLowerCase().startsWith("http")) {
+                MessageMultiConsumer mmc = service.getClass().getAnnotation(MessageMultiConsumer.class);
+                if (mmc != null) {
+                    register(ns, "mqtp", service);
+                    ClusterEntry mqentry = new ClusterEntry(ns, "mqtp", service);
+                    localEntrys.put(mqentry.serviceid, mqentry);
+                }
+            }
+        }
+        //远程模式加载IP列表, 只支持SNCP协议    
+        if (ns.isSNCP()) {
+            for (Service service : remoteServices) {
+                ClusterEntry entry = new ClusterEntry(ns, protocol, service);
+                updateSncpTransport(entry);
+                remoteEntrys.put(entry.serviceid, entry);
+            }
+        }
+    }
+
+    //注销服务, 在NodeService调用Service.destroy 方法之前调用
+    public void deregister(NodeServer ns, String protocol, Set<Service> localServices, Set<Service> remoteServices) {
+        //注销本地模式  远程模式不注册
+        for (Service service : localServices) {
+            if (!canRegister(protocol, service)) continue;
+            deregister(ns, protocol, service);
+        }
+        afterDeregister(ns, protocol);
+    }
+
+    protected boolean canRegister(String protocol, Service service) {
+        if ("SNCP".equalsIgnoreCase(protocol) && service.getClass().getAnnotation(Local.class) != null) return false;
+        if (service instanceof WebSocketNode) {
+            if (((WebSocketNode) service).getLocalWebSocketEngine() == null) return false;
+        }
+        return true;
+    }
+
+    public void start() {
+    }
+
+    protected void afterDeregister(NodeServer ns, String protocol) {
+        if (!this.waits) return;
+        int s = intervalCheckSeconds();
+        if (s > 0) {  //暂停，弥补其他依赖本进程服务的周期偏差
+            try {
+                Thread.sleep(s * 1000);
+            } catch (InterruptedException ex) {
+            }
+            logger.info(this.getClass().getSimpleName() + " wait for " + s * 1000 + "ms after deregister");
+        }
+    }
+
+    public int intervalCheckSeconds() {
+        return 10;
+    }
+
+    //获取MQTP的HTTP远程服务的可用ip列表, key = servicename的后半段
+    public abstract CompletableFuture<Map<String, Collection<InetSocketAddress>>> queryMqtpAddress(String protocol, String module, String resname);
+
+    //获取HTTP远程服务的可用ip列表
+    public abstract CompletableFuture<Collection<InetSocketAddress>> queryHttpAddress(String protocol, String module, String resname);
+
+    //获取远程服务的可用ip列表
+    protected abstract CompletableFuture<Collection<InetSocketAddress>> queryAddress(ClusterEntry entry);
+
+    //注册服务
+    protected abstract void register(NodeServer ns, String protocol, Service service);
+
+    //注销服务
+    protected abstract void deregister(NodeServer ns, String protocol, Service service);
+
+    //格式: protocol:classtype-resourcename
+    protected void updateSncpTransport(ClusterEntry entry) {
+        Service service = entry.serviceref.get();
+        if (service == null) return;
+        Collection<InetSocketAddress> addrs = ClusterAgent.this.queryAddress(entry).join();
+        Sncp.updateTransport(service, transportFactory, Sncp.getResourceType(service).getName() + "-" + Sncp.getResourceName(service), entry.netprotocol, entry.address, null, addrs);
+    }
+
+    protected String generateApplicationServiceName() {
+        return "application" + (appName == null || appName.isEmpty() ? "" : ("." + appName)) + ".node" + this.nodeid;
+    }
+
+    protected String generateApplicationServiceId() { //与servicename相同
+        return generateApplicationServiceName();
+    }
+
+    protected String generateApplicationCheckName() {
+        return "check-" + generateApplicationServiceName();
+    }
+
+    protected String generateApplicationCheckId() {
+        return "check-" + generateApplicationServiceId();
+    }
+
+    //也会提供给HttpMessageClusterAgent适用
+    public String generateHttpServiceName(String protocol, String module, String resname) {
+        return protocol.toLowerCase() + ":" + module + (resname == null || resname.isEmpty() ? "" : ("-" + resname));
+    }
+
+    //格式: protocol:classtype-resourcename
+    protected String generateServiceName(NodeServer ns, String protocol, Service service) {
+        if (protocol.toLowerCase().startsWith("http")) {  //HTTP使用RestService.name方式是为了与MessageClient中的module保持一致, 因为HTTP依靠的url中的module，无法知道Service类名
+            String resname = Sncp.getResourceName(service);
+            String module = Rest.getRestModule(service).toLowerCase();
+            return protocol.toLowerCase() + ":" + module + (resname.isEmpty() ? "" : ("-" + resname));
+        }
+        if ("mqtp".equalsIgnoreCase(protocol)) {
+            MessageMultiConsumer mmc = service.getClass().getAnnotation(MessageMultiConsumer.class);
+            String selfmodule = Rest.getRestModule(service).toLowerCase();
+            return protocol.toLowerCase() + ":" + mmc.module() + ":" + selfmodule;
+        }
+        if (!Sncp.isSncpDyn(service)) return protocol.toLowerCase() + ":" + service.getClass().getName();
+        String resname = Sncp.getResourceName(service);
+        return protocol.toLowerCase() + ":" + Sncp.getResourceType(service).getName() + (resname.isEmpty() ? "" : ("-" + resname));
+    }
+
+    //格式: protocol:classtype-resourcename:nodeid
+    protected String generateServiceId(NodeServer ns, String protocol, Service service) {
+        return generateServiceName(ns, protocol, service) + ":" + this.nodeid;
+    }
+
+    protected String generateCheckName(NodeServer ns, String protocol, Service service) {
+        return "check-" + generateServiceName(ns, protocol, service);
+    }
+
+    protected String generateCheckId(NodeServer ns, String protocol, Service service) {
+        return "check-" + generateServiceId(ns, protocol, service);
+    }
+
+    protected ConcurrentHashMap<String, ClusterEntry> getLocalEntrys() {
+        return localEntrys;
+    }
+
+    protected ConcurrentHashMap<String, ClusterEntry> getRemoteEntrys() {
+        return remoteEntrys;
+    }
+
+    @Override
+    public String toString() {
+        return JsonConvert.root().convertTo(this);
+    }
+
+    public TransportFactory getTransportFactory() {
+        return transportFactory;
+    }
+
+    public void setTransportFactory(TransportFactory transportFactory) {
+        this.transportFactory = transportFactory;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String[] getProtocols() {
+        return protocols;
+    }
+
+    public void setProtocols(String[] protocols) {
+        this.protocols = protocols;
+    }
+
+    public int[] getPorts() {
+        return ports;
+    }
+
+    public void setPorts(int[] ports) {
+        this.ports = ports;
+    }
+
+    public AnyValue getConfig() {
+        return config;
+    }
+
+    public void setConfig(AnyValue config) {
+        this.config = config;
+    }
+
+    public class ClusterEntry {
+
+        public String serviceid;
+
+        public String servicename;
+
+        public String checkid;
+
+        public String checkname;
+
+        public String protocol;
+
+        public String netprotocol;
+
+        public WeakReference<Service> serviceref;
+
+        public InetSocketAddress address;
+
+        public boolean canceled;
+
+        public ClusterEntry(NodeServer ns, String protocol, Service service) {
+            this.serviceid = generateServiceId(ns, protocol, service);
+            this.servicename = generateServiceName(ns, protocol, service);
+            this.checkid = generateCheckId(ns, protocol, service);
+            this.checkname = generateCheckName(ns, protocol, service);
+            this.protocol = protocol;
+            this.address = ns.getSocketAddress();
+            this.serviceref = new WeakReference(service);
+            Server server = ns.getServer();
+            this.netprotocol = server instanceof SncpServer ? ((SncpServer) server).getNetprotocol() : Transport.DEFAULT_PROTOCOL;
+        }
+
+        @Override
+        public String toString() {
+            return JsonConvert.root().convertTo(this);
+        }
+    }
+}

src/org/redkale/convert/AnyDecoder.java

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

src/org/redkale/convert/ArrayDecoder.java

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

src/org/redkale/convert/ArrayEncoder.java

@@ -27,9 +27,9 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
 
     protected final Encodeable anyEncoder;
 
-    protected final Encodeable<Writer, Object> encoder;
+    protected final Encodeable<Writer, Object> componentEncoder;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -45,7 +45,7 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
                 throw new ConvertException("(" + type + ") is not a array type");
             }
             factory.register(type, this);
-            this.encoder = factory.loadEncoder(this.componentType);
+            this.componentEncoder = factory.loadEncoder(this.componentType);
             this.anyEncoder = factory.getAnyEncoder();
         } finally {
             inited = true;
@@ -66,11 +66,11 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
             return;
         }
         if (value.length == 0) {
-            out.writeArrayB(0, encoder, value);
+            out.writeArrayB(0, this, componentEncoder, value); 
             out.writeArrayE();
             return;
         }
-        if (this.encoder == null) {
+        if (this.componentEncoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -81,12 +81,12 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
                 }
             }
         }
-        if (out.writeArrayB(value.length, encoder, value) < 0) {
+        if (out.writeArrayB(value.length, this, componentEncoder, value) < 0) { 
             final Type comp = this.componentType;
             boolean first = true;
             for (Object v : value) {
                 if (!first) out.writeArrayMark();
-                writeMemberValue(out, member, ((v != null && (v.getClass() == comp || out.specify() == comp)) ? encoder : anyEncoder), v, first);
+                writeMemberValue(out, member, ((v != null && (v.getClass() == comp || out.specify() == comp)) ? componentEncoder : anyEncoder), v, first);
                 if (first) first = false;
             }
         }
@@ -99,7 +99,7 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
 
     @Override
     public String toString() {
-        return this.getClass().getSimpleName() + "{componentType:" + this.componentType + ", encoder:" + this.encoder + "}";
+        return this.getClass().getSimpleName() + "{componentType:" + this.componentType + ", encoder:" + this.componentEncoder + "}";
     }
 
     @Override
@@ -111,8 +111,8 @@ public class ArrayEncoder<T> implements Encodeable<Writer, T[]> {
         return componentType;
     }
 
-    public Encodeable<Writer, Object> getEncoder() {
-        return encoder;
+    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>
@@ -29,9 +29,9 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
 
     protected Creator<Collection<T>> creator;
 
-    protected final Decodeable<Reader, T> decoder;
+    protected final Decodeable<Reader, T> componentDecoder;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -43,12 +43,12 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
                 this.componentType = pt.getActualTypeArguments()[0];
                 this.creator = factory.loadCreator((Class) pt.getRawType());
                 factory.register(type, this);
-                this.decoder = factory.loadDecoder(this.componentType);
+                this.componentDecoder = factory.loadDecoder(this.componentType);
             } else if (factory.isReversible()) {
                 this.componentType = Object.class;
-                this.creator = factory.loadCreator(Object.class);
+                this.creator = factory.loadCreator(type instanceof Class ? (Class) type : Collection.class);
                 factory.register(type, this);
-                this.decoder = factory.loadDecoder(this.componentType);
+                this.componentDecoder = factory.loadDecoder(this.componentType);
             } else {
                 throw new ConvertException("CollectionDecoder not support the type (" + type + ")");
             }
@@ -60,20 +60,32 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
         }
     }
 
+    //仅供类似JsonAnyDecoder这种动态创建使用， 不得调用 factory.register
+    public CollectionDecoder(final ConvertFactory factory, Type type, Type componentType,
+        Creator<Collection<T>> creator, final Decodeable<Reader, T> componentDecoder) {
+        Objects.requireNonNull(componentDecoder);
+        this.type = type;
+        this.componentType = componentType;
+        this.creator = creator;
+        this.componentDecoder = componentDecoder;
+        this.inited = true;
+    }
+
     @Override
     public Collection<T> convertFrom(Reader in) {
         return convertFrom(in, null);
     }
 
     public Collection<T> convertFrom(Reader in, DeMember member) {
-        int len = in.readArrayB(member, decoder);
+        byte[] typevals = new byte[1];
+        int len = in.readArrayB(member, typevals, componentDecoder);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {
-            contentLength = in.readMemberContentLength(member, decoder);
+            contentLength = in.readMemberContentLength(member, componentDecoder);
             len = Reader.SIGN_NOLENGTH;
         }
-        if (this.decoder == null) {
+        if (this.componentDecoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -84,7 +96,7 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
                 }
             }
         }
-        final Decodeable<Reader, T> localdecoder = this.decoder;
+        final Decodeable<Reader, T> localdecoder = getComponentDecoder(this.componentDecoder, typevals);
         final Collection<T> result = this.creator.create();
         boolean first = true;
         if (len == Reader.SIGN_NOLENGTH) {
@@ -92,7 +104,7 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
             while (hasNext(in, member, startPosition, contentLength, first)) {
                 Reader itemReader = getItemReader(in, member, first);
                 if (itemReader == null) break;
-                result.add(readMemberValue(itemReader, member, first));
+                result.add(readMemberValue(itemReader, member, localdecoder, first));
                 first = false;
             }
         } else {
@@ -108,12 +120,17 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
         return in.hasNext(startPosition, contentLength);
     }
 
+    protected Decodeable<Reader, T> getComponentDecoder(Decodeable<Reader, T> decoder, byte[] typevals) {
+        return decoder;
+    }
+
     protected Reader getItemReader(Reader in, DeMember member, boolean first) {
         return in;
     }
-    
-    protected T readMemberValue(Reader in, DeMember member, boolean first) {
-        return this.decoder.convertFrom(in);
+
+    protected T readMemberValue(Reader in, DeMember member, Decodeable<Reader, T> decoder, boolean first) {
+        if (in == null) return null;
+        return decoder.convertFrom(in);
     }
 
     @Override
@@ -125,8 +142,8 @@ public class CollectionDecoder<T> implements Decodeable<Reader, Collection<T>> {
         return componentType;
     }
 
-    public Decodeable<Reader, T> getDecoder() {
-        return decoder;
+    public Decodeable<Reader, T> getComponentDecoder() {
+        return componentDecoder;
     }
 
 }

src/org/redkale/convert/CollectionEncoder.java

@@ -23,9 +23,9 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
 
     protected final Type type;
 
-    protected final Encodeable<Writer, Object> encoder;
+    protected final Encodeable<Writer, Object> componentEncoder;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -35,12 +35,12 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
             if (type instanceof ParameterizedType) {
                 Type t = ((ParameterizedType) type).getActualTypeArguments()[0];
                 if (t instanceof TypeVariable) {
-                    this.encoder = factory.getAnyEncoder();
+                    this.componentEncoder = factory.getAnyEncoder();
                 } else {
-                    this.encoder = factory.loadEncoder(t);
+                    this.componentEncoder = factory.loadEncoder(t);
                 }
             } else {
-                this.encoder = factory.getAnyEncoder();
+                this.componentEncoder = factory.getAnyEncoder();
             }
         } finally {
             inited = true;
@@ -61,11 +61,11 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
             return;
         }
         if (value.isEmpty()) {
-            out.writeArrayB(0, encoder, value);
+            out.writeArrayB(0, this, componentEncoder, value);
             out.writeArrayE();
             return;
         }
-        if (this.encoder == null) {
+        if (this.componentEncoder == null) {
             if (!this.inited) {
                 synchronized (lock) {
                     try {
@@ -76,19 +76,19 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
                 }
             }
         }
-        if (out.writeArrayB(value.size(), encoder, value) < 0) {
+        if (out.writeArrayB(value.size(), this, componentEncoder, value) < 0) {
             boolean first = true;
             for (Object v : value) {
                 if (!first) out.writeArrayMark();
-                writeValue(out, member, v);
+                writeMemberValue(out, member, v, first);
                 if (first) first = false;
             }
         }
         out.writeArrayE();
     }
 
-    protected void writeValue(Writer out, EnMember member, Object value) {
-        encoder.convertTo(out, value);
+    protected void writeMemberValue(Writer out, EnMember member, Object value, boolean first) {
+        componentEncoder.convertTo(out, value);
     }
 
     @Override
@@ -96,8 +96,16 @@ public class CollectionEncoder<T> implements Encodeable<Writer, Collection<T>> {
         return type;
     }
 
-    public Encodeable<Writer, Object> getEncoder() {
-        return encoder;
+    @Override
+    public String toString() {
+        return this.getClass().getSimpleName() + "{componentType:" + this.type + ", encoder:" + this.componentEncoder + "}";
     }
 
+    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,12 +32,35 @@ 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);
+
+    //@since 2.2.0
+    public abstract <T> T convertFrom(final Type type, final byte[] bytes, final int offset, final int length);
+
     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);
 
+    public abstract byte[] convertToBytes(final Object value);
+
+    public abstract byte[] convertToBytes(final Type type, final Object value);
+
     public abstract ByteBuffer[] convertTo(final Supplier<ByteBuffer> supplier, final Object value);
 
     public abstract ByteBuffer[] convertTo(final Supplier<ByteBuffer> supplier, final Type type, final Object value);

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

@@ -16,7 +16,9 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.*;
 import java.util.regex.Pattern;
 import java.util.stream.*;
+import org.redkale.convert.bson.BsonConvert;
 import org.redkale.convert.ext.*;
+import org.redkale.convert.json.JsonConvert;
 import org.redkale.util.*;
 
 /**
@@ -32,6 +34,10 @@ import org.redkale.util.*;
 @SuppressWarnings("unchecked")
 public abstract class ConvertFactory<R extends Reader, W extends Writer> {
 
+    private static final AtomicBoolean loaderInited = new AtomicBoolean();
+
+    private static Convert defProtobufConvert;
+
     private final ConvertFactory parent;
 
     protected Convert<R, W> convert;
@@ -45,6 +51,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 +97,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 +139,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) {
+            }
         }
     }
 
@@ -135,6 +194,30 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
         return this.parent;
     }
 
+    public static Convert findConvert(ConvertType type) {
+        if (type == null) return null;
+        if (type == ConvertType.JSON) return JsonConvert.root();
+        if (type == ConvertType.BSON) return BsonConvert.root();
+        if (loaderInited.get()) {
+            if (type == ConvertType.PROTOBUF) return defProtobufConvert;
+        }
+        synchronized (loaderInited) {
+            if (!loaderInited.get()) {
+                Iterator<ConvertLoader> it = ServiceLoader.load(ConvertLoader.class).iterator();
+                while (it.hasNext()) {
+                    ConvertLoader cl = it.next();
+                    if (cl.type() == ConvertType.PROTOBUF) defProtobufConvert = cl.convert();
+                }
+                loaderInited.set(true);
+            }
+        }
+        return type == ConvertType.PROTOBUF ? defProtobufConvert : null;
+    }
+
+    protected static boolean getSystemPropertyBoolean(String key, String parentkey, boolean defvalue) {
+        return Boolean.parseBoolean(System.getProperty(key, System.getProperty(parentkey, String.valueOf(defvalue))));
+    }
+
     public abstract ConvertType getConvertType();
 
     public abstract boolean isReversible(); //是否可逆的
@@ -217,15 +300,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);
@@ -234,10 +312,14 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
             final Method method = (Method) element;
             fieldName = readGetSetFieldName(method);
             if (fieldName != null) {
-                try {
-                    ccs = method.getDeclaringClass().getDeclaredField(fieldName).getAnnotationsByType(ConvertColumn.class);
-                } catch (Exception e) { //说明没有该字段，忽略异常
-                }
+                Class mclz = method.getDeclaringClass();
+                do {
+                    try {
+                        ccs = mclz.getDeclaredField(fieldName).getAnnotationsByType(ConvertColumn.class);
+                        break;
+                    } catch (Exception e) { //说明没有该字段，忽略异常
+                    }
+                } while (mclz != Object.class && (mclz = mclz.getSuperclass()) != Object.class);
             }
         }
         if (onlyColumns != null && fieldName == null) {
@@ -252,8 +334,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);
@@ -261,7 +343,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;
             }
@@ -404,37 +489,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) {
@@ -495,6 +602,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;
@@ -579,6 +709,7 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
             decoder = od;
         } else if (!clazz.getName().startsWith("java.")
             || java.net.HttpCookie.class == clazz
+            || java.util.AbstractMap.SimpleEntry.class == clazz
             || clazz.getName().startsWith("java.awt.geom.Point2D")) {
             Decodeable simpleCoder = null;
             for (final Method method : clazz.getDeclaredMethods()) {
@@ -662,7 +793,8 @@ public abstract class ConvertFactory<R extends Reader, W extends Writer> {
             encoder = new OptionalCoder(this, type);
         } else if (clazz == Object.class) {
             return (Encodeable<W, E>) this.anyEncoder;
-        } else if (!clazz.getName().startsWith("java.") || java.net.HttpCookie.class == clazz) {
+        } else if (!clazz.getName().startsWith("java.") || java.net.HttpCookie.class == clazz
+            || java.util.Map.Entry.class == clazz || java.util.AbstractMap.SimpleEntry.class == clazz) {
             Encodeable simpleCoder = null;
             for (final Method method : clazz.getDeclaredMethods()) {
                 if (!Modifier.isStatic(method.getModifiers())) continue;

src/org/redkale/convert/ConvertField.java

@@ -0,0 +1,102 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package org.redkale.convert;
+
+import java.io.Serializable;
+import java.lang.reflect.Type;
+import org.redkale.convert.json.JsonConvert;
+
+/**
+ * newConvert参数中的Function返回结果的数据类
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+public class ConvertField implements Serializable {
+
+    protected String name;
+
+    protected Type type;
+
+    protected int position;
+
+    protected Object value;
+
+    public ConvertField() {
+    }
+
+    public ConvertField(String name, Object value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public ConvertField(String name, int position, Object value) {
+        this.name = name;
+        this.position = position;
+        this.value = value;
+    }
+
+    public ConvertField(String name, Type type, Object value) {
+        this.name = name;
+        this.type = type;
+        this.value = value;
+    }
+
+    public ConvertField(String name, Type type, int position, Object value) {
+        this.name = name;
+        this.type = type;
+        this.position = position;
+        this.value = value;
+    }
+
+    public static ConvertField[] ofArray(Object... items) {
+        int len = items.length / 2;
+        ConvertField[] rs = new ConvertField[len];
+        for (int i = 0; i < len; i++) {
+            rs[i] = new ConvertField(items[i * 2].toString(), items[i * 2 + 1]);
+        }
+        return rs;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public void setType(Type type) {
+        this.type = type;
+    }
+
+    public int getPosition() {
+        return position;
+    }
+
+    public void setPosition(int position) {
+        this.position = position;
+    }
+
+    public Object getValue() {
+        return value;
+    }
+
+    public void setValue(Object value) {
+        this.value = value;
+    }
+
+    @Override
+    public String toString() {
+        return JsonConvert.root().convertTo(this);
+    }
+}

src/org/redkale/convert/ConvertLoader.java

@@ -0,0 +1,23 @@
+/*
+ * 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;
+
+/**
+ * Convert的扩展实现类加载器
+ *
+ *
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ *
+ * @since 2.2.0
+ */
+public interface ConvertLoader {
+
+    public ConvertType type();
+
+    public Convert convert();
+}

src/org/redkale/convert/ConvertType.java

@@ -17,8 +17,10 @@ public enum ConvertType {
 
     JSON(1),
     BSON(2),
-    DIY(64),
-    ALL(127);
+    PROTOBUF(64),
+    PROTOBUF_JSON(64 + 1),
+    DIY(256),
+    ALL(1023);
 
     private final int value;
 
@@ -26,8 +28,19 @@ public enum ConvertType {
         this.value = v;
     }
 
+    public int getValue() {
+        return value;
+    }
+
     public boolean contains(ConvertType type) {
         if (type == null) return false;
         return this.value >= type.value && (this.value & type.value) > 0;
     }
+
+    public static ConvertType find(int value) {
+        for (ConvertType t : ConvertType.values()) {
+            if (value == t.value) return t;
+        }
+        return null;
+    }
 }

src/org/redkale/convert/DeMember.java

@@ -26,6 +26,8 @@ public final class DeMember<R extends Reader, T, F> {
 
     protected int position; //从1开始
 
+    protected int tag; //主要给protobuf使用
+
     protected final Attribute<T, F> attribute;
 
     protected Decodeable<R, F> decoder;
@@ -84,8 +86,13 @@ public final class DeMember<R extends Reader, T, F> {
         return this.position;
     }
 
+    public int getTag() {
+        return this.tag;
+    }
+
     public int compareTo(boolean fieldSort, DeMember<R, T, F> o) {
         if (o == null) return -1;
+        if (this.position != o.position) return (this.position == 0 ? Integer.MAX_VALUE : this.position) - (o.position == 0 ? Integer.MAX_VALUE : o.position);
         if (this.index != o.index) return (this.index == 0 ? Integer.MAX_VALUE : this.index) - (o.index == 0 ? Integer.MAX_VALUE : o.index);
         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;
@@ -106,6 +113,6 @@ public final class DeMember<R extends Reader, T, F> {
 
     @Override
     public String toString() {
-        return "DeMember{" + "attribute=" + attribute.field() + ", decoder=" + (decoder == null ? null : decoder.getClass().getName()) + '}';
+        return "DeMember{" + "attribute=" + attribute.field() + ", position=" + position + ", tag=" + tag + ", decoder=" + (decoder == null ? null : decoder.getClass().getName()) + '}';
     }
 }

src/org/redkale/convert/EnMember.java

@@ -26,21 +26,23 @@ public final class EnMember<W extends Writer, T, F> {
 
     final Encodeable<W, F> encoder;
 
-    final boolean istring;
+    final boolean string;
 
     //final boolean isnumber;
-    final boolean isbool;
+    final boolean bool;
 
     protected int index;
 
     protected int position; //从1开始
 
+    protected int tag; //主要给protobuf使用
+
     public EnMember(Attribute<T, F> attribute, Encodeable<W, F> encoder) {
         this.attribute = attribute;
         this.encoder = encoder;
         Class t = attribute.type();
-        this.istring = CharSequence.class.isAssignableFrom(t);
-        this.isbool = t == Boolean.class || t == boolean.class;
+        this.string = CharSequence.class.isAssignableFrom(t);
+        this.bool = t == Boolean.class || t == boolean.class;
         //this.isnumber = Number.class.isAssignableFrom(t) || (!this.isbool && t.isPrimitive());
     }
 
@@ -74,11 +76,11 @@ public final class EnMember<W extends Writer, T, F> {
     }
 
     public boolean isStringType() {
-        return istring;
+        return string;
     }
 
     public boolean isBoolType() {
-        return isbool;
+        return bool;
     }
 
     public int getIndex() {
@@ -89,8 +91,13 @@ public final class EnMember<W extends Writer, T, F> {
         return this.position;
     }
 
+    public int getTag() {
+        return this.tag;
+    }
+
     public int compareTo(boolean fieldSort, EnMember<W, T, F> o) {
         if (o == null) return -1;
+        if (this.position != o.position) return (this.position == 0 ? Integer.MAX_VALUE : this.position) - (o.position == 0 ? Integer.MAX_VALUE : o.position);
         if (this.index != o.index) return (this.index == 0 ? Integer.MAX_VALUE : this.index) - (o.index == 0 ? Integer.MAX_VALUE : o.index);
         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;
@@ -111,6 +118,6 @@ public final class EnMember<W extends Writer, T, F> {
 
     @Override
     public String toString() {
-        return "EnMember{" + "attribute=" + attribute.field() + ", encoder=" + (encoder == null ? null : encoder.getClass().getName()) + '}';
+        return "EnMember{" + "attribute=" + attribute.field() + ", position=" + position + ", encoder=" + (encoder == null ? null : encoder.getClass().getName()) + '}';
     }
 }

src/org/redkale/convert/MapDecoder.java

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

src/org/redkale/convert/MapEncoder.java

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

@@ -29,13 +29,13 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
 
     protected Creator<T> creator;
 
-    protected DeMember<R, T, ?>[] creatorConstructorMembers = new DeMember[0];
+    protected DeMember<R, T, ?>[] creatorConstructorMembers = null;
 
     protected DeMember[] members;
 
     protected ConvertFactory factory;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -61,7 +61,10 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
     public void init(final ConvertFactory factory) {
         this.factory = factory;
         try {
-            if (type == Object.class) return;
+            if (type == Object.class) {
+                this.creatorConstructorMembers = null;
+                return;
+            }
 
             Class clazz = null;
             if (type instanceof ParameterizedType) {
@@ -91,10 +94,14 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
                 for (final Field field : clazz.getFields()) {
                     if (Modifier.isStatic(field.getModifiers())) continue;
                     if (factory.isConvertDisabled(field)) continue;
-                    ref = factory.findRef(field);
+                    ref = factory.findRef(clazz, field);
                     if (ref != null && ref.ignore()) continue;
-                    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, type, clazz, field, null, null), fieldCoder);
                     if (ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
@@ -116,10 +123,15 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
                             continue;
                         }
                     }
-                    ref = factory.findRef(method);
+                    ref = factory.findRef(clazz, method);
                     if (ref != null && ref.ignore()) continue;
-                    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, type, clazz, null, null, method), fieldCoder);
                     if (ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
@@ -137,7 +149,7 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
                         try {
                             Field f = clazz.getDeclaredField(constructorField);
                             Type t = TypeToken.createClassType(f.getGenericType(), this.type);
-                            list.add(new DeMember(ObjectEncoder.createAttribute(factory, clazz, f, null, null), factory.loadDecoder(t)));
+                            list.add(new DeMember(ObjectEncoder.createAttribute(factory, type, clazz, f, null, null), factory.loadDecoder(t)));
                         } catch (NoSuchFieldException nsfe) { //不存在field， 可能存在getter方法
                             char[] fs = constructorField.toCharArray();
                             fs[0] = Character.toUpperCase(fs[0]);
@@ -149,11 +161,12 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
                                 getter = clazz.getMethod("is" + mn);
                             }
                             Type t = TypeToken.createClassType(TypeToken.getGenericType(getter.getGenericParameterTypes()[0], this.type), this.type);
-                            list.add(new DeMember(ObjectEncoder.createAttribute(factory, clazz, null, getter, null), factory.loadDecoder(t)));
+                            list.add(new DeMember(ObjectEncoder.createAttribute(factory, type, clazz, null, getter, null), factory.loadDecoder(t)));
                         }
                     }
                 }
                 this.members = list.toArray(new DeMember[list.size()]);
+                //先排序一次
                 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++) {
@@ -167,7 +180,9 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
                         while (pos.contains(++pidx));
                         member.position = pidx;
                     }
+                    initForEachDeMember(factory, member);
                 }
+                Arrays.sort(this.members, (a, b) -> a.compareTo(factory.isFieldSort(), b));
 
                 if (cps != null) {
                     final String[] fields = cps;
@@ -193,6 +208,13 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
         }
     }
 
+    protected void initForEachDeMember(ConvertFactory factory, DeMember member) {
+    }
+
+    protected void setTag(DeMember member, int tag) {
+        member.tag = tag;
+    }
+
     /**
      * 对象格式: [0x1][short字段个数][字段名][字段值]...[0x2]
      *
@@ -202,9 +224,10 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
      */
     @Override
     public T convertFrom(final R in) {
-        final String clazz = in.readObjectB(typeClass);
+        R objin = objectReader(in);
+        final String clazz = objin.readObjectB(typeClass);
         if (clazz == null) return null;
-        if (!clazz.isEmpty()) return (T) factory.loadDecoder(factory.getEntityAlias(clazz)).convertFrom(in);
+        if (!clazz.isEmpty()) return (T) factory.loadDecoder(factory.getEntityAlias(clazz)).convertFrom(objin);
         if (!this.inited) {
             synchronized (lock) {
                 try {
@@ -220,19 +243,19 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
             }
         }
         if (this.creatorConstructorMembers == null) {  //空构造函数
-            final T result = this.creator.create();
+            final T result = this.creator == null ? null : this.creator.create();
             boolean first = true;
-            while (hasNext(in, first)) {
-                DeMember member = in.readFieldName(members);
-                in.readBlank();
+            while (hasNext(objin, first)) {
+                DeMember member = objin.readFieldName(members);
+                objin.readBlank();
                 if (member == null) {
-                    in.skipValue(); //跳过不存在的属性的值
+                    objin.skipValue(); //跳过不存在的属性的值
                 } else {
-                    readMemberValue(in, member, result, first);
+                    readMemberValue(objin, member, result, first);
                 }
                 first = false;
             }
-            in.readObjectE(typeClass);
+            objin.readObjectE(typeClass);
             return result;
         } else {  //带参数的构造函数
             final DeMember<R, T, ?>[] fields = this.creatorConstructorMembers;
@@ -240,13 +263,13 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
             final Object[][] otherParams = new Object[this.members.length][2];
             int oc = 0;
             boolean first = true;
-            while (hasNext(in, first)) {
-                DeMember member = in.readFieldName(members);
-                in.readBlank();
+            while (hasNext(objin, first)) {
+                DeMember member = objin.readFieldName(members);
+                objin.readBlank();
                 if (member == null) {
-                    in.skipValue(); //跳过不存在的属性的值
+                    objin.skipValue(); //跳过不存在的属性的值
                 } else {
-                    Object val = readMemberValue(in, member, first);
+                    Object val = readMemberValue(objin, member, first);
                     boolean flag = true;
                     for (int i = 0; i < fields.length; i++) {
                         if (member == fields[i]) {
@@ -260,7 +283,8 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
                 }
                 first = false;
             }
-            in.readObjectE(typeClass);
+            objin.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]);
@@ -269,6 +293,10 @@ public class ObjectDecoder<R extends Reader, T> implements Decodeable<R, T> {
         }
     }
 
+    protected R objectReader(R in) {
+        return in;
+    }
+
     protected boolean hasNext(R in, boolean first) {
         return in.hasNext();
     }

src/org/redkale/convert/ObjectEncoder.java

@@ -32,7 +32,7 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
 
     protected ConvertFactory factory;
 
-    protected boolean inited = false;
+    protected volatile boolean inited = false;
 
     protected final Object lock = new Object();
 
@@ -75,10 +75,14 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
                 for (final Field field : clazz.getFields()) {
                     if (Modifier.isStatic(field.getModifiers())) continue;
                     if (factory.isConvertDisabled(field)) continue;
-                    ref = factory.findRef(field);
+                    ref = factory.findRef(clazz, field);
                     if (ref != null && ref.ignore()) continue;
-                    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, type, clazz, field, null, null), fieldCoder);
                     if (ref != null) member.index = ref.getIndex();
                     list.add(member);
                 }
@@ -100,14 +104,19 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
                             continue;
                         }
                     }
-                    ref = factory.findRef(method);
+                    ref = factory.findRef(clazz, method);
                     if (ref != null && ref.ignore()) continue;
-                    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, type, 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, (a, b) -> a.compareTo(factory.isFieldSort(), b));
                 Set<Integer> pos = new HashSet<>();
                 for (int i = 0; i < this.members.length; i++) {
@@ -121,7 +130,9 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
                         while (pos.contains(++pidx));
                         member.position = pidx;
                     }
+                    initForEachEnMember(factory, member);
                 }
+                Arrays.sort(this.members, (a, b) -> a.compareTo(factory.isFieldSort(), b));
 
             } catch (Exception ex) {
                 throw new ConvertException(ex);
@@ -134,6 +145,13 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
         }
     }
 
+    protected void initForEachEnMember(ConvertFactory factory, EnMember member) {
+    }
+
+    protected void setTag(EnMember member, int tag) {
+        member.tag = tag;
+    }
+
     @Override
     public void convertTo(W out, T value) {
         if (value == null) {
@@ -155,12 +173,30 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
             factory.loadEncoder(clz).convertTo(out, value);
             return;
         }
-        if (out.writeObjectB(value) < 0) {
+        W objout = objectWriter(out, value);
+        if (objout.writeObjectB(value) < 0) {
+            int maxPosition = 0;
             for (EnMember member : members) {
-                out.writeObjectField(member, value);
+                maxPosition = member.getPosition();
+                objout.writeObjectField(member, value);
+            }
+            if (objout.objExtFunc != null) {
+                ConvertField[] extFields = objout.objExtFunc.apply(value);
+                if (extFields != null) {
+                    Encodeable<W, ?> anyEncoder = factory.getAnyEncoder();
+                    for (ConvertField en : extFields) {
+                        if (en == null) continue;
+                        maxPosition++;
+                        objout.writeObjectField(en.getName(), en.getType(), Math.max(en.getPosition(), maxPosition), anyEncoder, en.getValue());
+                    }
+                }
             }
         }
-        out.writeObjectE(value);
+        objout.writeObjectE(value);
+    }
+
+    protected W objectWriter(W out, T value) {
+        return out;
     }
 
     @Override
@@ -242,33 +278,33 @@ public class ObjectEncoder<W extends Writer, T> implements Encodeable<W, T> {
         }
     }
 
-    static Attribute createAttribute(final ConvertFactory factory, Class clazz, final Field field, final Method getter, final Method setter) {
+    static Attribute createAttribute(final ConvertFactory factory, Type realType, 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) {
                 }
             }
             fieldalias = ref == null || ref.name().isEmpty() ? mfieldname : ref.name();
         }
-        return Attribute.create(clazz, fieldalias, field, getter, setter);
+        return Attribute.create(realType, clazz, fieldalias, null, field, getter, setter, null);
     }
 
 }

src/org/redkale/convert/OptionalCoder.java

@@ -20,9 +20,7 @@ import java.util.*;
  */
 public class OptionalCoder<R extends Reader, W extends Writer, T> extends SimpledCoder<R, W, Optional<T>> {
 
-    private final Type type;
-
-    private final Type componentType;
+    protected final Type componentType;
 
     protected final Class componentClass;
 
@@ -30,7 +28,7 @@ public class OptionalCoder<R extends Reader, W extends Writer, T> extends Simple
 
     protected final Encodeable<Writer, T> encoder;
 
-    private boolean inited = false;
+    protected volatile boolean inited = false;
 
     private final Object lock = new Object();
 

src/org/redkale/convert/Reader.java

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

src/org/redkale/convert/StreamDecoder.java

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

src/org/redkale/convert/StreamEncoder.java

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

src/org/redkale/convert/Writer.java

@@ -6,6 +6,8 @@
 package org.redkale.convert;
 
 import java.lang.reflect.*;
+import java.util.function.*;
+import org.redkale.util.*;
 
 /**
  * 序列化的数据输出流
@@ -23,6 +25,12 @@ public abstract class Writer {
     //convertTo时是否以指定Type的ObjectEncoder进行处理
     protected Type specify;
 
+    //对某个字段值进行动态处理
+    protected BiFunction<Attribute, Object, Object> objFieldFunc;
+
+    //对某个对象进行动态扩展字段值处理
+    protected Function<Object, ConvertField[]> objExtFunc;
+
     /**
      * 设置specify
      *
@@ -38,6 +46,11 @@ public abstract class Writer {
         }
     }
 
+    protected boolean recycle() {
+        this.objFieldFunc = null;
+        return true;
+    }
+
     /**
      * 返回specify
      *
@@ -105,20 +118,63 @@ public abstract class Writer {
      */
     @SuppressWarnings("unchecked")
     public void writeObjectField(final EnMember member, Object obj) {
-        Object value = member.attribute.get(obj);
+        Object value;
+        if (objFieldFunc == null) {
+            value = member.attribute.get(obj);
+        } else {
+            value = objFieldFunc.apply(member.attribute, obj);
+        }
         if (value == null) return;
         if (tiny()) {
-            if (member.istring) {
+            if (member.string) {
                 if (((CharSequence) value).length() == 0) return;
-            } else if (member.isbool) {
+            } else if (member.bool) {
                 if (!((Boolean) value)) return;
             }
         }
-        this.writeFieldName(member);
+        Attribute attr = member.getAttribute();
+        this.writeFieldName(attr.field(), attr.genericType(), member.getPosition());
         member.encoder.convertTo(this, value);
         this.comma = true;
     }
 
+    /**
+     * 输出一个对象的某个扩展字段
+     *
+     *
+     * @param fieldName  字段名称
+     * @param fieldType  字段类型
+     * @param fieldPos   字段顺序
+     * @param anyEncoder Encoder
+     * @param value      写入的字段对象
+     */
+    @SuppressWarnings("unchecked")
+    public void writeObjectField(final String fieldName, Type fieldType, int fieldPos, Encodeable anyEncoder, Object value) {
+        if (value == null) return;
+        if (fieldType == null) fieldType = value.getClass();
+        if (tiny() && fieldType instanceof Class) {
+            Class clazz = (Class) fieldType;
+            if (CharSequence.class.isAssignableFrom(clazz)) {
+                if (((CharSequence) value).length() == 0) return;
+            } else if (clazz == boolean.class || clazz == Boolean.class) {
+                if (!((Boolean) value)) return;
+            }
+        }
+        this.writeFieldName(fieldName, fieldType, fieldPos);
+        anyEncoder.convertTo(this, value);
+        this.comma = true;
+    }
+
+    /**
+     * 输出一个字段名
+     *
+     * @param member 字段
+     */
+    public final void writeFieldName(final EnMember member) {
+        Attribute attr = member.getAttribute();
+        this.writeFieldName(attr.field(), attr.genericType(), member.getPosition());
+    }
+
     /**
      * 输出一个对象后的操作
      *
@@ -129,13 +185,14 @@ public abstract class Writer {
     /**
      * 输出一个数组前的操作
      *
-     * @param size    数组长度
-     * @param encoder Encodeable
-     * @param obj     对象
+     * @param size             数组长度
+     * @param arrayEncoder     Encodeable 可能是ArrayEncoder、CollectionEncoder或StreamEncoder
+     * @param componentEncoder Encodeable
+     * @param obj              对象, 不一定是数组、Collection对象，也可能是伪Collection对象
      *
      * @return 返回-1表示还没有写入对象内容，大于-1表示已写入对象内容，返回对象内容大小
      */
-    public abstract int writeArrayB(int size, Encodeable<Writer, Object> encoder, Object obj);
+    public abstract int writeArrayB(int size, Encodeable arrayEncoder, Encodeable<Writer, Object> componentEncoder, Object obj);
 
     /**
      * 输出数组元素间的间隔符
@@ -155,7 +212,7 @@ public abstract class Writer {
      * @param size         map大小
      * @param keyEncoder   Encodeable
      * @param valueEncoder Encodeable
-     * @param obj          对象
+     * @param obj          对象, 不一定是Map对象，也可能是伪Map对象
      *
      * @return 返回-1表示还没有写入对象内容，大于-1表示已写入对象内容，返回对象内容大小
      */
@@ -176,9 +233,11 @@ public abstract class Writer {
     /**
      * 输出一个字段名
      *
-     * @param member 字段的EnMember对象
+     * @param fieldName 字段名称
+     * @param fieldType 字段类型
+     * @param fieldPos  字段顺序
      */
-    public abstract void writeFieldName(EnMember member);
+    public abstract void writeFieldName(String fieldName, Type fieldType, int fieldPos);
 
     /**
      * 写入一个boolean值
@@ -256,4 +315,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,18 +49,38 @@ public class BsonByteBufferReader extends BsonReader {
         return mask == null ? currentBuffer.get(currentBuffer.position()) : mask.unmask(currentBuffer.get(currentBuffer.position()));
     }
 
-    /**
-     * 判断下一个非空白字节是否为[
-     *
-     * @param member  DeMember
-     * @param decoder Decodeable
-     * @return 数组长度或 SIGN_NULL
-     */
     @Override
-    public final int readArrayB(DeMember member, Decodeable decoder) {
+    public int readMapB(DeMember member, byte[] typevals, Decodeable keyDecoder, Decodeable valueDecoder) {
         short bt = readShort();
         if (bt == Reader.SIGN_NULL) return bt;
         short lt = readShort();
+        byte kt = readByte();
+        byte vt = readByte();
+        if (typevals != null) {
+            typevals[0] = kt;
+            typevals[1] = vt;
+        }
+        return (bt & 0xffff) << 16 | (lt & 0xffff);
+    }
+
+    /**
+     * 判断下一个非空白字节是否为[
+     *
+     * @param member           DeMember
+     * @param typevals         byte[]
+     * @param componentDecoder Decodeable
+     *
+     * @return 数组长度或 SIGN_NULL
+     */
+    @Override
+    public final int readArrayB(DeMember member, byte[] typevals, Decodeable componentDecoder) {
+        short bt = readShort();
+        if (bt == Reader.SIGN_NULL) return bt;
+        short lt = readShort();
+        if (componentDecoder != null && componentDecoder != ByteSimpledCoder.instance) {
+            byte comval = readByte();
+            if (typevals != null) typevals[0] = comval;
+        }
         return (bt & 0xffff) << 16 | (lt & 0xffff);
     }
 //------------------------------------------------------------

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

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

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

@@ -37,11 +37,11 @@ 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));
+    private static final ObjectPool<BsonReader> readerPool = BsonReader.createPool(Integer.getInteger("convert.bson.pool.size", Integer.getInteger("convert.pool.size", 16)));
 
-    private static final ObjectPool<BsonWriter> writerPool = BsonWriter.createPool(Integer.getInteger("convert.bson.pool.size", 16));
+    private static final ObjectPool<BsonWriter> writerPool = BsonWriter.createPool(Integer.getInteger("convert.bson.pool.size", Integer.getInteger("convert.pool.size", 16)));
 
     private final boolean tiny;
 
@@ -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,16 +109,18 @@ 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);
     }
 
+    @Override
     @SuppressWarnings("unchecked")
-    public <T> T convertFrom(final Type type, final byte[] bytes, final int start, final int len) {
+    public <T> T convertFrom(final Type type, final byte[] bytes, final int offset, final int len) {
         if (type == null) return null;
         final BsonReader in = readerPool.get();
-        in.setBytes(bytes, start, len);
+        in.setBytes(bytes, offset, len);
         @SuppressWarnings("unchecked")
         T rs = (T) factory.loadDecoder(type).convertFrom(in);
         readerPool.accept(in);
@@ -161,6 +178,16 @@ public final class BsonConvert extends BinaryConvert<BsonReader, BsonWriter> {
         return result;
     }
 
+    @Override
+    public byte[] convertToBytes(final Object value) {
+        return convertTo(value);
+    }
+
+    @Override
+    public byte[] convertToBytes(final Type type, final Object value) {
+        return convertTo(type, value);
+    }
+
     @Override
     public byte[] convertMapTo(final Object... values) {
         if (values == null) return null;
@@ -173,33 +200,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 +238,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 +250,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
@@ -20,12 +24,22 @@ import org.redkale.util.AnyValue;
 @SuppressWarnings("unchecked")
 public final class BsonFactory extends ConvertFactory<BsonReader, BsonWriter> {
 
-    private static final BsonFactory instance = new BsonFactory(null, Boolean.getBoolean("convert.bson.tiny"));
+    private static final BsonFactory instance = new BsonFactory(null, getSystemPropertyBoolean("convert.bson.tiny", "convert.tiny", true));
 
     static final Decodeable objectDecoder = instance.loadDecoder(Object.class);
 
     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);
@@ -55,7 +69,7 @@ public final class BsonFactory extends ConvertFactory<BsonReader, BsonWriter> {
     }
 
     public static BsonFactory create() {
-        return new BsonFactory(null, Boolean.getBoolean("convert.bson.tiny"));
+        return new BsonFactory(null, getSystemPropertyBoolean("convert.bson.tiny", "convert.tiny", true));
     }
 
     @Override
@@ -89,4 +103,110 @@ public final class BsonFactory extends ConvertFactory<BsonReader, BsonWriter> {
         return true;
     }
 
+    protected static byte typeEnum(final Type type) {
+        return typeEnum(TypeToken.typeToClass(type));
+    }
+
+    protected static byte typeEnum(final Class type) {
+        Objects.requireNonNull(type);
+        byte typeval = 127;  //字段的类型值
+        if (type == boolean.class || type == Boolean.class) {
+            typeval = 11;
+        } else if (type == byte.class || type == Byte.class) {
+            typeval = 12;
+        } else if (type == short.class || type == Short.class) {
+            typeval = 13;
+        } else if (type == char.class || type == Character.class) {
+            typeval = 14;
+        } else if (type == int.class || type == Integer.class) {
+            typeval = 15;
+        } else if (type == long.class || type == Long.class) {
+            typeval = 16;
+        } else if (type == float.class || type == Float.class) {
+            typeval = 17;
+        } else if (type == double.class || type == Double.class) {
+            typeval = 18;
+        } else if (type == String.class) {
+            typeval = 19;
+        } else if (type == boolean[].class || type == Boolean[].class) {
+            typeval = 21;
+        } else if (type == byte[].class || type == Byte[].class) {
+            typeval = 22;
+        } else if (type == short[].class || type == Short[].class) {
+            typeval = 23;
+        } else if (type == char[].class || type == Character[].class) {
+            typeval = 24;
+        } else if (type == int[].class || type == Integer[].class) {
+            typeval = 25;
+        } else if (type == long[].class || type == Long[].class) {
+            typeval = 26;
+        } else if (type == float[].class || type == Float[].class) {
+            typeval = 27;
+        } else if (type == double[].class || type == Double[].class) {
+            typeval = 28;
+        } else if (type == String[].class) {
+            typeval = 29;
+        } else if (type.isArray()) {
+            typeval = 81;
+        } else if (Collection.class.isAssignableFrom(type)) {
+            typeval = 82;
+        } else if (Stream.class.isAssignableFrom(type)) {
+            typeval = 83;
+        } else if (Map.class.isAssignableFrom(type)) {
+            typeval = 84;
+        }
+        return typeval;
+    }
+
+    protected static Decodeable typeEnum(final byte typeval) {
+        switch (typeval) {
+            case 11:
+                return BoolSimpledCoder.instance;
+            case 12:
+                return ByteSimpledCoder.instance;
+            case 13:
+                return ShortSimpledCoder.instance;
+            case 14:
+                return CharSimpledCoder.instance;
+            case 15:
+                return IntSimpledCoder.instance;
+            case 16:
+                return LongSimpledCoder.instance;
+            case 17:
+                return FloatSimpledCoder.instance;
+            case 18:
+                return DoubleSimpledCoder.instance;
+            case 19:
+                return StringSimpledCoder.instance;
+            case 21:
+                return BoolArraySimpledCoder.instance;
+            case 22:
+                return ByteArraySimpledCoder.instance;
+            case 23:
+                return ShortArraySimpledCoder.instance;
+            case 24:
+                return CharArraySimpledCoder.instance;
+            case 25:
+                return IntArraySimpledCoder.instance;
+            case 26:
+                return LongArraySimpledCoder.instance;
+            case 27:
+                return FloatArraySimpledCoder.instance;
+            case 28:
+                return DoubleArraySimpledCoder.instance;
+            case 29:
+                return StringArraySimpledCoder.instance;
+            case 81:
+                return skipArrayDecoder;
+            case 82:
+                return skipCollectionDecoder;
+            case 83:
+                return skipStreamDecoder;
+            case 84:
+                return skipMapDecoder;
+            case 127:
+                return BsonFactory.objectDecoder;
+        }
+        return null;
+    }
 }

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

@@ -93,53 +93,27 @@ public class BsonReader extends Reader {
         final byte val = this.typeval;
         this.typeval = 0;
         switch (val) {
-            case 1: readBoolean();
+            case 11: readBoolean();
                 break;
-            case 2: readByte();
+            case 12: readByte();
                 break;
-            case 3: readShort();
+            case 13: readShort();
                 break;
-            case 4: readChar();
+            case 14: readChar();
                 break;
-            case 5: readInt();
+            case 15: readInt();
                 break;
-            case 6: readLong();
+            case 16: readLong();
                 break;
-            case 7: readFloat();
+            case 17: readFloat();
                 break;
-            case 8: readDouble();
+            case 18: readDouble();
                 break;
-            case 9: readString();
+            case 19: readString();
                 break;
-            case 101:
-                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(DeMember member, Decodeable keydecoder) {
-        return readArrayB(member, keydecoder);
+    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(DeMember member, Decodeable decoder) {
+    public int readArrayB(DeMember member, byte[] typevals, Decodeable componentDecoder) { //componentDecoder可能为null
         short bt = readShort();
         if (bt == Reader.SIGN_NULL) return bt;
-        return (bt & 0xffff) << 16 | ((content[++this.position] & 0xff) << 8) | (content[++this.position] & 0xff);
+        int rs = (bt & 0xffff) << 16 | ((content[++this.position] & 0xff) << 8) | (content[++this.position] & 0xff);
+        if (componentDecoder != null && componentDecoder != ByteSimpledCoder.instance) {
+            byte comval = readByte();
+            if (typevals != null) typevals[0] = comval;
+        }
+        return rs;
     }
 
     @Override
@@ -263,7 +251,7 @@ public class BsonReader extends Reader {
 
     @Override
     public final byte[] readByteArray() {
-        int len = readArrayB(null, null);
+        int len = readArrayB(null, null, null);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {
@@ -358,4 +346,9 @@ public class BsonReader extends Reader {
         return value;
     }
 
+    @Override
+    public ValueType readType() {
+        throw new UnsupportedOperationException("Not supported yet."); 
+    }
+
 }

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

@@ -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.*;
 
 /**
@@ -18,7 +20,7 @@ import org.redkale.util.*;
  */
 public class BsonWriter extends Writer {
 
-    private static final int defaultSize = Integer.getInteger("convert.bson.writer.buffer.defsize", 1024);
+    private static final int defaultSize = Integer.getInteger("convert.bson.writer.buffer.defsize", Integer.getInteger("convert.writer.buffer.defsize", 1024));
 
     private byte[] content;
 
@@ -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,10 +98,12 @@ public class BsonWriter extends Writer {
         count += len;
     }
 
+    @Override
     protected boolean recycle() {
+        super.recycle();
         this.count = 0;
         this.specify = null;
-        if (this.content.length > defaultSize) {
+        if (this.content != null && this.content.length > defaultSize) {
             this.content = new byte[defaultSize];
         }
         return true;
@@ -131,7 +135,7 @@ public class BsonWriter extends Writer {
             writeNull();
             return;
         }
-        writeArrayB(values.length, null, values);
+        writeArrayB(values.length, null, null, values);
         boolean flag = false;
         for (byte v : values) {
             if (flag) writeArrayMark();
@@ -197,50 +201,10 @@ public class BsonWriter extends Writer {
     }
 
     @Override
-    public final void writeFieldName(EnMember member) {
-        Attribute attribute = member.getAttribute();
+    public final void writeFieldName(String fieldName, Type fieldType, int fieldPos) {
         writeByte(BsonReader.SIGN_HASNEXT);
-        writeSmallString(attribute.field());
-        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));
     }
 
     /**
@@ -279,14 +243,22 @@ 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 int writeArrayB(int size, Encodeable<Writer, Object> encoder, Object obj) {
+    public final int writeArrayB(int size, Encodeable arrayEncoder, Encodeable<Writer, Object> componentEncoder, Object obj) {
         writeInt(size);
+        if (componentEncoder != null && componentEncoder != ByteSimpledCoder.instance) {
+            writeByte(BsonFactory.typeEnum(componentEncoder.getType()));
+        }
         return -1;
     }
 
@@ -300,7 +272,9 @@ public class BsonWriter extends Writer {
 
     @Override
     public int writeMapB(int size, Encodeable<Writer, Object> keyEncoder, Encodeable<Writer, Object> valueEncoder, Object obj) {
-        writeArrayB(size, valueEncoder, obj);
+        writeInt(size);
+        writeByte(BsonFactory.typeEnum(keyEncoder.getType()));
+        writeByte(BsonFactory.typeEnum(valueEncoder.getType()));
         return -1;
     }
 

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

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

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

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

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

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

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

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

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

@@ -29,7 +29,7 @@ public final class BoolArraySimpledCoder<R extends Reader, W extends Writer> ext
             out.writeNull();
             return;
         }
-        if (out.writeArrayB(values.length, BoolSimpledCoder.instance, values) < 0) {
+        if (out.writeArrayB(values.length, this, BoolSimpledCoder.instance, values) < 0) {
             boolean flag = false;
             for (boolean v : values) {
                 if (flag) out.writeArrayMark();
@@ -42,7 +42,7 @@ public final class BoolArraySimpledCoder<R extends Reader, W extends Writer> ext
 
     @Override
     public boolean[] convertFrom(R in) {
-        int len = in.readArrayB(null, BoolSimpledCoder.instance);
+        int len = in.readArrayB(null, null, BoolSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

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

@@ -30,7 +30,7 @@ public final class ByteBufferSimpledCoder<R extends Reader, W extends Writer> ex
             out.writeNull();
             return;
         }
-        if (out.writeArrayB(value.remaining(), ByteSimpledCoder.instance, value) < 0) {
+        if (out.writeArrayB(value.remaining(), this, ByteSimpledCoder.instance, value) < 0) {
             boolean flag = false;
             for (byte v : value.array()) {
                 if (flag) out.writeArrayMark();
@@ -43,7 +43,7 @@ public final class ByteBufferSimpledCoder<R extends Reader, W extends Writer> ex
 
     @Override
     public ByteBuffer convertFrom(R in) {
-        int len = in.readArrayB(null, ByteSimpledCoder.instance);
+        int len = in.readArrayB(null, null, ByteSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

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

@@ -29,7 +29,7 @@ public final class CharArraySimpledCoder<R extends Reader, W extends Writer> ext
             out.writeNull();
             return;
         }
-        if (out.writeArrayB(values.length, CharSimpledCoder.instance, values) < 0) {
+        if (out.writeArrayB(values.length, this, CharSimpledCoder.instance, values) < 0) {
             boolean flag = false;
             for (char v : values) {
                 if (flag) out.writeArrayMark();
@@ -42,7 +42,7 @@ public final class CharArraySimpledCoder<R extends Reader, W extends Writer> ext
 
     @Override
     public char[] convertFrom(R in) {
-        int len = in.readArrayB(null, CharSimpledCoder.instance);
+        int len = in.readArrayB(null, null, CharSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/ext/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,7 +30,7 @@ public final class DoubleArraySimpledCoder<R extends Reader, W extends Writer> e
             out.writeNull();
             return;
         }
-        if (out.writeArrayB(values.length, DoubleSimpledCoder.instance, values) < 0) {
+        if (out.writeArrayB(values.length, this, DoubleSimpledCoder.instance, values) < 0) {
             boolean flag = false;
             for (double v : values) {
                 if (flag) out.writeArrayMark();
@@ -43,7 +43,7 @@ public final class DoubleArraySimpledCoder<R extends Reader, W extends Writer> e
 
     @Override
     public double[] convertFrom(R in) {
-        int len = in.readArrayB(null, DoubleSimpledCoder.instance);
+        int len = in.readArrayB(null, null, DoubleSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

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

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

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

@@ -22,8 +22,6 @@ import org.redkale.convert.Writer;
  */
 public final class EnumSimpledCoder<R extends Reader, W extends Writer, E extends Enum> extends SimpledCoder<R, W, E> {
 
-    private final Class<E> type;
-
     public EnumSimpledCoder(Class<E> type) {
         this.type = type;
     }
@@ -42,11 +40,11 @@ public final class EnumSimpledCoder<R extends Reader, W extends Writer, E extend
     public E convertFrom(final R in) {
         String value = in.readSmallString();
         if (value == null) return null;
-        return (E) Enum.valueOf(type, value);
+        return (E) Enum.valueOf((Class<E>) type, value);
     }
 
     @Override
     public Class<E> getType() {
-        return type;
+        return (Class<E>) 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

@@ -29,7 +29,7 @@ public final class FloatArraySimpledCoder<R extends Reader, W extends Writer> ex
             out.writeNull();
             return;
         }
-        if (out.writeArrayB(values.length, FloatSimpledCoder.instance, values) < 0) {
+        if (out.writeArrayB(values.length, this, FloatSimpledCoder.instance, values) < 0) {
             boolean flag = false;
             for (float v : values) {
                 if (flag) out.writeArrayMark();
@@ -42,7 +42,7 @@ public final class FloatArraySimpledCoder<R extends Reader, W extends Writer> ex
 
     @Override
     public float[] convertFrom(R in) {
-        int len = in.readArrayB(null, FloatSimpledCoder.instance);
+        int len = in.readArrayB(null, null, FloatSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

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

@@ -30,7 +30,7 @@ public final class IntArraySimpledCoder<R extends Reader, W extends Writer> exte
             out.writeNull();
             return;
         }
-        if (out.writeArrayB(values.length, IntSimpledCoder.instance, values) < 0) {
+        if (out.writeArrayB(values.length, this, IntSimpledCoder.instance, values) < 0) {
             boolean flag = false;
             for (int v : values) {
                 if (flag) out.writeArrayMark();
@@ -43,7 +43,7 @@ public final class IntArraySimpledCoder<R extends Reader, W extends Writer> exte
 
     @Override
     public int[] convertFrom(R in) {
-        int len = in.readArrayB(null, IntSimpledCoder.instance);
+        int len = in.readArrayB(null, null, IntSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

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

@@ -30,7 +30,7 @@ public final class LongArraySimpledCoder<R extends Reader, W extends Writer> ext
             out.writeNull();
             return;
         }
-        if (out.writeArrayB(values.length, LongSimpledCoder.instance, values) < 0) {
+        if (out.writeArrayB(values.length, this, LongSimpledCoder.instance, values) < 0) {
             boolean flag = false;
             for (long v : values) {
                 if (flag) out.writeArrayMark();
@@ -43,7 +43,7 @@ public final class LongArraySimpledCoder<R extends Reader, W extends Writer> ext
 
     @Override
     public long[] convertFrom(R in) {
-        int len = in.readArrayB(null, LongSimpledCoder.instance);
+        int len = in.readArrayB(null, null, LongSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

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

@@ -29,7 +29,7 @@ public final class ShortArraySimpledCoder<R extends Reader, W extends Writer> ex
             out.writeNull();
             return;
         }
-        if (out.writeArrayB(values.length, ShortSimpledCoder.instance, values) < 0) {
+        if (out.writeArrayB(values.length, this, ShortSimpledCoder.instance, values) < 0) {
             boolean flag = false;
             for (short v : values) {
                 if (flag) out.writeArrayMark();
@@ -42,7 +42,7 @@ public final class ShortArraySimpledCoder<R extends Reader, W extends Writer> ex
 
     @Override
     public short[] convertFrom(R in) {
-        int len = in.readArrayB(null, ShortSimpledCoder.instance);
+        int len = in.readArrayB(null, null, ShortSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

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

@@ -27,7 +27,7 @@ public final class StringArraySimpledCoder<R extends Reader, W extends Writer> e
             out.writeNull();
             return;
         }
-        if (out.writeArrayB(values.length, StringSimpledCoder.instance, values) < 0) {
+        if (out.writeArrayB(values.length, this, StringSimpledCoder.instance, values) < 0) {
             boolean flag = false;
             for (String v : values) {
                 if (flag) out.writeArrayMark();
@@ -44,7 +44,7 @@ public final class StringArraySimpledCoder<R extends Reader, W extends Writer> e
     }
 
     public String[] convertFrom(R in, DeMember member) {
-        int len = in.readArrayB(member, StringSimpledCoder.instance);
+        int len = in.readArrayB(member, null, StringSimpledCoder.instance);
         int contentLength = -1;
         if (len == Reader.SIGN_NULL) return null;
         if (len == Reader.SIGN_NOLENBUTBYTES) {

src/org/redkale/convert/ext/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

@@ -69,6 +69,10 @@ public class JsonByteBufferReader extends JsonReader {
      */
     @Override
     protected final char nextChar() {
+        return nextChar(null);
+    }
+
+    protected final char nextChar(StringBuilder sb) {
         if (currentChar != 0) {
             char ch = currentChar;
             this.currentChar = 0;
@@ -78,14 +82,18 @@ public class JsonByteBufferReader extends JsonReader {
             int remain = this.currentBuffer.remaining();
             if (remain == 0 && this.currentIndex + 1 >= this.buffers.length) return 0;
         }
-        byte b1 = nextByte();
-        if (b1 >= 0) {// 1 byte, 7 bits: 0xxxxxxx
-            return (char) b1;
-        } else if ((b1 >> 5) == -2 && (b1 & 0x1e) != 0) { // 2 bytes, 11 bits: 110xxxxx 10xxxxxx
-            return (char) (((b1 << 6) ^ nextByte()) ^ (((byte) 0xC0 << 6) ^ ((byte) 0x80)));
-        } else if ((b1 >> 4) == -2) { // 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
-            return (char) ((b1 << 12) ^ (nextByte() << 6) ^ (nextByte() ^ (((byte) 0xE0 << 12) ^ ((byte) 0x80 << 6) ^ ((byte) 0x80))));
-        } else { // 4 bytes, 21 bits: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+        byte b = nextByte();
+        if (b >= 0) {// 1 byte, 7 bits: 0xxxxxxx
+            return (char) b;
+        } else if ((b >> 5) == -2 && (b & 0x1e) != 0) { // 2 bytes, 11 bits: 110xxxxx 10xxxxxx
+            return (char) (((b << 6) ^ nextByte()) ^ (((byte) 0xC0 << 6) ^ ((byte) 0x80)));
+        } else if ((b >> 4) == -2) { // 3 bytes, 16 bits: 1110xxxx 10xxxxxx 10xxxxxx
+            return (char) ((b << 12) ^ (nextByte() << 6) ^ (nextByte() ^ (((byte) 0xE0 << 12) ^ ((byte) 0x80 << 6) ^ ((byte) 0x80))));
+        } else if ((b >> 3) == -2) {// 4 bytes, 21 bits: 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+            int uc = ((b << 18) ^ (nextByte() << 12) ^ (nextByte() << 6) ^ (nextByte() ^ (((byte) 0xF0 << 18) ^ ((byte) 0x80 << 12) ^ ((byte) 0x80 << 6) ^ ((byte) 0x80))));
+            if (sb != null) sb.append(Character.highSurrogate(uc));
+            return Character.lowSurrogate(uc);
+        } else {
             throw new RuntimeException(new UnmappableCharacterException(4));
         }
     }
@@ -139,13 +147,14 @@ public class JsonByteBufferReader extends JsonReader {
     /**
      * 判断下一个非空白字符是否为[
      *
-     * @param member  DeMember
-     * @param decoder Decodeable
+     * @param member   DeMember
+     * @param typevals byte[]
+     * @param decoder  Decodeable
      *
      * @return SIGN_NOLENGTH 或 SIGN_NULL
      */
     @Override
-    public final int readArrayB(DeMember member, Decodeable decoder) {
+    public final int readArrayB(DeMember member, byte[] typevals, Decodeable decoder) {
         char ch = nextGoodChar();
         if (ch == '[' || ch == '{') return SIGN_NOLENGTH;
         if (ch == 'n' && nextChar() == 'u' && nextChar() == 'l' && nextChar() == 'l') return SIGN_NULL;
@@ -207,9 +216,9 @@ public class JsonByteBufferReader extends JsonReader {
         if (ch == '"' || ch == '\'') {
             final char quote = ch;
             for (;;) {
-                ch = nextChar();
+                ch = nextChar(sb);
                 if (ch == '\\') {
-                    char c = nextChar();
+                    char c = nextChar(sb);
                     switch (c) {
                         case '"':
                         case '\'':
@@ -248,9 +257,9 @@ public class JsonByteBufferReader extends JsonReader {
         } else {
             sb.append(ch);
             for (;;) {
-                ch = nextChar();
+                ch = nextChar(sb);
                 if (ch == '\\') {
-                    char c = nextChar();
+                    char c = nextChar(sb);
                     switch (c) {
                         case '"':
                         case '\'':

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

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

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

@@ -11,6 +11,7 @@ import java.nio.*;
 import java.nio.charset.*;
 import java.util.function.*;
 import org.redkale.convert.*;
+import org.redkale.service.RetResult;
 import org.redkale.util.*;
 
 /**
@@ -21,14 +22,17 @@ 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();
 
-    private static final ObjectPool<JsonReader> readerPool = JsonReader.createPool(Integer.getInteger("convert.json.pool.size", 16));
+    public static final Type TYPE_RETRESULT_STRING = new TypeToken<RetResult<String>>() {
+    }.getType();
 
-    private static final ObjectPool<JsonWriter> writerPool = JsonWriter.createPool(Integer.getInteger("convert.json.pool.size", 16));
+    private static final ObjectPool<JsonReader> readerPool = JsonReader.createPool(Integer.getInteger("convert.json.pool.size", Integer.getInteger("convert.pool.size", 16)));
+
+    private static final ObjectPool<JsonWriter> writerPool = JsonWriter.createPool(Integer.getInteger("convert.json.pool.size", Integer.getInteger("convert.pool.size", 16)));
 
     private final boolean tiny;
 
@@ -46,6 +50,21 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
         return JsonFactory.root().getConvert();
     }
 
+    @Override
+    public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc) {
+        return newConvert(fieldFunc, null);
+    }
+
+    @Override
+    public JsonConvert newConvert(final BiFunction<Attribute, Object, Object> fieldFunc, Function<Object, ConvertField[]> objExtFunc) {
+        return new JsonConvert(getFactory(), tiny) {
+            @Override
+            protected <S extends JsonWriter> S configWrite(S writer) {
+                return fieldFunc(writer, fieldFunc, objExtFunc);
+            }
+        };
+    }
+
     //------------------------------ reader -----------------------------------------------------------
     public JsonReader pollJsonReader(final ByteBuffer... buffers) {
         return new JsonByteBufferReader((ConvertMask) null, buffers);
@@ -65,19 +84,19 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
 
     //------------------------------ writer -----------------------------------------------------------
     public JsonByteBufferWriter pollJsonWriter(final Supplier<ByteBuffer> supplier) {
-        return new JsonByteBufferWriter(tiny, supplier);
+        return configWrite(new JsonByteBufferWriter(tiny, supplier));
     }
 
     public JsonWriter pollJsonWriter(final OutputStream out) {
-        return new JsonStreamWriter(tiny, out);
+        return configWrite(new JsonStreamWriter(tiny, out));
     }
 
     public JsonWriter pollJsonWriter(final Charset charset, final OutputStream out) {
-        return new JsonStreamWriter(tiny, charset, out);
+        return configWrite(new JsonStreamWriter(tiny, charset, out));
     }
 
     public JsonWriter pollJsonWriter() {
-        return writerPool.get().tiny(tiny);
+        return configWrite(writerPool.get().tiny(tiny));
     }
 
     public void offerJsonWriter(final JsonWriter writer) {
@@ -85,6 +104,18 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     }
 
     //------------------------------ convertFrom -----------------------------------------------------------
+    @Override
+    public <T> T convertFrom(final Type type, final byte[] bytes) {
+        if (bytes == null) return null;
+        return convertFrom(type, new String(bytes, StandardCharsets.UTF_8));
+    }
+
+    @Override
+    public <T> T convertFrom(final Type type, final byte[] bytes, final int offset, final int length) {
+        if (bytes == null) return null;
+        return convertFrom(type, new String(bytes, offset, length, StandardCharsets.UTF_8));
+    }
+
     public <T> T convertFrom(final Type type, final String text) {
         if (text == null) return null;
         return convertFrom(type, Utility.charArray(text));
@@ -95,10 +126,10 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
         return convertFrom(type, text, 0, text.length);
     }
 
-    public <T> T convertFrom(final Type type, final char[] text, final int start, final int len) {
+    public <T> T convertFrom(final Type type, final char[] text, final int offset, final int length) {
         if (text == null || type == null) return null;
         final JsonReader in = readerPool.get();
-        in.setText(text, start, len);
+        in.setText(text, offset, length);
         T rs = (T) factory.loadDecoder(type).convertFrom(in);
         readerPool.accept(in);
         return rs;
@@ -128,6 +159,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 offset, final int length) {
+        if (text == null) return null;
+        final JsonReader in = readerPool.get();
+        in.setText(text, offset, length);
+        Object rs = new AnyDecoder(factory).convertFrom(in);
+        readerPool.accept(in);
+        return (V) rs;
+    }
+
+    //返回非null的值是由String、ArrayList、HashMap任意组合的对象
+    public <V> V convertFrom(final InputStream in) {
+        if (in == null) return null;
+        return (V) new AnyDecoder(factory).convertFrom(new JsonStreamReader(in));
+    }
+
+    //返回非null的值是由String、ArrayList、HashMap任意组合的对象
+    public <V> V convertFrom(final ByteBuffer... buffers) {
+        if (buffers == null || buffers.length == 0) return null;
+        return (V) new AnyDecoder(factory).convertFrom(new JsonByteBufferReader((ConvertMask) null, buffers));
+    }
+
+    //返回非null的值是由String、ArrayList、HashMap任意组合的对象
+    public <V> V convertFrom(final ConvertMask mask, final ByteBuffer... buffers) {
+        if (buffers == null || buffers.length == 0) return null;
+        return (V) new AnyDecoder(factory).convertFrom(new JsonByteBufferReader(mask, buffers));
+    }
+
+    //返回非null的值是由String、ArrayList、HashMap任意组合的对象
+    public <V> V convertFrom(final JsonReader reader) {
+        if (reader == null) return null;
+        return (V) new AnyDecoder(factory).convertFrom(reader);
+    }
+
     //------------------------------ convertTo -----------------------------------------------------------
     @Override
     public String convertTo(final Object value) {
@@ -139,7 +216,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     public String convertTo(final Type type, final Object value) {
         if (type == null) return null;
         if (value == null) return "null";
-        final JsonWriter writer = writerPool.get().tiny(tiny);
+        final JsonWriter writer = pollJsonWriter();
         writer.specify(type);
         factory.loadEncoder(type).convertTo(writer, value);
         String result = writer.toString();
@@ -147,10 +224,29 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
         return result;
     }
 
+    @Override
+    public byte[] convertToBytes(final Object value) {
+        if (value == null) return null;
+        String result = convertTo(value.getClass(), value);
+        return result == null ? null : result.getBytes(StandardCharsets.UTF_8);
+    }
+
+    @Override
+    public byte[] convertToBytes(final Type type, final Object value) {
+        if (type == null) return null;
+        if (value == null) return null;
+        final JsonWriter writer = pollJsonWriter();
+        writer.specify(type);
+        factory.loadEncoder(type).convertTo(writer, value);
+        String result = writer.toString();
+        writerPool.accept(writer);
+        return result == null ? null : result.getBytes(StandardCharsets.UTF_8);
+    }
+
     @Override
     public String convertMapTo(final Object... values) {
         if (values == null) return "null";
-        final JsonWriter writer = writerPool.get().tiny(tiny);
+        final JsonWriter writer = pollJsonWriter();
         ((AnyEncoder) factory.getAnyEncoder()).convertMapTo(writer, values);
         String result = writer.toString();
         writerPool.accept(writer);
@@ -159,7 +255,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
 
     public void convertTo(final OutputStream out, final Object value) {
         if (value == null) {
-            new JsonStreamWriter(tiny, out).writeNull();
+            pollJsonWriter(out).writeNull();
         } else {
             convertTo(out, value.getClass(), value);
         }
@@ -168,9 +264,9 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     public void convertTo(final OutputStream out, final Type type, final Object value) {
         if (type == null) return;
         if (value == null) {
-            new JsonStreamWriter(tiny, out).writeNull();
+            pollJsonWriter(out).writeNull();
         } else {
-            final JsonWriter writer = writerPool.get().tiny(tiny);
+            final JsonWriter writer = pollJsonWriter();
             writer.specify(type);
             factory.loadEncoder(type).convertTo(writer, value);
             byte[] bs = writer.toBytes();
@@ -185,9 +281,9 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
 
     public void convertMapTo(final OutputStream out, final Object... values) {
         if (values == null) {
-            new JsonStreamWriter(tiny, out).writeNull();
+            pollJsonWriter(out).writeNull();
         } else {
-            final JsonWriter writer = writerPool.get().tiny(tiny);
+            final JsonWriter writer = pollJsonWriter();
             ((AnyEncoder) factory.getAnyEncoder()).convertMapTo(writer, values);
             byte[] bs = writer.toBytes();
             writerPool.accept(writer);
@@ -202,7 +298,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     @Override
     public ByteBuffer[] convertTo(final Supplier<ByteBuffer> supplier, final Object value) {
         if (supplier == null) return null;
-        JsonByteBufferWriter out = new JsonByteBufferWriter(tiny, null, supplier);
+        JsonByteBufferWriter out = pollJsonWriter(supplier);
         if (value == null) {
             out.writeNull();
         } else {
@@ -214,7 +310,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     @Override
     public ByteBuffer[] convertTo(final Supplier<ByteBuffer> supplier, final Type type, final Object value) {
         if (supplier == null || type == null) return null;
-        JsonByteBufferWriter out = new JsonByteBufferWriter(tiny, null, supplier);
+        JsonByteBufferWriter out = pollJsonWriter(supplier);
         if (value == null) {
             out.writeNull();
         } else {
@@ -227,7 +323,7 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
     @Override
     public ByteBuffer[] convertMapTo(final Supplier<ByteBuffer> supplier, final Object... values) {
         if (supplier == null) return null;
-        JsonByteBufferWriter out = new JsonByteBufferWriter(tiny, null, supplier);
+        JsonByteBufferWriter out = pollJsonWriter(supplier);
         if (values == null) {
             out.writeNull();
         } else {
@@ -269,14 +365,14 @@ public final class JsonConvert extends TextConvert<JsonReader, JsonWriter> {
 
     public JsonWriter convertToWriter(final Type type, final Object value) {
         if (type == null) return null;
-        final JsonWriter writer = writerPool.get().tiny(tiny);
+        final JsonWriter writer = pollJsonWriter();
         writer.specify(type);
         factory.loadEncoder(type).convertTo(writer, value);
         return writer;
     }
 
     public JsonWriter convertMapToWriter(final Object... values) {
-        final JsonWriter writer = writerPool.get().tiny(tiny);
+        final JsonWriter writer = pollJsonWriter();
         ((AnyEncoder) factory.getAnyEncoder()).convertMapTo(writer, values);
         return writer;
     }