修复JsonByteBuffer解析bug

.gitignore

@@ -10,3 +10,9 @@
 
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
+/target/
+/.idea/
+/redkale.iml
+/ClientConnection.java
+/nbactions.xml
+/nb-configuration.xml

README.md

@@ -1,29 +1,27 @@
-<h1>项目介绍</h1>
+<b>项目介绍</b>
 <p>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Redkale (中文名: 红菜苔，一种湖北特产蔬菜) 是基于Java 8全新的微服务框架， 包含HTTP、WebSocket、TCP/UDP、数据序列化、数据缓存、依赖注入等功能。 本框架致力于简化集中式和微服务架构的开发，在增强开发敏捷性的同时保持高性能。
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Redkale (中文名: 红菜苔，一种湖北特产蔬菜) 是基于Java 11全新的微服务框架， 包含HTTP、WebSocket、TCP/UDP、数据序列化、数据缓存、依赖注入等功能。 本框架致力于简化集中式和微服务架构的开发，在增强开发敏捷性的同时保持高性能。
 </p>
 <strong>RedKale 有如下主要特点：</strong>
 <ol>
-<li>大量使用Java 8新特性（接口默认值、Stream、Lambda、JDk8内置的ASM等）</li>
+<li>大量使用Java 8+新特性（接口默认值、Stream、Lambda、内置的ASM、HttpClient等）</li>
 <li>提供HTTP服务，同时内置JSON功能与限时缓存功能</li>
-<li>TCP层完全使用NIO.2，并统一TCP与UDP的接口换</li>
+<li>TCP层完全使用NIO，并统一TCP与UDP的接口换</li>
 <li>提供分布式与集中式部署的无缝切换</li>
 <li>提供类似JPA功能，包含数据缓存自动同步、分表分库与简洁的数据层操作接口</li>
 <li>可以动态修改已依赖注入的资源</li>
-</ol>
+</ol> 
 
 <strong>Redkale 设计理念</strong>
 <p>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;作为一个全新的微服务框架，Redkale在接口定义上使用了Java 8大量的新语法，接口有默认实现、接口带静态方法、重复注解等特性，同时在设计上与主流框架有很大不同。Redkale是按组件形式设计的，而非以容器为主，几乎每个子包都是能提供独立功能的组件。如Tomcat是按容器设计的，所有web资源/配置由Tomcat控制，开发者很能难控制到Tomcat内部，而Redkale的HTTP服务只是个组件，开发者既可以自己启动和配置HttpServer，也可以把Redkale当成容器通过Redkale进程来初始化服务。Spring的Ioc容器也是如此，Redkale提供的依赖注入仅通过ResouceFactory一个类来控制，非常轻量，并且可动态更改已注入的资源。Spring提倡控制反转思想，而自身的容器却让开发者很难控制。Redkale是一个既能以组件形式也能以容器形式存在的框架。从整体上看，Redkale的架构分两层：接口和默认实现。开发者若想替换掉Redkale内置的HTTP服务而使用符合JavaEE规范的HttpServlet, 可以采用自定义协议基于JSR 340(Servlet 3.1)来实现自己的HTTP服务；若想使用Hibernate作为数据库操作，可以写一个自己的DataSource实现类；JSON的序列化和反序列化也可以使用第三方的实现；Memcached或Redis也可以作为另一个CacheSource的实现替换Redkale的默认实现。这其实包含了控制反转的思想，让框架里的各个组件均可让开发者控制。<br/>
-   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;与主流框架比，功能上Redkale显得很简单，这体现了Redkale的简易性，而并非是不足，从一个良好的设计习惯或架构上来看，有些常用功能是不需要提供的，如Redkale的HTTP服务不支持HTTPS和JSP，HTTPS比HTTP多了一层加密解密，这种密集型的计算不是Java的专长，通常提供HTTP服务的架构不会将Java动态服务器放在最前端，而是在前方会放nginx或apache，除了负载均衡还能静动分离，因此HTTPS的加解密应交给nginx这样的高性能服务器处理。Redkale再提供HTTPS服务就显得鸡肋。JSP其实算是一个落后的技术，现在是一个多样化终端的时代，终端不只局限于桌面程序和PC浏览器，还有原生App、混合式App、微信端、移动H5、提供第三方接口等各种形式的终端，这些都不是JSP能方便兼顾的，而HTTP+JSON作为通用性接口可以避免重复开发，模版引擎的功能加上各种强大的JS框架足以取代JSP。Redkale在功能上做了筛选，不会为了迎合主流而提供，而是以良好的设计思想为指导。这是Redkale的主导思维。
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;作为一个全新的微服务框架，Redkale在接口定义上使用了Java 8以上版本的大量新特性，接口有默认实现、接口带静态方法、重复注解等特性，同时在设计上与主流框架有很大不同。Redkale是按组件形式设计的，而非以容器为主，几乎每个子包都是能提供独立功能的组件。如Tomcat是按容器设计的，所有web资源/配置由Tomcat控制，开发者很能难控制到Tomcat内部，而Redkale的HTTP服务只是个组件，开发者既可以自己启动和配置HttpServer，也可以把Redkale当成容器通过Redkale进程来初始化服务。Spring的Ioc容器也是如此，Redkale提供的依赖注入仅通过ResouceFactory一个类来控制，非常轻量，并且可动态更改已注入的资源。Spring提倡控制反转思想，而自身的容器却让开发者很难控制。Redkale是一个既能以组件形式也能以容器形式存在的框架。从整体上看，Redkale的架构分两层：接口和默认实现。开发者若想替换掉Redkale内置的HTTP服务而使用符合JavaEE规范的HttpServlet, 可以采用自定义协议基于JSR 340(Servlet 3.1)来实现自己的HTTP服务；若想使用Hibernate作为数据库操作，可以写一个自己的DataSource实现类；JSON的序列化和反序列化也可以使用第三方的实现；Memcached或Redis也可以作为另一个CacheSource的实现替换Redkale的默认实现。这其实包含了控制反转的思想，让框架里的各个组件均可让开发者控制。<br/>
+   &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;与主流框架比，功能上Redkale显得很简单，这体现了Redkale的简易性，而并非是不足，从一个良好的设计习惯或架构上来看，有些常用功能是不需要提供的，如Redkale的HTTP服务不支持JSP, JSP其实算是一个落后的技术，现在是一个多样化终端的时代，终端不只局限于桌面程序和PC浏览器，还有原生App、混合式App、微信端、移动H5、提供第三方接口等各种形式的终端，这些都不是JSP能方便兼顾的，而HTTP+JSON作为通用性接口可以避免重复开发，模版引擎的功能加上各种强大的JS框架足以取代JSP。Redkale在功能上做了筛选，不会为了迎合主流而提供，而是以良好的设计思想为指导。这是Redkale的主导思维。
 </p>
 
 
-&nbsp;&nbsp;&nbsp;编译RedKale 1.8.x版本需要在源码工程中的编译器选项中加入： <b>-XDignore.symbol.file=true</b>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>详情请访问:&nbsp;&nbsp;&nbsp;&nbsp;<a href='https://redkale.org' target='_blank'>https://redkale.org</a></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;<b>基本文档:&nbsp;&nbsp;&nbsp;&nbsp;<a href='https://redkale.org/articles.html' target='_blank'>https://redkale.org/articles.html</a></b>
 
-&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>
-
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<h5>欢迎加入Redkale QQ群:  527523235</h5>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<b>欢迎加入Redkale QQ群:  527523235</b>
 &nbsp;

bin/apidoc.bat

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

bin/apidoc.cmd

@@ -0,0 +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 apidoc

bin/apidoc.sh

@@ -15,4 +15,4 @@ do
 done
 export CLASSPATH=$CLASSPATH:$lib
 echo "$APP_HOME"
-java -DCMD=APIDOC  -DAPP_HOME="$APP_HOME"  org.redkale.boot.Application
+java -DAPP_HOME="$APP_HOME"  org.redkale.boot.Application apidoc

bin/redkale.cmd

@@ -1,8 +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
-
+java -DAPP_HOME="%APP_HOME%" -classpath "%APP_HOME%"\lib\* org.redkale.boot.Application %*

bin/redkale.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 -DAPP_HOME="$APP_HOME"  org.redkale.boot.Application $@ &

bin/restart.cmd

@@ -4,6 +4,6 @@ SET APP_HOME=%~dp0
 
 IF NOT EXIST "%APP_HOME%\conf\application.xml"  SET APP_HOME=%~dp0..
 
-call "%APP_HOME%\bin\shutdown.bat" 
+call "%APP_HOME%\bin\shutdown.cmd" 
 
-call "%APP_HOME%\bin\start.bat" 
+call "%APP_HOME%\bin\start.cmd" 

bin/start.cmd

@@ -0,0 +1,8 @@
+@ECHO OFF
+
+SET APP_HOME=%~dp0
+ 
+IF NOT EXIST "%APP_HOME%\conf\application.xml"  SET APP_HOME=%~dp0..
+
+java -server -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"/logs.out &
+nohup  java -server -DAPP_HOME="$APP_HOME" org.redkale.boot.Application > "$APP_HOME"/logs.out &
 

conf/application.xml

@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<application port="2121">     
-    
-    <!--  详细配置说明见： http://redkale.org/redkale.html#redkale_confxml  -->
-    
-    <resources>       
-
-    </resources> 
+<application nodeid="10000" port="2020">     
         
-    <server protocol="HTTP" port="6060">      
-              
+    <properties load="config.properties">
+        <property name="system.property.redkale.convert.protobuf.enumtostring" value="true"/>
+    </properties>         
+        
+    <server protocol="HTTP" port="5050">                    
         <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>
@@ -24,10 +21,9 @@
         
         <filters autoload="true"/>
 
-        <rest path="/pipes" />  <!-- base指定的自定义HttpServlet子类必须标记@HttpUserType, 不设置base则视为没有当前用户信息设置  -->  
-        
-        <servlets path="/pipes" autoload="true" />
+        <rest path="/pipes" /> 
         
+        <servlets path="/pipes" autoload="true" />        
     </server>
     
 </application>

conf/config.properties

@@ -0,0 +1,2 @@
+
+#

conf/logging.properties

@@ -18,8 +18,8 @@ java.util.logging.FileHandler.level = FINER
 java.util.logging.FileHandler.limit = 10M
 java.util.logging.FileHandler.count = 20
 java.util.logging.FileHandler.encoding = UTF-8
-java.util.logging.FileHandler.pattern = ${APP_HOME}/logs-%m/log-%d.log
-java.util.logging.FileHandler.unusual = ${APP_HOME}/logs-%m/log-warnerr-%d.log
+java.util.logging.FileHandler.pattern = ${APP_HOME}/logs-%tY%tm/log-%tY%tm%td.log
+java.util.logging.FileHandler.unusual = ${APP_HOME}/logs-%tY%tm/log-warnerr-%tY%tm%td.log
 java.util.logging.FileHandler.append = true
 
 java.util.logging.ConsoleHandler.level = FINEST

conf/persistence.xml

@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.0" xmlns="http://java.sun.com/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_2_0.xsd">
-    
-    <persistence-unit name="" transaction-type="RESOURCE_LOCAL">
-        <shared-cache-mode>ALL</shared-cache-mode>
-        <properties>
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://localhost:3306/center?autoReconnect=true&amp;characterEncoding=utf8"/>
-            <property name="javax.persistence.jdbc.user" value="root"/>
-            <property name="javax.persistence.jdbc.password" value="1234"/>
-        </properties>
-    </persistence-unit>
-    
-    <!--
-    <persistence-unit name="user.read" transaction-type="RESOURCE_LOCAL">
-        <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.user" value="system"/>
-            <property name="javax.persistence.jdbc.password" value="1234"/>
-        </properties>
-    </persistence-unit>
-    
-    <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.user" value="root"/>
-            <property name="javax.persistence.jdbc.password" value="1234"/>
-        </properties>
-    </persistence-unit>
-    -->
-    
-</persistence>

conf/source.properties

@@ -0,0 +1,22 @@
+
+############ DataSource   @Resource(name="platf") ############
+#redkale.datasource[platf].url = jdbc:mysql://127.0.0.1:3306/platf?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8
+#redkale.datasource[platf].user = root
+#redkale.datasource[platf].password = 12345678
+### true: auto ddl;
+#redkale.datasource[platf].table-autoddl = true 
+
+############ DataSource   @Resource(name="user") ############
+#redkale.datasource[user].read.url = jdbc:mysql://127.0.0.1:3306/user_r?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8
+#redkale.datasource[user].read.user = root
+#redkale.datasource[user].read.password = 12345678
+
+#redkale.datasource[user].write.url = jdbc:mysql://127.0.0.1:3306/user_w?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8
+#redkale.datasource[user].write.user = root
+#redkale.datasource[user].write.password = 12345678
+
+
+############ CacheSource   @Resource(name="usersession") ############
+#redkale.cachesource[usersession].node[0].url = redis://127.0.0.1:6363
+#redkale.cachesource[usersession].node[0].password = 12345678
+#redkale.cachesource[usersession].node[0].db = 0

lib/readme.txt

@@ -1 +1 @@
-<EFBFBD><EFBFBD><EFBFBD>н<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>jarĬ<EFBFBD>Ϸ<EFBFBD><EFBFBD>ڴ˴<EFBFBD>
+<EFBFBD><EFBFBD><EFBFBD>н<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ĵ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>jarĬ<EFBFBD>Ϸ<EFBFBD><EFBFBD>ڴ˴<EFBFBD> 

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/gitrun.sh

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+export LC_ALL="zh_CN.UTF-8"
+
+rm -fr redkale
+
+rm -fr src
+rm -fr bin
+rm -fr conf
+
+git clone https://github.com/redkale/redkale.git
+
+cp -fr redkale/src ./
+cp -fr redkale/bin ./
+cp -fr redkale/conf ./
+
+mvn clean
+mvn deploy

my/pom.xml

@@ -4,16 +4,40 @@
     <groupId>org.redkale</groupId>
     <artifactId>redkale</artifactId>
     <packaging>jar</packaging>
+    <name>RedkaleProject</name>     
     <url>http://redkale.org</url>
     <description>redkale -- java framework</description>
-    <version>1.6.2</version>
+    <version>2.7.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+		
+        <junit.version>5.7.0</junit.version> 
+        <maven-plugin.version>3.2.0</maven-plugin.version>
+        <maven-gpg-plugin.version>3.0.1</maven-gpg-plugin.version>
+        <maven-compiler-plugin.version>3.8.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.0.0-M5</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0-M5</maven-failsafe-plugin.version>
+    </properties>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
     <licenses>     
         <license>      
             <name>Apache 2</name>       
-            <url>http://www.apache.org/licenses/</url>     
+            <url>https://www.apache.org/licenses/</url>     
             <distribution>repo</distribution>    
             <comments>Apache License</comments>     
-        </license>     
+        </license>      
     </licenses>
     
     <developers>     
@@ -21,13 +45,13 @@
             <id>Redkale</id>     
             <name>redkale</name>       
             <email>redkale@qq.com</email>  
-            <url>http://redkale.org</url>    
+            <url>https://redkale.org</url>    
             <roles>     
                 <role>Project Manager</role>     
                 <role>Architect</role>     
             </roles>    
             <organization>redkale</organization>     
-            <organizationUrl>http://redkale.org</organizationUrl>       
+            <organizationUrl>https://redkale.org</organizationUrl>       
             <properties>     
                 <dept>No</dept>     
             </properties>     
@@ -35,12 +59,6 @@
         </developer>     
     </developers>  
     
-    <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>
-    </properties>
-    <name>Redkale</name>
     <distributionManagement>
         <snapshotRepository>
             <id>ossrh</id>
@@ -51,23 +69,24 @@
             <url>https://oss.sonatype.org/service/local/staging/deploy/maven2/</url>
         </repository>
     </distributionManagement>
+
     <scm>
         <url>https://github.com/redkale/redkale</url>
         <connection>scm:git:git@github.com/redkale/redkale.git</connection>
         <developerConnection>scm:git:git@github.com:redkale/redkale.git</developerConnection>
     </scm>
+
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.5.1</version>                                
+                <version>${maven-compiler-plugin.version}</version>                                
                 <configuration>
 					<compilerArgument>-parameters</compilerArgument>
                     <encoding>UTF-8</encoding>
                     <compilerArguments>
                         <verbose />
-                        <bootclasspath>${java.home}/lib/rt.jar</bootclasspath>
                     </compilerArguments>
                 </configuration>    
             </plugin>
@@ -75,9 +94,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-jar-plugin</artifactId>
-                <version>2.6</version>
+                <version>${maven-plugin.version}</version>
                 <configuration>
                     <archive>
+						<addMavenDescriptor>false</addMavenDescriptor>
                         <manifest>
                             <mainClass>org.redkale.boot.Application</mainClass>
                         </manifest>
@@ -88,7 +108,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-gpg-plugin</artifactId>
-                <version>1.6</version>
+                <version>${maven-gpg-plugin.version}</version>
                 <executions>
                     <execution>
                         <id>sign-artifacts</id>
@@ -99,10 +119,11 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-source-plugin</artifactId>
-                <version>3.0.0</version>
+                <version>${maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -111,10 +132,11 @@
                     </execution>
                 </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.10.3</version>
+                <version>${maven-plugin.version}</version>
                 <executions>
                     <execution>
                         <goals>
@@ -127,7 +149,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-assembly-plugin</artifactId>   
-                <version>3.0.0</version>
+                <version>${maven-plugin.version}</version>
                 <configuration>
                     <appendAssemblyId>false</appendAssemblyId>
                     <descriptors>   

my/readme.txt

@@ -1 +1,9 @@
-<EFBFBD><EFBFBD>Ŀ¼<EFBFBD>µ<EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sonatypeʱʹ<EFBFBD>ã<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڹ<EFBFBD><DAB9>̴<EFBFBD><CCB4><EFBFBD><EFBFBD><EFBFBD>
+<EFBFBD><EFBFBD>Ŀ¼<EFBFBD>µ<EFBFBD><EFBFBD>ļ<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>sonatypeʱʹ<EFBFBD>ã<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ڹ<EFBFBD><DAB9>̴<EFBFBD><CCB4><EFBFBD><EFBFBD><EFBFBD>
+
+ʹ<EFBFBD><EFBFBD>gpg<EFBFBD><EFBFBD><EFBFBD><EFBFBD>sonatype<EFBFBD><EFBFBD>Կ:
+
+1<EFBFBD><EFBFBD> gpg  <20>C-gen-key
+2<EFBFBD><EFBFBD> gpg --keyserver keys.openpgp.org --send-keys  <20><><EFBFBD>Ĺ<EFBFBD>Կ(һ<><D2BB>ʮ<EFBFBD><CAAE><EFBFBD><EFBFBD><EFBFBD>Ƶ<EFBFBD><C6B5><EFBFBD><EFBFBD>֣<EFBFBD><D6A3><EFBFBD><EFBFBD><EFBFBD>DE346FA5)
+      <20><>ʾ<EFBFBD><CABE> gpg: <20>ӹ<EFBFBD>Կ<EFBFBD><D4BF><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>ʧ<EFBFBD>ܣ<EFBFBD>Server indicated a failure  <20><>ʾ<EFBFBD><CABE><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
+
+  

my/settings.xml

@@ -21,6 +21,7 @@
         
         <profile> 
             <id>release</id>
+			<!--
             <build>
                 <plugins>
                     <plugin>
@@ -92,6 +93,7 @@
                     </plugin>
                 </plugins>
             </build>
+			-->
         </profile>
     </profiles>
 </settings>

pom.xml

@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.redkale</groupId>
+    <artifactId>redkale</artifactId>
+    <packaging>jar</packaging>
+    <name>RedkaleProject</name>     
+    <url>https://redkale.org</url>
+    <description>redkale -- java framework</description>
+    <version>2.8.0-SNAPSHOT</version>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        
+        <junit.version>5.9.0</junit.version>
+        <maven-jar-plugin.version>3.3.0</maven-jar-plugin.version>
+        <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
+        <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+        <maven-failsafe-plugin.version>3.0.0</maven-failsafe-plugin.version>
+    </properties>
+
+    <licenses>     
+        <license>      
+            <name>Apache 2</name>       
+            <url>https://www.apache.org/licenses/</url>     
+            <distribution>repo</distribution>    
+            <comments>Apache License</comments>     
+        </license>      
+    </licenses>
+    
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>${junit.version}</version>
+            <scope>test</scope>
+        </dependency>        
+    </dependencies>
+    
+    <repositories>
+        <repository>
+            <id>central</id>
+            <name>Central Repository</name>
+            <url>https://repo.maven.apache.org/maven2</url>
+        </repository>
+        <repository>
+            <id>sonatype-nexus-snapshots</id>
+            <name>Sonatype Nexus Snapshots</name>
+            <url>https://oss.sonatype.org/content/repositories/snapshots</url>
+        </repository>
+    </repositories>
+    
+    <developers>     
+        <developer>      
+            <id>Redkale</id>     
+            <name>redkale</name>       
+            <email>redkale@qq.com</email>  
+            <url>https://redkale.org</url>    
+            <roles>     
+                <role>Project Manager</role>     
+                <role>Architect</role>     
+            </roles>    
+            <organization>redkale</organization>     
+            <organizationUrl>https://redkale.org</organizationUrl>       
+            <properties>     
+                <dept>No</dept>     
+            </properties>     
+            <timezone>8</timezone>     
+        </developer>     
+    </developers>  
+
+    <scm>
+        <url>https://github.com/redkale/redkale</url>
+        <connection>scm:git:git@github.com/redkale/redkale.git</connection>
+        <developerConnection>scm:git:git@github.com:redkale/redkale.git</developerConnection>
+    </scm>
+
+    <build>
+        <plugins>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>${maven-compiler-plugin.version}</version>                                               
+                <configuration>				
+                    <encoding>UTF-8</encoding>
+                    <compilerArgs>
+                        <arg>-parameters</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+            <!--  需要注释掉， 否则会生成native-image配置信息
+            <plugin>
+                <groupId>org.redkale.maven.plugins</groupId>
+                <artifactId>redkale-maven-plugin</artifactId>
+                <version>1.1.0</version>                                                
+                <executions>
+                    <execution>
+                        <id>redkale-compile</id> 
+                        <phase>process-classes</phase>
+                        <goals>
+                            <goal>compile</goal>
+                        </goals>                   
+                    </execution>
+                </executions>    
+            </plugin>
+            -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>${maven-jar-plugin.version}</version>
+                <configuration>
+                    <archive>
+                        <addMavenDescriptor>false</addMavenDescriptor>
+                        <manifest>
+                            <mainClass>org.redkale.boot.Application</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+                    
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven-surefire-plugin.version}</version>
+                <configuration>
+                    <forkMode>once</forkMode>
+                    <argLine>-Dfile.encoding=UTF-8</argLine>
+                </configuration>
+            </plugin>
+        
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-failsafe-plugin</artifactId>
+                <version>${maven-failsafe-plugin.version}</version>
+            </plugin>
+        </plugins>
+    </build>
+    
+</project>

root/readme.txt

@@ -0,0 +1 @@
+ 

src/META-INF/application-template.xml

