From 42c188867a392b6757ea0ae8196c12b90cf68152 Mon Sep 17 00:00:00 2001
From: Redkale <22250530@qq.com>
Date: Thu, 18 Aug 2016 14:21:23 +0800
Subject: [PATCH]

---
 src/META-INF/application-template.xml |  5 +++--
 src/org/redkale/boot/NodeServer.java  | 10 +++++-----
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/META-INF/application-template.xml b/src/META-INF/application-template.xml
index 9bd72f2e8..faa88a36a 100644
--- a/src/META-INF/application-template.xml
+++ b/src/META-INF/application-template.xml
@@ -114,8 +114,9 @@
             -->
             <service value="com.xxx.XXX2Service" name="" groups="xxx;yyy"/>
             <!--   给Service增加配置属性 -->
-            <service value="com.xxx.XXX1Service">
-                <property name="xxxxxx" value="XXXXXXXX"/>
+            <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>
diff --git a/src/org/redkale/boot/NodeServer.java b/src/org/redkale/boot/NodeServer.java
index 46557e60b..3840b1435 100644
--- a/src/org/redkale/boot/NodeServer.java
+++ b/src/org/redkale/boot/NodeServer.java
@@ -450,19 +450,19 @@ public abstract class NodeServer {
                 prop.addValue("groups", sc);
             }
             ClassFilter filter = new ClassFilter(ref, inter, prop);
-            for (AnyValue av : list.getAnyValues(property)) {
+            for (AnyValue av : list.getAnyValues(property)) { // <service> 或  <servlet> 节点
                 final AnyValue[] items = av.getAnyValues("property");
-                if (av instanceof DefaultAnyValue && items.length > 0) {
+                if (av instanceof DefaultAnyValue && items.length > 0) { //存在 <property>节点
                     DefaultAnyValue dav = DefaultAnyValue.create();
                     final AnyValue.Entry<String>[] strings = av.getStringEntrys();
-                    if (strings != null) {
+                    if (strings != null) {  //将<service>或<servlet>节点的属性值传给dav
                         for (AnyValue.Entry<String> en : strings) {
                             dav.addValue(en.name, en.getValue());
                         }
                     }
                     final AnyValue.Entry<AnyValue>[] anys = av.getAnyEntrys();
                     if (anys != null) {
-                        for (AnyValue.Entry<AnyValue> en : anys) {
+                        for (AnyValue.Entry<AnyValue> en : anys) { //将<service>或<servlet>节点的非property属性节点传给dav
                             if (!"property".equals(en.name)) dav.addValue(en.name, en.getValue());
                         }
                     }
@@ -470,7 +470,7 @@ public abstract class NodeServer {
                     for (AnyValue item : items) {
                         ps.addValue(item.getValue("name"), item.getValue("value"));
                     }
-                    dav.addValue("property", ps);
+                    dav.addValue("properties", ps);
                     av = dav;
                 }
                 filter.filter(av, av.getValue("value"), false);