shuzheng 9 лет назад
Родитель
Сommit
ae47aa012a

+ 4 - 2
cms/cms-web/src/main/java/com/zheng/cms/controller/CmsTagController.java

@@ -50,7 +50,7 @@ public class CmsTagController extends BaseController {
 		CmsTagExample cmsTagExample = new CmsTagExample();
 		cmsTagExample.setOffset((page - 1) * rows);
 		cmsTagExample.setLimit(rows);
-		cmsTagExample.setOrderByClause("tag_id desc");
+		cmsTagExample.setOrderByClause("orders desc");
 		List<CmsTag> tags = cmsTagService.getMapper().selectByExample(cmsTagExample);
 
 		// 分页对象
@@ -85,7 +85,9 @@ public class CmsTagController extends BaseController {
 			}
 			return "/tag/add";
 		}
-		cmsTag.setCtime(System.currentTimeMillis());
+		long time = System.currentTimeMillis();
+		cmsTag.setCtime(time);
+		cmsTag.setOrders(time);
 		cmsTagService.getMapper().insertSelective(cmsTag);
 		_log.info("新增记录id为:{}", cmsTag.getTagId());
 		return "redirect:/tag/list";

+ 1 - 3
cms/cms-web/src/main/resources/i18n/messages_en_US.properties

@@ -1,3 +1 @@
-user.list=User List
-user.username.null=username can not be null\!
-user.username.length=username length must between {min}~{max}!
+404=page not found!

+ 1 - 3
cms/cms-web/src/main/resources/i18n/messages_zh_CN.properties

@@ -1,3 +1 @@
-user.list=\u7528\u6237\u5217\u8868
-user.username.null=\u5E10\u53F7\u4E0D\u80FD\u4E3A\u7A7A\uFF01
-user.username.length=\u5E10\u53F7\u957F\u5EA6\u5FC5\u987B\u5728{min}~{max}\u4E4B\u95F4\uFF01
+404=\u9875\u9762\u6CA1\u6709\u627E\u5230\uFF01

+ 6 - 3
cms/cms-web/src/main/webapp/WEB-INF/jsp/404.jsp

@@ -1,12 +1,15 @@
 <%@ page contentType="text/html; charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
+<c:set var="basePath" value="${pageContext.request.contextPath}"/>
 <!DOCTYPE html>
 <html>
 <head>
-    <meta charset="utf-8"/>
-<title>404</title>
+<meta charset="utf-8"/>
+<title><spring:message code="404"/></title>
 </head>
 <body>
 404

+ 5 - 3
cms/cms-web/src/main/webapp/WEB-INF/jsp/500.jsp

@@ -1,12 +1,14 @@
-<%@ page contentType="text/html; charset=utf-8" isErrorPage="true"%>
+<%@ page contentType="text/html; charset=utf-8"%>
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
-<fmt:setLocale value="zh_CN"/>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
+<c:set var="basePath" value="${pageContext.request.contextPath}"/>
 <!DOCTYPE html>
 <html>
 <head>
-	<meta charset="utf-8"/>
+<meta charset="utf-8"/>
 <title>500</title>
 </head>
 <body>

+ 8 - 1
cms/cms-web/src/main/webapp/WEB-INF/jsp/index.jsp

@@ -1,5 +1,10 @@
 <%@ page contentType="text/html; charset=utf-8"%>
 <%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
+<c:set var="basePath" value="${pageContext.request.contextPath}"/>
 <!DOCTYPE html>
 <html>
 <head>
@@ -7,6 +12,8 @@
     <title>首页</title>
 </head>
 <body>
-首页
+<ul>
+    <li><a href="${basePath}/tag/list">标签管理</a></li>
+</ul>
 </body>
 </html>

+ 39 - 0
cms/cms-web/src/main/webapp/WEB-INF/jsp/tag/add.jsp