@@ -1,313 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 
-    文件说明:
-        ${APP_HOME} 指当前程序的根目录APP_HOME
-        没注明唯一的节点可多个存在
-        required： 被声明required的属性值不能为空
-        
-                                            group
-                                         /  /  \  \  
-                                      /    /    \   \   
-                                   /     /       \    \                      
-                               node1   node2   node3  node4
-                             /       \                             
-                          /             \
-                       /                   \
-                    /                         \
-             serviceid1                       serviceid2
-            /       \                        /           \
-  serviceid1_name1  serviceid1_name2   serviceid2_name1  serviceid2_name2    
--->
-<!--     
-    address:  本地局域网的IP地址， 默认值为默认网卡的ip，当不使用默认值需要指定值，如192.168.1.22
-    port: required  程序的管理Server的端口，用于关闭或者与监管系统进行数据交互
-    lib:  加上额外的lib路径,多个路径用分号;隔开； 默认为空。  例如: ${APP_HOME}/lib/a.jar;${APP_HOME}/lib2/b.jar;
--->
-<application port="6560" lib="">  
-    
-    <!-- 
-        【节点全局唯一】
-        所有服务所需的资源 
-    -->
-    <resources>  
-        
-        <!--
-            【节点全局唯一】
-            transport节点只能有一个，用于配置所有Transport的池参数，没配置该节点将自动创建一个。
-            threads： 线程总数， 默认: <group>节点数*CPU核数*2
-            bufferCapacity: ByteBuffer的初始化大小， 默认: 32K; 
-            bufferPoolSize： ByteBuffer池的大小，默认: 线程总数*4
-            readTimeoutSeconds: TCP读取超时秒数, 默认为6秒， 为0表示无超时限制
-            writeTimeoutSeconds: TCP写入超时秒数, 默认为6秒， 为0表示无超时限制
-            strategy: 远程请求的负载均衡策略， 必须是org.redkale.net.TransportStrategy的实现类
-        -->
-        <transport bufferCapacity="32K" bufferPoolSize="32" threads="32" readTimeoutSeconds="6" writeTimeoutSeconds="6"/>
-        
-        <!--
-            一个组包含多个node， 同一Service服务可以由多个进程提供，这些进程称为一个GROUP，且同一GROUP内的进程必须在同一机房或局域网内
-            一个group节点对应一个 Transport 对象。
-            name: 服务组ID，长度不能超过11个字节. 默认为空字符串。 注意: name不能包含$符号。
-            protocol：值范围：UDP TCP， 默认TCP
-            subprotocol: 子协议，预留字段。默认值为空
-            注意: 一个node只能所属一个group。只要存在protocol=SNCP的Server节点信息， 就必须有group节点信息。
-        -->
-        <group name="" protocol="TCP">
-            <!--
-                需要将本地node的addr与port列在此处。
-                同一个<node>节点值只能存在一个<group>节点内，即同一个addr+port只能属于一个group。
-                addr: required IP地址
-                port: required 端口
-            -->
-            <node addr="127.0.0.1" port="7070"/>
-        </group>
-        
-        <!--
-            全局的数据源设置, 可以是CacheSource、DataSource， JDBC的DataSource通常通过persistence.xml配置，此处多用于CacheSource的配置
-            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"/>
-        </source>
-        
-        <!--
-           Application启动的监听事件,可配置多个节点
-           value: 类名，必须是ApplicationListener的子类
-        -->
-        <listener value="org.redkalex.xxx.XXXApplicationListener"/>
-        
-        <!-- 
-            【节点全局唯一】
-            全局的参数配置, 可以通过@Resource(name="property.xxxxxx") 进行注入<property>的信息, 被注解的字段类型只能是String、primitive class
-            如果name是system.property.开头的值将会在进程启动时进行System.setProperty("yyyy", "YYYYYY")操作。
-            如果name是mimetype.property.开头的值将会在进程启动时进行MimeType.add("yyyy", "YYYYYY")操作。
-            load:  加载文件，多个用;隔开。
-            默认置入的system.property.的有：
-               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");
-               
-            <properties>节点下也可包含非<property>节点.
-            非<property>其节点可以通过@Resource(name="properties.xxxxxx")进行注入, 被注解的字段类型只能是AnyValue、AnyValue[]
-        -->
-        <properties load="config.properties">
-            <property name="system.property.yyyy" value="YYYYYY"/>
-            <property name="xxxxxx" value="XXXXXXXX"/>
-            <property name="xxxxxx" value="XXXXXXXX"/>
-            <property name="xxxxxx" value="XXXXXXXX"/>
-        </properties>
-                
-    </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
-        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
-    -->
-    <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文件
-           truststorepass: TRUST密码
-           truststorefile: TRUST文件
-        -->
-        <ssl creator=""/>
-        
-        <!-- 
-           加载所有的Service服务;
-           在同一个进程中同一个name同一类型的Service将共用同一个实例
-           autoload="true"  默认值. 自动加载classpath下所有的Service类  
-           autoload="false" 需要显著的指定Service类
-           includes： 当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
-           excludes： 当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开           
-           groups:   所属组的节点,多个节点值用;隔开，如果配置文件中存在多个SNCP协议的Server节点，需要显式指定group属性.
-                    当 protocol == SNCP 时 group表示当前Server与哪些节点组关联。
-                    当 protocol != SNCP 时 group只能是空或者一个group的节点值，不能为多个节点值。
-        -->
-        <services autoload="true" includes="" excludes="">
-
-            <!-- 显著加载指定的Service的接口类 -->
-            <service value="com.xxx.XXX1Service"/>
-            <!-- 
-               name:   显式指定name，覆盖默认的空字符串值。 注意: name不能包含$符号。
-               groups: 显式指定groups，覆盖<services>节点的groups默认值。
-               ignore: 是否禁用， 默认为false。
-            -->
-            <service value="com.xxx.XXX2Service" name="" groups="xxx;yyy"/>
-            <!--   给Service增加配置属性 -->
-            <service value="com.xxx.XXX1Service"> 
-                <!-- property值在public void init(AnyValue conf)方法中可以通过AnyValue properties=conf.getAnyValue("properties")获取 -->
-                <property name="xxxxxx" value="XXXXXXXX"/>  
-                <property name="xxxxxx" value="XXXXXXXX"/>
-            </service>
-        </services>
-        
-        <!-- 
-           加载所有的Filter服务;
-           autoload="true"  默认值.  
-           autoload="false" 需要显著的指定Filter类
-           includes： 当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
-           excludes： 当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开    
-        -->
-        <filters autoload="true" includes="" excludes="">
-            
-            <!-- 
-               显著加载指定的Filter类
-               value=: Filter类名。必须与Server的协议层相同，HTTP必须是HttpFilter
-               ignore: 是否禁用， 默认为false。
-            -->
-            <!-- 显著加载指定的Filter类 -->
-            <filter value="com.xxx.XXX1Filter"/>
-            
-            <!--   给Filter增加配置属性 -->
-            <filter value="com.xxx.XXX12Filter"> 
-                <!-- property值在public void init(AnyValue conf)方法中可以通过AnyValue properties=conf.getAnyValue("properties")获取 -->
-                <property name="xxxxxx" value="XXXXXXXX"/>  
-                <property name="xxxxxx" value="XXXXXXXX"/>
-            </filter>
-        </filters>
-        
-        <!-- 
-           REST的核心配置项
-           当Server为HTTP协议时, rest节点才有效。存在[rest]节点则Server启动时会加载REST服务, 节点可以多个,(WATCH协议不需要设置，系统会自动生成)
-           path:     servlet的ContextPath前缀 默认为空
-           base:     REST服务的BaseServlet，必须是 org.redkale.net.http.HttpServlet 的子类，且子类必须标记@HttpUserType。
-           autoload：默认值"true"  默认值. 加载当前server所能使用的Servce对象;    
-           includes：当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
-           excludes：当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
-        -->
-        <rest path="/pipes" base="org.redkale.net.http.HttpServlet" autoload="true" includes="" excludes="">
-            <!-- 
-               value:  Service类名，列出的表示必须被加载的Service对象
-               ignore: 是否忽略，设置为true则不会加载该Service对象，默认值为false
-            -->
-            <service value="com.xxx.XXXXService"/>
-            <!-- 
-               value:  WebSocket类名，列出的表示必须被加载且标记为@RestWebSocket的WebSocket对象
-               ignore: 是否忽略，设置为true则不会加载该RestWebSocket对象，默认值为false
-            -->
-            <websocket value="com.xxx.XXXXRestWebSocket"/>
-        </rest>
-        
-        <!--
-           【节点在<server>中唯一】
-           当Server为HTTP协议时, request节点才有效。
-           remoteaddr 节点: 替换请求方节点的IP地址， 通常请求方是由nginx等web静态服务器转发过的则需要配置该节点。
-           且value值只能是以request.headers.开头，表示从request.headers中获取对应的header值。
-           例如下面例子获取request.getRemoteAddr()值，如果header存在X-RemoteAddress值则返回X-RemoteAddress值，不存在返回getRemoteAddress()。
-        -->
-        <request>
-            <remoteaddr value="request.headers.X-RemoteAddress"/>
-        </request>
-        
-        <!--
-           【节点在<server>中唯一】
-           当Server为HTTP协议时, response节点才有效。
-           contenttype: plain值为调用finish时的ContentType; 默认值: text/plain; charset=utf-8
-                        json值为调用finishJson时的ContentType; 默认值: application/json; charset=utf-8
-           defcookie 节点: 当response里输出的cookie没有指定domain 和path时，使用该节点的默认值。
-           如果addheader、setheader 的value值以request.parameters.开头则表示从request.parameters中获取对应的parameter值
-           如果addheader、setheader 的value值以request.headers.开头则表示从request.headers中获取对应的header值
-           例如下面例子是在Response输出header时添加两个header（一个addHeader， 一个setHeader）。
-           options 节点: 设置了该节点且auto=true，当request的method=OPTIONS自动设置addheader、setheader并返回200状态码
-           date 节点: 设置了该节点且period有值(单位：毫秒);返回response会包含Date头信息，默认为period=0
-                      period=0表示实时获取当前时间;
-                      period<0表示不设置date;
-                      period>0表示定时获取时间; 设置1000表示每秒刷新Date时间
-        -->
-        <response>
-            <contenttype plain="text/plain; charset=utf-8" json="application/json; charset=utf-8"/>            
-            <defcookie domain="" path=""/>  
-            <addheader name="Access-Control-Allow-Origin" value="request.headers.Origin" /> 
-            <setheader name="Access-Control-Allow-Headers" value="request.headers.Access-Control-Request-Headers"/>
-            <setheader name="Access-Control-Allow-Credentials" value="true"/>
-            <options auto="true" />
-            <date period="0" />
-        </response>
-        <!-- 
-           【节点在<server>中唯一】
-           当Server为HTTP协议时，render才有效. 指定输出引擎的实现类
-           value: 输出引擎的实现类, 必须是org.redkale.net.http.HttpRender的子类
-        -->
-        <render value="org.redkalex.htel.HttpTemplateRender"/>
-        <!-- 
-           【节点在<server>中唯一】
-           当Server为HTTP协议时，ResourceServlet才有效. 默认存在一个有默认属性的resource-servlet节点
-           webroot: web资源的根目录, 默认取server节点中的root值
-           servlet: 静态资源HttpServlet的实现，默认使用HttpResourceServlet
-           index : 启始页，默认值：index.html
-        -->
-        <resource-servlet webroot="root" index="index.html">
-            <!--
-                【节点在<resource-servlet>中唯一】
-                资源缓存的配置, 默认存在一个含默认属性的caches节点
-                limit:  资源缓存最大容量， 默认: 0, 为0表示不缓存， 单位可以是B、K、M、G，不区分大小写
-                lengthmax: 可缓存的文件大小上限， 默认: 1M（超过1M的文件不会被缓存）
-                watch: 是否监控缓存文件的变化， 默认为false，不监控
-            -->
-            <cache  limit="0M" lengthmax="1M" watch="false"/>
-            <!--
-               支持类似nginx中的rewrite， 目前只支持静态资源对静态资源的跳转。
-               type: 匹配的类型, 目前只支持location(匹配requestURI), 默认: location
-               match: 匹配的正则表达式
-               forward: 需跳转后的资源链接
-               例如下面例子是将/xxx-yyy.html的页面全部跳转到/xxx.html
-            -->
-            <rewrite type="location" match="^/([^-]+)-[^-\.]+\.html(.*)" forward="/$1.html"/>
-        </resource-servlet>
-        <!-- 
-           加载所有的Servlet服务;
-           path:  servlet的ContextPath前缀 默认为空
-           autoload="true"  默认值. 自动加载classpath下所有的Servlet类 
-           autoload="false" 需要显著的指定Service类
-           includes： 当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
-           excludes： 当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
-        -->
-        <servlets path="/pipes" autoload="true" includes="" excludes="">
-            <!-- 
-               显著加载指定的Servlet类
-               value=: Servlet类名。必须与Server的协议层相同，HTTP必须是HttpServlet
-               ignore: 是否禁用， 默认为false。
-            -->
-            <servlet value="com.xxx.XXX1Servlet" />
-            <servlet value="com.xxx.XXX2Servlet" />
-            <servlet value="com.xxx.XXX3Servlet" >
-                <property name="xxxxxx" value="XXXXXXXX"/>
-                <property name="yyyyyy" value="YYYYYYYY"/>
-            </servlet>
-        </servlets>
-    </server>
-    
-    <server protocol="SNCP" host="127.0.0.1" port="7070" root="root" lib=""> 
-        <!-- 参数完全同上 -->
-        <services autoload="true" includes="" excludes="" />
-    </server>
-</application>

src/META-INF/persistence-template.xml

@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- 其配置算是标准的JPA配置文件的缩略版 -->
-<persistence>	
-    <!-- 系统基本库 -->
-    <persistence-unit name="demouser">
-        <properties>
-            <!-- 
-                DataSource的实现类，没有设置默认为org.redkale.source.DataJdbcSource的实现，使用常规基于JDBC的数据库驱动一般无需设置
-            -->
-            <property name="javax.persistence.datasource" value="org.redkale.source.DataJdbcSource"/>
-            <!-- 
-                是否开启缓存(标记为@Cacheable的Entity类)，值目前只支持两种： ALL: 所有开启缓存。 NONE: 关闭所有缓存
-            -->
-            <property name="javax.persistence.cachemode" value="ALL"/>
-            
-            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/dbuser?characterEncoding=utf8"/>
-            <!-- 
-                javax.persistence.jdbc.driver在JPA的值是JDBC驱动，Redkale有所不同，值应该是javax.sql.DataSource的子类。 
-                为了兼容用户习惯，Redkale内置常见JDBC驱动到javax.sql.DataSource的映射关系：
-                                     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"/>
-            
-            <!-- 最大连接数，默认值：CPU数*16  -->
-            <property name="javax.persistence.connections.limit" value="32"/>
-            
-            <!--  包含的SQL模板，相当于反向LIKE，不同的JDBC驱动的SQL语句不一样，Redkale内置了MySQL的语句 -->
-            <property name="javax.persistence.contain.sqltemplate" value="LOCATE(${keystr}, ${column}) > 0"/>
-            <property name="javax.persistence.notcontain.sqltemplate" value="LOCATE(${keystr}, ${column}) = 0"/>
-            
-            <!--  复制表结构的SQL模板，Redkale内置了MySQL的语句 -->
-            <property name="javax.persistence.tablenotexist.sqlstates" value="42000;42S02"/>
-            <property name="javax.persistence.tablecopy.sqltemplate" value="CREATE TABLE ${newtable} LIKE ${oldtable}"/>
-           
-        </properties>
-    </persistence-unit>
-    <!-- IM消息库 -->
-    <persistence-unit name="demoim">
-        <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.user" value="root"/>
-            <property name="javax.persistence.jdbc.password" value="123456"/>
-        </properties>
-    </persistence-unit>
-</persistence>

src/javax/annotation/Resource.java

@@ -1,32 +0,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-package javax.annotation;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * @since Common Annotations 1.0
- */
-@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
-@Retention(RetentionPolicy.RUNTIME)
-public @interface Resource {
-    public enum AuthenticationType {
-        CONTAINER,
-        APPLICATION
-    }
-    public String name() default "";
-
-    public Class<?> type() default Object.class;
-    public AuthenticationType authenticationType() default AuthenticationType.CONTAINER;
-    public boolean shareable() default true;
-    public String description() default "";
-    public String mappedName() default "";
-
-    public String lookup() default "";
-}

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/main/java/META-INF/apidoc-template.html

@@ -55,8 +55,8 @@
                                 } else {
                                     var w = param.required ? "font-weight:bold;" : "";
                                     var c = ' style="' + w + '"';
-                                    if (param.src == "HEADER") c = ' style="color:red;' + w + '"';
-                                    if (param.src == "COOKIE") c = ' style="color:blue;' + w + '"';
+                                    if (param.style == "HEADER") c = ' style="color:red;' + w + '"';
+                                    if (param.style == "COOKIE") c = ' style="color:blue;' + w + '"';
                                     paramshtml.push('<tr><td ' + c + '> ' + param.name + ' </td><td> ' + t + '</td><td> ' + param.comment + '</td></tr>');
                                 }
                             }
@@ -103,7 +103,7 @@
         </script>
 
         <script>
-            var jsoncontent = '${content}'; //这里必须要用单引号引起来
+            var jsoncontent = '#{content}'; //这里必须要用单引号引起来
             document.write(createhtml(jsoncontent));
         </script>
     </body>

src/main/java/META-INF/application-template.properties

@@ -0,0 +1,46 @@
+
+redkale.nodeid = 1000
+redkale.port = 6560
+redkale.lib = ./
+
+#\u3010executor\u8282\u70b9\u5168\u5c40\u552f\u4e00\u3011
+redkale.executor.threads = 4
+redkale.executor.hash = false
+
+#\u3010excludelibs\u8282\u70b9\u5168\u5c40\u552f\u4e00\u3011
+redkale.excludelibs.value = ^.*mysql.*$;^.*kafka.*$
+
+#\u3010cluster\u8282\u70b9\u5168\u5c40\u552f\u4e00\u3011
+redkale.cluster.type = org.redkalex.cluster.consul.ConsulClusterAgent
+redkale.cluster.waits= = false
+redkale.cluster.protocols = SNCP
+redkale.cluster.ports = 7070;7071
+
+redkale.mq[0].name = 
+redkale.mq[0].type = org.redkalex.mq.kafka.KafkaMessageAgent
+redkale.mq[0].servers.value = 127.0.0.1:9101
+
+redkale.group[0].name = 
+redkale.group[0].protocol = TCP
+redkale.group[0].node[0].addr = 127.0.0.1
+redkale.group[0].node[0].port = 7070
+
+redkale.listener[0].value = org.redkalex.xxx.XXXApplicationListener
+
+#\u3010properties\u8282\u70b9\u5168\u5c40\u552f\u4e00\u3011
+redkale.properties.load = config.properties
+redkale.properties.property[0].name = system.property.yyyy
+redkale.properties.property[0].value = YYYYYY
+redkale.properties.property[1].name = xxxxxxx
+redkale.properties.property[1].value = YYYYYY
+
+redkale.server[0].protocol = HTTP
+redkale.server[0].host = 127.0.0.1
+redkale.server[0].port = 6060
+redkale.server[0].root = root
+redkale.server[0].lib = 
+
+#\u3010ssl\u8282\u70b9\u5728<server>\u4e2d\u552f\u4e00\u3011
+redkale.server[0].ssl.build = org.redkale.net.SSLBuilder\u5b50\u7c7b
+
+redkale.server[0].services[0].autoload = true

src/main/java/META-INF/application-template.xml

@@ -0,0 +1,352 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+    文件说明:
+        ${APP_HOME} 指当前程序的根目录APP_HOME
+        没注明唯一的节点可多个存在
+        required： 被声明required的属性值不能为空
+        
+                                            group
+                                         /  /  \  \  
+                                      /    /    \   \   
+                                   /     /       \    \                      
+                               node1   node2   node3  node4
+                             /       \                             
+                          /             \
+                       /                   \
+                    /                         \
+             serviceid1                       serviceid2
+            /       \                        /           \
+  serviceid1_name1  serviceid1_name2   serviceid2_name1  serviceid2_name2    
+-->
+<!--     
+    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;
+-->
+<application nodeid="1000" port="6560" lib="">  
+    
+    <!-- 
+        【已废弃，不再需要此节点】
+        所有服务所需的资源 
+    -->
+    <resources>          
+    </resources> 
+    
+    <!--
+       【节点全局唯一】 @since 2.3.0
+        全局Serivce执行的线程池， Application.workExecutor, 没配置该节点将自动创建一个。
+        threads： 线程数，为0表示不启用workExecutor，只用IO线程。默认: CPU核数, 核数=1的情况下默认值为2
+    -->
+    <executor threads="4"/>
+        
+    <!--
+       【节点全局唯一】
+        自动扫描时排除部分包路径
+        value：    排除lib.path与excludes中的正则表达式匹配的路径, 多个正则表达式用分号;隔开
+    -->
+    <excludelibs value="^.*mysql.*$;^.*kafka.*$"/>
+        
+    <!--
+       【节点全局唯一】
+        第三方服务发现管理接口
+        type：          类名，必须是org.redkale.cluster.ClusterAgent的子类
+        waits:          注销服务后是否需要等待检查周期时间后再进行Service销毁，默认值为：false
+                        当一个Service进行服务注销后，不能立刻销毁Service，因为健康检测是有间隔时间差的，
+                        需要等待一个健康检测周期时间，让其他进程都更新完服务列表。
+                        如果使用MQ，可以设置为false，如果对服务健壮性要求高，建议设置为true
+        protocols:      服务发现可以处理的协议， 默认值为: SNCP, 多个协议用分号;隔开
+        ports:          服务发现可以处理的端口， 多个端口用分号;隔开
+        ttls:           心跳频率，多少秒一次
+        xxxx:           自定义的字段属性，例如：CacheClusterAgent有source字段; ConsulClusterAgent有apiurl字段;
+    -->
+    <cluster type="org.redkalex.cluster.consul.ConsulClusterAgent" waits="false" protocols="SNCP" ports="7070;7071" xxx="xxx" />
+
+    <!--
+        MQ管理接口配置
+        不同MQ节点所配置的MQ集群不能重复。
+        MQ跟着协议走，所以mq的属性值需要被赋值在rest节点上, 由于SncpServlet是自动生成的，故SNCP协议下，mq属性值被赋值在service/services节点上
+        name:   服务的名称，用于监控识别，多个mq节点时只能有一个name为空的节点，mq.name不能重复,命名规则: 字母、数字、下划线
+        type： 实现类名，必须是org.redkale.mq.MessageAgent的子类
+        coder: MessageRecord的解析器类，必须是org.redkale.mq.MessageCoder<MessageRecord>的实现类, 
+               可对数据包进行加密解密，默认值：org.redkale.mq.MessageRecordCoder
+        MQ节点下的子节点配置没有固定格式, 根据MessageAgent实现方的定义来配置
+    -->
+    <mq name="" type="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内的进程必须在同一机房或局域网内
+        name:       服务组ID，长度不能超过11个字节. 默认为空字符串。 注意: name不能包含$符号。
+        protocol：  值范围：UDP TCP， 默认TCP
+        注意: 一个node只能所属一个group。只要存在protocol=SNCP的Server节点信息， 就必须有group节点信息。
+    -->
+    <group name="" protocol="TCP">
+        <!--
+            需要将本地node的addr与port列在此处。
+            同一个<node>节点值只能存在一个<group>节点内，即同一个addr+port只能属于一个group。
+            addr: required IP地址
+            port: required 端口
+        -->
+        <node addr="127.0.0.1" port="7070"/>
+    </group>
+
+    <!--
+       Application启动的监听事件,可配置多个节点
+       value: 类名，必须是ApplicationListener的子类
+    -->
+    <listener value="org.redkalex.xxx.XXXApplicationListener"/>
+        
+    <!-- 
+        【节点全局唯一】
+        全局的参数配置, 可以通过@Resource(name="property.xxxxxx") 进行注入<property>的信息, 被注解的字段类型只能是String、primitive class
+        如果name是system.property.开头的值将会在进程启动时进行System.setProperty("yyyy", "YYYYYY")操作。
+        如果name是mimetype.property.开头的值将会在进程启动时进行MimeType.add("yyyy", "YYYYYY")操作。
+        先加载子节点property，再加载load文件， 最后加载agent的实现子类。
+        load:  加载文件，多个用;隔开。
+        其他属性: 供org.redkale.boot.PropertiesAgentProvider使用判断
+        默认置入的system.property.的有：
+           System.setProperty("redkale.convert.pool.size", "128");
+           System.setProperty("redkale.convert.writer.buffer.defsize", "4096");
+           System.setProperty("redkale.trace.enable", "false");
+           
+        <properties>节点下也可包含非<property>节点.
+        非<property>其节点可以通过@Resource(name="properties.xxxxxx")进行注入, 被注解的字段类型只能是AnyValue、AnyValue[]
+    -->
+    <properties load="config.properties">
+        <property name="system.property.yyyy" value="YYYYYY"/>
+        <property name="xxxxxx" value="XXXXXXXX"/>
+        <property name="xxxxxx" value="XXXXXXXX"/>
+        <property name="xxxxxx" value="XXXXXXXX"/>
+    </properties>
+        
+    <!--
+        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个【已废弃 @since 2.3.0】
+        maxconns：           最大连接数, 小于1表示无限制， 默认: 0
+        maxbody:             request.body最大值， 默认: 64K
+        bufferCapacity:      ByteBuffer的初始化大小， TCP默认: 32K;  (HTTP 2.0、WebSocket，必须要16k以上); UDP默认: 8K
+        bufferPoolSize：     ByteBuffer池的大小，默认: 线程数*4
+        responsePoolSize：   Response池的大小，默认: 1024
+        aliveTimeoutSeconds: KeepAlive读操作超时秒数， 默认30， 0表示永久不超时; -1表示禁止KeepAlive
+        readTimeoutSeconds:  读操作超时秒数， 默认0， 0表示永久不超时
+        writeTimeoutSeconds: 写操作超时秒数， 默认0， 0表示永久不超时
+        interceptor:         启动/关闭NodeServer时被调用的拦截器实现类，必须是org.redkale.boot.NodeInterceptor的子类，默认为null
+    -->
+    <server protocol="HTTP" host="127.0.0.1" port="6060" root="root" lib=""> 
+        
+        <!-- 
+           【节点在<server>中唯一】
+           builder:             创建SSLContext的实现类, 可自定义，必须是org.redkale.net.SSLBuilder的子类
+           sslProvider:         java.security.Provider自定义的实现类，如第三方: org.conscrypt.OpenSSLProvider、org.bouncycastle.jce.provider.BouncyCastleProvider
+           jsseProvider:        java.security.Provider自定义的实现类，如第三方: org.conscrypt.JSSEProvider、   org.bouncycastle.jce.provider.BouncyCastleJsseProvider
+           protocol:            TLS版本，默认值: TLS
+           protocols:           设置setEnabledProtocols, 多个用,隔开 如: TLSv1.2,TLSv1.3
+           clientAuth:          WANT/NEED/NONE, 默认值: NONE
+           ciphers:             设置setEnabledCipherSuites, 多个用,隔开 如: TLS_RSA_WITH_AES_128_CBC_SHA256,TLS_RSA_WITH_AES_256_CBC_SHA256
+           keystorePass:        KEY密码
+           keystoreFile:        KEY文件 .jks
+           keystoreType:        KEY类型， 默认值为JKS
+           keystoreAlgorithm:   KEY文件的algorithm， 默认值为SunX509
+           truststorePass:      TRUST密码
+           truststoreFile:      TRUST文件
+           truststoreType:      TRUST类型， 默认值为JKS
+           truststoreAlgorithm: TRUST文件的algorithm， 默认值为SunX509
+        -->
+        <ssl builder=""/>
+        
+        <!-- 
+           加载所有的Service服务;
+           在同一个进程中同一个name同一类型的Service将共用同一个实例
+           autoload="true"  默认值. 自动加载classpath下所有的Service类  
+           autoload="false" 需要显著的指定Service类
+           mq:        所属的MQ管理器，当 protocol == SNCP 时该值才有效, 存在该属性表示Service的SNCP协议采用消息总线代理模式
+           includes： 当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
+           excludes： 当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开           
+           group:     所属组的节点, 不能指定多个group, 如果配置文件中存在多个SNCP协议的Server节点，需要显式指定group属性.
+                         当 protocol == SNCP 时 group表示当前Server与哪些节点组关联。
+                         当 protocol != SNCP 时 group只能是空或者一个group的节点值。
+                         特殊值"$remote", 视为通过第三方服务注册发现管理工具来获取远程模式的ip端口信息
+        -->
+        <services autoload="true" includes="" excludes="">
+
+            <!-- 显著加载指定的Service的接口类 -->
+            <service value="com.xxx.XXX1Service"/>
+            <!-- 
+               name:   显式指定name，覆盖默认的空字符串值。 注意: name不能包含$符号。
+               mq:     所属的MQ管理器，当 protocol == SNCP 时该值才有效, 存在该属性表示Service的SNCP协议采用消息总线代理模式
+               group:  显式指定group，覆盖<services>节点的group默认值。
+               ignore: 是否禁用， 默认为false。
+            -->
+            <service value="com.xxx.XXX2Service" name="" group="xxx"/>
+            <!--   给Service增加配置属性 -->
+            <service value="com.xxx.XXX1Service"> 
+                <!-- property值在public void init(AnyValue conf)方法中可以通过AnyValue properties=conf.getAnyValue("properties")获取 -->
+                <property name="xxxxxx" value="XXXXXXXX"/>  
+                <property name="xxxxxx" value="XXXXXXXX"/>
+            </service>
+        </services>
+        
+        <!-- 
+           加载所有的Filter服务;
+           autoload="true"  默认值.  
+           autoload="false" 需要显著的指定Filter类
+           includes：       当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
+           excludes：       当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开    
+        -->
+        <filters autoload="true" includes="" excludes="">
+            
+            <!-- 
+               显著加载指定的Filter类
+               value=: Filter类名。必须与Server的协议层相同，HTTP必须是HttpFilter
+               ignore: 是否禁用， 默认为false。
+            -->
+            <!-- 显著加载指定的Filter类 -->
+            <filter value="com.xxx.XXX1Filter"/>
+            
+            <!--   给Filter增加配置属性 -->
+            <filter value="com.xxx.XXX12Filter"> 
+                <!-- property值在public void init(AnyValue conf)方法中可以通过AnyValue properties=conf.getAnyValue("properties")获取 -->
+                <property name="xxxxxx" value="XXXXXXXX"/>  
+                <property name="xxxxxx" value="XXXXXXXX"/>
+            </filter>
+        </filters>
+        
+        <!-- 
+           REST的核心配置项
+           当Server为HTTP协议时, rest节点才有效。存在[rest]节点则Server启动时会加载REST服务, 节点可以多个,(WATCH协议不需要设置，系统会自动生成)
+           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中的正则表达式匹配的类, 多个正则表达式用分号;隔开
+        -->
+        <rest path="/pipes" base="org.redkale.net.http.HttpServlet" autoload="true" includes="" excludes="">
+            <!-- 
+               value:  Service类名，列出的表示必须被加载的Service对象
+               ignore: 是否忽略，设置为true则不会加载该Service对象，默认值为false
+            -->
+            <service value="com.xxx.XXXXService"/>
+            <!-- 
+               value:  WebSocket类名，列出的表示必须被加载且标记为@RestWebSocket的WebSocket对象
+               ignore: 是否忽略，设置为true则不会加载该RestWebSocket对象，默认值为false
+            -->
+            <websocket value="com.xxx.XXXXRestWebSocket"/>
+        </rest>
+        
+        <!--
+           【节点在<server>中唯一】
+           当Server为HTTP协议时, request节点才有效。
+           remoteaddr 节点: 替换请求方节点的IP地址， 通常请求方是由nginx等web静态服务器转发过的则需要配置该节点。
+           且value值只能是以request.headers.开头，表示从request.headers中获取对应的header值。
+           locale value值必须是request.headers.或request.parameters.开头。
+           例如下面例子获取request.getRemoteAddr()值，如果header存在X-RemoteAddress值则返回X-RemoteAddress值，不存在返回getRemoteAddress()。
+        -->
+        <request>
+            <remoteaddr value="request.headers.X-RemoteAddress"/>
+            <locale value="request.headers.locale" /> 
+            <rpc authenticator="org.redkale.net.http.HttpRpcAuthenticator的实现类"/>
+        </request>
+        
+        <!--
+           【节点在<server>中唯一】
+           当Server为HTTP协议时, response节点才有效。
+           contenttype: plain值为调用finish时的ContentType; 默认值: text/plain; charset=utf-8
+                        json值为调用finishJson时的ContentType; 默认值: application/json; charset=utf-8
+           defcookie 节点: 当response里输出的cookie没有指定domain 和path时，使用该节点的默认值。
+           addheader、setheader 的value值以request.parameters.开头则表示从request.parameters中获取对应的parameter值
+           addheader、setheader 的value值以request.headers.开头则表示从request.headers中获取对应的header值
+           例如下面例子是在Response输出header时添加两个header（一个addHeader， 一个setHeader）。
+           options 节点: 设置了该节点且auto=true，当request的method=OPTIONS自动设置addheader、setheader并返回200状态码
+           date 节点: 设置了该节点且period有值(单位：毫秒);返回response会包含Date头信息，默认为period=0
+                      period=0表示实时获取当前时间;
+                      period<0表示不设置date;
+                      period>0表示定时获取时间; 设置1000表示每秒刷新Date时间
+        -->
+        <response>
+            <content-type plain="text/plain; charset=utf-8" json="application/json; charset=utf-8"/>            
+            <defcookie domain="" path=""/>  
+            <addheader name="Access-Control-Allow-Origin" value="request.headers.Origin" />  <!-- 可多节点 -->
+            <setheader name="Access-Control-Allow-Headers" value="request.headers.Access-Control-Request-Headers"/>  <!-- 可多节点 -->
+            <setheader name="Access-Control-Allow-Credentials" value="true"/>
+            <options auto="true" />
+            <date period="0" />
+        </response>
+        <!-- 
+           【节点在<server>中唯一】
+           当Server为HTTP协议时，render才有效. 指定输出引擎的实现类
+           value: 输出引擎的实现类, 必须是org.redkale.net.http.HttpRender的子类
+           suffixs: 引擎文件名后缀，多个用;隔开，默认值为: .htel
+        -->
+        <render value="org.redkalex.htel.HttpTemplateRender" suffixs=".htel"/>
+        <!-- 
+           【节点在<server>中唯一】
+           当Server为HTTP协议时，ResourceServlet才有效. 默认存在一个有默认属性的resource-servlet节点
+           webroot: web资源的根目录, 默认取server节点中的root值
+           servlet: 静态资源HttpServlet的实现，默认使用HttpResourceServlet
+           index :  启始页，默认值：index.html
+        -->
+        <resource-servlet webroot="root" index="index.html">
+            <!--
+                【节点在<resource-servlet>中唯一】
+                资源缓存的配置, 默认存在一个含默认属性的caches节点
+                limit:     资源缓存最大容量， 默认: 0, 为0表示不缓存， 单位可以是B、K、M、G，不区分大小写
+                lengthmax: 可缓存的文件大小上限， 默认: 1M（超过1M的文件不会被缓存）
+                watch:     是否监控缓存文件的变化， 默认为false，不监控
+            -->
+            <cache  limit="0M" lengthmax="1M" watch="false"/>
+            <!--
+               支持类似nginx中的rewrite， 目前只支持静态资源对静态资源的跳转。
+               type:    匹配的类型, 目前只支持location(匹配requestURI), 默认: location
+               match:   匹配的正则表达式
+               forward: 需跳转后的资源链接
+               例如下面例子是将/xxx-yyy.html的页面全部跳转到/xxx.html
+            -->
+            <rewrite type="location" match="^/([^-]+)-[^-\.]+\.html(.*)" forward="/$1.html"/>
+        </resource-servlet>
+        <!-- 
+           加载所有的Servlet服务;
+           path:            servlet的ContextPath前缀 默认为空
+           autoload="true"  默认值. 自动加载classpath下所有的Servlet类 
+           autoload="false" 需要显著的指定Service类
+           includes：       当autoload="true"， 拉取类名与includes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
+           excludes：       当autoload="true"， 排除类名与excludes中的正则表达式匹配的类, 多个正则表达式用分号;隔开
+        -->
+        <servlets path="/pipes" autoload="true" includes="" excludes="">
+            <!-- 
+               显著加载指定的Servlet类
+               value=: Servlet类名。必须与Server的协议层相同，HTTP必须是HttpServlet
+               ignore: 是否禁用， 默认为false。
+            -->
+            <servlet value="com.xxx.XXX1Servlet" />
+            <servlet value="com.xxx.XXX2Servlet" />
+            <servlet value="com.xxx.XXX3Servlet" >
+                <property name="xxxxxx" value="XXXXXXXX"/>
+                <property name="yyyyyy" value="YYYYYYYY"/>
+            </servlet>
+        </servlets>
+    </server>
+    
+    <server protocol="SNCP" host="127.0.0.1" port="7070" root="root" lib=""> 
+        <!-- 参数完全同上 -->
+        <services autoload="true" includes="" excludes="" />
+    </server>
+    
+</application>

