Merge c5cb9a5 into 6460eb9

sofastack · Apr 1, 2018 · 7ee84b0 · 7ee84b0
2 parents 6460eb9 + c5cb9a5
commit 7ee84b0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/jarslink-module-demo/src/main/java/com/alipay/jarslink/demo/AnnotationAction.java b/jarslink-module-demo/src/main/java/com/alipay/jarslink/demo/AnnotationAction.java
@@ -5,7 +5,7 @@
 import org.springframework.stereotype.Component;
 
 /**
- * annotation bean  由注解扫描发现注册
+ * annotation bean  由注解扫描发现注册，同时该action注入了{@link com.alipay.jarslink.demo.XmlAction}，XmlAction定义在xml中
  *
  * @author joe
  * @version 2018.03.31 23:10

diff --git a/jarslink-module-demo/src/main/java/com/alipay/jarslink/demo/OverrideXmlAction.java b/jarslink-module-demo/src/main/java/com/alipay/jarslink/demo/OverrideXmlAction.java
@@ -4,6 +4,11 @@
 import org.springframework.stereotype.Component;
 
 /**
+ * 此Action与{@link com.alipay.jarslink.demo.XmlAction}name相同，{@link com.alipay.jarslink.demo.XmlAction}定义在xml
+ * 中，此Action将被覆盖，jarslink查找不到该action
+ *
+ * @see com.alipay.jarslink.demo.XmlAction
+ *
  * @author joe
  * @version 2018.04.01 00:03
  */

diff --git a/jarslink-module-demo/src/main/java/com/alipay/jarslink/demo/XmlAction.java b/jarslink-module-demo/src/main/java/com/alipay/jarslink/demo/XmlAction.java
@@ -3,7 +3,9 @@
 import com.alipay.jarslink.api.Action;
 
 /**
- * XML bean ，定义在xml中
+ * XML bean ，定义在xml中，此action将覆盖{@link com.alipay.jarslink.demo.OverrideXmlAction}
+ *
+ * @see com.alipay.jarslink.demo.OverrideXmlAction
  *
  * @author joe
  * @version 2018.03.31 23:10