Merge remote-tracking branch 'origin/develop'

netbuffer · netbuffer · commit 535e6b83caf9 · 2017-12-07T20:31:00.000+08:00
diff --git a/src/main/webapp/WEB-INF/tags/func.tag b/src/main/webapp/WEB-INF/tags/func.tag
@@ -0,0 +1,4 @@
+<%@tag pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
+<%@ attribute name="name" type="java.lang.String" required="true"%>
+<h1>func param:${name}</h1>
diff --git a/src/main/webapp/WEB-INF/tags/hello.tag b/src/main/webapp/WEB-INF/tags/hello.tag
diff --git a/src/main/webapp/test.jsp b/src/main/webapp/test.jsp
@@ -3,7 +3,7 @@
 <%@ taglib prefix="l2d" uri="/WEB-INF/LongToDateTag.tld"%>
 <%@ taglib prefix='fmt' uri="http://java.sun.com/jsp/jstl/fmt" %>
 <%@taglib prefix="spring" uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="tags" tagdir="/WEB-INF/" %>
+<%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
 <!DOCTYPE html>
 <html>
 <head>
@@ -21,6 +21,7 @@
 	<span style="color:green;">user</span>:${user}<br />
 	<span style="color:red;">u</span>:${u}
 	<hr/>
-	<tag:hello name="world" />
+	<tags:hello name="world"></tags:hello>
+	<tags:func name="func"></tags:func>
 </body>
 </html>