src/main/java/META-INF/logging-template.properties

@@ -15,11 +15,16 @@ com.sun.level = INFO
 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
+java.util.logging.FileHandler.pattern = ${APP_HOME}/logs-%tY%tm/log-%tY%tm%td.log
 #java.util.logging.FileHandler.unusual \u5c5e\u6027\u8868\u793a\u5c06 WARNING\u3001SEVERE \u7ea7\u522b\u7684\u65e5\u5fd7\u590d\u5236\u5199\u5165\u5355\u72ec\u7684\u6587\u4ef6\u4e2d
-java.util.logging.FileHandler.unusual = ${APP_HOME}/logs-%m/log-warnerr-%d.log
+java.util.logging.FileHandler.unusual = ${APP_HOME}/logs-%tY%tm/log-warnerr-%tY%tm%td.log
 #\u9700\u8981\u5c4f\u853d\u6d88\u606f\u5185\u5bb9\u7684\u6b63\u5219\u8868\u8fbe\u5f0f
-java.util.logging.FileHandler.denyreg = 
+java.util.logging.FileHandler.denyregx = 
 java.util.logging.FileHandler.append = true
 
 #java.util.logging.ConsoleHandler.level = FINE
+
+#\u5c06\u65e5\u5fd7\u5199\u8fdbSearchSource, \u5fc5\u987b\u6307\u5b9asource\u8d44\u6e90\u540d\uff0c\u5728source.properties\u4e2d\u5b9a\u4e49
+#java.util.logging.SearchHandler.source = platfsearch
+#\u6307\u5b9a\u5199\u8fdbSearchSource\u7684\u8868\u540d\uff0c\u9ed8\u8ba4\u503c\u4e3alog-record
+#java.util.logging.SearchHandler.tag = log-${APP_NAME}-%tY%tm%td

src/main/java/META-INF/persistence-template.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+  【================================================ 已废弃 ================================================】建议使用 source.properties
+   其配置算是标准的JPA配置文件的缩略版
+-->
+<persistence>	
+    <!-- 系统基本库 -->
+    <persistence-unit name="demouser">
+        <properties>
+            <!-- 
+                DataSource的实现类，没有设置默认为org.redkale.source.DataJdbcSource的实现，使用常规基于JDBC的数据库驱动一般无需设置
+            -->
+            <property name="javax.persistence.datasource" value="org.redkale.source.DataJdbcSource"/>
+            <!-- 
+                是否开启缓存(标记为@Cacheable的Entity类)，值目前只支持两种： ALL: 所有开启缓存。 NONE: 关闭所有缓存， 非NONE字样统一视为ALL
+            -->
+            <property name="javax.persistence.cachemode" value="ALL"/>
+            <!-- 
+                是否自动建表当表不存在的时候， 目前只支持mysql、postgres， 默认为false
+            -->
+            <property name="javax.persistence.table.autoddl" value="false"/>
+            
+            <!-- 多个URL用;隔开，如分布式SearchSource需要配多个URL -->
+            <property name="javax.persistence.jdbc.url" value="jdbc:mysql://127.0.0.1:3306/dbuser?characterEncoding=utf8"/>
+            <property name="javax.persistence.jdbc.user" value="root"/>
+            <property name="javax.persistence.jdbc.password" value="123456"/>
+            
+            <!-- 最大连接数，默认值：CPU数 -->
+            <property name="javax.persistence.connections.limit" value="12"/>
+            
+            <!--  包含的SQL模板，相当于反向LIKE，不同的JDBC驱动的SQL语句不一样，Redkale内置了MySQL的语句 -->
+            <property name="javax.persistence.contain.sqltemplate" value="LOCATE(#{keystr}, #{column}) > 0"/>
+            <property name="javax.persistence.notcontain.sqltemplate" value="LOCATE(#{keystr}, #{column}) = 0"/>
+            
+            <!--  复制表结构的SQL模板，Redkale内置了MySQL的语句 -->
+            <property name="javax.persistence.tablenotexist.sqlstates" value="42000;42S02"/>
+            <property name="javax.persistence.tablecopy.sqltemplate" value="CREATE TABLE IF NOT EXISTS #{newtable} LIKE #{oldtable}"/>
+           
+        </properties>
+    </persistence-unit>
+    <!-- IM消息库 -->
+    <persistence-unit name="demoim">
+        <properties>
+            <!-- jdbc:mysql://127.0.0.1:3306/dbim?allowPublicKeyRetrieval=true&amp;rewriteBatchedStatements=true&amp;serverTimezone=UTC&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.user" value="root"/>
+            <property name="javax.persistence.jdbc.password" value="123456"/>
+        </properties>
+    </persistence-unit>
+</persistence>

src/main/java/META-INF/source-template.properties