@@ -0,0 +1,39 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
+<c:set var="basePath" value="${pageContext.request.contextPath}"/>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8"/>
+<title>新增</title>
+</head>
+<body>
+<div>
+	<a href="${basePath}/">首页</a> &gt; <a href="${basePath}/tag/list">标签列表</a> &gt; 新增
+</div>
+<div>
+	<form method="post">
+	<table border="1">
+		<tr><td>名称:</td><td><input type="text" name="name" autofocus/></td></tr>
+		<tr><td>描述:</td><td><input type="text" name="description"/></td></tr>
+		<tr><td>图标:</td><td><input type="text" name="icon"/></td></tr>
+		<tr>
+			<td>类型:</td>
+			<td>
+				<select name="type">
+					<option value="1">普通</option>
+					<option value="2">热门</option>
+				</select>
+			</td>
+		</tr>
+		<tr><td>别名:</td><td><input type="text" name="alias"/></td></tr>
+		<tr><td></td><td><a href="${basePath}/tag/list">取消</a> <input type="submit" value="保存"/></td></tr>
+	</table>
+	</form>
+</div>
+</body>
+</html>

+ 61 - 0
cms/cms-web/src/main/webapp/WEB-INF/jsp/tag/list.jsp

@@ -0,0 +1,61 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
+<c:set var="basePath" value="${pageContext.request.contextPath}"/>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8"/>
+<title>列表</title>
+</head>
+<body>
+<div>
+	<a href="${basePath}/">首页</a> &gt; 标签列表
+</div>
+<div>
+	<table border="1">
+		<caption><a href="${basePath}/tag/add">新增</a></caption>
+		<thead>
+			<tr>
+				<th>ID</th>
+				<th>名称</th>
+				<th>描述</th>
+				<th>图标</th>
+				<th>类型</th>
+				<th>别名</th>
+				<th>创建时间</th>
+				<th>操作</th>
+			</tr>
+		</thead>
+		<tbody>
+			<c:forEach var="tag" items="${tags}">
+			<tr>
+				<td>${tag.tagId}</td>
+				<td>${tag.name}</td>
+				<td>${tag.description}</td>
+				<td>${tag.icon}</td>
+				<td>
+					<c:if test="${tag.type==1}">普通</c:if>
+					<c:if test="${tag.type==2}">热门</c:if>
+				</td>
+				<td>${tag.alias}</td>
+				<td>
+					<jsp:useBean id="date" class="java.util.Date"/>
+					<jsp:setProperty name="date" property="time" value="${tag.ctime}"/>
+					<fmt:formatDate value="${date}" type="both" pattern="yyyy-MM-dd HH:mm:ss" timeZone="Asia/Shanghai"/>
+				</td>
+				<td>
+					<a href="${basePath}/tag/update/${tag.tagId}">修改</a>
+					<a href="${basePath}/tag/delete/${tag.tagId}" onclick="return confirm('确认删除吗?');">删除</a>
+				</td>
+			</tr>
+			</c:forEach>
+		</tbody>
+	</table>
+	<div>${paginator.html}</div>
+</div>
+</body>
+</html>

+ 40 - 0
cms/cms-web/src/main/webapp/WEB-INF/jsp/tag/update.jsp

@@ -0,0 +1,40 @@
+<%@ page contentType="text/html; charset=utf-8"%>
+<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
+<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
+<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
+<c:set var="basePath" value="${pageContext.request.contextPath}"/>
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8"/>
+<title>编辑</title>
+</head>
+<body>
+<div>
+	<a href="${basePath}/">首页</a> &gt; <a href="${basePath}/tag/list">标签列表</a> &gt; 编辑
+</div>
+<div>
+	<form method="post">
+	<table border="1">
+		<input type="hidden" name="tagId" value="${tag.tagId}"/>
+		<tr><td>名称:</td><td><input type="text" name="name" value="${tag.name}"/></td></tr>
+		<tr><td>描述:</td><td><input type="text" name="description" value="${tag.description}"/></td></tr>
+		<tr><td>图标:</td><td><input type="text" name="icon" value="${tag.icon}"/></td></tr>
+		<tr>
+			<td>类型:</td>
+			<td>
+				<select name="type">
+					<option value="1" <c:if test="${tag.type==1}">selected="selected"</c:if>>普通</option>
+					<option value="2" <c:if test="${tag.type==2}">selected="selected"</c:if>>热门</option>
+				</select>
+			</td>
+		</tr>
+		<tr><td>别名:</td><td><input type="text" name="alias" value="${tag.alias}"/></td></tr>
+		<tr><td></td><td><a href="${basePath}/tag/list">取消</a> <input type="submit" value="保存"/></td></tr>
+	</table>
+	</form>
+</div>
+</body>
+</html>

