diff --git a/docs/config.md b/docs/config.md
index 4ec717835..84552c2d8 100644
--- a/docs/config.md
+++ b/docs/config.md
@@ -5,20 +5,7 @@
文件说明:
${APP_HOME} 指当前程序的根目录APP_HOME
没注明唯一的节点可多个存在
- required: 被声明required的属性值不能为空
-
- group
- / / \ \
- / / \ \
- / / \ \
- node1 node2 node3 node4
- / \
- / \
- / \
- / \
- serviceid1 serviceid2
- / \ / \
- serviceid1_name1 serviceid1_name2 serviceid2_name1 serviceid2_name2
+ required: 被声明required的属性值不能为空
-->
-
+
@@ -365,6 +353,7 @@
+
```
# source.properties 配置:
diff --git a/src/main/java/META-INF/application-template.xml b/src/main/java/META-INF/application-template.xml
index f5e168203..8d7a90f3f 100644
--- a/src/main/java/META-INF/application-template.xml
+++ b/src/main/java/META-INF/application-template.xml
@@ -26,14 +26,7 @@
lib: 加上额外的lib路径,多个路径用分号;隔开; 默认为空。 例如: ${APP_HOME}/lib/a.jar;${APP_HOME}/lib2/b.jar;
-->
-
-
-
-
-
+
diff --git a/src/main/java/org/redkale/net/Server.java b/src/main/java/org/redkale/net/Server.java
index a4084e163..927b9ce15 100644
--- a/src/main/java/org/redkale/net/Server.java
+++ b/src/main/java/org/redkale/net/Server.java
@@ -57,7 +57,7 @@ public abstract class Server dispatcher;
+ protected DispatcherServlet dispatcher;
//ClassLoader
protected RedkaleClassLoader serverClassLoader;
@@ -138,6 +138,14 @@ public abstract class Server predicateEntry = (t) -> t.servlet == servlet;
- Predicate> predicateFilter = (t) -> t.getValue() == servlet;
+ Predicate predicateEntry = t -> t.servlet == servlet;
+ Predicate> predicateFilter = t -> t.getValue() == servlet;
removeHttpServlet(predicateEntry, predicateFilter);
return servlet;
}
- public HttpServlet removeHttpServlet(Service service) {
- Predicate predicateEntry = (t) -> {
+ public HttpServlet removeHttpServlet(Service service) {
+ Predicate predicateEntry = t -> {
if (!Rest.isRestDyn(t.servlet)) {
return false;
}
@@ -161,7 +161,7 @@ public class HttpDispatcherServlet extends DispatcherServlet HttpServlet removeHttpServlet(Class websocketOrServletType) {
- Predicate predicateEntry = (t) -> {
+ Predicate predicateEntry = t -> {
Class type = t.servlet.getClass();
if (type == websocketOrServletType) {
return true;
@@ -169,7 +169,7 @@ public class HttpDispatcherServlet extends DispatcherServlet> predicateFilter = (t) -> {
+ Predicate> predicateFilter = t -> {
Class type = t.getValue().getClass();
if (type == websocketOrServletType) {
return true;