Merge remote-tracking branch 'remotes/origin/develop'

netbuffer · netbuffer · commit 61c744277b5f · 2017-05-07T22:12:45.000+08:00
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-#ssmbootstrap_table demo
+# ssmbootstrap_table demo
 
 ## 技术栈/technology stack
 * spring+springmvc+mybatis
diff --git a/src/main/webapp/WEB-INF/hello.tag b/src/main/webapp/WEB-INF/hello.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>hello:${name}</h1>
diff --git a/src/main/webapp/test.jsp b/src/main/webapp/test.jsp
@@ -3,6 +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/" %>
 <!DOCTYPE html>
 <html>
 <head>
@@ -19,5 +20,7 @@
 	syn:${syn}<hr/>
 	<span style="color:green;">user</span>:${user}<br />
 	<span style="color:red;">u</span>:${u}
+	<hr/>
+	<tag:hello name="world" />
 </body>
 </html>