+ 0 - 53
cms/cms-web/src/main/webapp/WEB-INF/jsp/user/add.jsp

@@ -1,53 +0,0 @@
-<%@ page contentType="text/html; charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
-<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
-<c:set var="basePath" value="${pageContext.request.contextPath}"/>
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8"/>
-<title>添加用户</title>
-</head>
-<body>
-<div class="breadcrumb">
-	<span class="crust"><a href="${basePath}/" class="crumb">首页</a><span class="arrow"><span>&gt;</span></span></span>
-	<span class="crust"><a href="${basePath}/user" class="crumb">用户管理</a><span class="arrow"><span>&gt;</span></span></span>
-	<span class="crust"><a href="" class="crumb">添加用户</a><span class="arrow"><span>&gt;</span></span></span>
-</div>
-<div id="main">
-	<form id="form" method="post">
-	<input type="hidden" name="_csrf" value="${_csrf.token}" />
-	<table border="1">
-		<caption>添加用户</caption>
-		<tr><td>帐号:<font color="#cc0000">*</font></td><td><input id="username" type="text" name="username" placeholder="必填" required="true" maxlength="20" autofocus value=""/></td></tr>
-		<tr><td>密码:<font color="#cc0000">*</font></td><td><input id="password" type="password" name="password" placeholder="必填" required="true" maxlength="20" value=""/></td></tr>
-		<tr><td>昵称:<font color="#cc0000">*</font></td><td><input id="nickname" type="text" name="nickname" placeholder="必填" required="true" maxlength="20" value=""/></td></tr>
-		<tr>
-			<td>性别:</td>
-			<td>
-				<select id="sex" name="sex">
-					<option value="0">-请选择-</option>
-					<option value="1">男</option>
-					<option value="2">女</option>
-				</select>
-			</td>
-		</tr>
-		<tr><td></td><td><a href="${basePath}/user">取消</a> <input type="submit" value="保存"/></td></tr>
-	</table>
-	</form>
-	<form id="form2" action="${basePath}/user/upload" method="post" enctype="multipart/form-data">
-	<table border="1">
-		<caption>修改头像</caption>
-		<tr><td>头像:</td><td><input id="file" type="file" name="file"/></td></tr>
-		</tr>
-		<tr><td></td><td><input type="submit" value="上传"/></td></tr>
-	</table>
-	</form>
-</div>
-<form:errors path="*" cssStyle="color:red"></form:errors>
-<form:errors path="username" cssClass="errorClass"></form:errors>
-</body>
-</html>

+ 0 - 64
cms/cms-web/src/main/webapp/WEB-INF/jsp/user/list.jsp