@@ -0,0 +1,50 @@
+
+# CacheSource   @Resource(name="usersession")
+# type\u53ef\u4ee5\u4e0d\u7528\u8bbe\u7f6e\uff0c\u6846\u67b6\u4f1a\u6839\u636eurl\u5224\u65ad\u4f7f\u7528\u54ea\u4e2aCacheSource\u5b9e\u73b0\u7c7b
+redkale.cachesource.usersession.type = org.redkalex.cache.redis.RedisCacheSource
+# \u6700\u5927\u8fde\u63a5\u6570
+redkale.cachesource.usersession.maxconns = 16
+# \u8282\u70b9\u5730\u5740
+redkale.cachesource.usersession.node[0].url = redis://127.0.0.1:6363
+# \u8282\u70b9\u5bc6\u7801
+redkale.cachesource.usersession.node[0].password = 12345678
+# \u8282\u70b9db
+redkale.cachesource.usersession.node[0].db = 0
+
+#\u7b80\u5316\u5199\u6cd5: \u53ef\u4ee5\u4e0d\u7528.node[0], \u5c06\u53c2\u6570\u90fd\u5408\u5e76\u5230url\u4e2d
+redkale.cachesource.usersession.url = redis://user:123456@127.0.0.1:6363?db=0
+
+
+# DataSource   @Resource(name="platf")
+# type\u53ef\u4ee5\u4e0d\u7528\u8bbe\u7f6e\uff0c\u6846\u67b6\u4f1a\u6839\u636eurl\u5224\u65ad\u4f7f\u7528\u54ea\u4e2aDataSource\u5b9e\u73b0\u7c7b\uff0c\u9ed8\u8ba4\u503c: org.redkale.source.DataJdbcSource
+redkale.datasource.platf.type = org.redkale.source.DataJdbcSource
+# \u662f\u5426\u5f00\u542f\u7f13\u5b58(\u6807\u8bb0\u4e3a@Cacheable\u7684Entity\u7c7b)\uff0c\u503c\u76ee\u524d\u53ea\u652f\u6301\u4e24\u79cd\uff1a ALL: \u6240\u6709\u5f00\u542f\u7f13\u5b58\u3002 NONE: \u5173\u95ed\u6240\u6709\u7f13\u5b58\uff0c \u975eNONE\u5b57\u6837\u7edf\u4e00\u89c6\u4e3aALL
+redkale.datasource.platf.cachemode = ALL
+# \u662f\u5426\u81ea\u52a8\u5efa\u8868\u5f53\u8868\u4e0d\u5b58\u5728\u7684\u65f6\u5019\uff0c \u76ee\u524d\u53ea\u652f\u6301mysql\u3001postgres\uff0c \u9ed8\u8ba4\u4e3afalse
+redkale.datasource.platf.table-autoddl = false
+# \u7528\u6237
+redkale.datasource.platf.user = root
+# \u5bc6\u7801
+redkale.datasource.platf.password = 12345678
+# \u591a\u4e2aURL\u7528;\u9694\u5f00\uff0c\u5982\u5206\u5e03\u5f0fSearchSource\u9700\u8981\u914d\u591a\u4e2aURL
+redkale.datasource.platf.url = jdbc:mysql://127.0.0.1:3306/platf?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8
+# \u6700\u5927\u8fde\u63a5\u6570\uff0c\u9ed8\u8ba4\u503c\uff1aCPU\u6570
+redkale.datasource.platf.maxconns = 16
+# \u5305\u542b\u7684SQL\u6a21\u677f\uff0c\u76f8\u5f53\u4e8e\u53cd\u5411LIKE\uff0c\u4e0d\u540c\u7684JDBC\u9a71\u52a8\u7684SQL\u8bed\u53e5\u4e0d\u4e00\u6837\uff0cRedkale\u5185\u7f6e\u4e86MySQL\u7684\u8bed\u53e5
+redkale.datasource.platf.contain-sqltemplate = LOCATE(#{keystr}, #{column}) > 0
+# \u5305\u542b\u7684SQL\u6a21\u677f\uff0c\u76f8\u5f53\u4e8e\u53cd\u5411LIKE\uff0c\u4e0d\u540c\u7684JDBC\u9a71\u52a8\u7684SQL\u8bed\u53e5\u4e0d\u4e00\u6837\uff0cRedkale\u5185\u7f6e\u4e86MySQL\u7684\u8bed\u53e5
+redkale.datasource.platf.notcontain-sqltemplate = LOCATE(#{keystr}, #{column}) = 0
+# \u590d\u5236\u8868\u7ed3\u6784\u7684SQL\u6a21\u677f\uff0cRedkale\u5185\u7f6e\u4e86MySQL\u7684\u8bed\u53e5
+redkale.datasource.platf.tablenotexist-sqlstates = 42000;42S02
+# \u590d\u5236\u8868\u7ed3\u6784\u7684SQL\u6a21\u677f\uff0cRedkale\u5185\u7f6e\u4e86MySQL\u7684\u8bed\u53e5
+redkale.datasource.platf.tablecopy-sqltemplate = CREATE TABLE IF NOT EXISTS #{newtable} LIKE #{oldtable}
+
+
+# DataSource \u8bfb\u5199\u5206\u79bb
+redkale.datasource.platf.read.url = jdbc:mysql://127.0.0.1:3306/platf_r?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8
+redkale.datasource.platf.read.user = root
+redkale.datasource.platf.read.password = 12345678
+
+redkale.datasource.platf.write.url = jdbc:mysql://127.0.0.1:3306/platf_w?allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&serverTimezone=UTC&characterEncoding=utf8
+redkale.datasource.platf.write.user = root
+redkale.datasource.platf.write.password = 12345678

src/main/java/javax/annotation/Priority.java

@@ -0,0 +1,39 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package javax.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 值越大，优先级越高
+ *
+ * @since Common Annotations 1.2
+ *
+ * @deprecated replace by org.redkale.annotation.Priority
+ */
+@Deprecated(since = "2.8.0")
+@Target({ElementType.TYPE})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Priority {
+
+    /**
+     * 优先级值
+     *
+     * @return int
+     */
+    int value();
+}

src/main/java/javax/annotation/Resource.java

@@ -0,0 +1,83 @@
+/*
+ * To change this license header, choose License Headers in Project Properties.
+ * To change this template file, choose Tools | Templates
+ * and open the template in the editor.
+ */
+package javax.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * @since Common Annotations 1.0
+ *
+ * @deprecated replace by org.redkale.annotation.Resource
+ */
+@Deprecated(since = "2.8.0")
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Resource {
+
+//    /**
+//     * AuthenticationType
+//     */
+//    @Deprecated
+//    public enum AuthenticationType {
+//        /**
+//         * @deprecated
+//         */
+//        CONTAINER,
+//        /**
+//         * @deprecated
+//         */
+//        APPLICATION
+//    }
+//    
+    /**
+     * 资源名称
+     *
+     * @return String
+     */
+    public String name() default "";
+
+    /**
+     * 依赖注入的类型
+     *
+     * @return Class
+     */
+    public Class<?> type() default Object.class;
+//
+//    /**
+//     *
+//     * @return AuthenticationType
+//     */
+//    @Deprecated
+//    public AuthenticationType authenticationType() default AuthenticationType.CONTAINER;
+//
+//    /**
+//     *
+//     * @return boolean
+//     */
+//    @Deprecated
+//    public boolean shareable() default true;
+//
+//    /**
+//     *
+//     * @return String
+//     */
+//    @Deprecated
+//    public String description() default "";
+//
+//    /**
+//     *
+//     * @return String
+//     */
+//    @Deprecated
+//    public String mappedName() default "";
+//
+//    /**
+//     *
+//     * @return String
+//     */
+//    @Deprecated
+//    public String lookup() default "";
+}

src/main/java/javax/persistence/Cacheable.java

@@ -17,8 +17,7 @@ package javax.persistence;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Target;
+import java.lang.annotation.*;
 
 /**
  * Specifies whether an entity should be cached if caching is enabled
@@ -33,7 +32,10 @@ import java.lang.annotation.Target;
  * not be cached by the provider.
  *
  * @since Java Persistence 2.0
+ * 
+ * @deprecated replace by org.redkale.persistence.Cacheable
  */
+@Deprecated(since = "2.8.0")
 @Target({TYPE})
 @Retention(RUNTIME)
 public @interface Cacheable {
@@ -51,4 +53,12 @@ public @interface Cacheable {
      * @return int
      */
     int interval() default 0;
+
+    /**
+     * DataSource是否直接返回对象的真实引用， 而不是copy一份
+     *
+     * @return boolean
+     */
+    boolean direct() default false;
+
 }

src/main/java/javax/persistence/Column.java

@@ -0,0 +1,154 @@
+/** *****************************************************************************
+ * 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 static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+
+/**
+ * Specifies the mapped column for a persistent property or field.
+ * If no <code>Column</code> annotation is specified, the default values apply.
+ *
+ * <blockquote><pre>
+ *    Example 1:
+ *
+ *    &#064;Column(name="DESC", nullable=false, length=512)
+ *    public String getDescription() { return description; }
+ *
+ *    Example 2:
+ *
+ *    &#064;Column(name="DESC",
+ *            columnDefinition="CLOB NOT NULL",
+ *            table="EMP_DETAIL")
+ *    &#064;Lob
+ *    public String getDescription() { return description; }
+ *
+ *    Example 3:
+ *
+ *    &#064;Column(name="ORDER_COST", updatable=false, precision=12, scale=2)
+ *    public BigDecimal getCost() { return cost; }
+ *
+ * </pre></blockquote>
+ *
+ *
+ * @since Java Persistence 1.0
+ * 
+ * @deprecated replace by org.redkale.persistence.Column
+ */
+@Deprecated(since = "2.8.0") 
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+public @interface Column {
+
+    /**
+     * (Optional) The name of the column. Defaults to
+     * the property or field name.
+     *
+     * @return String
+     */
+    String name() default "";
+
+    /**
+     * (Optional) The comment of the column.
+     *
+     * @return String
+     */
+    String comment() default "";
+
+    /**
+     * (Optional) Whether the column is a unique key. This is a
+     * shortcut for the <code>UniqueConstraint</code> annotation at the table
+     * level and is useful for when the unique key constraint
+     * corresponds to only a single column. This constraint applies
+     * in addition to any constraint entailed by primary key mapping and
+     * to constraints specified at the table level.
+     *
+     * @return boolean
+     */
+    boolean unique() default false;
+
+    /**
+     * (Optional) Whether the database column is required.
+     *
+     * @return boolean
+     */
+    boolean nullable() default true;
+
+    /**
+     * for OpenAPI Specification 3
+     *
+     * @return String
+     */
+    String example() default "";
+
+    /**
+     * (Optional) Whether the column is included in SQL INSERT
+     * statements generated by the persistence provider.
+     *
+     * @return boolean
+     */
+    boolean insertable() default true;
+
+    /**
+     * (Optional) Whether the column is included in SQL UPDATE
+     * statements generated by the persistence provider.
+     *
+     * @return boolean
+     */
+    boolean updatable() default true;
+
+    /**
+     * (Optional) The name of the table that contains the column.
+     * If absent the column is assumed to be in the primary table.
+     *
+     * @return String
+     */
+    @Deprecated
+    String table() default "";
+
+    /**
+     * (Optional) The column length. (Applies only if a
+     * string-valued column is used.)
+     * if type==String and length == 65535 then sqltype is TEXT   <br>
+     * if type==String and length &#60;= 16777215 then sqltype is MEDIUMTEXT   <br>
+     * if type==String and length &#62; 16777215 then sqltype is LONGTEXT   <br>
+     * if type==byte[] and length &#60;= 65535 then sqltype is BLOB   <br>
+     * if type==byte[] and length &#60;= 16777215 then sqltype is MEDIUMBLOB   <br>
+     * if type==byte[] and length &#62; 16777215 then sqltype is LONGBLOB   <br>
+     *
+     * @return int
+     */
+    int length() default 255;
+
+    /**
+     * (Optional) The precision for a decimal (exact numeric)
+     * column. (Applies only if a decimal column is used.)
+     * Value must be set by developer if used when generating
+     * the DDL for the column.
+     *
+     * @return int
+     */
+    int precision() default 0;
+
+    /**
+     * (Optional) The scale for a decimal (exact numeric) column.
+     * (Applies only if a decimal column is used.)
+     *
+     * @return int
+     */
+    int scale() default 0;
+}

src/main/java/javax/persistence/Entity.java

@@ -15,18 +15,20 @@
  ******************************************************************************/ 
 package javax.persistence;
 
-import java.lang.annotation.Target;
-import java.lang.annotation.Retention;
-import java.lang.annotation.Documented;
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.*;
 
 /**
  * Specifies that the class is an entity. This annotation is applied to the
  * entity class.
  * 
  * @since Java Persistence 1.0
+ * 
+ * @deprecated replace by org.redkale.persistence.Entity
  */
+@Deprecated(since = "2.8.0")
+@Inherited
 @Documented
 @Target(TYPE)
 @Retention(RUNTIME)

src/main/java/javax/persistence/Id.java

@@ -0,0 +1,56 @@
+/*******************************************************************************
+ * 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 static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+
+/**
+ * Specifies the primary key of an entity.
+ * The field or property to which the <code>Id</code> annotation is applied 
+ * should be one of the following types: any Java primitive type; 
+ * any primitive wrapper type; 
+ * <code>String</code>; 
+ * <code>java.util.Date</code>; 
+ * <code>java.sql.Date</code>; 
+ * <code>java.math.BigDecimal</code>;
+ * <code>java.math.BigInteger</code>.
+ *
+ * <p>The mapped column for the primary key of the entity is assumed 
+ * to be the primary key of the primary table. If no <code>Column</code> annotation 
+ * is specified, the primary key column name is assumed to be the name 
+ * of the primary key property or field.
+ *
+ * <pre>
+ *   Example:
+ *
+ *   &#064;Id
+ *   public Long getId() { return id; }
+ * </pre>
+ *
+ * @see Column
+ * see GeneratedValue
+ *
+ * @since Java Persistence 1.0
+ * 
+ * @deprecated replace by org.redkale.persistence.Id
+ */
+@Deprecated(since = "2.8.0")
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+
+public @interface Id {}

src/main/java/javax/persistence/Index.java

@@ -0,0 +1,71 @@
+/** *****************************************************************************
+ * Copyright (c) 2011 - 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
+ *
+ ***************************************************************************** */
+package javax.persistence;
+
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.*;
+
+/**
+ * Used in schema generation to specify creation of an index.
+ * <p>
+ * Note that it is not necessary to specify an index for a primary key,
+ * as the primary key index will be created automatically.
+ *
+ * <p>
+ * The syntax of the <code>columnList</code> element is a
+ * <code>column_list</code>, as follows:
+ *
+ * <pre>
+ *    column::= index_column [,index_column]*
+ *    index_column::= column_name [ASC | DESC]
+ * </pre>
+ *
+ * <p>
+ * If <code>ASC</code> or <code>DESC</code> is not specified,
+ * <code>ASC</code> (ascending order) is assumed.
+ *
+ * @since Java Persistence 2.1
+ * 
+ * @deprecated replace by org.redkale.persistence.Index
+ *
+ */
+@Deprecated(since = "2.8.0")
+@Target({})
+@Retention(RUNTIME)
+public @interface Index {
+
+    /**
+     * (Optional) The name of the index; defaults to a provider-generated name.
+     *
+     * @return String
+     */
+    String name() default "";
+
+    /**
+     * (Required) The names of the columns to be included in the index,
+     * in order.
+     *
+     * @return String
+     */
+    String columnList();
+
+    /**
+     * (Optional) Whether the index is unique.
+     *
+     * @return boolean
+     */
+    boolean unique() default false;
+
+}

src/main/java/javax/persistence/Table.java

@@ -0,0 +1,94 @@
+/** *****************************************************************************
+ * 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 static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.*;
+
+/**
+ * Specifies the primary table for the annotated entity. Additional
+ * tables may be specified using SecondaryTable or SecondaryTables annotation.
+ *
+ * <p>
+ * If no <code>Table</code> annotation is specified for an entity
+ * class, the default values apply.
+ *
+ * <pre>
+ *    Example:
+ *
+ *    &#064;Entity
+ *    &#064;Table(name="CUST", schema="RECORDS")
+ *    public class Customer { ... }
+ * </pre>
+ *
+ * @since Java Persistence 1.0
+ * 
+ * @deprecated replace by org.redkale.persistence.Table
+ */
+@Deprecated(since = "2.8.0")
+@Target(TYPE)
+@Retention(RUNTIME)
+public @interface Table {
+
+    /**
+     * (Optional) The name of the table.
+     * <p>
+     * Defaults to the entity name.
+     *
+     * @return String
+     */
+    String name() default "";
+
+    /** (Optional) The catalog of the table.
+     * <p>
+     * Defaults to the default catalog.
+     *
+     * @return String
+     */
+    String catalog() default "";
+
+    /**
+     * (Optional) Unique constraints that are to be placed on
+     * the table. These are only used if table generation is in
+     * effect. These constraints apply in addition to any constraints
+     * specified by the <code>Column</code> and <code>JoinColumn</code>
+     * annotations and constraints entailed by primary key mappings.
+     * <p>
+     * Defaults to no additional constraints.
+     * @return UniqueConstraint[]
+     */
+    UniqueConstraint[] uniqueConstraints() default {};
+
+    /**
+     * (Optional) Indexes for the table. These are only used if
+     * table generation is in effect. Note that it is not necessary
+     * to specify an index for a primary key, as the primary key
+     * index will be created automatically.
+     *
+     * @return indexes
+     * @since Java Persistence 2.1
+     */
+    Index[] indexes() default {};
+
+    /**
+     * comment
+     * 
+     * @return String
+     */
+    String comment() default "";
+
+}

src/main/java/javax/persistence/Transient.java

@@ -0,0 +1,46 @@
+/*******************************************************************************
+ * 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 static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+
+/**
+ * Specifies that the property or field is not persistent. It is used
+ * to annotate a property or field of an entity class, mapped
+ * superclass, or embeddable class.
+ *
+ * <pre>
+ *    Example:
+ *
+ *    &#064;Entity
+ *    public class Employee {
+ *        &#064;Id int id;
+ *        &#064;Transient User currentUser;
+ *        ...
+ *    }
+ * </pre>
+ *
+ * @since Java Persistence 1.0
+ * 
+ * @deprecated replace by org.redkale.persistence.Transient
+ */
+@Deprecated(since = "2.8.0")
+@Target({METHOD, FIELD})
+@Retention(RUNTIME)
+
+public @interface Transient {}

src/main/java/javax/persistence/UniqueConstraint.java

@@ -0,0 +1,58 @@
+/** *****************************************************************************
+ * 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 static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.*;
+
+/**
+ * Specifies that a unique constraint is to be included in
+ * the generated DDL for a primary or secondary table.
+ *
+ * <pre>
+ *    Example:
+ *    &#064;Entity
+ *    &#064;Table(
+ *        name="EMPLOYEE",
+ *        uniqueConstraints=
+ *            &#064;UniqueConstraint(columnNames={"EMP_ID", "EMP_NAME"})
+ *    )
+ *    public class Employee { ... }
+ * </pre>
+ *
+ * @since Java Persistence 1.0
+ * 
+ * @deprecated replace by org.redkale.persistence.UniqueConstraint
+ */
+@Deprecated(since = "2.8.0")
+@Target({})
+@Retention(RUNTIME)
+public @interface UniqueConstraint {
+
+    /** (Optional) Constraint name. A provider-chosen name will be chosen
+     * if a name is not specified.
+     *
+     * @return String
+     * @since Java Persistence 2.0
+     */
+    String name() default "";
+
+    /** (Required) An array of the column names that make up the constraint.
+     *
+     * @return String[]
+     */
+    String[] columnNames();
+}

src/main/java/module-info.java

@@ -4,31 +4,41 @@
  *
  * @author zhangjx
  *
+ */
 module org.redkale {
 
     requires java.base;
-    requires java.logging;
-    requires java.xml;
+    requires java.logging;    
+    requires java.net.http;
     requires java.sql;
-
     requires jdk.unsupported;  //sun.misc.Unsafe
 
-    exports javax.annotation;
-    exports javax.persistence;
-
+    exports org.redkale.annotation;
+    exports org.redkale.asm;
     exports org.redkale.boot;
     exports org.redkale.boot.watch;
+    exports org.redkale.cluster;
     exports org.redkale.convert;
     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.client;
     exports org.redkale.net.http;
     exports org.redkale.net.sncp;
+    exports org.redkale.persistence;
     exports org.redkale.service;
     exports org.redkale.source;
     exports org.redkale.util;
     exports org.redkale.watch;
     
+    uses org.redkale.boot.PropertiesAgentProvider;
+    uses org.redkale.cluster.ClusterAgentProvider;
+    uses org.redkale.convert.ConvertProvider;
+    uses org.redkale.mq.MessageAgentProvider;
+    uses org.redkale.source.CacheSourceProvider;
+    uses org.redkale.source.DataSourceProvider;
+    uses org.redkale.util.ResourceAnnotationProvider;
+    
 }
-*/

src/main/java/org/redkale/annotation/AutoLoad.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.redkale.util;
+package org.redkale.annotation;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

src/main/java/org/redkale/annotation/Bean.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.annotation;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 标记参数bean
+ *
+ * @since 2.5.0
+ */
+@Inherited
+@Documented
+@Target(TYPE)
+@Retention(RUNTIME)
+public @interface Bean {
+
+}

src/main/java/org/redkale/annotation/Command.java

@@ -0,0 +1,50 @@
+/*
+ * 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.annotation;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 接收命令的标记， 只能标记在本地模式下Service里参数为(String)或(String, String[])的public方法上
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ *
+ * @since 2.1.0
+ */
+@Inherited
+@Documented
+@Target({METHOD})
+@Retention(RUNTIME)
+public @interface Command {
+
+    /**
+     * 命令号，没有指定值则接收所有的命令
+     *
+     * @return String
+     */
+    String value() default "";
+
+    /**
+     * 参数帮助说明，在value不为空命令redkale --help时显示
+     *
+     * @return String
+     *
+     * @since 2.7.0
+     */
+    String description() default "";
+
+    /**
+     * 描述
+     *
+     * @return String
+     */
+    String comment() default "";
+}

src/main/java/org/redkale/annotation/Comment.java

@@ -0,0 +1,29 @@
+/*
+ * 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.annotation;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.*;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 标记注释，备注
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+@Inherited
+@Documented
+@Target({TYPE, METHOD, FIELD, PARAMETER, CONSTRUCTOR, LOCAL_VARIABLE, ANNOTATION_TYPE, TYPE_PARAMETER})
+@Retention(RUNTIME)
+public @interface Comment {
+
+    String name() default "";
+
+    String value();
+}

src/main/java/org/redkale/annotation/Component.java

@@ -0,0 +1,24 @@
+package org.redkale.annotation;
+
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+import java.lang.annotation.*;
+
+/**
+ * 标记Component的Service类特点: <br>
+ * 1、直接构造, 不使用Sncp动态构建对象 <br>
+ * 2、不会生成对应协议的Servlet <br>
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @since 2.8.0
+ */
+@Inherited
+@Documented
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface Component {
+
+}

src/main/java/org/redkale/annotation/ConstructorParameters.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.redkale.util;
+package org.redkale.annotation;
 
 import java.lang.annotation.*;
 import static java.lang.annotation.ElementType.*;

src/main/java/org/redkale/annotation/LogExcludeLevel.java

@@ -0,0 +1,46 @@
+/*
+ * 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.annotation;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 等于level日志级别且包含keys字符串的日志才会被排除 <br>
+ *
+ * <blockquote><pre>
+ * &#64;LogExcludeLevel(levels = {"FINEST"}, keys = {"SET username ="})
+ * public class UserRecord {
+ *      public int userid;
+ *      public String username = "";
+ * }
+ *
+ * 这样当调用DataSource对UserRecord对象进行操作时，拼接的SQL语句含"SET username ="字样的都会在FINEST日志级别过滤掉
+ * </pre></blockquote>
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+@Documented
+@Target({TYPE})
+@Retention(RUNTIME)
+@Repeatable(LogExcludeLevel.LogExcludeLevels.class)
+public @interface LogExcludeLevel {
+
+    String[] levels();
+
+    String[] keys();
+
+    @Documented
+    @Target({TYPE})
+    @Retention(RUNTIME)
+    @interface LogExcludeLevels {
+
+        LogExcludeLevel[] value();
+    }
+}

src/main/java/org/redkale/annotation/LogLevel.java

@@ -0,0 +1,26 @@
+/*
+ * 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.annotation;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.TYPE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * 被标记的日志级别以上的才会被记录
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+@Documented
+@Target({TYPE})
+@Retention(RUNTIME)
+public @interface LogLevel {
+
+    String value();
+}

src/main/java/org/redkale/annotation/NonBlocking.java

@@ -0,0 +1,27 @@
+/*
+ *
+ */
+package org.redkale.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 非阻塞模式标记， 标记在Service类和方法、Filter类、HttpServlet类上  <br>
+ * 一般情况下，没有显注此注解的方法视为阻塞时， 以下两种情况除外:  <br>
+ * 1、返回类型是CompletionStage <br>
+ * 2、返回类型是void且参数存在CompletionHandler类型 <br>
+ * 阻塞模式的方法会在work线程池中运行， 非阻塞在IO线程中运行。
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ *
+ * @since 2.8.0
+ */
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface NonBlocking {  //不可使用@Inherited，防止被继承, 见HttpServlet.preExecute/authenticate/execute
+
+    boolean value() default true;
+}

src/main/java/org/redkale/annotation/Nonnull.java

@@ -0,0 +1,21 @@
+/*
+ *
+ */
+package org.redkale.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 标记值可以为null
+ *
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ *
+ * @since 2.8.0
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Nonnull {
+
+}

src/main/java/org/redkale/annotation/Nullable.java

@@ -0,0 +1,21 @@
+/*
+ *
+ */
+package org.redkale.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * 标记值可以为null
+ *
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ *
+ * @since 2.8.0
+ */
+@Documented
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Nullable {
+
+}

src/main/java/org/redkale/annotation/Priority.java

@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package javax.annotation;
+package org.redkale.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
@@ -23,11 +23,17 @@ import java.lang.annotation.Target;
 
 /**
  * 值越大，优先级越高
- * 
+ *
  * @since Common Annotations 1.2
  */
 @Target({ElementType.TYPE})
 @Retention(RetentionPolicy.RUNTIME)
 public @interface Priority {
+
+    /**
+     * 优先级值
+     *
+     * @return int
+     */
     int value();
 }

src/main/java/org/redkale/annotation/Resource.java

@@ -0,0 +1,52 @@
+/*
+ * 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.annotation;
+
+import java.lang.annotation.*;
+
+/**
+ * &#64;Resource(name = "$") 表示资源name采用所属对象的name  <br>
+ * &#64;Resource(name = "@name") 表示资源对象自身的name  <br>
+ * &#64;Resource(name = "@type") 表示资源对象自身的类型  <br>
+ *
+ * @since Common Annotations 1.0
+ *
+ * @since 2.8.0
+ */
+@Target({ElementType.TYPE, ElementType.METHOD, ElementType.FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface Resource {
+
+    /**
+     * 是否必须存在
+     *
+     * @return boolean
+     *
+     * @since 2.8.0
+     */
+    public boolean required() default true;
+
+    /**
+     * 资源名称  <br>
+     * <blockquote><pre>
+     * name规则:
+     * 1: "$"有特殊含义, 表示资源本身，"$"不能单独使用
+     * 2: "@name"、"@type"有特殊含义
+     * 3: 只能是字母、数字、(短横)-、(下划线)_、点(.)的组合
+     * </pre></blockquote>
+     *
+     * @return String
+     */
+    public String name() default "";
+
+    /**
+     * 依赖注入的类型
+     *
+     * @return Class
+     */
+    public Class<?> type() default Object.class;
+
+}

src/main/java/org/redkale/annotation/ResourceListener.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.annotation;
+
+import java.lang.annotation.*;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+/**
+ * &#64;Resource资源被更新时的监听事件, 本注解只能标记在方法参数为ResourceEvent[]上 <br>
+ * 注意: 一个类只能存在一个&#64;ResourceListener的方法， 多余的会被忽略 <br>
+ * 方法在资源被更新以后调用。
+ *
+ * <blockquote><pre>
+ * public class RecordService implements Service {
+ *
+ *    &#64;Resource(name = "record.id")
+ *    private int id;
+ *
+ *    &#64;Resource(name = "record.name")
+ *    private String name;
+ *
+ *    &#64;ResourceListener
+ *    private void changeResource(ResourceEvent[] events) {
+ *        for(ResourceEvent event : events) {
+ *            System.out.println("@Resource = " + event.name() + " 资源变更:  newVal = " + event.newValue() + ", oldVal = " + event.oldValue());
+ *        }
+ *    }
+ *
+ *    public static void main(String[] args) throws Exception {
+ *        ResourceFactory factory = ResourceFactory.root();
+ *        factory.register("record.id", "2345");
+ *        factory.register("record.name", "my old name");
+ *        Record record = new Record();
+ *        factory.inject(record);
+ *        factory.register("record.name", "my new name");
+ *   }
+ *
+ * }
+ * </pre></blockquote>
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+@Documented
+@Target({METHOD})
+@Retention(RUNTIME)
+public @interface ResourceListener {
+
+    /**
+     * 新旧值是否不同时才回调方法 <br>
+     * true: 新值与旧值不同时才回调ResourceListener方法
+     * false: 只要执行了ResourceFactory.register 就回调ResourceListener方法
+     *
+     * @since 2.7.0
+     * @return boolean
+     */
+    boolean different() default true;
+}

src/main/java/org/redkale/annotation/ResourceType.java

@@ -3,7 +3,7 @@
  * To change this template file, choose Tools | Templates
  * and open the template in the editor.
  */
-package org.redkale.util;
+package org.redkale.annotation;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

src/main/java/org/redkale/annotation/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * 提供基础注解包
+ */
+package org.redkale.annotation;

src/main/java/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: ( &#60;tt&#62;visit&#60;/tt&#62; | &#60;tt&#62;visitEnum&#60;/tt&#62; |
+ * &#60;tt&#62;visitAnnotation&#60;/tt&#62; | &#60;tt&#62;visitArray&#60;/tt&#62; )* &#60;tt&#62;visitEnd&#60;/tt&#62;.
  *
  * @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
+     *         &#60;tt&#62;null&#60;/tt&#62; 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
+     *         &#60;tt&#62;null&#60;/tt&#62; 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/main/java/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
+     * &#60;tt&#62;true&#60;tt&#62; if values are named, &#60;tt&#62;false&#60;/tt&#62; 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.
+     *            &#60;tt&#62;true&#60;tt&#62; if values are named, &#60;tt&#62;false&#60;/tt&#62; 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 &#60;tt&#62;parent&#60;/tt&#62; 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.
+     *            &#60;tt&#62;null&#60;/tt&#62; if the annotation targets 'typeRef' as a whole.
      * @param out
      *            where the type reference and type path must be put.
      */

src/main/java/org/redkale/asm/Attribute.java

@@ -58,13 +58,15 @@
  */
 package org.redkale.asm;
 
+import java.util.Arrays;
+
 /**
  * A non standard class, field, method or code attribute.
  *
  * @author Eric Bruneton
  * @author Eugene Kuleshov
  */
-class Attribute {
+public class Attribute {
 
     /**
      * The type of this attribute.
@@ -77,7 +79,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 &#60;tt&#62;null&#60;/tt&#62;.
      */
     Attribute next;
 
@@ -92,19 +94,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 &#60;tt&#62;true&#60;/tt&#62; if this type of attribute is unknown. The default
+     * implementation of this method always returns &#60;tt&#62;true&#60;/tt&#62;.
      *
-     * @return <tt>true</tt> if this type of attribute is unknown.
+     * @return &#60;tt&#62;true&#60;/tt&#62; 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 &#60;tt&#62;true&#60;/tt&#62; if this type of attribute is a code attribute.
      *
-     * @return <tt>true</tt> if this type of attribute is a code attribute.
+     * @return &#60;tt&#62;true&#60;/tt&#62; if this type of attribute is a code attribute.
      */
     public boolean isCodeAttribute() {
         return false;
@@ -113,7 +115,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 &#60;tt&#62;null&#60;/tt&#62; if
      *         this attribute is not a code attribute that contains labels.
      */
     protected Label[] getLabels() {
@@ -123,7 +125,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 &#60;tt&#62;len&#60;/tt&#62; bytes starting at the given offset, in
      * the given class reader.
      *
      * @param cr
@@ -146,7 +148,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 &#60;tt&#62;null&#60;/tt&#62; 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 +171,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 &#60;tt&#62;null&#60;/tt&#62; 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 &#60;tt&#62;null&#60;/tt&#62; if this attribute is not a
      *            code attribute.
      * @param maxStack
      *            the maximum stack size of the method corresponding to this
@@ -216,11 +218,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 &#60;tt&#62;null&#60;/tt&#62; 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 &#60;tt&#62;null&#60;/tt&#62; if these attributes
      *            are not code attributes.
      * @param maxStack
      *            the maximum stack size of the method corresponding to these
@@ -254,11 +256,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 &#60;tt&#62;null&#60;/tt&#62; 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 &#60;tt&#62;null&#60;/tt&#62; if these attributes
      *            are not code attributes.
      * @param maxStack
      *            the maximum stack size of the method corresponding to these
@@ -281,4 +283,82 @@ class Attribute {
             attr = attr.next;
         }
     }
+
+    //The stuff below is temporary - once proper support for nestmate attribute has been added, it can be safely removed.
+    //see also changes in ClassReader.accept.
+    /**
+     * 
+     */
+    public static class NestMembers extends Attribute {
+        /**
+         * 
+         */
+        public NestMembers() {
+            super("NestMembers");
+        }
+
+        byte[] bytes;
+        String[] classes;
+
+        @Override
+        protected Attribute read(ClassReader cr, int off, int len, char[] buf, int codeOff, Label[] labels) {
+            int offset = off;
+            NestMembers a = new NestMembers();
+            int size = cr.readShort(off);
+            a.classes = new String[size];
+            off += 2;
+            for (int i = 0; i < size ; i++) {
+                a.classes[i] = cr.readClass(off, buf);
+                off += 2;
+            }
+            a.bytes = Arrays.copyOfRange(cr.b, offset, offset + len);
+            return a;
+        }
+
+        @Override
+        protected ByteVector write(ClassWriter cw, byte[] code, int len, int maxStack, int maxLocals) {
+            ByteVector v = new ByteVector(bytes.length);
+            v.putShort(classes.length);
+            for (String s : classes) {
+                v.putShort(cw.newClass(s));
+            }
+            return v;
+        }
+    }
+
+    /**
+     * 
+     */
+    public static class NestHost extends Attribute {
+
+        byte[] bytes;
+        String clazz;
+        /**
+         * 
+         */
+        public NestHost() {
+            super("NestHost");
+        }
+
+        @Override
+        protected Attribute read(ClassReader cr, int off, int len, char[] buf, int codeOff, Label[] labels) {
+            int offset = off;
+            NestHost a = new NestHost();
+            a.clazz = cr.readClass(off, buf);
+            a.bytes = Arrays.copyOfRange(cr.b, offset, offset + len);
+            return a;
+        }
+
+        @Override
+        protected ByteVector write(ClassWriter cw, byte[] code, int len, int maxStack, int maxLocals) {
+            ByteVector v = new ByteVector(bytes.length);
+            v.putShort(cw.newClass(clazz));
+            return v;
+        }
+    }
+
+    static final Attribute[] DEFAULT_ATTRIBUTE_PROTOS = new Attribute[] {
+        new NestMembers(),
+        new NestHost()
+    };
 }

src/main/java/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 &#60;tt&#62;null&#60;/tt&#62; to put &#60;tt&#62;len&#60;/tt&#62;
      *            null bytes into this byte vector.
      * @param off
      *            index of the fist byte of b that must be copied.

src/main/java/org/redkale/asm/ClassReader.java

@@ -185,9 +185,9 @@ public class ClassReader {
     public ClassReader(final byte[] b, final int off, final int len) {
         this.b = b;
         // checks the class version
-        if (readShort(off + 6) > Opcodes.V10) {
-            //throw new IllegalArgumentException();
-        }
+        //if (readShort(off + 6) > Opcodes.V11) {
+        //    throw new IllegalArgumentException();
+        //}
         // parses the constant pool
         items = new int[readUnsignedShort(off + 8)];
         int n = items.length;
@@ -205,6 +205,10 @@ public class ClassReader {
             case ClassWriter.FLOAT:
             case ClassWriter.NAME_TYPE:
             case ClassWriter.INDY:
+            // @@@ ClassWriter.CONDY
+            // Enables MethodHandles.lookup().defineClass to function correctly
+            // when it reads the class name
+            case 17:
                 size = 5;
                 break;
             case ClassWriter.LONG:
@@ -267,7 +271,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 &#60;tt&#62;null&#60;/tt&#62; for
      *         {@link Object} class.
      *
      * @see ClassVisitor#visit(int, int, String, String, String, String[])
@@ -281,7 +285,7 @@ public class ClassReader {
      * {@link Type#getInternalName() getInternalName}).
      *
      * @return the array of internal names for all implemented interfaces or
-     *         <tt>null</tt>.
+     *         &#60;tt&#62;null&#60;/tt&#62;.
      *
      * @see ClassVisitor#visit(int, int, String, String, String, String[])
      */
@@ -526,7 +530,7 @@ public class ClassReader {
      *            , {@link #SKIP_FRAMES}, {@link #SKIP_CODE}.
      */
     public void accept(final ClassVisitor classVisitor, final int flags) {
-        accept(classVisitor, new Attribute[0], flags);
+        accept(classVisitor, Attribute.DEFAULT_ATTRIBUTE_PROTOS, flags);
     }
 
     /**
@@ -1932,7 +1936,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
+     *            &#60;tt&#62;true&#60;/tt&#62; if the annotations to be read are visible at
      *            runtime.
      */
     private void readParameterAnnotations(final MethodVisitor mv,
@@ -2474,9 +2478,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 &#60;tt&#62;null&#60;/tt&#62; 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 &#60;tt&#62;null&#60;/tt&#62; to skip this
      *         attribute.
      */
     private Attribute readAttribute(final Attribute[] attrs, final String type,

src/main/java/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: &#60;tt&#62;visit&#60;/tt&#62; [ &#60;tt&#62;visitSource&#60;/tt&#62; ] [
+ * &#60;tt&#62;visitModule&#60;/tt&#62; ][ &#60;tt&#62;visitOuterClass&#60;/tt&#62; ] ( &#60;tt&#62;visitAnnotation&#60;/tt&#62; |
+ * &#60;tt&#62;visitTypeAnnotation&#60;/tt&#62; | &#60;tt&#62;visitAttribute&#60;/tt&#62; )* (
+ * &#60;tt&#62;visitInnerClass&#60;/tt&#62; | &#60;tt&#62;visitField&#60;/tt&#62; | &#60;tt&#62;visitMethod&#60;/tt&#62; )*
+ * &#60;tt&#62;visitEnd&#60;/tt&#62;.
  *
  * @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 &#60;tt&#62;null&#60;/tt&#62; 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.
+     *            &#60;tt&#62;null&#60;/tt&#62;, 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>.
+     *            &#60;tt&#62;null&#60;/tt&#62;.
      */
     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 &#60;tt&#62;null&#60;/tt&#62;.
      * @param debug
      *            additional debug information to compute the correspondance
      *            between source and compiled elements of the class. May be
-     *            <tt>null</tt>.
+     *            &#60;tt&#62;null&#60;/tt&#62;.
      */
     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 &#60;tt&#62;null&#60;/tt&#62; 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
+     *            &#60;tt&#62;null&#60;/tt&#62; 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
+     *            &#60;tt&#62;null&#60;/tt&#62; 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
+     *            &#60;tt&#62;true&#60;/tt&#62; if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or &#60;tt&#62;null&#60;/tt&#62; 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.
+     *            &#60;tt&#62;null&#60;/tt&#62; 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
+     *            &#60;tt&#62;true&#60;/tt&#62; if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or &#60;tt&#62;null&#60;/tt&#62; 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 &#60;tt&#62;null&#60;/tt&#62; 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 &#60;tt&#62;null&#60;/tt&#62; 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 &#60;tt&#62;null&#60;/tt&#62; 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,
+     *            &#60;tt&#62;null&#60;/tt&#62; 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 &#60;tt&#62;int&#60;/tt&#62;,
+     *            &#60;tt&#62;float&#60;/tt&#62;, &#60;tt&#62;long&#60;/tt&#62; or &#60;tt&#62;String&#60;/tt&#62; 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
+     *         &#60;tt&#62;null&#60;/tt&#62; 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 &#60;tt&#62;null&#60;/tt&#62;) 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 &#60;tt&#62;null&#60;/tt&#62; 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>
+     *            &#60;tt&#62;null&#60;/tt&#62;.
+     * @return an object to visit the byte code of the method, or &#60;tt&#62;null&#60;/tt&#62;
      *         if this class visitor is not interested in visiting the code of
      *         this method.
      */

src/main/java/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 &#60;tt&#62;i&#60;/tt&#62;
+     * the Item whose index is &#60;tt&#62;i&#60;/tt&#62;. 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
+     * &#60;tt&#62;true&#60;/tt&#62; 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.
+     *            &#60;tt&#62;true&#60;/tt&#62; if &#60;tt&#62;owner&#60;/tt&#62; 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.
+     *            &#60;tt&#62;true&#60;/tt&#62; if &#60;tt&#62;owner&#60;/tt&#62; 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 &#60;tt&#62;null&#60;/tt&#62; if there is no such item.
      */
     private Item get(final Item key) {
         Item i = items[key.hashCode % items.length];

src/main/java/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: ( &#60;tt&#62;visitAnnotation&#60;/tt&#62; |
+ * &#60;tt&#62;visitTypeAnnotation&#60;/tt&#62; | &#60;tt&#62;visitAttribute&#60;/tt&#62; )* &#60;tt&#62;visitEnd&#60;/tt&#62;.
  *
  * @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
+     *            &#60;tt&#62;true&#60;/tt&#62; if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or &#60;tt&#62;null&#60;/tt&#62; 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.
+     *            &#60;tt&#62;null&#60;/tt&#62; 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
+     *            &#60;tt&#62;true&#60;/tt&#62; if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or &#60;tt&#62;null&#60;/tt&#62; if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitTypeAnnotation(int typeRef,

src/main/java/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 &#60;tt&#62;null&#60;/tt&#62;.
      */
     private AnnotationWriter anns;
 
     /**
-     * The runtime invisible annotations of this field. May be <tt>null</tt>.
+     * The runtime invisible annotations of this field. May be &#60;tt&#62;null&#60;/tt&#62;.
      */
     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 &#60;tt&#62;null&#60;/tt&#62;.
      */
     private AnnotationWriter tanns;
 
     /**
      * The runtime invisible type annotations of this field. May be
-     * <tt>null</tt>.
+     * &#60;tt&#62;null&#60;/tt&#62;.
      */
     private AnnotationWriter itanns;
 
     /**
-     * The non standard attributes of this field. May be <tt>null</tt>.
+     * The non standard attributes of this field. May be &#60;tt&#62;null&#60;/tt&#62;.
      */
     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 &#60;tt&#62;null&#60;/tt&#62;.
      * @param value
-     *            the field's constant value. May be <tt>null</tt>.
+     *            the field's constant value. May be &#60;tt&#62;null&#60;/tt&#62;.
      */
     FieldWriter(final ClassWriter cw, final int access, final String name,
             final String desc, final String signature, final Object value) {

src/main/java/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 &#60;tt&#62;true&#60;/tt&#62; 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 &#60;tt&#62;true&#60;/tt&#62; 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 &#60;tt&#62;true&#60;/tt&#62; 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 &#60;tt&#62;true&#60;/tt&#62; if the type array has been modified by this
      *         operation.
      */
     private static boolean merge(final ClassWriter cw, int t,

src/main/java/org/redkale/asm/Handle.java

@@ -99,7 +99,6 @@ public final class Handle {
      */
     final boolean itf;
 
-
     /**
      * Constructs a new field or method handle.
      *

src/main/java/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.
+     * &#60;tt&#62;null&#60;/tt&#62; to catch any exceptions.
      */
     String desc;
 

src/main/java/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 &#60;tt&#62;true&#60;/tt&#62; if the given item if equal to this one,
+     *         &#60;tt&#62;false&#60;/tt&#62; otherwise.
      */
     boolean isEqualTo(final Item i) {
         switch (type) {

src/main/java/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.
+     *            &#60;tt&#62;true&#60;/tt&#62; if the reference must be stored in 4 bytes, or
+     *            &#60;tt&#62;false&#60;/tt&#62; 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 &#60;tt&#62;true&#60;/tt&#62; 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/main/java/org/redkale/asm/MethodDebugVisitor.java

@@ -5,7 +5,10 @@
  */
 package org.redkale.asm;
 
+import java.lang.annotation.Annotation;
+import java.lang.reflect.Method;
 import java.util.*;
+import static org.redkale.asm.Opcodes.*;
 
 /**
  * MethodVisitor 的调试类
@@ -54,11 +57,20 @@ public class MethodDebugVisitor {
         }
     }
 
+    /**
+     *
+     * @param visitor MethodVisitor
+     */
     public MethodDebugVisitor(MethodVisitor visitor) {
         //super(Opcodes.ASM5, visitor);
         this.visitor = visitor;
     }
 
+    public void visitTryCatchBlock(Label start, Label end, Label handler, String type) {
+        visitor.visitTryCatchBlock(start, end, handler, type);
+        if (debug) System.out.println("mv.visitTryCatchBlock(label0, label1, label2, \"" + type + "\");");
+    }
+
     public AnnotationVisitor visitParameterAnnotation(int i, String string, boolean bln) {
         AnnotationVisitor av = visitor.visitParameterAnnotation(i, string, bln);
         if (debug) System.out.println("mv.visitParameterAnnotation(" + i + ", \"" + string + "\", " + bln + ");");
@@ -189,4 +201,74 @@ public class MethodDebugVisitor {
         visitor.visitEnd();
         if (debug) System.out.println("mv.visitEnd();\r\n\r\n\r\n");
     }
+
+    public static void pushInt(MethodDebugVisitor mv, int num) {
+        if (num < 6) {
+            mv.visitInsn(ICONST_0 + num);
+        } else if (num <= Byte.MAX_VALUE) {
+            mv.visitIntInsn(BIPUSH, num);
+        } else if (num <= Short.MAX_VALUE) {
+            mv.visitIntInsn(SIPUSH, num);
+        } else {
+            mv.visitLdcInsn(num);
+        }
+    }
+
+    public static void pushInt(MethodVisitor mv, int num) {
+        if (num < 6) {
+            mv.visitInsn(ICONST_0 + num);
+        } else if (num <= Byte.MAX_VALUE) {
+            mv.visitIntInsn(BIPUSH, num);
+        } else if (num <= Short.MAX_VALUE) {
+            mv.visitIntInsn(SIPUSH, num);
+        } else {
+            mv.visitLdcInsn(num);
+        }
+    }
+
+    public static void visitAnnotation(final AnnotationVisitor av, final Annotation ann) {
+        try {
+            for (Method anm : ann.annotationType().getMethods()) {
+                final String mname = anm.getName();
+                if ("equals".equals(mname) || "hashCode".equals(mname) || "toString".equals(mname) || "annotationType".equals(mname)) continue;
+                final Object r = anm.invoke(ann);
+                if (r instanceof String[]) {
+                    AnnotationVisitor av1 = av.visitArray(mname);
+                    for (String item : (String[]) r) {
+                        av1.visit(null, item);
+                    }
+                    av1.visitEnd();
+                } else if (r instanceof Class[]) {
+                    AnnotationVisitor av1 = av.visitArray(mname);
+                    for (Class item : (Class[]) r) {
+                        av1.visit(null, Type.getType(item));
+                    }
+                    av1.visitEnd();
+                } else if (r instanceof Enum[]) {
+                    AnnotationVisitor av1 = av.visitArray(mname);
+                    for (Enum item : (Enum[]) r) {
+                        av1.visitEnum(null, Type.getDescriptor(item.getClass()), ((Enum) item).name());
+                    }
+                    av1.visitEnd();
+                } else if (r instanceof Annotation[]) {
+                    AnnotationVisitor av1 = av.visitArray(mname);
+                    for (Annotation item : (Annotation[]) r) {
+                        visitAnnotation(av1.visitAnnotation(null, Type.getDescriptor(((Annotation) item).annotationType())), item);
+                    }
+                    av1.visitEnd();
+                } else if (r instanceof Class) {
+                    av.visit(mname, Type.getType((Class) r));
+                } else if (r instanceof Enum) {
+                    av.visitEnum(mname, Type.getDescriptor(r.getClass()), ((Enum) r).name());
+                } else if (r instanceof Annotation) {
+                    visitAnnotation(av.visitAnnotation(null, Type.getDescriptor(((Annotation) r).annotationType())), (Annotation) r);
+                } else {
+                    av.visit(mname, r);
+                }
+            }
+            av.visitEnd();
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
 }

src/main/java/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: ( &#60;tt&#62;visitParameter&#60;/tt&#62; )* [
+ * &#60;tt&#62;visitAnnotationDefault&#60;/tt&#62; ] ( &#60;tt&#62;visitAnnotation&#60;/tt&#62; |
+ * &#60;tt&#62;visitParameterAnnotation&#60;/tt&#62; &#60;tt&#62;visitTypeAnnotation&#60;/tt&#62; |
+ * &#60;tt&#62;visitAttribute&#60;/tt&#62; )* [ &#60;tt&#62;visitCode&#60;/tt&#62; ( &#60;tt&#62;visitFrame&#60;/tt&#62; |
+ * &#60;tt&#62;visit<i>X</i>Insn&#60;/tt&#62; | &#60;tt&#62;visitLabel&#60;/tt&#62; |
+ * &#60;tt&#62;visitInsnAnnotation&#60;/tt&#62; | &#60;tt&#62;visitTryCatchBlock&#60;/tt&#62; |
+ * &#60;tt&#62;visitTryCatchAnnotation&#60;/tt&#62; | &#60;tt&#62;visitLocalVariable&#60;/tt&#62; |
+ * &#60;tt&#62;visitLocalVariableAnnotation&#60;/tt&#62; | &#60;tt&#62;visitLineNumber&#60;/tt&#62; )*
+ * &#60;tt&#62;visitMaxs&#60;/tt&#62; ] &#60;tt&#62;visitEnd&#60;/tt&#62;. In addition, the
+ * &#60;tt&#62;visit<i>X</i>Insn&#60;/tt&#62; and &#60;tt&#62;visitLabel&#60;/tt&#62; 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
+ * &#60;tt&#62;visitInsnAnnotation&#60;/tt&#62; must be called <i>after</i> the annotated
+ * instruction, &#60;tt&#62;visitTryCatchBlock&#60;/tt&#62; must be called <i>before</i> the
  * labels passed as arguments have been visited,
- * <tt>visitTryCatchBlockAnnotation</tt> must be called <i>after</i> the
+ * &#60;tt&#62;visitTryCatchBlockAnnotation&#60;/tt&#62; 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
+ * &#60;tt&#62;visitLocalVariable&#60;/tt&#62;, &#60;tt&#62;visitLocalVariableAnnotation&#60;/tt&#62; and
+ * &#60;tt&#62;visitLineNumber&#60;/tt&#62; 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 &#60;tt&#62;ACC_FINAL&#60;/tt&#62;,
+     *            &#60;tt&#62;ACC_SYNTHETIC&#60;/tt&#62; or/and &#60;tt&#62;ACC_MANDATED&#60;/tt&#62; 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 &#60;tt&#62;null&#60;/tt&#62; 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
+     *            &#60;tt&#62;true&#60;/tt&#62; if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or &#60;tt&#62;null&#60;/tt&#62; 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.
+     *            &#60;tt&#62;null&#60;/tt&#62; 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
+     *            &#60;tt&#62;true&#60;/tt&#62; if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or &#60;tt&#62;null&#60;/tt&#62; 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
+     *            &#60;tt&#62;true&#60;/tt&#62; if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or &#60;tt&#62;null&#60;/tt&#62; if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitParameterAnnotation(int parameter,
@@ -444,7 +444,6 @@ public abstract class MethodVisitor {
         }
     }
 
-
     /**
      * Visits a method instruction. A method instruction is an instruction that
      * invokes a method.
@@ -569,7 +568,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 &#60;tt&#62;.class&#60;/tt&#62; 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 +603,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. &#60;tt&#62;labels[i]&#60;/tt&#62; is the
+     *            beginning of the handler block for the &#60;tt&#62;min + i&#60;/tt&#62; key.
      */
     public void visitTableSwitchInsn(int min, int max, Label dflt,
             Label... labels) {
@@ -622,8 +621,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. &#60;tt&#62;labels[i]&#60;/tt&#62; is the
+     *            beginning of the handler block for the &#60;tt&#62;keys[i]&#60;/tt&#62; key.
      */
     public void visitLookupSwitchInsn(Label dflt, int[] keys, Label[] labels) {
         if (mv != null) {
@@ -668,12 +667,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.
+     *            &#60;tt&#62;null&#60;/tt&#62; 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
+     *            &#60;tt&#62;true&#60;/tt&#62; if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or &#60;tt&#62;null&#60;/tt&#62; if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitInsnAnnotation(int typeRef,
@@ -699,7 +698,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 &#60;tt&#62;null&#60;/tt&#62; to catch any exceptions (for
      *            "finally" blocks).
      * @throws IllegalArgumentException
      *             if one of the labels has already been visited by this visitor
@@ -725,12 +724,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.
+     *            &#60;tt&#62;null&#60;/tt&#62; 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
+     *            &#60;tt&#62;true&#60;/tt&#62; if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or &#60;tt&#62;null&#60;/tt&#62; if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitTryCatchAnnotation(int typeRef,
@@ -750,7 +749,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
+     *            &#60;tt&#62;null&#60;/tt&#62; if the local variable type does not use generic
      *            types.
      * @param start
      *            the first instruction corresponding to the scope of this local
@@ -782,7 +781,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.
+     *            &#60;tt&#62;null&#60;/tt&#62; 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 +795,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
+     *            &#60;tt&#62;true&#60;/tt&#62; if the annotation is visible at runtime.
+     * @return a visitor to visit the annotation values, or &#60;tt&#62;null&#60;/tt&#62; if
      *         this visitor is not interested in visiting this annotation.
      */
     public AnnotationVisitor visitLocalVariableAnnotation(int typeRef,
@@ -819,7 +818,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 &#60;tt&#62;start&#60;/tt&#62; has not already been visited by this
      *             visitor (by the {@link #visitLabel visitLabel} method).
      */
     public void visitLineNumber(int line, Label start) {

src/main/java/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 &#60;tt&#62;null&#60;/tt&#62;.
      */
     private ByteVector annd;
 
     /**
-     * The runtime visible annotations of this method. May be <tt>null</tt>.
+     * The runtime visible annotations of this method. May be &#60;tt&#62;null&#60;/tt&#62;.
      */
     private AnnotationWriter anns;
 
     /**
-     * The runtime invisible annotations of this method. May be <tt>null</tt>.
+     * The runtime invisible annotations of this method. May be &#60;tt&#62;null&#60;/tt&#62;.
      */
     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 &#60;tt&#62;null&#60;/tt&#62;
      * .
      */
     private AnnotationWriter tanns;
 
     /**
      * The runtime invisible type annotations of this method. May be
-     * <tt>null</tt>.
+     * &#60;tt&#62;null&#60;/tt&#62;.
      */
     private AnnotationWriter itanns;
 
     /**
      * The runtime visible parameter annotations of this method. May be
-     * <tt>null</tt>.
+     * &#60;tt&#62;null&#60;/tt&#62;.
      */
     private AnnotationWriter[] panns;
 
     /**
      * The runtime invisible parameter annotations of this method. May be
-     * <tt>null</tt>.
+     * &#60;tt&#62;null&#60;/tt&#62;.
      */
     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 &#60;tt&#62;null&#60;/tt&#62;.
      */
     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 &#60;tt&#62;null&#60;/tt&#62;.
      */
     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 &#60;tt&#62;stackSize&#60;/tt&#62;.
      */
     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 &#60;tt&#62;stackSize&#60;/tt&#62;.
      */
     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 &#60;tt&#62;null&#60;/tt&#62;.
      * @param exceptions
      *            the internal names of the method's exceptions. May be
-     *            <tt>null</tt>.
+     *            &#60;tt&#62;null&#60;/tt&#62;.
      * @param compute
      *            Indicates what must be automatically computed (see #compute).
      */

src/main/java/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: &#60;tt&#62;visitMainClass&#60;/tt&#62; | ( &#60;tt&#62;visitPackage&#60;/tt&#62; |
+ * &#60;tt&#62;visitRequire&#60;/tt&#62; | &#60;tt&#62;visitExport&#60;/tt&#62; | &#60;tt&#62;visitOpen&#60;/tt&#62; |
+ * &#60;tt&#62;visitUse&#60;/tt&#62; | &#60;tt&#62;visitProvide&#60;/tt&#62; )* &#60;tt&#62;visitEnd&#60;/tt&#62;.
  *
  * 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>.
+     *        &#60;tt&#62;null&#60;/tt&#62;.
      */
     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>.
+     *        &#60;tt&#62;null&#60;/tt&#62;.
      */
     public void visitOpen(String packaze, int access, String... modules) {
         if (mv != null) {

src/main/java/org/redkale/asm/Opcodes.java

@@ -73,19 +73,23 @@ package org.redkale.asm;
 public interface Opcodes {
 
     // ASM API versions
-
-    int ASM4 = 4 << 16 | 0 << 8 | 0;
-    int ASM5 = 5 << 16 | 0 << 8 | 0;
-    int ASM6 = 6 << 16 | 0 << 8 | 0;
+    int ASM4 = 4 << 16 | 0 << 8;
+    int ASM5 = 5 << 16 | 0 << 8;
+    int ASM6 = 6 << 16 | 0 << 8;
 
     // versions
 
+    int V1_1 = 3 << 16 | 45;
+    int V1_2 = 0 << 16 | 46;
+    int V1_3 = 0 << 16 | 47;
+    int V1_4 = 0 << 16 | 48;
     int V1_5 = 0 << 16 | 49;
     int V1_6 = 0 << 16 | 50;
     int V1_7 = 0 << 16 | 51;
     int V1_8 = 0 << 16 | 52;
     int V9 = 0 << 16 | 53;
     int V10 = 0 << 16 | 54;
+    int V11 = 0 << 16 | 55;
 
     // access flags
 

src/main/java/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 &#60;tt&#62;void&#60;/tt&#62; 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 &#60;tt&#62;boolean&#60;/tt&#62; 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 &#60;tt&#62;char&#60;/tt&#62; 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 &#60;tt&#62;byte&#60;/tt&#62; 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 &#60;tt&#62;short&#60;/tt&#62; 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 &#60;tt&#62;int&#60;/tt&#62; 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 &#60;tt&#62;float&#60;/tt&#62; 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 &#60;tt&#62;long&#60;/tt&#62; 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 &#60;tt&#62;double&#60;/tt&#62; 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 &#60;tt&#62;void&#60;/tt&#62; 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 &#60;tt&#62;boolean&#60;/tt&#62; 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 &#60;tt&#62;char&#60;/tt&#62; 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 &#60;tt&#62;byte&#60;/tt&#62; 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 &#60;tt&#62;short&#60;/tt&#62; 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 &#60;tt&#62;int&#60;/tt&#62; 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 &#60;tt&#62;float&#60;/tt&#62; 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 &#60;tt&#62;long&#60;/tt&#62; 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 &#60;tt&#62;double&#60;/tt&#62; 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>).
+     *         &#60;tt&#62;(argSize &lt;&lt; 2) | retSize&#60;/tt&#62; (argSize is therefore equal to
+     *         &#60;tt&#62;i &gt;&gt; 2&#60;/tt&#62;, and retSize to &#60;tt&#62;i &amp; 0x03&#60;/tt&#62;).
      */
     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 = &#60;tt&#62;(argSize &lt;&lt; 2) | retSize&#60;/tt&#62;
+     *         (argSize is therefore equal to &#60;tt&#62;i &gt;&gt; 2&#60;/tt&#62;,
+     *         and retSize to &#60;tt&#62;i &amp; 0x03&#60;/tt&#62;).
      */
     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 &#60;tt&#62;long&#60;/tt&#62; and
+     *         &#60;tt&#62;double&#60;/tt&#62;, 0 for &#60;tt&#62;void&#60;/tt&#62; 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 &#60;tt&#62;float&#60;/tt&#62; and
+     *         &#60;tt&#62;opcode&#60;/tt&#62; 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 &#60;tt&#62;true&#60;/tt&#62; if the given object is equal to this type.
      */
     @Override
     public boolean equals(final Object o) {

src/main/java/org/redkale/asm/TypePath.java

@@ -161,7 +161,7 @@ public class TypePath {
      * @return the corresponding TypePath object, or null if the path is empty.
      */
     public static TypePath fromString(final String typePath) {
-        if (typePath == null || typePath.length() == 0) {
+        if (typePath == null || typePath.isEmpty()) {
             return null;
         }
         int n = typePath.length();

src/main/java/org/redkale/boot/ApiDocCommand.java

@@ -0,0 +1,664 @@
+/*
+ * 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.boot;
+
+import java.io.*;
+import java.lang.reflect.*;
+import java.math.*;
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.*;
+import java.util.logging.*;
+import org.redkale.annotation.Comment;
+import org.redkale.convert.*;
+import org.redkale.convert.json.*;
+import org.redkale.mq.MessageMultiConsumer;
+import org.redkale.net.http.*;
+import org.redkale.persistence.*;
+import org.redkale.service.RetResult;
+import org.redkale.source.*;
+import org.redkale.util.*;
+
+/**
+ * API接口文档生成类，作用：生成Application实例中所有HttpServer的可用HttpServlet的API接口方法   <br>
+ * 继承 HttpBaseServlet 是为了获取 HttpMapping 信息 <br>
+ * https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+public final class ApiDocCommand {
+
+    private static final java.lang.reflect.Type TYPE_RETRESULT_OBJECT = new TypeToken<RetResult<Object>>() {
+    }.getType();
+
+    private static final java.lang.reflect.Type TYPE_RETRESULT_STRING = new TypeToken<RetResult<String>>() {
+    }.getType();
+
+    private static final java.lang.reflect.Type TYPE_RETRESULT_INTEGER = new TypeToken<RetResult<Integer>>() {
+    }.getType();
+
+    private static final java.lang.reflect.Type TYPE_RETRESULT_LONG = new TypeToken<RetResult<Long>>() {
+    }.getType();
+
+    private final Application app; //Application全局对象
+
+    public ApiDocCommand(Application app) {
+        this.app = app;
+    }
+
+    public String command(String cmd, String[] params) throws Exception {
+        //是否跳过RPC接口
+        boolean skipRPC = true;
+        String apiHost = "http://localhost";
+
+        if (params != null && params.length > 0) {
+            for (String param : params) {
+                if (param == null) continue;
+                param = param.toLowerCase();
+                if (param.startsWith("--api-skiprpc=")) {
+                    skipRPC = "true".equalsIgnoreCase(param.substring("--api-skiprpc=".length()));
+                } else if (param.startsWith("--api-host=")) {
+                    apiHost = param.substring("--api-host=".length());
+                }
+            }
+        }
+
+        List<Map> serverList = new ArrayList<>();
+        Field __prefix = HttpServlet.class.getDeclaredField("_prefix");
+        __prefix.setAccessible(true);
+        Map<String, Map<String, Map<String, Object>>> typesMap = new LinkedHashMap<>();
+        //https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md
+        Map<String, Object> swaggerPathsMap = new LinkedHashMap<>();
+        List<Map> swaggerServers = new ArrayList<>();
+        List<Map> swaggerTags = new ArrayList<>();
+        Map<String, Map<String, Object>> swaggerComponentsMap = new LinkedHashMap<>();
+        for (NodeServer node : app.servers) {
+            if (!(node instanceof NodeHttpServer)) continue;
+            final Map<String, Object> map = new LinkedHashMap<>();
+            serverList.add(map);
+            HttpServer server = node.getServer();
+            map.put("address", server.getSocketAddress());
+            swaggerServers.add(Utility.ofMap("url", apiHost + ":" + server.getSocketAddress().getPort()));
+            List<Map<String, Object>> servletsList = new ArrayList<>();
+            map.put("servlets", servletsList);
+            String plainContentType = server.getResponseConfig() == null ? "application/json" : server.getResponseConfig().plainContentType;
+            if (plainContentType == null || plainContentType.isEmpty()) plainContentType = "application/json";
+            if (plainContentType.indexOf(';') > 0) plainContentType = plainContentType.substring(0, plainContentType.indexOf(';'));
+
+            for (HttpServlet servlet : server.getDispatcherServlet().getServlets()) {
+                if (!(servlet instanceof HttpServlet)) continue;
+                if (servlet instanceof WebSocketServlet) continue;
+                if (servlet.getClass().getAnnotation(MessageMultiConsumer.class) != null) {
+                    node.logger.log(Level.INFO, servlet + " be skipped because has @MessageMultiConsumer");
+                    continue;
+                }
+                WebServlet ws = servlet.getClass().getAnnotation(WebServlet.class);
+                if (ws == null) {
+                    node.logger.log(Level.WARNING, servlet + " not found @WebServlet");
+                    continue;
+                }
+                if (ws.name().isEmpty()) {
+                    node.logger.log(Level.INFO, servlet + " be skipped because @WebServlet.name is empty");
+                    continue;
+                }
+                final String tag = ws.name().isEmpty() ? servlet.getClass().getSimpleName().replace("Servlet", "").toLowerCase() : ws.name();
+                final Map<String, Object> servletMap = new LinkedHashMap<>();
+                String prefix = (String) __prefix.get(servlet);
+                String[] urlregs = ws.value();
+                if (prefix != null && !prefix.isEmpty()) {
+                    for (int i = 0; i < urlregs.length; i++) {
+                        urlregs[i] = prefix + urlregs[i];
+                    }
+                }
+                servletMap.put("urlregs", urlregs);
+                servletMap.put("moduleid", ws.moduleid());
+                servletMap.put("name", ws.name());
+                servletMap.put("comment", ws.comment());
+
+                List<Map> mappingsList = new ArrayList<>();
+                servletMap.put("mappings", mappingsList);
+                final Class selfClz = servlet.getClass();
+                Class clz = servlet.getClass();
+                HashSet<String> actionUrls = new HashSet<>();
+                do {
+                    if (Modifier.isAbstract(clz.getModifiers())) break;
+                    for (Method method : clz.getMethods()) {
+                        if (method.getParameterCount() != 2) continue;
+                        HttpMapping action = method.getAnnotation(HttpMapping.class);
+                        if (action == null) continue;
+                        if (!action.inherited() && selfClz != clz) continue; //忽略不被继承的方法
+                        if (actionUrls.contains(action.url())) continue;
+                        if (HttpScope.class.isAssignableFrom(action.result())) continue; //忽略模板引擎的方法
+                        if (action.rpconly() && skipRPC) continue; //不生成RPC接口
+
+                        final List<Map<String, Object>> swaggerParamsList = new ArrayList<>();
+
+                        final Map<String, Object> mappingMap = new LinkedHashMap<>();
+                        mappingMap.put("url", prefix + action.url());
+                        actionUrls.add(action.url());
+                        mappingMap.put("auth", action.auth());
+                        mappingMap.put("actionid", action.actionid());
+                        mappingMap.put("comment", action.comment());
+                        List<Map> paramsList = new ArrayList<>();
+                        mappingMap.put("params", paramsList);
+                        List<String> results = new ArrayList<>();
+                        Type resultType = action.result();
+                        if (!action.resultRef().isEmpty()) {
+                            Field f = servlet.getClass().getDeclaredField(action.resultRef());
+                            f.setAccessible(true);
+                            resultType = (Type) f.get(servlet);
+                        }
+//                        for (final Class rtype : action.results()) {
+//                            results.add(rtype.getName());
+//                            if (typesMap.containsKey(rtype.getName())) continue;
+//                            if (rtype.getName().startsWith("java.")) continue;
+//                            if (rtype.getName().startsWith("javax.")) continue;
+//                            final boolean filter = FilterBean.class.isAssignableFrom(rtype);
+//                            final Map<String, Map<String, Object>> typeMap = new LinkedHashMap<>();
+//                            Class loop = rtype;
+//                            do {
+//                                if (loop == null || loop.isInterface()) break;
+//                                for (Field field : loop.getDeclaredFields()) {
+//                                    if (Modifier.isFinal(field.getModifiers())) continue;
+//                                    if (Modifier.isStatic(field.getModifiers())) continue;
+//
+//                                    Map<String, Object> fieldmap = new LinkedHashMap<>();
+//                                    fieldmap.put("type", field.getType().isArray() ? (field.getType().getComponentType().getName() + "[]") : field.getGenericType().getTypeName());
+//
+//                                    Comment comment = field.getAnnotation(Comment.class);
+//                                    Column col = field.getAnnotation(Column.class);
+//                                    FilterColumn fc = field.getAnnotation(FilterColumn.class);
+//                                    if (comment != null) {
+//                                        fieldmap.put("comment", comment.value());
+//                                    } else if (col != null) {
+//                                        fieldmap.put("comment", col.comment());
+//                                    } else if (fc != null) {
+//                                        fieldmap.put("comment", fc.comment());
+//                                    }
+//                                    fieldmap.put("primary", !filter && (field.getAnnotation(Id.class) != null));
+//                                    fieldmap.put("updatable", (filter || col == null || col.updatable()));
+//                                    if (servlet.getClass().getAnnotation(Rest.RestDyn.class) != null) {
+//                                        if (field.getAnnotation(RestAddress.class) != null) continue;
+//                                    }
+//
+//                                    typeMap.put(field.getName(), fieldmap);
+//                                }
+//                            } while ((loop = loop.getSuperclass()) != Object.class);
+//                            typesMap.put(rtype.getName(), typeMap);
+//                        }
+                        mappingMap.put("results", results);
+                        boolean hasbodyparam = false;
+                        Map<String, Object> swaggerRequestBody = new LinkedHashMap<>();
+                        for (HttpParam param : method.getAnnotationsByType(HttpParam.class)) {
+                            final Map<String, Object> oldapisParamMap = new LinkedHashMap<>();
+                            final boolean isarray = param.type().isArray();
+                            final Class ptype = isarray ? param.type().getComponentType() : param.type();
+                            oldapisParamMap.put("name", param.name());
+                            oldapisParamMap.put("radix", param.radix());
+                            oldapisParamMap.put("type", ptype.getName() + (isarray ? "[]" : ""));
+                            oldapisParamMap.put("style", param.style());
+                            oldapisParamMap.put("comment", param.comment());
+                            oldapisParamMap.put("required", param.required());
+                            paramsList.add(oldapisParamMap);
+                            {
+                                final Map<String, Object> paramSchemaMap = new LinkedHashMap<>();
+                                Type paramGenericType = param.type();
+                                if (!param.typeref().isEmpty()) {
+                                    Field f = servlet.getClass().getDeclaredField(param.typeref());
+                                    f.setAccessible(true);
+                                    paramGenericType = (Type) f.get(servlet);
+                                }
+                                simpleSchemaType(null, node.getLogger(), swaggerComponentsMap, param.type(), paramGenericType, paramSchemaMap, true);
+                                if (param.style() == HttpParam.HttpParameterStyle.BODY) {
+                                    swaggerRequestBody.put("description", param.comment());
+                                    swaggerRequestBody.put("content", Utility.ofMap(plainContentType, Utility.ofMap("schema", paramSchemaMap)));
+                                } else {
+                                    final Map<String, Object> swaggerParamMap = new LinkedHashMap<>();
+                                    swaggerParamMap.put("name", param.name());
+                                    swaggerParamMap.put("in", param.style().name().toLowerCase());
+                                    swaggerParamMap.put("description", param.comment());
+                                    swaggerParamMap.put("required", param.required());
+                                    if (param.deprecated()) {
+                                        swaggerParamMap.put("deprecated", param.deprecated());
+                                    }
+                                    //https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#parameterStyle
+                                    swaggerParamMap.put("style", param.style() == HttpParam.HttpParameterStyle.HEADER || param.name().indexOf('#') == 0 ? "simple" : "form");
+                                    swaggerParamMap.put("explode", true);
+                                    swaggerParamMap.put("schema", paramSchemaMap);
+                                    Object example = formatExample(null, param.example(), param.type(), paramGenericType);
+                                    if (example != null) {
+                                        swaggerParamMap.put("example", example);
+                                    } else if (!param.example().isEmpty()) {
+                                        swaggerParamMap.put("example", param.example());
+                                    }
+                                    swaggerParamsList.add(swaggerParamMap);
+                                }
+                            }
+                            if (param.style() == HttpParam.HttpParameterStyle.BODY) hasbodyparam = true;
+                            if (ptype.isPrimitive() || ptype == String.class) continue;
+                            if (typesMap.containsKey(ptype.getName())) continue;
+                            if (ptype.getName().startsWith("java.")) continue;
+                            if (ptype.getName().startsWith("javax.")) continue;
+
+                            final Map<String, Map<String, Object>> typeMap = new LinkedHashMap<>();
+                            Class loop = ptype;
+                            final boolean filter = FilterBean.class.isAssignableFrom(loop);
+                            do {
+                                if (loop == null || loop.isInterface()) break;
+                                for (Field field : loop.getDeclaredFields()) {
+                                    if (Modifier.isFinal(field.getModifiers())) continue;
+                                    if (Modifier.isStatic(field.getModifiers())) continue;
+
+                                    Map<String, Object> fieldmap = new LinkedHashMap<>();
+                                    fieldmap.put("type", field.getType().isArray() ? (field.getType().getComponentType().getName() + "[]") : field.getGenericType().getTypeName());
+
+                                    Column col = field.getAnnotation(Column.class);
+                                    FilterColumn fc = field.getAnnotation(FilterColumn.class);
+                                    Comment comment = field.getAnnotation(Comment.class);
+                                    org.redkale.util.Comment comment2 = field.getAnnotation(org.redkale.util.Comment.class);
+                                    if (comment != null) {
+                                        fieldmap.put("comment", comment.value());
+                                    } else if (comment2 != null) {
+                                        fieldmap.put("comment", comment2.value());
+                                    } else if (col != null) {
+                                        fieldmap.put("comment", col.comment());
+                                    } else if (fc != null) {
+                                        fieldmap.put("comment", fc.comment());
+                                    }
+                                    fieldmap.put("primary", !filter && (field.getAnnotation(Id.class) != null || field.getAnnotation(javax.persistence.Id.class) != null));
+                                    fieldmap.put("updatable", (filter || col == null || col.updatable()));
+
+                                    if (servlet.getClass().getAnnotation(Rest.RestDyn.class) != null) {
+                                        if (field.getAnnotation(RestAddress.class) != null) continue;
+                                    }
+
+                                    typeMap.put(field.getName(), fieldmap);
+                                }
+                            } while ((loop = loop.getSuperclass()) != Object.class);
+
+                            typesMap.put(ptype.getName(), typeMap);
+                        }
+                        mappingMap.put("result", action.result().getSimpleName().replace("void", "Object"));
+                        mappingsList.add(mappingMap);
+
+                        final Map<String, Object> swaggerOperatMap = new LinkedHashMap<>();
+                        swaggerOperatMap.put("tags", new String[]{tag});
+                        swaggerOperatMap.put("operationId", action.name());
+                        if (method.getAnnotation(Deprecated.class) != null) {
+                            swaggerOperatMap.put("deprecated", true);
+                        }
+                        Map<String, Object> respSchemaMap = new LinkedHashMap<>();
+                        JsonFactory returnFactory = Rest.createJsonFactory(false, method.getAnnotationsByType(RestConvert.class), method.getAnnotationsByType(RestConvertCoder.class));
+                        simpleSchemaType(returnFactory, node.getLogger(), swaggerComponentsMap, action.result(), resultType, respSchemaMap, true);
+
+                        Map<String, Object> respMap = new LinkedHashMap<>();
+                        respMap.put("schema", respSchemaMap);
+                        Object example = formatExample(returnFactory, action.example(), action.result(), resultType);
+                        if (example != null) respSchemaMap.put("example", example);
+                        if (!swaggerRequestBody.isEmpty()) swaggerOperatMap.put("requestBody", swaggerRequestBody);
+                        swaggerOperatMap.put("parameters", swaggerParamsList);
+                        String actiondesc = action.comment();
+                        if (action.rpconly()) actiondesc = "[Only for RPC API] " + actiondesc;
+                        swaggerOperatMap.put("responses", Utility.ofMap("200", Utility.ofMap("description", actiondesc, "content", Utility.ofMap("application/json", respMap))));
+
+                        String m = action.methods() == null || action.methods().length == 0 ? null : action.methods()[0].toLowerCase();
+                        if (m == null) {
+                            m = hasbodyparam || TYPE_RETRESULT_STRING.equals(resultType) || TYPE_RETRESULT_INTEGER.equals(resultType)
+                                || TYPE_RETRESULT_LONG.equals(resultType) || action.name().contains("create") || action.name().contains("insert")
+                                || action.name().contains("update") || action.name().contains("delete") || action.name().contains("send") ? "post" : "get";
+                        }
+                        swaggerPathsMap.put(prefix + action.url(), Utility.ofMap("description", action.comment(), m, swaggerOperatMap));
+                    }
+                } while ((clz = clz.getSuperclass()) != HttpServlet.class);
+                mappingsList.sort((o1, o2) -> ((String) o1.get("url")).compareTo((String) o2.get("url")));
+                servletsList.add(servletMap);
+                if (!actionUrls.isEmpty()) swaggerTags.add(Utility.ofMap("name", tag, "description", ws.comment()));
+            }
+            servletsList.sort((o1, o2) -> {
+                String[] urlregs1 = (String[]) o1.get("urlregs");
+                String[] urlregs2 = (String[]) o2.get("urlregs");
+                return urlregs1.length > 0 ? (urlregs2.length > 0 ? urlregs1[0].compareTo(urlregs2[0]) : 1) : -1;
+            });
+        }
+        { // https://github.com/OAI/OpenAPI-Specification 
+            Map<String, Object> swaggerResultMap = new LinkedHashMap<>();
+            swaggerResultMap.put("openapi", "3.0.0");
+            Map<String, Object> infomap = new LinkedHashMap<>();
+            infomap.put("title", "Redkale generate apidoc");
+            infomap.put("version", "1.0.0");
+            swaggerResultMap.put("info", infomap);
+            swaggerResultMap.put("servers", swaggerServers);
+            swaggerResultMap.put("paths", swaggerPathsMap);
+            swaggerResultMap.put("tags", swaggerTags);
+            if (!swaggerComponentsMap.isEmpty()) swaggerResultMap.put("components", Utility.ofMap("schemas", swaggerComponentsMap));
+            final FileOutputStream out = new FileOutputStream(new File(app.getHome(), "openapi-doc.json"));
+            out.write(JsonConvert.root().convertTo(swaggerResultMap).getBytes(StandardCharsets.UTF_8));
+            out.close();
+        }
+        {
+            Map<String, Object> oldapisResultMap = new LinkedHashMap<>();
+            oldapisResultMap.put("servers", serverList);
+            oldapisResultMap.put("types", typesMap);
+            final String json = JsonConvert.root().convertTo(oldapisResultMap);
+            final FileOutputStream out = new FileOutputStream(new File(app.getHome(), "apidoc.json"));
+            out.write(json.getBytes(StandardCharsets.UTF_8));
+            out.close();
+            File doctemplate = new File(app.getConfPath().toString(), "apidoc-template.html");
+            InputStream in = null;
+            if (doctemplate.isFile() && doctemplate.canRead()) {
+                in = new FileInputStream(doctemplate);
+            }
+            if (in != null) {
+                String content = Utility.read(in).replace("'#{content}'", json);
+                in.close();
+                FileOutputStream outhtml = new FileOutputStream(new File(app.getHome(), "apidoc.html"));
+                outhtml.write(content.getBytes(StandardCharsets.UTF_8));
+                outhtml.close();
+            }
+        }
+        return "apidoc success";
+    }
+
+    private static void simpleSchemaType(JsonFactory factory, Logger logger, Map<String, Map<String, Object>> componentsMap, Class type, Type genericType, Map<String, Object> schemaMap, boolean recursive) {
+        if (type == int.class || type == Integer.class || type == AtomicInteger.class) {
+            schemaMap.put("type", "integer");
+            schemaMap.put("format", "int32");
+        } else if (type == long.class || type == Long.class
+            || type == AtomicLong.class || type == LongAdder.class || type == BigInteger.class) {
+            schemaMap.put("type", "integer");
+            schemaMap.put("format", "int64");
+        } else if (type == float.class || type == Float.class) {
+            schemaMap.put("type", "number");
+            schemaMap.put("format", "float");
+        } else if (type == double.class || type == Double.class || type == BigDecimal.class) {
+            schemaMap.put("type", "number");
+            schemaMap.put("format", "double");
+        } else if (type == boolean.class || type == Boolean.class || type == AtomicBoolean.class) {
+            schemaMap.put("type", "boolean");
+        } else if (type.isPrimitive() || Number.class.isAssignableFrom(type)) {
+            schemaMap.put("type", "number");
+        } else if (type == String.class || CharSequence.class.isAssignableFrom(type)) {
+            schemaMap.put("type", "string");
+        } else if (recursive && (type.isArray() || Collection.class.isAssignableFrom(type))) {
+            schemaMap.put("type", "array");
+            Map<String, Object> sbumap = new LinkedHashMap<>();
+            if (type.isArray()) {
+                simpleSchemaType(factory, logger, componentsMap, type.getComponentType(), type.getComponentType(), sbumap, false);
+            } else if (genericType instanceof ParameterizedType) {
+                Type subpt = ((ParameterizedType) genericType).getActualTypeArguments()[0];
+                if (subpt instanceof Class) {
+                    simpleSchemaType(factory, logger, componentsMap, (Class) subpt, subpt, sbumap, false);
+                } else if (subpt instanceof ParameterizedType && ((ParameterizedType) subpt).getOwnerType() instanceof Class) {
+                    simpleSchemaType(factory, logger, componentsMap, (Class) ((ParameterizedType) subpt).getOwnerType(), subpt, sbumap, false);
+                } else {
+                    sbumap.put("type", "object");
+                }
+            } else {
+                sbumap.put("type", "object");
+            }
+            schemaMap.put("items", sbumap);
+        } else if (!type.getName().startsWith("java.") && !type.getName().startsWith("javax.")) {
+            String ct = simpleComponentType(factory, logger, componentsMap, type, genericType);
+            if (ct == null) {
+                schemaMap.put("type", "object");
+            } else {
+                schemaMap.put("$ref", "#/components/schemas/" + ct);
+            }
+        } else {
+            schemaMap.put("type", "object");
+        }
+    }
+
+    private static String simpleComponentType(JsonFactory factory, Logger logger, Map<String, Map<String, Object>> componentsMap, Class type, Type genericType) {
+        try {
+            Set<Type> types = new HashSet<>();
+            Encodeable encodeable = JsonFactory.root().loadEncoder(genericType);
+            String ct = componentKey(factory, logger, types, componentsMap, null, encodeable, true);
+            if (ct == null || ct.length() == 0) return null;
+            if (componentsMap.containsKey(ct)) return ct;
+            Map<String, Object> cmap = new LinkedHashMap<>();
+            componentsMap.put(ct, cmap); //必须在调用simpleSchemaType之前put，不然嵌套情况下死循环
+
+            cmap.put("type", "object");
+            List<String> requireds = new ArrayList<>();
+            Map<String, Object> properties = new LinkedHashMap<>();
+            if (encodeable instanceof ObjectEncoder) {
+                for (EnMember member : ((ObjectEncoder) encodeable).getMembers()) {
+                    Map<String, Object> schemaMap = new LinkedHashMap<>();
+                    simpleSchemaType(factory, logger, componentsMap, TypeToken.typeToClassOrElse(member.getEncoder().getType(), Object.class), member.getEncoder().getType(), schemaMap, true);
+                    String desc = "";
+                    if (member.getField() != null) {
+                        Column col = member.getField().getAnnotation(Column.class);
+                        if (col == null) {
+                            FilterColumn fcol = member.getField().getAnnotation(FilterColumn.class);
+                            if (fcol != null) {
+                                desc = fcol.comment();
+                                if (fcol.required()) requireds.add(member.getAttribute().field());
+                            }
+                        } else {
+                            desc = col.comment();
+                            if (!col.nullable()) requireds.add(member.getAttribute().field());
+                        }
+                        if (desc.isEmpty() && member.getField().getAnnotation(Comment.class) != null) {
+                            desc = member.getField().getAnnotation(Comment.class).value();
+                        } else if (desc.isEmpty() && member.getField().getAnnotation(org.redkale.util.Comment.class) != null) {
+                            desc = member.getField().getAnnotation(org.redkale.util.Comment.class).value();
+                        }
+                    } else if (member.getMethod() != null) {
+                        Column col = member.getMethod().getAnnotation(Column.class);
+                        if (col == null) {
+                            FilterColumn fcol = member.getMethod().getAnnotation(FilterColumn.class);
+                            if (fcol != null) {
+                                desc = fcol.comment();
+                                if (fcol.required()) requireds.add(member.getAttribute().field());
+                            }
+                        } else {
+                            desc = col.comment();
+                            if (!col.nullable()) requireds.add(member.getAttribute().field());
+                        }
+                        if (desc.isEmpty() && member.getMethod().getAnnotation(Comment.class) != null) {
+                            desc = member.getMethod().getAnnotation(Comment.class).value();
+                        } else if (desc.isEmpty() && member.getMethod().getAnnotation(org.redkale.util.Comment.class) != null) {
+                            desc = member.getMethod().getAnnotation(org.redkale.util.Comment.class).value();
+                        }
+                    }
+                    if (!desc.isEmpty()) schemaMap.put("description", desc);
+                    properties.put(member.getAttribute().field(), schemaMap);
+                }
+            }
+            if (!requireds.isEmpty()) cmap.put("required", requireds);
+            cmap.put("properties", properties);
+            return ct;
+        } catch (Exception e) {
+            logger.log(Level.WARNING, genericType + " generate component info error", e);
+            return null;
+        }
+    }
+
+    private static String componentKey(JsonFactory factory, Logger logger, Set<Type> types, Map<String, Map<String, Object>> componentsMap, EnMember field, Encodeable encodeable, boolean first) {
+        if (encodeable instanceof ObjectEncoder) {
+            if (types.contains(encodeable.getType())) return "";
+            types.add(encodeable.getType());
+            StringBuilder sb = new StringBuilder();
+            sb.append(((ObjectEncoder) encodeable).getTypeClass().getSimpleName());
+            for (EnMember member : ((ObjectEncoder) encodeable).getMembers()) {
+                if (member.getEncoder() instanceof ArrayEncoder
+                    || member.getEncoder() instanceof CollectionEncoder) {
+                    String subsb = componentKey(factory, logger, types, componentsMap, member, member.getEncoder(), false);
+                    if (subsb == null) return null;
+                    AccessibleObject real = member.getField() == null ? member.getMethod() : member.getField();
+                    if (real == null) continue;
+                    Class cz = real instanceof Field ? ((Field) real).getType() : ((Method) real).getReturnType();
+                    Type ct = real instanceof Field ? ((Field) real).getGenericType() : ((Method) real).getGenericReturnType();
+                    if (cz == ct) continue;
+                    if (field == null && encodeable.getType() instanceof Class) continue;
+                    if (sb.length() > 0 && subsb.length() > 0) sb.append("_");
+                    sb.append(subsb);
+                } else if (member.getEncoder() instanceof ObjectEncoder || member.getEncoder() instanceof SimpledCoder) {
+                    AccessibleObject real = member.getField() == null ? member.getMethod() : member.getField();
+                    if (real == null) continue;
+                    if (types.contains(member.getEncoder().getType())) continue;
+                    types.add(member.getEncoder().getType());
+                    if (member.getEncoder() instanceof SimpledCoder) {
+                        simpleSchemaType(factory, logger, componentsMap, ((SimpledCoder) member.getEncoder()).getType(), ((SimpledCoder) member.getEncoder()).getType(), new LinkedHashMap<>(), true);
+                    } else {
+                        simpleSchemaType(factory, logger, componentsMap, ((ObjectEncoder) member.getEncoder()).getTypeClass(), ((ObjectEncoder) member.getEncoder()).getType(), new LinkedHashMap<>(), true);
+                    }
+                    Class cz = real instanceof Field ? ((Field) real).getType() : ((Method) real).getReturnType();
+                    Type ct = real instanceof Field ? ((Field) real).getGenericType() : ((Method) real).getGenericReturnType();
+                    if (cz == ct) continue;
+                    String subsb = componentKey(factory, logger, types, componentsMap, member, member.getEncoder(), false);
+                    if (subsb == null) return null;
+                    if (field == null && member.getEncoder().getType() instanceof Class) continue;
+                    if (sb.length() > 0 && subsb.length() > 0) sb.append("_");
+                    sb.append(subsb);
+                } else if (member.getEncoder() instanceof MapEncoder) {
+                    continue;
+                } else {
+                    return null;
+                }
+            }
+            return sb.toString();
+        } else if (encodeable instanceof ArrayEncoder || encodeable instanceof CollectionEncoder) {
+            final boolean array = (encodeable instanceof ArrayEncoder);
+            Encodeable subEncodeable = array ? ((ArrayEncoder) encodeable).getComponentEncoder() : ((CollectionEncoder) encodeable).getComponentEncoder();
+            if (subEncodeable instanceof SimpledCoder && field != null) return "";
+            final String sb = componentKey(factory, logger, types, componentsMap, null, subEncodeable, false);
+            if (sb == null || sb.isEmpty()) return sb;
+            if (field != null && field.getField() != null && field.getField().getDeclaringClass() == Sheet.class) {
+                return sb;
+            }
+            return sb + (array ? "_Array" : "_Collection");
+        } else if (encodeable instanceof SimpledCoder) {
+            Class stype = ((SimpledCoder) encodeable).getType();
+            if (stype.isPrimitive() || stype == Boolean.class || Number.class.isAssignableFrom(stype) || CharSequence.class.isAssignableFrom(stype)) {
+                return stype.getSimpleName();
+            }
+            return "";
+        } else if (encodeable instanceof MapEncoder) {
+            return first ? null : "";
+        } else {
+            return null;
+        }
+    }
+
+    private static Object formatExample(JsonFactory factory, String example, Class type, Type genericType) {
+        if (example != null && !example.isEmpty()) return example;
+        JsonFactory jsonFactory = factory == null || factory == JsonFactory.root() ? exampleFactory : factory;
+        if (type == Flipper.class) {
+            return new Flipper();
+        } else if (TYPE_RETRESULT_OBJECT.equals(genericType)) {
+            return RetResult.success();
+        } else if (TYPE_RETRESULT_STRING.equals(genericType)) {
+            return RetResult.success();
+        } else if (TYPE_RETRESULT_INTEGER.equals(genericType)) {
+            return RetResult.success(0);
+        } else if (TYPE_RETRESULT_LONG.equals(genericType)) {
+            return RetResult.success(0L);
+        } else if (type == boolean.class || type == Boolean.class) {
+            return true;
+        } else if (type.isPrimitive()) {
+            return 0;
+        } else if (type == boolean[].class || type == Boolean[].class) {
+            return new boolean[]{true, false};
+        } else if (type == byte[].class || type == Byte[].class) {
+            return new byte[]{0, 0};
+        } else if (type == char[].class || type == Character[].class) {
+            return new char[]{'a', 'b'};
+        } else if (type == short[].class || type == Short[].class) {
+            return new short[]{0, 0};
+        } else if (type == int[].class || type == Integer[].class) {
+            return new int[]{0, 0};
+        } else if (type == long[].class || type == Long[].class) {
+            return new long[]{0, 0};
+        } else if (type == float[].class || type == Float[].class) {
+            return new float[]{0, 0};
+        } else if (type == double[].class || type == Double[].class) {
+            return new double[]{0, 0};
+        } else if (Number.class.isAssignableFrom(type)) {
+            return 0;
+        } else if (CharSequence.class.isAssignableFrom(type)) {
+            return "";
+        } else if (CompletableFuture.class.isAssignableFrom(type)) {
+            if (genericType instanceof ParameterizedType) {
+                try {
+                    ParameterizedType pt = (ParameterizedType) genericType;
+                    Type valType = pt.getActualTypeArguments()[0];
+                    return formatExample(factory, example, valType instanceof ParameterizedType ? (Class) ((ParameterizedType) valType).getRawType() : ((Class) valType), valType);
+                } catch (Throwable t) {
+                }
+            }
+        } else if (Sheet.class.isAssignableFrom(type)) { //要在Collection前面
+            if (genericType instanceof ParameterizedType) {
+                try {
+                    ParameterizedType pt = (ParameterizedType) genericType;
+                    Type valType = pt.getActualTypeArguments()[0];
+                    Class valClass = valType instanceof ParameterizedType ? (Class) ((ParameterizedType) valType).getRawType() : (Class) valType;
+                    Object val = formatExample(factory, example, valClass, valType);
+                    return new StringWrapper(jsonFactory.getConvert().convertTo(jsonFactory.getConvert().convertFrom(genericType, "{'rows':[" + val + "," + val + "]}")));
+                } catch (Throwable t) {
+                }
+            }
+        } else if (type.isArray()) {
+            try {
+                Object val = formatExample(factory, example, type.getComponentType(), type.getComponentType());
+                return new StringWrapper(jsonFactory.getConvert().convertTo(jsonFactory.getConvert().convertFrom(genericType, "[" + val + "," + val + "]")));
+            } catch (Throwable t) {
+            }
+        } else if (Collection.class.isAssignableFrom(type)) {
+            if (genericType instanceof ParameterizedType) {
+                try {
+                    ParameterizedType pt = (ParameterizedType) genericType;
+                    Type valType = pt.getActualTypeArguments()[0];
+                    Class valClass = valType instanceof ParameterizedType ? (Class) ((ParameterizedType) valType).getRawType() : (Class) valType;
+                    Object val = formatExample(factory, example, valClass, valType);
+                    return new StringWrapper(jsonFactory.getConvert().convertTo(jsonFactory.getConvert().convertFrom(genericType, "[" + val + "," + val + "]")));
+                } catch (Throwable t) {
+                }
+            }
+        } else if (type == RetResult.class) {
+            if (genericType instanceof ParameterizedType) {
+                try {
+                    ParameterizedType pt = (ParameterizedType) genericType;
+                    Type valType = pt.getActualTypeArguments()[0];
+                    Class valClass = valType instanceof ParameterizedType ? (Class) ((ParameterizedType) valType).getRawType() : (Class) valType;
+                    Object val = formatExample(factory, example, valClass, valType);
+                    return new StringWrapper(jsonFactory.getConvert().convertTo(jsonFactory.getConvert().convertFrom(genericType, "{'result':" + val + "}")));
+                } catch (Throwable t) {
+                }
+            }
+        } else if (type != void.class) {
+            try {
+                Decodeable decoder = jsonFactory.loadDecoder(genericType);
+                if (decoder instanceof ObjectDecoder) {
+                    StringBuilder json = new StringBuilder();
+                    json.append("{");
+                    int index = 0;
+                    for (DeMember member : ((ObjectDecoder) decoder).getMembers()) {
+                        if (!(member.getDecoder() instanceof ObjectDecoder)) continue;
+                        if (index > 0) json.append(",");
+                        json.append('"').append(member.getAttribute().field()).append("\":{}");
+                        index++;
+                    }
+                    json.append("}");
+                    Object val = jsonFactory.getConvert().convertFrom(genericType, json.toString());
+                    return new StringWrapper(jsonFactory.getConvert().convertTo(val));
+                }
+                Creator creator = Creator.create(type);
+                return new StringWrapper(jsonFactory.getConvert().convertTo(creator.create()));
+            } catch (Throwable t) {
+            }
+        }
+        return example;
+    }
+
+    private static final JsonFactory exampleFactory = JsonFactory.create().tiny(false);
+
+}

src/main/java/org/redkale/boot/ApplicationListener.java

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

src/main/java/org/redkale/boot/ClassFilter.java

@@ -6,16 +6,20 @@
 package org.redkale.boot;
 
 import java.io.*;
-import java.lang.annotation.*;
+import java.lang.annotation.Annotation;
 import java.lang.reflect.Modifier;
 import java.net.*;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.function.Predicate;
 import java.util.jar.*;
 import java.util.logging.*;
-import java.util.regex.*;
-import org.redkale.util.*;
+import java.util.regex.Pattern;
+import org.redkale.annotation.AutoLoad;
+import org.redkale.annotation.*;
 import org.redkale.util.AnyValue.DefaultAnyValue;
+import org.redkale.util.*;
 
 /**
  * class过滤器， 符合条件的class会保留下来存入FilterEntry。
@@ -30,12 +34,12 @@ public final class ClassFilter<T> {
 
     private static final Logger logger = Logger.getLogger(ClassFilter.class.getName()); //日志对象
 
-    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的子类
@@ -60,11 +64,11 @@ public final class ClassFilter<T> {
 
     private final ClassLoader classLoader;
 
-    public ClassFilter(ClassLoader classLoader, Class<? extends Annotation> annotationClass, Class superClass, Class[] excludeSuperClasses) {
+    public ClassFilter(RedkaleClassLoader classLoader, Class<? extends Annotation> annotationClass, Class superClass, Class[] excludeSuperClasses) {
         this(classLoader, annotationClass, superClass, excludeSuperClasses, null);
     }
 
-    public ClassFilter(ClassLoader classLoader, Class<? extends Annotation> annotationClass, Class superClass, Class[] excludeSuperClasses, AnyValue conf) {
+    public ClassFilter(RedkaleClassLoader classLoader, Class<? extends Annotation> annotationClass, Class superClass, Class[] excludeSuperClasses, AnyValue conf) {
         this.annotationClass = annotationClass;
         this.superClass = superClass;
         this.excludeSuperClasses = excludeSuperClasses;
@@ -72,8 +76,8 @@ public final class ClassFilter<T> {
         this.classLoader = classLoader == null ? Thread.currentThread().getContextClassLoader() : classLoader;
     }
 
-    public static ClassFilter create(Class[] excludeSuperClasses, String includeregs, String excluderegs, Set<String> includeValues, Set<String> excludeValues) {
-        ClassFilter filter = new ClassFilter(null, null, null, excludeSuperClasses);
+    public static ClassFilter create(RedkaleClassLoader classLoader, Class[] excludeSuperClasses, String includeregs, String excluderegs, Set<String> includeValues, Set<String> excludeValues) {
+        ClassFilter filter = new ClassFilter(classLoader, null, null, excludeSuperClasses);
         filter.setIncludePatterns(includeregs == null ? null : includeregs.split(";"));
         filter.setExcludePatterns(excluderegs == null ? null : excluderegs.split(";"));
         filter.setPrivilegeIncludes(includeValues);
@@ -82,13 +86,17 @@ public final class ClassFilter<T> {
     }
 
     public ClassFilter<T> or(ClassFilter<T> filter) {
-        if (ors == null) ors = new ArrayList<>();
+        if (ors == null) {
+            ors = new ArrayList<>();
+        }
         ors.add(filter);
         return this;
     }
 
     public ClassFilter<T> and(ClassFilter<T> filter) {
-        if (ands == null) ands = new ArrayList<>();
+        if (ands == null) {
+            ands = new ArrayList<>();
+        }
         ands.add(filter);
         return this;
     }
@@ -99,11 +107,16 @@ public final class ClassFilter<T> {
      * @return Set&lt;FilterEntry&lt;T&gt;&gt;
      */
     public final Set<FilterEntry<T>> getFilterEntrys() {
-        HashSet<FilterEntry<T>> set = new HashSet<>();
-        set.addAll(entrys);
-        if (ors != null) ors.forEach(f -> set.addAll(f.getFilterEntrys()));
-        if (ands != null) ands.forEach(f -> set.addAll(f.getFilterEntrys()));
-        return set;
+        List<FilterEntry<T>> list = new ArrayList<>();
+        list.addAll(entrys);
+        if (ors != null) {
+            ors.forEach(f -> list.addAll(f.getFilterEntrys()));
+        }
+        if (ands != null) {
+            ands.forEach(f -> list.addAll(f.getFilterEntrys()));
+        }
+        Collections.sort(list);
+        return new LinkedHashSet<>(list);
     }
 
     /**
@@ -112,11 +125,16 @@ public final class ClassFilter<T> {
      * @return Set&lt;FilterEntry&lt;T&gt;&gt;
      */
     public final Set<FilterEntry<T>> getFilterExpectEntrys() {
-        HashSet<FilterEntry<T>> set = new HashSet<>();
-        set.addAll(expectEntrys);
-        if (ors != null) ors.forEach(f -> set.addAll(f.getFilterExpectEntrys()));
-        if (ands != null) ands.forEach(f -> set.addAll(f.getFilterExpectEntrys()));
-        return set;
+        List<FilterEntry<T>> list = new ArrayList<>();
+        list.addAll(expectEntrys);
+        if (ors != null) {
+            ors.forEach(f -> list.addAll(f.getFilterExpectEntrys()));
+        }
+        if (ands != null) {
+            ands.forEach(f -> list.addAll(f.getFilterExpectEntrys()));
+        }
+        Collections.sort(list);
+        return new LinkedHashSet<>(list);
     }
 
     /**
@@ -125,7 +143,7 @@ public final class ClassFilter<T> {
      * @return Set&lt;FilterEntry&lt;T&gt;&gt;
      */
     public final Set<FilterEntry<T>> getAllFilterEntrys() {
-        HashSet<FilterEntry<T>> rs = new HashSet<>();
+        HashSet<FilterEntry<T>> rs = new LinkedHashSet<>();
         rs.addAll(getFilterEntrys());
         rs.addAll(getFilterExpectEntrys());
         return rs;
@@ -159,52 +177,69 @@ public final class ClassFilter<T> {
      *
      * @param property  application.xml中对应class节点下的property属性项
      * @param clazzname class名称
-     * @param autoscan  为true表示自动扫描的， false表示显著调用filter， AutoLoad的注解将被忽略
+     * @param autoScan  为true表示自动扫描的， false表示显著调用filter， AutoLoad的注解将被忽略
      * @param url       URL
      */
-    public final void filter(AnyValue property, String clazzname, boolean autoscan, 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) {
             for (ClassFilter filter : ands) {
-                if (!filter.accept(property, clazzname)) return;
+                if (!filter.accept(property, clazzname)) {
+                    return;
+                }
             }
         }
         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.") || clazzname.contains("module-info")) 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;
+            if (!cf.accept(property, clazz, autoScan)) {
+                return;
+            }
             if (cf.conf != null) {
                 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)的
-                expectEntrys.add(new FilterEntry(clazz, autoscan, true, property));
+            org.redkale.util.AutoLoad auto2 = (org.redkale.util.AutoLoad) clazz.getAnnotation(org.redkale.util.AutoLoad.class);
+            if ((expectPredicate != null && expectPredicate.test(clazzname)) || (autoScan && auto != null && !auto.value())
+                || (autoScan && auto2 != null && !auto2.value())) { //自动扫描且被标记为@AutoLoad(false)的
+                expectEntrys.add(new FilterEntry(clazz, autoScan, true, property));
             } else {
-                entrys.add(new FilterEntry(clazz, autoscan, false, property));
+                entrys.add(new FilterEntry(clazz, autoScan, false, property));
             }
         } catch (Throwable cfe) {
-            if (finest && !clazzname.startsWith("sun.") && !clazzname.startsWith("javax.")
+            if (logger.isLoggable(Level.FINEST) && !clazzname.startsWith("sun.") && !clazzname.startsWith("javax.")
                 && !clazzname.startsWith("com.sun.") && !clazzname.startsWith("jdk.") && !clazzname.startsWith("META-INF")
-                && (!(cfe instanceof NoClassDefFoundError) || ((NoClassDefFoundError) cfe).getMessage().startsWith("java.lang.NoClassDefFoundError: java"))) {
+                && !clazzname.startsWith("com.mysql.") && !clazzname.startsWith("com.microsoft.") && !clazzname.startsWith("freemarker.")
+                && !clazzname.startsWith("org.redkale") && (clazzname.contains("Service") || clazzname.contains("Servlet"))) {
+                if (cfe instanceof NoClassDefFoundError) {
+                    String msg = ((NoClassDefFoundError) cfe).getMessage();
+                    if (msg.startsWith("java.lang.NoClassDefFoundError: java") || msg.startsWith("javax/")) {
+                        return;
+                    }
+                }
+                //&& (!(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);
             }
         }
@@ -233,30 +268,46 @@ public final class ClassFilter<T> {
         boolean r = accept0(property, classname);
         if (r && ands != null) {
             for (ClassFilter filter : ands) {
-                if (!filter.accept(property, classname)) return false;
+                if (!filter.accept(property, classname)) {
+                    return false;
+                }
             }
         }
         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;
     }
 
     private boolean accept0(AnyValue property, String classname) {
-        if (this.refused) return false;
-        if (this.privilegeIncludes != null && this.privilegeIncludes.contains(classname)) return true;
-        if (this.privilegeExcludes != null && this.privilegeExcludes.contains(classname)) return false;
-        if (classname.startsWith("java.") || classname.startsWith("javax.")) return false;
+        if (this.refused) {
+            return false;
+        }
+        if (this.privilegeIncludes != null && this.privilegeIncludes.contains(classname)) {
+            return true;
+        }
+        if (this.privilegeExcludes != null && this.privilegeExcludes.contains(classname)) {
+            return false;
+        }
+        if (classname.startsWith("java.") || classname.startsWith("javax.")) {
+            return false;
+        }
         if (excludePatterns != null) {
             for (Pattern reg : excludePatterns) {
-                if (reg.matcher(classname).matches()) return false;
+                if (reg.matcher(classname).matches()) {
+                    return false;
+                }
             }
         }
         if (includePatterns != null) {
             for (Pattern reg : includePatterns) {
-                if (reg.matcher(classname).matches()) return true;
+                if (reg.matcher(classname).matches()) {
+                    return true;
+                }
             }
         }
         return includePatterns == null;
@@ -273,27 +324,41 @@ public final class ClassFilter<T> {
      */
     @SuppressWarnings("unchecked")
     public boolean accept(AnyValue property, Class clazz, boolean autoscan) {
-        if (this.refused || !Modifier.isPublic(clazz.getModifiers())) return false;
-        if (annotationClass != null && clazz.getAnnotation(annotationClass) == null) return false;
+        if (this.refused || !Modifier.isPublic(clazz.getModifiers())) {
+            return false;
+        }
+        if (annotationClass != null && clazz.getAnnotation(annotationClass) == null) {
+            return false;
+        }
         boolean rs = superClass == null || (clazz != superClass && superClass.isAssignableFrom(clazz));
         if (rs && this.excludeSuperClasses != null && this.excludeSuperClasses.length > 0) {
             for (Class c : this.excludeSuperClasses) {
-                if (c != null && (clazz == c || c.isAssignableFrom(clazz))) return false;
+                if (c != null && (clazz == c || c.isAssignableFrom(clazz))) {
+                    return false;
+                }
             }
         }
         return rs;
     }
 
     public static Pattern[] toPattern(String[] regs) {
-        if (regs == null || regs.length == 0) return null;
+        if (regs == null || regs.length == 0) {
+            return null;
+        }
         int i = 0;
         Pattern[] rs = new Pattern[regs.length];
         for (String reg : regs) {
-            if (reg == null || reg.trim().isEmpty()) continue;
+            if (reg == null || reg.trim().isEmpty()) {
+                continue;
+            }
             rs[i++] = Pattern.compile(reg.trim());
         }
-        if (i == 0) return null;
-        if (i == rs.length) return rs;
+        if (i == 0) {
+            return null;
+        }
+        if (i == rs.length) {
+            return rs;
+        }
         Pattern[] ps = new Pattern[i];
         System.arraycopy(rs, 0, ps, 0, i);
         return ps;
@@ -347,6 +412,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;
     }
@@ -369,9 +442,9 @@ public final class ClassFilter<T> {
      *
      * @param <T> 泛型
      */
-    public static final class FilterEntry<T> {
+    public static final class FilterEntry<T> implements Comparable<FilterEntry<T>> {
 
-        private final HashSet<String> groups = new LinkedHashSet<>();
+        private final String group; //优先级高于remote属性
 
         private final String name;
 
@@ -389,22 +462,26 @@ public final class ClassFilter<T> {
 
         public FilterEntry(Class<T> type, final boolean autoload, boolean expect, AnyValue property) {
             this.type = type;
-            String str = property == null ? null : property.getValue("groups");
-            if (str != null) {
-                str = str.trim();
-                if (str.endsWith(";")) str = str.substring(0, str.length() - 1);
-            }
-            if (str != null) groups.addAll(Arrays.asList(str.split(";")));
             this.property = property;
             this.autoload = autoload;
             this.expect = expect;
+            this.group = property == null ? null : property.getValue("group", "").trim();
             this.name = property == null ? "" : property.getValue("name", "");
         }
 
+        @Override //@Priority值越大，优先级越高, 需要排前面
+        public int compareTo(FilterEntry o) {
+            if (!(o instanceof FilterEntry)) {
+                return 1;
+            }
+            Priority p1 = this.type.getAnnotation(Priority.class);
+            Priority p2 = ((FilterEntry<T>) o).type.getAnnotation(Priority.class);
+            return (p2 == null ? 0 : p2.value()) - (p1 == null ? 0 : p1.value());
+        }
+
         @Override
         public String toString() {
-            return this.getClass().getSimpleName() + "[thread=" + Thread.currentThread().getName()
-                + ", type=" + this.type.getSimpleName() + ", name=" + name + ", groups=" + groups + "]";
+            return this.getClass().getSimpleName() + "[type=" + this.type.getSimpleName() + ", name=" + name + ", group=" + this.group + "]";
         }
 
         @Override
@@ -414,9 +491,13 @@ public final class ClassFilter<T> {
 
         @Override
         public boolean equals(Object obj) {
-            if (obj == null) return false;
-            if (getClass() != obj.getClass()) return false;
-            return (this.type == ((FilterEntry<?>) obj).type && this.groups.equals(((FilterEntry<?>) obj).groups) && this.name.equals(((FilterEntry<?>) obj).name));
+            if (obj == null) {
+                return false;
+            }
+            if (getClass() != obj.getClass()) {
+                return false;
+            }
+            return (this.type == ((FilterEntry<?>) obj).type && this.name.equals(((FilterEntry<?>) obj).name));
         }
 
         public Class<T> getType() {
@@ -431,12 +512,16 @@ public final class ClassFilter<T> {
             return property;
         }
 
-        public boolean isEmptyGroups() {
-            return groups == null || groups.isEmpty();
+        public boolean isEmptyGroup() {
+            return group == null || group.isEmpty();
         }
 
-        public HashSet<String> getGroups() {
-            return groups;
+        public String getGroup() {
+            return group;
+        }
+
+        public boolean isRemote() {
+            return "$remote".equalsIgnoreCase(group);
         }
 
         public boolean isAutoload() {
@@ -446,6 +531,7 @@ public final class ClassFilter<T> {
         public boolean isExpect() {
             return expect;
         }
+
     }
 
     /**
@@ -465,28 +551,32 @@ public final class ClassFilter<T> {
          * 加载当前线程的classpath扫描所有class进行过滤
          *
          * @param excludeFile 不需要扫描的文件夹， 可以为null
+         * @param loader      RedkaleClassloader， 不可为null
          * @param excludeRegs 包含此关键字的文件将被跳过， 可以为null
          * @param filters     过滤器
          *
          * @throws IOException 异常
          */
-        public static void load(final File excludeFile, final String[] excludeRegs, final ClassFilter... filters) throws IOException {
-            RedkaleClassLoader loader = (RedkaleClassLoader) Thread.currentThread().getContextClassLoader();
+        public static void load(final File excludeFile, RedkaleClassLoader loader, final String[] excludeRegs, final ClassFilter... filters) throws IOException {
             List<URL> urlfiles = new ArrayList<>(2);
             List<URL> urljares = new ArrayList<>(2);
             final URL exurl = excludeFile != null ? excludeFile.toURI().toURL() : null;
             final Pattern[] excludePatterns = toPattern(excludeRegs);
             for (URL url : loader.getAllURLs()) {
-                if (exurl != null && exurl.sameFile(url)) continue;
-                if (excludePatterns != null) {
+                if (exurl != null && exurl.sameFile(url)) {
+                    continue;
+                }
+                if (excludePatterns != null && url != RedkaleClassLoader.URL_NONE) {
                     boolean skip = false;
                     for (Pattern p : excludePatterns) {
                         if (p.matcher(url.toString()).matches()) {
-                            skip = false;
+                            skip = true;
                             break;
                         }
                     }
-                    if (skip) continue;
+                    if (skip) {
+                        continue;
+                    }
                 }
                 if (url.getPath().endsWith(".jar")) {
                     urljares.add(url);
@@ -501,23 +591,48 @@ public final class ClassFilter<T> {
                 Set<String> classes = cache.get(url);
                 if (classes == null) {
                     classes = new LinkedHashSet<>();
-                    try (JarFile jar = new JarFile(URLDecoder.decode(url.getFile(), "UTF-8"))) {
+                    try (JarFile jar = new JarFile(URLDecoder.decode(url.getFile(), StandardCharsets.UTF_8))) {
                         Enumeration<JarEntry> it = jar.entries();
                         while (it.hasMoreElements()) {
                             String entryname = it.nextElement().getName().replace('/', '.');
                             if (entryname.endsWith(".class") && entryname.indexOf('$') < 0) {
                                 String classname = entryname.substring(0, entryname.length() - 6);
-                                if (classname.startsWith("javax.") || classname.startsWith("com.sun.")) continue;
+                                if (classname.startsWith("javax.") || classname.startsWith("com.sun.")) {
+                                    continue;
+                                }
                                 //常见的jar跳过
-                                if (classname.startsWith("com.mysql.")) break;
-                                if (classname.startsWith("org.mariadb.")) break;
-                                if (classname.startsWith("oracle.jdbc.")) break;
-                                if (classname.startsWith("org.postgresql.")) break;
-                                if (classname.startsWith("com.microsoft.sqlserver.")) break;
+                                if (classname.startsWith("com.redkaledyn.")) {
+                                    break; //redkale动态生成的类
+                                }
+                                if (classname.startsWith("com.mysql.")) {
+                                    break;
+                                }
+                                if (classname.startsWith("org.junit.")) {
+                                    break;
+                                }
+                                if (classname.startsWith("org.openjfx.")) {
+                                    break;
+                                }
+                                if (classname.startsWith("org.mariadb.")) {
+                                    break;
+                                }
+                                if (classname.startsWith("oracle.jdbc.")) {
+                                    break;
+                                }
+                                if (classname.startsWith("org.postgresql.")) {
+                                    break;
+                                }
+                                if (classname.startsWith("com.microsoft.sqlserver.")) {
+                                    break;
+                                }
                                 classes.add(classname);
-                                if (debug) debugstr.append(classname).append("\r\n");
+                                if (debug) {
+                                    debugstr.append(classname).append("\r\n");
+                                }
                                 for (final ClassFilter filter : filters) {
-                                    if (filter != null) filter.filter(null, classname, url);
+                                    if (filter != null) {
+                                        filter.filter(null, classname, url);
+                                    }
                                 }
                             }
                         }
@@ -526,7 +641,9 @@ public final class ClassFilter<T> {
                 } else {
                     for (String classname : classes) {
                         for (final ClassFilter filter : filters) {
-                            if (filter != null) filter.filter(null, classname, url);
+                            if (filter != null) {
+                                filter.filter(null, classname, url);
+                            }
                         }
                     }
                 }
@@ -535,40 +652,65 @@ public final class ClassFilter<T> {
                 Set<String> classes = cache.get(url);
                 if (classes == null) {
                     classes = new LinkedHashSet<>();
-                    files.clear();
-                    File root = new File(url.getFile());
-                    String rootpath = root.getPath();
-                    loadClassFiles(excludeFile, root, files);
-                    for (File f : files) {
-                        String classname = f.getPath().substring(rootpath.length() + 1, f.getPath().length() - 6).replace(File.separatorChar, '.');
-                        if (classname.startsWith("javax.") || classname.startsWith("com.sun.")) continue;
-                        classes.add(classname);
-                        if (debug) debugstr.append(classname).append("\r\n");
-                        for (final ClassFilter filter : filters) {
-                            if (filter != null) filter.filter(null, classname, url);
+                    final Set<String> cs = classes;
+                    if (url == RedkaleClassLoader.URL_NONE) {
+                        loader.forEachCacheClass(v -> cs.add(v));
+                    }
+                    if (cs.isEmpty()) {
+                        files.clear();
+                        File root = new File(url.getFile());
+                        String rootpath = root.getPath();
+                        loadClassFiles(excludeFile, root, files);
+                        for (File f : files) {
+                            String classname = f.getPath().substring(rootpath.length() + 1, f.getPath().length() - 6).replace(File.separatorChar, '.');
+                            if (classname.startsWith("javax.") || classname.startsWith("com.sun.")) {
+                                continue;
+                            }
+                            classes.add(classname);
+                            if (debug) {
+                                debugstr.append(classname).append("\r\n");
+                            }
+                            for (final ClassFilter filter : filters) {
+                                if (filter != null) {
+                                    filter.filter(null, classname, url);
+                                }
+                            }
+                        }
+                    } else {
+                        for (String classname : classes) {
+                            for (final ClassFilter filter : filters) {
+                                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, url);
+                            if (filter != null) {
+                                filter.filter(null, classname, url);
+                            }
                         }
                     }
                 }
             }
-            //if (debug) logger.log(Level.INFO, "scan classes: \r\n{0}", debugstr);
+            //if (debug) logger.log(Level.INFO, "Scan classes: \r\n{0}", debugstr);
         }
 
         private static void loadClassFiles(File exclude, File root, List<File> files) {
             if (root.isFile() && root.getName().endsWith(".class")) {
                 files.add(root);
             } else if (root.isDirectory()) {
-                if (exclude != null && exclude.equals(root)) return;
+                if (exclude != null && exclude.equals(root)) {
+                    return;
+                }
                 File[] lfs = root.listFiles();
-                if (lfs == null) throw new RuntimeException("File(" + root + ") cannot listFiles()");
-                for (File f : lfs) {
-                    loadClassFiles(exclude, f, files);
+                if (lfs != null) {
+                    for (File f : lfs) {
+                        loadClassFiles(exclude, f, files);
+                    }
                 }
             }
         }

src/main/java/org/redkale/boot/LoggingBaseHandler.java

@@ -0,0 +1,135 @@
+/*
+ */
+package org.redkale.boot;
+
+import java.io.*;
+import java.util.logging.*;
+import org.redkale.util.Traces;
+
+/**
+ * Handler基类
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @since 2.7.0
+ */
+public abstract class LoggingBaseHandler extends Handler {
+
+    //public static final String FORMATTER_FORMAT = "%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%tL %4$s %2$s%n%5$s%6$s%n";
+    //无threadName、TID
+    public static final String FORMATTER_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";
+
+    //有threadName
+    public static final String FORMATTER_FORMAT2 = "[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%tL] [%7$s] %4$s %2$s\r\n%5$s%6$s\r\n";
+
+    //有threadName、TID
+    public static final String FORMATTER_FORMAT3 = "[%1$tY-%1$tm-%1$td %1$tH:%1$tM:%1$tS.%tL] [%7$s] %8$s %4$s %2$s\r\n%5$s%6$s\r\n";
+
+    /**
+     * 默认的日志时间格式化类
+     * 与SimpleFormatter的区别在于level不使用本地化
+     *
+     */
+    public static class LoggingFormater extends Formatter {
+
+        @Override
+        public String format(LogRecord log) {
+            if (log.getThrown() == null && log.getMessage() != null && log.getMessage().startsWith("------")) {
+                return formatMessage(log) + "\r\n";
+            }
+            String source;
+            if (log.getSourceClassName() != null) {
+                source = log.getSourceClassName();
+                if (log.getSourceMethodName() != null) {
+                    source += " " + log.getSourceMethodName();
+                }
+            } else {
+                source = log.getLoggerName();
+            }
+            String message = formatMessage(log);
+            String throwable = "";
+            if (log.getThrown() != null) {
+                StringWriter sw = new StringWriter();
+                PrintWriter pw = new PrintWriter(sw) {
+                    @Override
+                    public void println() {
+                        super.print("\r\n");
+                    }
+                };
+                pw.println();
+                log.getThrown().printStackTrace(pw);
+                pw.close();
+                throwable = sw.toString();
+            }
+            Object[] params = log.getParameters();
+            if (params != null) {
+                if (params.length == 1) {
+                    return String.format(FORMATTER_FORMAT2,
+                        log.getInstant().toEpochMilli(),
+                        source,
+                        log.getLoggerName(),
+                        log.getLevel().getName(),
+                        message,
+                        throwable,
+                        params[0]);
+                } else if (params.length == 2) {
+                    return String.format(FORMATTER_FORMAT3,
+                        log.getInstant().toEpochMilli(),
+                        source,
+                        log.getLoggerName(),
+                        log.getLevel().getName(),
+                        message,
+                        throwable,
+                        params[0],
+                        params[1]);
+                }
+            }
+            return String.format(FORMATTER_FORMAT,
+                log.getInstant().toEpochMilli(),
+                source,
+                log.getLoggerName(),
+                log.getLevel().getName(),
+                message,
+                throwable);
+        }
+    }
+
+    static boolean traceFlag = false; //防止设置system.property前调用Traces类导致enable提前初始化
+
+    protected static void fillLogRecord(LogRecord log) {
+        String traceid = null;
+        if (traceFlag && Traces.enable()) {
+            traceid = Traces.currTraceid();
+            if (traceid == null || traceid.isEmpty()) {
+                traceid = "[TID:N/A] ";
+            } else {
+                traceid = "[TID:" + traceid + "] ";
+            }
+        }
+        if (traceid == null) {
+            log.setParameters(new String[]{Thread.currentThread().getName()});
+        } else {
+            log.setParameters(new String[]{Thread.currentThread().getName(), traceid});
+        }
+    }
+
+    public static void initDebugLogConfig() {
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream();
+            final PrintStream ps = new PrintStream(out);
+            final String handlerName = LoggingFileHandler.LoggingConsoleHandler.class.getName(); //java.util.logging.ConsoleHandler
+            ps.println("handlers = " + handlerName);
+            ps.println(".level = FINEST");
+            ps.println("jdk.level = INFO");
+            ps.println("sun.level = INFO");
+            ps.println("com.sun.level = INFO");
+            ps.println("javax.level = INFO");
+            ps.println(handlerName + ".level = FINEST");
+            ps.println(handlerName + ".formatter = " + LoggingFormater.class.getName());
+            LogManager.getLogManager().readConfiguration(new ByteArrayInputStream(out.toByteArray()));
+        } catch (Exception e) {
+        }
+    }
+
+}

src/main/java/org/redkale/boot/LoggingFileHandler.java

@@ -6,15 +6,14 @@
 package org.redkale.boot;
 
 import java.io.*;
-import java.nio.file.*;
+import java.nio.file.Files;
 import static java.nio.file.StandardCopyOption.*;
-import java.time.*;
-import java.util.*;
-import java.util.concurrent.*;
+import java.util.Calendar;
+import java.util.concurrent.LinkedBlockingQueue;
 import java.util.concurrent.atomic.*;
 import java.util.logging.*;
-import java.util.logging.Formatter;
 import java.util.regex.Pattern;
+import org.redkale.util.*;
 
 /**
  * 自定义的日志输出类
@@ -24,12 +23,12 @@ import java.util.regex.Pattern;
  * @author zhangjx
  */
 @SuppressWarnings("unchecked")
-public class LogFileHandler extends Handler {
+public class LoggingFileHandler extends LoggingBaseHandler {
 
     /**
      * SNCP的日志输出Handler
      */
-    public static class SncpLogFileHandler extends LogFileHandler {
+    public static class LoggingSncpFileHandler extends LoggingFileHandler {
 
         @Override
         public String getPrefix() {
@@ -37,56 +36,49 @@ public class LogFileHandler extends Handler {
         }
     }
 
-    /**
-     * 默认的日志时间格式化类
-     *
-     */
-    public static class LoggingFormater extends Formatter {
+    public static class LoggingConsoleHandler extends ConsoleHandler {
 
-        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";
+        private Pattern denyRegx;
 
-        @Override
-        public String format(LogRecord record) {
-            String source;
-            if (record.getSourceClassName() != null) {
-                source = record.getSourceClassName();
-                if (record.getSourceMethodName() != null) {
-                    source += " " + record.getSourceMethodName();
-                }
-            } else {
-                source = record.getLoggerName();
-            }
-            String message = formatMessage(record);
-            String throwable = "";
-            if (record.getThrown() != null) {
-                StringWriter sw = new StringWriter();
-                PrintWriter pw = new PrintWriter(sw) {
-                    @Override
-                    public void println() {
-                        super.print("\r\n");
-                    }
-                };
-                pw.println();
-                record.getThrown().printStackTrace(pw);
-                pw.close();
-                throwable = sw.toString();
-            }
-            return String.format(format,
-                System.currentTimeMillis(),
-                source,
-                record.getLoggerName(),
-                record.getLevel().getName(),
-                message,
-                throwable);
+        public LoggingConsoleHandler() {
+            super();
+            setFormatter(new LoggingFormater());
+            configure();
         }
 
+        private void configure() {
+            LogManager manager = LogManager.getLogManager();
+            String denyregxstr = manager.getProperty(LoggingConsoleHandler.class.getName() + ".denyregx");
+            if (denyregxstr == null) {
+                denyregxstr = manager.getProperty("java.util.logging.ConsoleHandler.denyregx");
+            }
+            try {
+                if (denyregxstr != null && !denyregxstr.trim().isEmpty()) {
+                    this.denyRegx = Pattern.compile(denyregxstr);
+                }
+            } catch (Exception e) {
+            }
+        }
+
+        @Override
+        public void publish(LogRecord log) {
+            if (denyRegx != null && denyRegx.matcher(log.getMessage()).find()) {
+                return;
+            }
+            fillLogRecord(log);
+            super.publish(log);
+        }
     }
 
-    protected final LinkedBlockingQueue<LogRecord> records = new LinkedBlockingQueue();
+    protected final LinkedBlockingQueue<LogRecord> logqueue = new LinkedBlockingQueue();
 
-    private String pattern;
+    protected String pattern;
 
-    private String unusual; //不为null表示将 WARNING、SEVERE 级别的日志写入单独的文件中
+    protected String patternDateFormat; //需要时间格式化
+
+    protected String unusual; //不为null表示将 WARNING、SEVERE 级别的日志写入单独的文件中
+
+    protected String unusualDateFormat; //需要时间格式化
 
     private int limit;   //文件大小限制
 
@@ -98,13 +90,13 @@ public class LogFileHandler extends Handler {
 
     private long tomorrow;
 
-    private boolean append;
+    protected boolean append;
 
-    private Pattern denyreg;
+    protected Pattern denyregx;
 
-    private final AtomicLong loglength = new AtomicLong();
+    private final AtomicLong logLength = new AtomicLong();
 
-    private final AtomicLong logunusuallength = new AtomicLong();
+    private final AtomicLong logUnusualLength = new AtomicLong();
 
     private File logfile;
 
@@ -114,7 +106,7 @@ public class LogFileHandler extends Handler {
 
     private OutputStream logunusualstream;
 
-    public LogFileHandler() {
+    public LoggingFileHandler() {
         updateTomorrow();
         configure();
         open();
@@ -128,12 +120,14 @@ public class LogFileHandler extends Handler {
         cal.set(Calendar.MILLISECOND, 0);
         cal.add(Calendar.DAY_OF_YEAR, 1);
         long t = cal.getTimeInMillis();
-        if (this.tomorrow != t) logindex.set(0);
+        if (this.tomorrow != t) {
+            logindex.set(0);
+        }
         this.tomorrow = t;
     }
 
     private void open() {
-        final String name = "Logging-" + getClass().getSimpleName() + "-Thread";
+        final String name = "Redkale-Logging-" + getClass().getSimpleName().replace("Logging", "") + "-Thread";
         new Thread() {
             {
                 setName(name);
@@ -144,9 +138,9 @@ public class LogFileHandler extends Handler {
             public void run() {
                 while (true) {
                     try {
-                        LogRecord record = records.take();
-                        final boolean bigger = (limit > 0 && limit <= loglength.get());
-                        final boolean changeday = tomorrow <= record.getMillis();
+                        LogRecord log = logqueue.take();
+                        final boolean bigger = (limit > 0 && limit <= logLength.get());
+                        final boolean changeday = tomorrow <= log.getMillis();
                         if (bigger || changeday) {
                             updateTomorrow();
                             if (logstream != null) {
@@ -154,57 +148,65 @@ public class LogFileHandler extends Handler {
                                 if (bigger) {
                                     for (int i = Math.min(count - 2, logindex.get() - 1); i > 0; i--) {
                                         File greater = new File(logfile.getPath() + "." + i);
-                                        if (greater.exists()) Files.move(greater.toPath(), new File(logfile.getPath() + "." + (i + 1)).toPath(), REPLACE_EXISTING, ATOMIC_MOVE);
+                                        if (greater.exists()) {
+                                            Files.move(greater.toPath(), new File(logfile.getPath() + "." + (i + 1)).toPath(), REPLACE_EXISTING, ATOMIC_MOVE);
+                                        }
                                     }
                                     Files.move(logfile.toPath(), new File(logfile.getPath() + ".1").toPath(), REPLACE_EXISTING, ATOMIC_MOVE);
                                 } else {
-                                    if (logfile.exists() && logfile.length() < 1) logfile.delete();
+                                    if (logfile.exists() && logfile.length() < 1) {
+                                        logfile.delete();
+                                    }
                                 }
                                 logstream = null;
                             }
                         }
                         if (unusual != null && changeday && logunusualstream != null) {
                             logunusualstream.close();
-                            if (limit > 0 && limit <= logunusuallength.get()) {
+                            if (limit > 0 && limit <= logUnusualLength.get()) {
                                 for (int i = Math.min(count - 2, logunusualindex.get() - 1); i > 0; i--) {
                                     File greater = new File(logunusualfile.getPath() + "." + i);
-                                    if (greater.exists()) Files.move(greater.toPath(), new File(logunusualfile.getPath() + "." + (i + 1)).toPath(), REPLACE_EXISTING, ATOMIC_MOVE);
+                                    if (greater.exists()) {
+                                        Files.move(greater.toPath(), new File(logunusualfile.getPath() + "." + (i + 1)).toPath(), REPLACE_EXISTING, ATOMIC_MOVE);
+                                    }
                                 }
                                 Files.move(logunusualfile.toPath(), new File(logunusualfile.getPath() + ".1").toPath(), REPLACE_EXISTING, ATOMIC_MOVE);
                             } else {
-                                if (logunusualfile.exists() && logunusualfile.length() < 1) logunusualfile.delete();
+                                if (logunusualfile.exists() && logunusualfile.length() < 1) {
+                                    logunusualfile.delete();
+                                }
                             }
                             logunusualstream = null;
                         }
                         if (logstream == null) {
                             logindex.incrementAndGet();
-                            java.time.LocalDate date = LocalDate.now();
-                            logfile = new File(pattern.replace("%m", String.valueOf((date.getYear() * 100 + date.getMonthValue()))).replace("%d", String.valueOf((date.getYear() * 10000 + date.getMonthValue() * 100 + date.getDayOfMonth()))));
+                            logfile = new File(patternDateFormat == null ? pattern : Utility.formatTime(patternDateFormat, -1, System.currentTimeMillis()));
                             logfile.getParentFile().mkdirs();
-                            loglength.set(logfile.length());
+                            logLength.set(logfile.length());
                             logstream = new FileOutputStream(logfile, append);
                         }
                         if (unusual != null && logunusualstream == null) {
                             logunusualindex.incrementAndGet();
-                            java.time.LocalDate date = LocalDate.now();
-                            logunusualfile = new File(unusual.replace("%m", String.valueOf((date.getYear() * 100 + date.getMonthValue()))).replace("%d", String.valueOf((date.getYear() * 10000 + date.getMonthValue() * 100 + date.getDayOfMonth()))));
+                            logunusualfile = new File(unusualDateFormat == null ? unusual : Utility.formatTime(unusualDateFormat, -1, System.currentTimeMillis()));
                             logunusualfile.getParentFile().mkdirs();
-                            logunusuallength.set(logunusualfile.length());
+                            logUnusualLength.set(logunusualfile.length());
                             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)) {
+                        logLength.addAndGet(bytes.length);
+                        if (unusual != null && (log.getLevel() == Level.WARNING || log.getLevel() == Level.SEVERE)) {
                             logunusualstream.write(bytes);
-                            logunusuallength.addAndGet(bytes.length);
+                            logUnusualLength.addAndGet(bytes.length);
                         }
                     } catch (Exception e) {
                         ErrorManager err = getErrorManager();
-                        if (err != null) err.error(null, e, ErrorManager.WRITE_FAILURE);
+                        if (err != null) {
+                            err.error(null, e, ErrorManager.WRITE_FAILURE);
+                        }
                     }
                 }
 
@@ -218,10 +220,10 @@ public class LogFileHandler extends Handler {
 
     private void configure() {
         LogManager manager = LogManager.getLogManager();
-        String cname = LogFileHandler.class.getName();
+        String cname = LoggingFileHandler.class.getName();
         this.pattern = manager.getProperty(cname + ".pattern");
         if (this.pattern == null) {
-            this.pattern = "logs-%m/" + getPrefix() + "log-%d.log";
+            this.pattern = "logs-%tm/" + getPrefix() + "log-%td.log";
         } else {
             int pos = this.pattern.lastIndexOf('/');
             if (pos > 0) {
@@ -230,6 +232,10 @@ public class LogFileHandler extends Handler {
                 this.pattern = getPrefix() + this.pattern;
             }
         }
+        if (this.pattern != null && this.pattern.contains("%")) { //需要时间格式化
+            this.patternDateFormat = this.pattern;
+            Utility.formatTime(this.patternDateFormat, -1, System.currentTimeMillis()); //测试时间格式是否正确
+        }
         String unusualstr = manager.getProperty(cname + ".unusual");
         if (unusualstr != null) {
             int pos = unusualstr.lastIndexOf('/');
@@ -239,6 +245,10 @@ public class LogFileHandler extends Handler {
                 this.unusual = getPrefix() + unusualstr;
             }
         }
+        if (this.unusual != null && this.unusual.contains("%")) { //需要时间格式化
+            this.unusualDateFormat = this.unusual;
+            Utility.formatTime(this.unusualDateFormat, -1, System.currentTimeMillis()); //测试时间格式是否正确
+        }
         String limitstr = manager.getProperty(cname + ".limit");
         try {
             if (limitstr != null) {
@@ -260,12 +270,16 @@ public class LogFileHandler extends Handler {
         }
         String countstr = manager.getProperty(cname + ".count");
         try {
-            if (countstr != null) this.count = Math.max(1, Math.abs(Integer.decode(countstr)));
+            if (countstr != null) {
+                this.count = Math.max(1, Math.abs(Integer.decode(countstr)));
+            }
         } catch (Exception e) {
         }
         String appendstr = manager.getProperty(cname + ".append");
         try {
-            if (appendstr != null) this.append = "true".equalsIgnoreCase(appendstr) || "1".equals(appendstr);
+            if (appendstr != null) {
+                this.append = "true".equalsIgnoreCase(appendstr) || "1".equals(appendstr);
+            }
         } catch (Exception e) {
         }
         String levelstr = manager.getProperty(cname + ".level");
@@ -280,6 +294,7 @@ public class LogFileHandler extends Handler {
         try {
             if (filterstr != null) {
                 Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(filterstr);
+                RedkaleClassLoader.putReflectionDeclaredConstructors(clz, clz.getName());
                 setFilter((Filter) clz.getDeclaredConstructor().newInstance());
             }
         } catch (Exception e) {
@@ -288,62 +303,69 @@ public class LogFileHandler extends Handler {
         try {
             if (formatterstr != null) {
                 Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(formatterstr);
+                RedkaleClassLoader.putReflectionDeclaredConstructors(clz, clz.getName());
                 setFormatter((Formatter) clz.getDeclaredConstructor().newInstance());
             }
         } catch (Exception e) {
         }
-        if (getFormatter() == null) setFormatter(new SimpleFormatter());
+        if (getFormatter() == null) {
+            setFormatter(new SimpleFormatter());
+        }
 
         String encodingstr = manager.getProperty(cname + ".encoding");
         try {
-            if (encodingstr != null) setEncoding(encodingstr);
+            if (encodingstr != null) {
+                setEncoding(encodingstr);
+            }
         } catch (Exception e) {
         }
 
-        String denyregstr = manager.getProperty(cname + ".denyreg");
+        String denyregxstr = manager.getProperty(cname + ".denyregx");
         try {
-            if (denyregstr != null && !denyregstr.trim().isEmpty()) {
-                denyreg = Pattern.compile(denyregstr);
+            if (denyregxstr != null && !denyregxstr.trim().isEmpty()) {
+                denyregx = Pattern.compile(denyregxstr);
             }
         } catch (Exception e) {
         }
     }
 
     @Override
-    public void publish(LogRecord record) {
-        final String sourceClassName = record.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());
-                break;
-            }
-        } else {
-            record.setSourceClassName('[' + Thread.currentThread().getName() + "] " + sourceClassName);
+    public void publish(LogRecord log) {
+        if (!isLoggable(log)) {
+            return;
         }
-        if (denyreg != null && denyreg.matcher(record.getMessage()).find()) return;
-        records.offer(record);
+        if (denyregx != null && denyregx.matcher(log.getMessage()).find()) {
+            return;
+        }
+        fillLogRecord(log);
+        logqueue.offer(log);
     }
 
     @Override
     public void flush() {
         try {
-            if (logstream != null) logstream.flush();
+            if (logstream != null) {
+                logstream.flush();
+            }
         } catch (Exception e) {
             ErrorManager err = getErrorManager();
-            if (err != null) err.error(null, e, ErrorManager.FLUSH_FAILURE);
+            if (err != null) {
+                err.error(null, e, ErrorManager.FLUSH_FAILURE);
+            }
         }
     }
 
     @Override
     public void close() throws SecurityException {
         try {
-            if (logstream != null) logstream.close();
+            if (logstream != null) {
+                logstream.close();
+            }
         } catch (Exception e) {
             ErrorManager err = getErrorManager();
-            if (err != null) err.error(null, e, ErrorManager.CLOSE_FAILURE);
+            if (err != null) {
+                err.error(null, e, ErrorManager.CLOSE_FAILURE);
+            }
         }
     }
 

src/main/java/org/redkale/boot/LoggingSearchHandler.java

@@ -0,0 +1,345 @@
+/*
+ */
+package org.redkale.boot;
+
+import java.io.*;
+import java.util.*;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Formatter;
+import java.util.logging.*;
+import java.util.regex.Pattern;
+import static org.redkale.boot.Application.RESNAME_APP_NAME;
+import org.redkale.convert.*;
+import org.redkale.convert.json.JsonConvert;
+import org.redkale.persistence.SearchColumn;
+import org.redkale.persistence.*;
+import org.redkale.source.*;
+import org.redkale.util.*;
+
+/**
+ * 基于SearchSource的日志输出类
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ * @since 2.7.0
+ */
+public class LoggingSearchHandler extends LoggingBaseHandler {
+
+    protected static final String DEFAULT_TABLE_NAME = "log-record";
+
+    protected final LinkedBlockingQueue<SearchLogRecord> logqueue = new LinkedBlockingQueue();
+
+    protected final AtomicInteger retryCount = new AtomicInteger(3);
+
+    protected String tag = DEFAULT_TABLE_NAME;  //用于表前缀， 默认是 
+
+    protected String tagDateFormat; //需要时间格式化
+
+    protected String pattern;
+
+    protected Pattern denyRegx;
+
+    protected String sourceResourceName;
+
+    protected SearchSource source;
+
+    //在LogManager.getLogManager().readConfiguration执行完后，通过反射注入Application
+    protected Application application;
+
+    public LoggingSearchHandler() {
+        configure();
+        open();
+    }
+
+    private void open() {
+        final String name = "Redkale-Logging-" + getClass().getSimpleName().replace("Logging", "") + "-Thread";
+        final int batchSize = 100; //批量最多100条
+        final List<SearchLogRecord> logList = new ArrayList<>();
+        final SimpleFormatter formatter = new SimpleFormatter();
+        final PrintStream outStream = System.out;
+        new Thread() {
+            {
+                setName(name);
+                setDaemon(true);
+            }
+
+            @Override
+            public void run() {
+                while (true) {
+                    try {
+                        SearchLogRecord log = logqueue.take();
+                        while (source == null && retryCount.get() > 0) initSource();
+                        //----------------------写日志-------------------------
+                        if (source == null) { //source加载失败
+                            outStream.print(formatter.format(log.rawLog));
+                        } else {
+                            logList.add(log);
+                            int size = batchSize;
+                            while (--size > 0) {
+                                log = logqueue.poll();
+                                if (log == null) {
+                                    break;
+                                }
+                                logList.add(log);
+                            }
+                            source.insert(logList);
+                        }
+                    } catch (Exception e) {
+                        ErrorManager err = getErrorManager();
+                        if (err != null) {
+                            err.error(null, e, ErrorManager.WRITE_FAILURE);
+                        }
+                    } finally {
+                        logList.clear();
+                    }
+                }
+
+            }
+        }.start();
+    }
+
+    private void initSource() {
+        if (retryCount.get() < 1) {
+            return;
+        }
+        try {
+            Utility.sleep(3000); //如果SearchSource自身在打印日志，需要停顿一点时间让SearchSource初始化完成
+            if (application == null) {
+                Utility.sleep(3000);
+            }
+            if (application == null) {
+                return;
+            }
+            this.source = (SearchSource) application.loadDataSource(sourceResourceName, false);
+            if (retryCount.get() == 1 && this.source == null) {
+                System.err.println("ERROR: not load logging.source(" + sourceResourceName + ")");
+            }
+        } catch (Exception t) {
+            ErrorManager err = getErrorManager();
+            if (err != null) {
+                err.error(null, t, ErrorManager.WRITE_FAILURE);
+            }
+        } finally {
+            retryCount.decrementAndGet();
+        }
+    }
+
+    private static boolean checkTagName(String name) {  //只能是字母、数字、短横、点、%、$和下划线
+        if (name.isEmpty()) {
+            return false;
+        }
+        for (char ch : name.toCharArray()) {
+            if (ch >= '0' && ch <= '9') {
+                continue;
+            }
+            if (ch >= 'a' && ch <= 'z') {
+                continue;
+            }
+            if (ch >= 'A' && ch <= 'Z') {
+                continue;
+            }
+            if (ch == '_' || ch == '-' || ch == '%' || ch == '$' || ch == '.') {
+                continue;
+            }
+            return false;
+        }
+        return true;
+    }
+
+    private void configure() {
+        LogManager manager = LogManager.getLogManager();
+        String cname = getClass().getName();
+        this.sourceResourceName = manager.getProperty(cname + ".source");
+        if (this.sourceResourceName == null || this.sourceResourceName.isEmpty()) {
+            throw new RedkaleException("not found logging.property " + cname + ".source");
+        }
+        String tagstr = manager.getProperty(cname + ".tag");
+        if (tagstr != null && !tagstr.isEmpty()) {
+            if (!checkTagName(tagstr.replaceAll("\\$\\{.+\\}", ""))) {
+                throw new RedkaleException("found illegal logging.property " + cname + ".tag = " + tagstr);
+            }
+            this.tag = tagstr.replace("${" + RESNAME_APP_NAME + "}", System.getProperty(RESNAME_APP_NAME, ""));
+            if (this.tag.contains("%")) {
+                this.tagDateFormat = this.tag;
+                Utility.formatTime(this.tagDateFormat, -1, System.currentTimeMillis()); //测试时间格式是否正确
+            }
+        }
+
+        String levelstr = manager.getProperty(cname + ".level");
+        try {
+            if (levelstr != null) {
+                Level l = Level.parse(levelstr);
+                setLevel(l != null ? l : Level.ALL);
+            }
+        } catch (Exception e) {
+        }
+        String filterstr = manager.getProperty(cname + ".filter");
+        try {
+            if (filterstr != null) {
+                Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(filterstr);
+                RedkaleClassLoader.putReflectionDeclaredConstructors(clz, clz.getName());
+                setFilter((Filter) clz.getDeclaredConstructor().newInstance());
+            }
+        } catch (Exception e) {
+        }
+        String formatterstr = manager.getProperty(cname + ".formatter");
+        try {
+            if (formatterstr != null) {
+                Class<?> clz = ClassLoader.getSystemClassLoader().loadClass(formatterstr);
+                RedkaleClassLoader.putReflectionDeclaredConstructors(clz, clz.getName());
+                setFormatter((Formatter) clz.getDeclaredConstructor().newInstance());
+            }
+        } catch (Exception e) {
+        }
+        if (getFormatter() == null) {
+            setFormatter(new SimpleFormatter());
+        }
+
+        String encodingstr = manager.getProperty(cname + ".encoding");
+        try {
+            if (encodingstr != null) {
+                setEncoding(encodingstr);
+            }
+        } catch (Exception e) {
+        }
+
+        String denyregxstr = manager.getProperty(cname + ".denyregx");
+        try {
+            if (denyregxstr != null && !denyregxstr.trim().isEmpty()) {
+                denyRegx = Pattern.compile(denyregxstr);
+            }
+        } catch (Exception e) {
+        }
+    }
+
+    @Override
+    public void publish(LogRecord log) {
+        if (!isLoggable(log)) {
+            return;
+        }
+        if (denyRegx != null && denyRegx.matcher(log.getMessage()).find()) {
+            return;
+        }
+        if (log.getSourceClassName() != null) {
+            StackTraceElement[] ses = new Throwable().getStackTrace();
+            for (int i = 2; i < ses.length; i++) {
+                if (ses[i].getClassName().startsWith("java.util.logging")) {
+                    continue;
+                }
+                log.setSourceClassName(ses[i].getClassName());
+                log.setSourceMethodName(ses[i].getMethodName());
+                break;
+            }
+        }
+        String rawTag = tagDateFormat == null ? tag : Utility.formatTime(tagDateFormat, -1, log.getInstant().toEpochMilli());
+        fillLogRecord(log);
+        logqueue.offer(new SearchLogRecord(rawTag, log));
+    }
+
+    @Override
+    public void flush() {
+    }
+
+    @Override
+    public void close() throws SecurityException {
+    }
+
+    @Entity
+    @Table(name = DEFAULT_TABLE_NAME)
+    @DistributeTable(strategy = SearchLogRecord.TableStrategy.class)
+    public static class SearchLogRecord {
+
+        @Id
+        @ConvertColumn(index = 1)
+        @SearchColumn(options = "false")
+        public String logid;
+
+        @ConvertColumn(index = 2)
+        @SearchColumn(options = "false")
+        public String level;
+
+        @ConvertColumn(index = 3)
+        @SearchColumn(date = true)
+        public long timestamp;
+
+        @ConvertColumn(index = 4)
+        @SearchColumn(options = "false")
+        public String traceid;
+
+        @ConvertColumn(index = 5)
+        public String threadName;
+
+        @ConvertColumn(index = 6)
+        @SearchColumn(text = true, options = "offsets")
+        public String loggerName;
+
+        @ConvertColumn(index = 7)
+        @SearchColumn(text = true, options = "offsets")
+        public String methodName;
+
+        @ConvertColumn(index = 8)
+        @SearchColumn(text = true, options = "offsets") //, analyzer = "ik_max_word"
+        public String message;  //log.message +"\r\n"+ log.thrown
+
+        @Transient
+        @ConvertDisabled
+        LogRecord rawLog;
+
+        @Transient
+        @ConvertDisabled
+        String rawTag;
+
+        public SearchLogRecord() {
+        }
+
+        protected SearchLogRecord(String tag, LogRecord log) {
+            this.rawLog = log;
+            this.rawTag = tag;
+            this.threadName = Thread.currentThread().getName();
+            this.traceid = LoggingBaseHandler.traceFlag ? Traces.currTraceid() : null;
+            String msg = log.getMessage();
+            if (log.getThrown() != null) {
+                StringWriter sw = new StringWriter();
+                PrintWriter pw = new PrintWriter(sw);
+                pw.println();
+                log.getThrown().printStackTrace(pw);
+                pw.close();
+                String throwable = sw.toString();
+                this.message = (msg != null && !msg.isEmpty()) ? (msg + "\r\n" + throwable) : throwable;
+            } else {
+                this.message = msg;
+            }
+            this.level = log.getLevel().toString();
+            this.loggerName = log.getLoggerName();
+            this.methodName = log.getSourceClassName() + " " + log.getSourceMethodName();
+            this.timestamp = log.getInstant().toEpochMilli();
+            this.logid = Utility.format36time(timestamp) + "_" + Utility.uuid();
+        }
+
+        @Override
+        public String toString() {
+            return JsonConvert.root().convertTo(this);
+        }
+
+        public static class TableStrategy implements DistributeTableStrategy<SearchLogRecord> {
+
+            @Override
+            public String getTable(String table, SearchLogRecord bean) {
+                return bean.rawTag;
+            }
+
+            @Override
+            public String getTable(String table, Serializable primary) {
+                throw new UnsupportedOperationException("Not supported yet.");
+            }
+
+            @Override
+            public String[] getTables(String table, FilterNode node) {
+                throw new UnsupportedOperationException("Not supported yet.");
+            }
+
+        }
+    }
+}

src/main/java/org/redkale/boot/NodeHttpServer.java

@@ -0,0 +1,563 @@
+/*
+ * 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.boot;
+
+import java.lang.annotation.Annotation;
+import java.lang.reflect.*;
+import java.net.*;
+import java.util.*;
+import java.util.concurrent.*;
+import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Level;
+import java.util.stream.Stream;
+import org.redkale.annotation.*;
+import static org.redkale.boot.Application.RESNAME_SNCP_ADDRESS;
+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;
+import org.redkale.service.Service;
+import org.redkale.util.AnyValue.DefaultAnyValue;
+import org.redkale.util.*;
+import org.redkale.watch.*;
+
+/**
+ * HTTP Server节点的配置Server
+ *
+ * <p>
+ * 详情见: https://redkale.org
+ *
+ * @author zhangjx
+ */
+@NodeProtocol("HTTP")
+public class NodeHttpServer extends NodeServer {
+
+    protected final boolean rest; //是否加载REST服务， 为true加载rest节点信息并将所有可REST化的Service生成RestServlet
+
+    protected final HttpServer httpServer;
+
+    protected ClassFilter<? extends WebSocket> webSocketFilter;
+
+    public NodeHttpServer(Application application, AnyValue serconf) {
+        super(application, createServer(application, serconf));
+        this.httpServer = (HttpServer) server;
+        this.rest = serconf == null ? false : serconf.getAnyValue("rest") != null;
+
+    }
+
+    private static Server createServer(Application application, AnyValue serconf) {
+        return new HttpServer(application, application.getStartTime(), application.getResourceFactory().createChild());
+    }
+
+    public HttpServer getHttpServer() {
+        return httpServer;
+    }
+
+    @Override
+    public InetSocketAddress getSocketAddress() {
+        return httpServer == null ? null : httpServer.getSocketAddress();
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    protected ClassFilter<Service> createServiceClassFilter() {
+        return createClassFilter(this.sncpGroup, null, Service.class, new Class[]{org.redkale.watch.WatchService.class}, Annotation.class, "services", "service");
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    protected ClassFilter<Filter> createFilterClassFilter() {
+        return createClassFilter(null, null, HttpFilter.class, new Class[]{WatchFilter.class}, null, "filters", "filter");
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    protected ClassFilter<Servlet> createServletClassFilter() {
+        return createClassFilter(null, WebServlet.class, HttpServlet.class, new Class[]{WatchServlet.class}, null, "servlets", "servlet");
+    }
+
+    @Override
+    protected List<ClassFilter> createOtherClassFilters() {
+        this.webSocketFilter = createClassFilter(null, RestWebSocket.class, WebSocket.class, null, null, "rest", "websocket");
+        List<ClassFilter> filters = super.createOtherClassFilters();
+        if (filters == null) {
+            filters = new ArrayList<>();
+        }
+        filters.add(webSocketFilter);
+        return filters;
+    }
+
+    @Override
+    protected void loadOthers(List<ClassFilter> otherFilters) throws Exception {
+        List<ClassFilter> filters = otherFilters;
+        if (filters != null) {
+            filters.remove(this.webSocketFilter); //webSocketFilter会在loadHttpFilter中处理，先剔除
+        }
+        super.loadOthers(filters);
+    }
+
+    @Override
+    protected void loadService(ClassFilter<? extends Service> serviceFilter) throws Exception {
+        super.loadService(serviceFilter);
+        initWebSocketService();
+    }
+
+    @Override
+    protected void loadFilter(ClassFilter<? extends Filter> filterFilter) throws Exception {
+        if (httpServer != null) {
+            loadHttpFilter(filterFilter);
+        }
+    }
+
+    @Override
+    @SuppressWarnings("unchecked")
+    protected void loadServlet(ClassFilter<? extends Servlet> servletFilter) throws Exception {
+        if (httpServer != null) {
+            loadHttpServlet(servletFilter);
+        }
+    }
+
+    private void initWebSocketService() {
+        final NodeServer self = this;
+        final ResourceFactory regFactory = application.getResourceFactory();
+        resourceFactory.register((ResourceFactory rf, String srcResourceName, final Object srcObj, final String resourceName, Field field, Object attachment) -> { //主要用于单点的服务
+            try {
+                if (field.getAnnotation(Resource.class) == null && field.getAnnotation(javax.annotation.Resource.class) == null) {
+                    return null;
+                }
+                if (!(srcObj instanceof WebSocketServlet)) {
+                    return null;
+                }
+                ResourceTypeLoader loader = null;
+                ResourceFactory sncpResFactory = null;
+                for (NodeServer ns : application.servers) {
+                    if (!ns.isSNCP()) {
+                        continue;
+                    }
+                    sncpResFactory = ns.resourceFactory;
+                    loader = sncpResFactory.findTypeLoader(WebSocketNode.class, field);
+                    if (loader != null) {
+                        break;
+                    }
+                }
+                Service nodeService = null;
+                if (loader != null) {
+                    nodeService = (Service) loader.load(sncpResFactory, srcResourceName, srcObj, resourceName, field, attachment);
+                }
+                regFactory.lock();
+                try {
+                    if (nodeService == null) {
+                        nodeService = (Service) rf.find(resourceName, WebSocketNode.class);
+                    }
+                    if (sncpResFactory != null && resourceFactory.find(RESNAME_SNCP_ADDRESS, String.class) == null) {
+                        resourceFactory.register(RESNAME_SNCP_ADDRESS, InetSocketAddress.class, sncpResFactory.find(RESNAME_SNCP_ADDRESS, InetSocketAddress.class));
+                        resourceFactory.register(RESNAME_SNCP_ADDRESS, SocketAddress.class, sncpResFactory.find(RESNAME_SNCP_ADDRESS, SocketAddress.class));
+                        resourceFactory.register(RESNAME_SNCP_ADDRESS, String.class, sncpResFactory.find(RESNAME_SNCP_ADDRESS, String.class));
+                    }
+                    if (nodeService == null) {
+                        MessageAgent messageAgent = null;
+                        try {
+                            Field c = WebSocketServlet.class.getDeclaredField("messageAgent");
+                            RedkaleClassLoader.putReflectionField("messageAgent", c);
+                            c.setAccessible(true);
+                            messageAgent = (MessageAgent) c.get(srcObj);
+                        } catch (Exception ex) {
+                            logger.log(Level.WARNING, "WebSocketServlet getMessageAgent error", ex);
+                        }
+                        nodeService = Sncp.createLocalService(serverClassLoader, resourceName, org.redkale.net.http.WebSocketNodeService.class, application.getResourceFactory(), application.getSncpRpcGroups(), sncpClient, messageAgent, (String) null, (AnyValue) null);
+                        regFactory.register(resourceName, WebSocketNode.class, nodeService);
+                    }
+                    resourceFactory.inject(resourceName, nodeService, self);
+                    field.set(srcObj, nodeService);
+                    logger.fine("Load Service " + nodeService);
+                    return nodeService;
+                } finally {
+                    regFactory.unlock();
+                }
+            } catch (Exception e) {
+                logger.log(Level.SEVERE, "WebSocketNode inject error", e);
+                return null;
+            }
+        }, WebSocketNode.class);
+    }
+
+    @SuppressWarnings("unchecked")
+    protected void loadHttpFilter(final ClassFilter<? extends Filter> classFilter) throws Exception {
+        final StringBuilder sb = logger.isLoggable(Level.INFO) ? new StringBuilder() : null;
+        List<FilterEntry<? extends Filter>> list = new ArrayList(classFilter.getFilterEntrys());
+        for (FilterEntry<? extends Filter> en : list) {
+            Class<HttpFilter> clazz = (Class<HttpFilter>) en.getType();
+            if (Modifier.isAbstract(clazz.getModifiers())) {
+                continue;
+            }
+            RedkaleClassLoader.putReflectionDeclaredConstructors(clazz, clazz.getName());
+            final HttpFilter filter = clazz.getDeclaredConstructor().newInstance();
+            resourceFactory.inject(filter, this);
+            DefaultAnyValue filterConf = (DefaultAnyValue) en.getProperty();
+            this.httpServer.addHttpFilter(filter, filterConf);
+            if (sb != null) {
+                sb.append("Load ").append(clazz.getName()).append(LINE_SEPARATOR);
+            }
+        }
+        if (sb != null && sb.length() > 0) {
+            logger.log(Level.INFO, sb.toString());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    protected void loadHttpServlet(final ClassFilter<? extends Servlet> servletFilter) throws Exception {
+        RedkaleClassLoader.putReflectionPublicClasses(HttpServlet.class.getName());
+        RedkaleClassLoader.putReflectionPublicClasses(HttpDispatcherServlet.class.getName());
+        RedkaleClassLoader.putReflectionDeclaredConstructors(HttpResourceServlet.class, HttpResourceServlet.class.getName());
+        final AnyValue servletsConf = this.serverConf.getAnyValue("servlets");
+        final StringBuilder sb = logger.isLoggable(Level.INFO) ? new StringBuilder() : null;
+        String prefix0 = servletsConf == null ? "" : servletsConf.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;
+        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());
+            boolean ws2 = WebSocketServlet.class.isAssignableFrom(o2.getType());
+            if (ws1 == ws2) {
+                Priority p1 = o1.getType().getAnnotation(Priority.class);
+                Priority p2 = o2.getType().getAnnotation(Priority.class);
+                int v = (p2 == null ? 0 : p2.value()) - (p1 == null ? 0 : p1.value());
+                return v == 0 ? o1.getType().getName().compareTo(o2.getType().getName()) : 0;
+            }
+            return ws1 ? -1 : 1;
+        });
+        final long starts = System.currentTimeMillis();
+        final List<AbstractMap.SimpleEntry<String, String[]>> ss = sb == null ? null : new ArrayList<>();
+        for (FilterEntry<? extends Servlet> en : list) {
+            Class<HttpServlet> clazz = (Class<HttpServlet>) en.getType();
+            if (Modifier.isAbstract(clazz.getModifiers())) {
+                continue;
+            }
+            if (clazz.getAnnotation(Rest.RestDyn.class) != null) {
+                continue; //动态生成的跳过
+            }
+            WebServlet ws = clazz.getAnnotation(WebServlet.class);
+            if (ws == null) {
+                continue;
+            }
+            if (ws.value().length == 0) {
+                logger.log(Level.INFO, "Not found @WebServlet.value in " + clazz.getName());
+                continue;
+            }
+            RedkaleClassLoader.putReflectionDeclaredConstructors(clazz, clazz.getName());
+            final HttpServlet servlet = clazz.getDeclaredConstructor().newInstance();
+            resourceFactory.inject(servlet, this);
+            final String[] mappings = ws.value();
+            String pref = ws.repair() ? prefix : "";
+            DefaultAnyValue servletConf = (DefaultAnyValue) en.getProperty();
+            this.httpServer.addHttpServlet(servlet, pref, servletConf, mappings);
+            if (ss != null) {
+                for (int i = 0; i < mappings.length; i++) {
+                    mappings[i] = pref + mappings[i];
+                }
+                ss.add(new AbstractMap.SimpleEntry<>("HttpServlet (type=" + clazz.getName() + ")", mappings));
+            }
+        }
+        final CopyOnWriteArrayList<AbstractMap.SimpleEntry<String, String[]>> rests = sb == null ? null : new CopyOnWriteArrayList<>();
+        final CopyOnWriteArrayList<AbstractMap.SimpleEntry<String, String[]>> webss = sb == null ? null : new CopyOnWriteArrayList<>();
+        if (rest && serverConf != null) {
+            final List<Object> restedObjects = new ArrayList<>();
+            final ReentrantLock restedLock = new ReentrantLock();
+            for (AnyValue restConf : serverConf.getAnyValues("rest")) {
+                loadRestServlet(webSocketFilter, restConf, restedObjects, restedLock, sb, rests, webss);
+            }
+            this.webSocketFilter = null;
+        }
+        int max = 0;
+        if (ss != null && sb != null) {
+            int maxTypeLength = 0;
+            int maxNameLength = 0;
+            if (rests != null) {
+                for (AbstractMap.SimpleEntry<String, String[]> en : rests) {
+                    int pos = en.getKey().indexOf(':');
+                    if (pos > maxTypeLength) {
+                        maxTypeLength = pos;
+                    }
+                    int len = en.getKey().length() - pos - 1;
+                    if (len > maxNameLength) {
+                        maxNameLength = len;
+                    }
+                }
+            }
+            if (webss != null) {
+                for (AbstractMap.SimpleEntry<String, String[]> en : webss) {
+                    int pos = en.getKey().indexOf(':');
+                    if (pos > maxTypeLength) {
+                        maxTypeLength = pos;
+                    }
+                    int len = en.getKey().length() - pos - 1;
+                    if (len > maxNameLength) {
+                        maxNameLength = len;
+                    }
+                }
+            }
+            if (rests != null) {
+                for (AbstractMap.SimpleEntry<String, String[]> en : rests) {
+                    StringBuilder sub = new StringBuilder();
+                    int pos = en.getKey().indexOf(':');
+                    sub.append("RestServlet (type=").append(en.getKey().substring(0, pos));
+                    for (int i = 0; i < maxTypeLength - pos; i++) {
+                        sub.append(' ');
+                    }
+                    String n = en.getKey().substring(pos + 1);
+                    sub.append(", name='").append(n).append("'");
+                    for (int i = 0; i < maxNameLength - n.length(); i++) {
+                        sub.append(' ');
+                    }
+                    sub.append(")");
+                    ss.add(new AbstractMap.SimpleEntry<>(sub.toString(), en.getValue()));
+                }
+            }
+            if (webss != null) {
+                for (AbstractMap.SimpleEntry<String, String[]> en : webss) {
+                    StringBuilder sub = new StringBuilder();
+                    int pos = en.getKey().indexOf(':');
+                    sub.append("RestWebSocket  (type=").append(en.getKey().substring(0, pos));
+                    for (int i = 0; i < maxTypeLength - pos; i++) {
+                        sub.append(' ');
+                    }
+                    String n = en.getKey().substring(pos + 1);
+                    sub.append(", name='").append(n).append("'");
+                    for (int i = 0; i < maxNameLength - n.length(); i++) {
+                        sub.append(' ');
+                    }
+                    sub.append(")");
+                    ss.add(new AbstractMap.SimpleEntry<>(sub.toString(), en.getValue()));
+                }
+            }
+            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("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("All HttpServlets load in ").append(System.currentTimeMillis() - starts).append(" ms").append(LINE_SEPARATOR);
+        }
+        if (sb != null && sb.length() > 0) {
+            logger.log(Level.INFO, sb.toString().trim());
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    protected void loadRestServlet(final ClassFilter<? extends WebSocket> webSocketFilter,
+        final AnyValue restConf, final List<Object> restedObjects,
+        final ReentrantLock restedLock, final StringBuilder sb,
+        final CopyOnWriteArrayList<AbstractMap.SimpleEntry<String, String[]>> rests,
+        final CopyOnWriteArrayList<AbstractMap.SimpleEntry<String, String[]>> webss) throws Exception {
+        if (!rest) {
+            return;
+        }
+        if (restConf == null) {
+            return; //不存在REST服务
+        }
+        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;
+        }
+
+        String mqname = restConf.getValue("mq");
+        MessageAgent agent0 = null;
+        if (mqname != null) {
+            agent0 = application.getMessageAgent(mqname);
+            if (agent0 == null) {
+                throw new RedkaleException("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");
+            final Class userType = userTypeStr == null ? null : this.serverClassLoader.loadClass(userTypeStr);
+
+            final Class baseServletType = this.serverClassLoader.loadClass(restConf.getValue("base", HttpServlet.class.getName()));
+            final Set<String> includeValues = new HashSet<>();
+            final Set<String> excludeValues = new HashSet<>();
+            for (AnyValue item : restConf.getAnyValues("service")) {
+                if (item.getBoolValue("ignore", false)) {
+                    excludeValues.add(item.getValue("value", ""));
+                } else {
+                    includeValues.add(item.getValue("value", ""));
+                }
+            }
+
+            final ClassFilter restFilter = ClassFilter.create(serverClassLoader, null, application.isCompileMode() ? "" : restConf.getValue("includes", ""), application.isCompileMode() ? "" : restConf.getValue("excludes", ""), includeValues, excludeValues);
+            final CountDownLatch scdl = new CountDownLatch(super.servletServices.size());
+            Stream<Service> stream = super.servletServices.stream();
+            if (!application.isCompileMode()) {
+                stream = stream.parallel(); //不能并行，否则在maven plugin运行环境下ClassLoader不对
+            }
+            stream.forEach((service) -> {
+                try {
+                    final Class stype = Sncp.getResourceType(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;
+                    }
+                    restedLock.lock();
+                    try {
+                        if (restedObjects.contains(service)) {
+                            logger.log(Level.WARNING, stype.getName() + " repeat create rest servlet, so ignore");
+                            return;
+                        }
+                        restedObjects.add(service); //避免重复创建Rest对象
+                    } finally {
+                        restedLock.unlock();
+                    }
+                    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("Create RestServlet(resource.name='" + name + "') = " + servlet);
+                    if (rests != null) {
+                        String[] mappings = servlet.getClass().getAnnotation(WebServlet.class).value();
+                        for (int i = 0; i < mappings.length; i++) {
+                            mappings[i] = prefix2 + mappings[i];
+                        }
+                        rests.add(new AbstractMap.SimpleEntry<>(Sncp.getResourceType(service).getName() + ":" + name, mappings));
+                    }
+                } finally {
+                    scdl.countDown();
+                }
+            });
+            scdl.await();
+        }
+        if (webSocketFilter != null) {  //加载RestWebSocket
+            final Set<String> includeValues = new HashSet<>();
+            final Set<String> excludeValues = new HashSet<>();
+            for (AnyValue item : restConf.getAnyValues("websocket")) {
+                if (item.getBoolValue("ignore", false)) {
+                    excludeValues.add(item.getValue("value", ""));
+                } else {
+                    includeValues.add(item.getValue("value", ""));
+                }
+            }
+            final ClassFilter restFilter = ClassFilter.create(serverClassLoader, null, application.isCompileMode() ? "" : restConf.getValue("includes", ""), application.isCompileMode() ? "" : restConf.getValue("excludes", ""), includeValues, excludeValues);
+
+            List<FilterEntry<? extends WebSocket>> list = new ArrayList(webSocketFilter.getFilterEntrys());
+            for (FilterEntry<? extends WebSocket> en : list) {
+                Class<WebSocket> clazz = (Class<WebSocket>) en.getType();
+                if (Modifier.isAbstract(clazz.getModifiers())) {
+                    logger.log(Level.FINE, clazz.getName() + " cannot abstract on rest websocket, so ignore");
+                    continue;
+                }
+                if (Modifier.isFinal(clazz.getModifiers())) {
+                    logger.log(Level.FINE, clazz.getName() + " cannot final on rest websocket, so ignore");
+                    continue;
+                }
+                final Class<? extends WebSocket> stype = en.getType();
+                if (stype.getAnnotation(Rest.RestDyn.class) != null) {
+                    continue;
+                }
+                RestWebSocket rs = stype.getAnnotation(RestWebSocket.class);
+                if (rs == null || rs.ignore()) {
+                    continue;
+                }
+
+                final String stypename = stype.getName();
+                if (!autoload && !includeValues.contains(stypename)) {
+                    continue;
+                }
+                if (!restFilter.accept(stypename)) {
+                    continue;
+                }
+                if (restedObjects.contains(stype)) {
+                    logger.log(Level.WARNING, stype.getName() + " repeat create rest websocket, so ignore");
+                    continue;
+                }
+                restedObjects.add(stype); //避免重复创建Rest对象
+                WebSocketServlet servlet = httpServer.addRestWebSocketServlet(serverClassLoader, stype, messageAgent, prefix, en.getProperty());
+                if (servlet == null) {
+                    continue; //没有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 (logger.isLoggable(Level.FINEST)) {
+                    logger.finest(stype.getName() + " create a RestWebSocketServlet");
+                }
+                if (webss != null) {
+                    String[] mappings = servlet.getClass().getAnnotation(WebServlet.class).value();
+                    for (int i = 0; i < mappings.length; i++) {
+                        mappings[i] = prefix2 + mappings[i];
+                    }
+                    webss.add(new AbstractMap.SimpleEntry<>(stype.getName() + ":" + rs.name(), mappings));
+                }
+            }
+        }
+        if (messageAgent != null) {
+            this.messageAgents.put(messageAgent.getName(), messageAgent);
+        }
+    }
+
+    @Override //loadServlet执行之后调用
+    protected void postLoadServlets() {
+        final ClusterAgent cluster = application.getClusterAgent();
+        if (!application.isCompileMode() && 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/main/java/org/redkale/boot/NodeProtocol.java

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