Merge branch 'master' of https://github.com/shuzheng/zheng
This commit is contained in:
shuzheng
commit
fc8ed398fa
|
|
@ -101,6 +101,7 @@ public class CmsArticleController extends BaseController {
|
|||
long time = System.currentTimeMillis();
|
||||
cmsArticle.setCtime(time);
|
||||
cmsArticle.setOrders(time);
|
||||
cmsArticle.setReadnumber(0);
|
||||
int count = cmsArticleService.insertSelective(cmsArticle);
|
||||
return new CmsResult(CmsResultConstant.SUCCESS, count);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,8 +73,8 @@
|
|||
<div class="col-sm-4">
|
||||
<div class="form-group">
|
||||
<div class="fg-line">
|
||||
<label for="readnumber">阅读数量</label>
|
||||
<input id="readnumber" type="text" class="form-control" name="readnumber">
|
||||
<label for="systemId">所属系统</label>
|
||||
<input id="systemId" type="text" class="form-control" name="systemId">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ $(function() {
|
|||
columns: [
|
||||
{field: 'ck', checkbox: true},
|
||||
{field: 'articleId', title: '编号', sortable: true, align: 'center'},
|
||||
{field: 'systemId', title: '所属系统'},
|
||||
{field: 'topicId', title: '所属专题'},
|
||||
{field: 'title', title: '标题'},
|
||||
{field: 'author', title: '作者'},
|
||||
|
|
|
|||
|
|
@ -73,8 +73,8 @@
|
|||
<div class="col-sm-4">
|
||||
<div class="form-group">
|
||||
<div class="fg-line">
|
||||
<label for="readnumber">阅读数量</label>
|
||||
<input id="readnumber" type="text" class="form-control" name="readnumber" value="0" value="${article.readnumber}">
|
||||
<label for="systemId">所属系统</label>
|
||||
<input id="systemId" type="text" class="form-control" name="systemId" value="${article.systemId}">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -16,6 +16,10 @@
|
|||
<label for="level">层深</label>
|
||||
<input id="level" type="text" class="form-control" name="level" maxlength="5">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="systemId">所属系统</label>
|
||||
<input id="systemId" type="text" class="form-control" name="systemId">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="name">名称</label>
|
||||
<input id="name" type="text" class="form-control" name="name" maxlength="20">
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ $(function() {
|
|||
{field: 'ck', checkbox: true},
|
||||
{field: 'categoryId', title: '编号', sortable: true, align: 'center'},
|
||||
{field: 'pid', title: '上级编号'},
|
||||
{field: 'systemId', title: '所属系统'},
|
||||
{field: 'name', title: '类目名称'},
|
||||
{field: 'alias', title: '类目别名'},
|
||||
{field: 'description', title: '描述'},
|
||||
|
|
|
|||
|
|
@ -16,6 +16,10 @@
|
|||
<label for="level">层深</label>
|
||||
<input id="level" type="text" class="form-control" name="level" maxlength="5" value="${category.level}">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="systemId">所属系统</label>
|
||||
<input id="systemId" type="text" class="form-control" name="systemId" value="${category.systemId}">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="name">名称</label>
|
||||
<input id="name" type="text" class="form-control" name="name" maxlength="20" value="${category.name}">
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
<form method="post">
|
||||
<table border="1">
|
||||
<tr><td>楼中楼编号：</td><td><input type="text" name="pid" autofocus/></td></tr>
|
||||
<tr><td>所属系统：</td><td><input type="text" name="systemId"/></td></tr>
|
||||
<tr><td>文章编号：</td><td><input type="text" name="articleId"/></td></tr>
|
||||
<tr><td>用户编号：</td><td><input type="text" name="userId"/></td></tr>
|
||||
<tr><td>评论内容：</td><td><input type="text" name="content"/></td></tr>
|
||||
|
|
@ -52,6 +52,7 @@ $(function() {
|
|||
columns: [
|
||||
{field: 'ck', checkbox: true},
|
||||
{field: 'commentId', title: '编号', sortable: true, align: 'center'},
|
||||
{field: 'systemId', title: '所属系统'},
|
||||
{field: 'content', title: '内容'},
|
||||
{field: 'ip', title: 'IP地址'},
|
||||
{field: 'agent', title: '用户标识'},
|
||||
|
|
|
|||
|
|
@ -1,66 +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>
|
||||
<a href="${basePath}/manage/index">首页</a> > 评论列表
|
||||
</div>
|
||||
<div>
|
||||
<table border="1">
|
||||
<caption><a href="${basePath}/manage/comment/add">新增</a></caption>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>ID</th>
|
||||
<th>楼中楼ID</th>
|
||||
<th>文章编号</th>
|
||||
<th>用户编号</th>
|
||||
<th>评论内容</th>
|
||||
<th>状态</th>
|
||||
<th>IP地址</th>
|
||||
<th>终端信息</th>
|
||||
<th>创建时间</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<c:forEach var="comment" items="${comments}">
|
||||
<tr>
|
||||
<td>${comment.commentId}</td>
|
||||
<td>${comment.pid}</td>
|
||||
<td>${comment.articleId}</td>
|
||||
<td>${comment.userId}</td>
|
||||
<td>${comment.content}</td>
|
||||
<td>
|
||||
<c:if test="${comment.status==-1}">不通过</c:if>
|
||||
<c:if test="${comment.status==0}">未审核</c:if>
|
||||
<c:if test="${comment.status==1}">通过</c:if>
|
||||
</td>
|
||||
<td>${comment.ip}</td>
|
||||
<td>${comment.agent}</td>
|
||||
<td>
|
||||
<jsp:useBean id="date" class="java.util.Date"/>
|
||||
<jsp:setProperty name="date" property="time" value="${comment.ctime}"/>
|
||||
<fmt:formatDate value="${date}" type="both" pattern="yyyy-MM-dd HH:mm:ss" timeZone="Asia/Shanghai"/>
|
||||
</td>
|
||||
<td>
|
||||
<a href="${basePath}/manage/comment/update/${comment.commentId}">修改</a>
|
||||
<a href="${basePath}/manage/comment/delete/${comment.commentId}" onclick="return confirm('确认删除吗？');">删除</a>
|
||||
</td>
|
||||
</tr>
|
||||
</c:forEach>
|
||||
</tbody>
|
||||
</table>
|
||||
<div>${paginator.html}</div>
|
||||
</div>
|
||||
</body>
|
||||
</html>
|
||||
|
|
@ -20,6 +20,7 @@
|
|||
<table border="1">
|
||||
<input type="hidden" name="commentId" value="${comment.commentId}"/>
|
||||
<tr><td>楼中楼编号：</td><td><input type="text" name="pid" value="${comment.pid}"/></td></tr>
|
||||
<tr><td>所属系统：</td><td><input type="text" name="systemId" value="${comment.systemId}"/></td></tr>
|
||||
<tr><td>文章编号：</td><td><input type="text" name="articleId" value="${comment.articleId}"/></td></tr>
|
||||
<tr><td>用户编号：</td><td><input type="text" name="userId" value="${comment.userId}"/></td></tr>
|
||||
<tr><td>评论内容：</td><td><input type="text" name="content" value="${comment.content}"/></td></tr>
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@
|
|||
<c:set var="basePath" value="${pageContext.request.contextPath}"/>
|
||||
<div id="createDialog" class="crudDialog">
|
||||
<form id="createForm" method="post">
|
||||
<div class="form-group">
|
||||
<label for="systemId">所属系统</label>
|
||||
<input id="systemId" type="text" class="form-control" name="systemId">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="name">名称</label>
|
||||
<input id="name" type="text" class="form-control" name="name" maxlength="20">
|
||||
|
|
|
|||
|
|
@ -53,6 +53,7 @@ $(function() {
|
|||
columns: [
|
||||
{field: 'ck', checkbox: true},
|
||||
{field: 'tagId', title: '编号', sortable: true, align: 'center'},
|
||||
{field: 'systemId', title: '所属系统'},
|
||||
{field: 'name', title: '标签名称'},
|
||||
{field: 'alias', title: '标签别名'},
|
||||
{field: 'description', title: '描述'},
|
||||
|
|
|
|||
|
|
@ -8,6 +8,10 @@
|
|||
<c:set var="basePath" value="${pageContext.request.contextPath}"/>
|
||||
<div id="updateDialog" class="crudDialog">
|
||||
<form id="updateForm" method="post">
|
||||
<div class="form-group">
|
||||
<label for="systemId">所属系统</label>
|
||||
<input id="systemId" type="text" class="form-control" name="systemId" value="${tag.systemId}">
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label for="name">名称</label>
|
||||
<input id="name" type="text" class="form-control" name="name" maxlength="20" value="${tag.name}">
|
||||
|
|
|
|||
|
|
@ -32,5 +32,11 @@
|
|||
<artifactId>qiniu-java-sdk</artifactId>
|
||||
<version>[7.0.0, 7.1.99]</version>
|
||||
</dependency>
|
||||
<!-- 阿里云OSS -->
|
||||
<dependency>
|
||||
<groupId>com.aliyun.oss</groupId>
|
||||
<artifactId>aliyun-sdk-oss</artifactId>
|
||||
<version>2.5.0</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
|
|
|
|||
Loading…
Reference in New Issue