@@ -1,64 +0,0 @@
-<%@ page contentType="text/html; charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
-<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
-<c:set var="basePath" value="${pageContext.request.contextPath}"/>
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8"/>
-<title><spring:message code="user.list"/></title>
-</head>
-<body>
-<div class="breadcrumb">
-	<span class="crust"><a href="${basePath}/" class="crumb">首页</a><span class="arrow"><span>&gt;</span></span></span>
-	<span class="crust"><a href="${basePath}/user" class="crumb">用户管理</a><span class="arrow"><span>&gt;</span></span></span>
-	<span class="crust"><a href="" class="crumb">用户列表</a><span class="arrow"><span>&gt;</span></span></span>
-</div>
-<div id="main">
-	<table id="datagrid" class="datagrid" border="1">
-		<caption><i class="fa fa-list-ol"></i> 用户列表 <a href="${basePath}/user/add">添加</a></caption>
-		<thead>
-			<tr>
-				<th>ID</th>
-				<th>账号</th>
-				<th>密码</th>
-				<th>昵称</th>
-				<th>性别</th>
-				<th>创建时间</th>
-				<th>操作</th>
-			</tr>
-		</thead>
-		<tbody>
-			<c:forEach var="user" items="${users}">
-			<tr>
-				<td>${user.id}</td>
-				<td>${user.username}</td>
-				<td>${user.password}</td>
-				<td>${user.nickname}</td>
-				<td>
-					<c:if test="${user.sex==1}">男</c:if>
-					<c:if test="${user.sex==2}">女</c:if>
-				</td>
-				<td>
-					<%-- 
-					<fmt:parseDate value="${user.ctime}" var="date" pattern="yyyyMMddHHmm"/> 
-					<fmt:formatDate value="${date}" type="both" pattern="yyyy-MM-dd HH:mm:ss" timeZone="Asia/Shanghai"/>
-					 --%>
-					${user.ctime}
-				</td>
-				<td>
-					<a href="${basePath}/book/list/${user.id}">书籍管理</a>
-					<a href="${basePath}/user/update/${user.id}">修改</a>
-					<a href="${basePath}/user/delete/${user.id}" onclick="return confirm('确认删除吗?');">删除</a>
-				</td>
-			</tr>
-			</c:forEach>
-		</tbody>
-	</table>
-	<div class="pages">${paginator.html}</div>
-</div>
-</body>
-</html>

+ 0 - 43
cms/cms-web/src/main/webapp/WEB-INF/jsp/user/update.jsp

@@ -1,43 +0,0 @@
-<%@ page contentType="text/html; charset=utf-8"%>
-<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
-<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn"%>
-<%@ taglib uri="http://www.springframework.org/tags" prefix="spring"%>
-<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form"%>
-<c:set var="basePath" value="${pageContext.request.contextPath}"/>
-<!DOCTYPE html>
-<html>
-<head>
-	<meta charset="utf-8"/>
-<title>修改用户</title>
-</head>
-<body>
-<div class="breadcrumb">
-	<span class="crust"><a href="${basePath}/" class="crumb">首页</a><span class="arrow"><span>&gt;</span></span></span>
-	<span class="crust"><a href="${basePath}/user" class="crumb">用户管理</a><span class="arrow"><span>&gt;</span></span></span>
-	<span class="crust"><a href="" class="crumb">修改用户</a><span class="arrow"><span>&gt;</span></span></span>
-</div>
-<div id="main">
-	<form id="form" method="post">
-	<input type="hidden" name="_csrf" value="${_csrf.token}" />
-	<table border="1">
-		<caption>修改用户</caption>
-		<tr><td>帐号:<font color="#cc0000">*</font></td><td><input id="username" type="text" name="username" placeholder="必填" required="true" maxlength="20" autofocus value="${user.username}"/></td></tr>
-		<tr><td>密码:<font color="#cc0000">*</font></td><td><input id="password" type="password" name="password" placeholder="必填" required="true" maxlength="20" value="${user.password}"/></td></tr>
-		<tr><td>昵称:<font color="#cc0000">*</font></td><td><input id="nickname" type="text" name="nickname" placeholder="必填" required="true" maxlength="20" value="${user.nickname}"/></td></tr>
-		<tr>
-			<td>性别:<font color="#cc0000">*</font></td>
-			<td>
-				<select id="sex" name="sex">
-					<option value="0">-请选择-</option>
-					<option value="1" <c:if test="${user.sex==1}">selected="selected"</c:if>>男</option>
-					<option value="2" <c:if test="${user.sex==2}">selected="selected"</c:if>>女</option>
-				</select>
-			</td>
-		</tr>
-		<tr><td></td><td><a href="${basePath}/user">取消</a> <input type="submit" value="保存"/></td></tr>
-	</table>
-	</form>
-</div>
-</body>
-</html>