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

Разница между файлами не показана из-за своего большого размера
+ 0 - 3781
DataModelDiagram/zheng.apm


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

@@ -25,12 +25,12 @@ public class ManageController {
 	private static Logger _log = LoggerFactory.getLogger(ManageController.class);
 
 	@RequestMapping(value = {"", "/index"})
-	public Object index() {
+	public String index() {
 		return "/manage/index";
 	}
 
 	@RequestMapping("/login")
-	public Object login() {
+	public String login() {
 		return "/manage/login";
 	}
 

+ 9 - 11
cms/cms-web/src/main/java/com/zheng/cms/controller/CmsArticleController.java → cms/cms-web/src/main/java/com/zheng/cms/controller/manage/CmsArticleController.java

@@ -1,5 +1,6 @@
-package com.zheng.cms.controller;
+package com.zheng.cms.controller.manage;
 
+import com.zheng.cms.controller.BaseController;
 import com.zheng.cms.dao.model.CmsArticle;
 import com.zheng.cms.dao.model.CmsArticleExample;
 import com.zheng.cms.service.CmsArticleService;
@@ -9,15 +10,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -25,7 +23,7 @@ import java.util.List;
  * Created by shuzheng on 2016/11/14.
  */
 @Controller
-@RequestMapping("/article")
+@RequestMapping("/manage/article")
 public class CmsArticleController extends BaseController {
 
 	private final static Logger _log = LoggerFactory.getLogger(CmsArticleController.class);
@@ -60,7 +58,7 @@ public class CmsArticleController extends BaseController {
 
 		model.addAttribute("articles", articles);
 		model.addAttribute("paginator", paginator);
-		return "/article/list";
+		return "/manage/article/list";
 	}
 	
 	/**
@@ -69,7 +67,7 @@ public class CmsArticleController extends BaseController {
 	 */
 	@RequestMapping(value = "/add", method = RequestMethod.GET)
 	public String add() {
-		return "/article/add";
+		return "/manage/article/add";
 	}
 	
 	/**
@@ -86,7 +84,7 @@ public class CmsArticleController extends BaseController {
 		int count = cmsArticleService.getMapper().insertSelective(cmsArticle);
 		model.addAttribute("count", count);
 		_log.info("新增记录id为:{}", cmsArticle.getArticleId());
-		return "redirect:/article/list";
+		return "redirect:/manage/article/list";
 	}
 
 	/**
@@ -99,7 +97,7 @@ public class CmsArticleController extends BaseController {
 	public String delete(@PathVariable("ids") String ids, Model model) {
 		int count = cmsArticleService.deleteByPrimaryKeys(ids);
 		model.addAttribute("count", count);
-		return "redirect:/article/list";
+		return "redirect:/manage/article/list";
 	}
 	
 	/**
@@ -112,7 +110,7 @@ public class CmsArticleController extends BaseController {
 	public String update(@PathVariable("id") int id, Model model) {
 		CmsArticle article = cmsArticleService.getMapper().selectByPrimaryKey(id);
 		model.addAttribute("article", article);
-		return "/article/update";
+		return "/manage/article/update";
 	}
 	
 	/**
@@ -127,7 +125,7 @@ public class CmsArticleController extends BaseController {
 		int count = cmsArticleService.getMapper().updateByPrimaryKeySelective(cmsArticle);
 		model.addAttribute("count", count);
 		model.addAttribute("id", id);
-		return "redirect:/article/list";
+		return "redirect:/manage/article/list";
 	}
 
 }

+ 9 - 11
cms/cms-web/src/main/java/com/zheng/cms/controller/CmsCategoryController.java → cms/cms-web/src/main/java/com/zheng/cms/controller/manage/CmsCategoryController.java

@@ -1,5 +1,6 @@
-package com.zheng.cms.controller;
+package com.zheng.cms.controller.manage;
 
+import com.zheng.cms.controller.BaseController;
 import com.zheng.cms.dao.model.CmsCategory;
 import com.zheng.cms.dao.model.CmsCategoryExample;
 import com.zheng.cms.service.CmsCategoryService;
@@ -9,15 +10,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -25,7 +23,7 @@ import java.util.List;
  * Created by shuzheng on 2016/11/14.
  */
 @Controller
-@RequestMapping("/category")
+@RequestMapping("/manage/category")
 public class CmsCategoryController extends BaseController {
 
 	private final static Logger _log = LoggerFactory.getLogger(CmsCategoryController.class);
@@ -60,7 +58,7 @@ public class CmsCategoryController extends BaseController {
 
 		model.addAttribute("categorys", categorys);
 		model.addAttribute("paginator", paginator);
-		return "/category/list";
+		return "/manage/category/list";
 	}
 	
 	/**
@@ -69,7 +67,7 @@ public class CmsCategoryController extends BaseController {
 	 */
 	@RequestMapping(value = "/add", method = RequestMethod.GET)
 	public String add() {
-		return "/category/add";
+		return "/manage/category/add";
 	}
 	
 	/**
@@ -86,7 +84,7 @@ public class CmsCategoryController extends BaseController {
 		int count = cmsCategoryService.getMapper().insertSelective(cmsCategory);
 		model.addAttribute("count", count);
 		_log.info("新增记录id为:{}", cmsCategory.getCategoryId());
-		return "redirect:/category/list";
+		return "redirect:/manage/category/list";
 	}
 
 	/**
@@ -99,7 +97,7 @@ public class CmsCategoryController extends BaseController {
 	public String delete(@PathVariable("ids") String ids, Model model) {
 		int count = cmsCategoryService.deleteByPrimaryKeys(ids);
 		model.addAttribute("count", count);
-		return "redirect:/category/list";
+		return "redirect:/manage/category/list";
 	}
 	
 	/**
@@ -112,7 +110,7 @@ public class CmsCategoryController extends BaseController {
 	public String update(@PathVariable("id") int id, Model model) {
 		CmsCategory category = cmsCategoryService.getMapper().selectByPrimaryKey(id);
 		model.addAttribute("category", category);
-		return "/category/update";
+		return "/manage/category/update";
 	}
 	
 	/**
@@ -127,7 +125,7 @@ public class CmsCategoryController extends BaseController {
 		int count = cmsCategoryService.getMapper().updateByPrimaryKeySelective(cmsCategory);
 		model.addAttribute("count", count);
 		model.addAttribute("id", id);
-		return "redirect:/category/list";
+		return "redirect:/manage/category/list";
 	}
 
 }

+ 9 - 13
cms/cms-web/src/main/java/com/zheng/cms/controller/CmsCommentController.java → cms/cms-web/src/main/java/com/zheng/cms/controller/manage/CmsCommentController.java

@@ -1,9 +1,8 @@
-package com.zheng.cms.controller;
+package com.zheng.cms.controller.manage;
 
+import com.zheng.cms.controller.BaseController;
 import com.zheng.cms.dao.model.CmsComment;
 import com.zheng.cms.dao.model.CmsCommentExample;
-import com.zheng.cms.dao.model.CmsTag;
-import com.zheng.cms.dao.model.CmsTagExample;
 import com.zheng.cms.service.CmsCommentService;
 import com.zheng.common.util.Paginator;
 import org.slf4j.Logger;
@@ -11,15 +10,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -27,7 +23,7 @@ import java.util.List;
  * Created by shuzheng on 2016/11/14.
  */
 @Controller
-@RequestMapping("/comment")
+@RequestMapping("/manage/comment")
 public class CmsCommentController extends BaseController {
 
 	private final static Logger _log = LoggerFactory.getLogger(CmsCommentController.class);
@@ -62,7 +58,7 @@ public class CmsCommentController extends BaseController {
 
 		model.addAttribute("comments", comments);
 		model.addAttribute("paginator", paginator);
-		return "/comment/list";
+		return "/manage/comment/list";
 	}
 	
 	/**
@@ -71,7 +67,7 @@ public class CmsCommentController extends BaseController {
 	 */
 	@RequestMapping(value = "/add", method = RequestMethod.GET)
 	public String add() {
-		return "/comment/add";
+		return "/manage/comment/add";
 	}
 	
 	/**
@@ -86,7 +82,7 @@ public class CmsCommentController extends BaseController {
 		int count = cmsCommentService.getMapper().insertSelective(cmsComment);
 		model.addAttribute("count", count);
 		_log.info("新增记录id为:{}", cmsComment.getArticleId());
-		return "redirect:/comment/list";
+		return "redirect:/manage/comment/list";
 	}
 
 	/**
@@ -99,7 +95,7 @@ public class CmsCommentController extends BaseController {
 	public String delete(@PathVariable("ids") String ids, Model model) {
 		int count = cmsCommentService.deleteByPrimaryKeys(ids);
 		model.addAttribute("count", count);
-		return "redirect:/comment/list";
+		return "redirect:/manage/comment/list";
 	}
 	
 	/**
@@ -112,7 +108,7 @@ public class CmsCommentController extends BaseController {
 	public String update(@PathVariable("id") int id, Model model) {
 		CmsComment comment = cmsCommentService.getMapper().selectByPrimaryKey(id);
 		model.addAttribute("comment", comment);
-		return "/comment/update";
+		return "/manage/comment/update";
 	}
 	
 	/**
@@ -127,7 +123,7 @@ public class CmsCommentController extends BaseController {
 		int count = cmsCommentService.getMapper().updateByPrimaryKeySelective(cmsComment);
 		model.addAttribute("count", count);
 		model.addAttribute("id", id);
-		return "redirect:/comment/list";
+		return "redirect:/manage/comment/list";
 	}
 
 }

+ 9 - 11
cms/cms-web/src/main/java/com/zheng/cms/controller/CmsTagController.java → cms/cms-web/src/main/java/com/zheng/cms/controller/manage/CmsTagController.java

@@ -1,5 +1,6 @@
-package com.zheng.cms.controller;
+package com.zheng.cms.controller.manage;
 
+import com.zheng.cms.controller.BaseController;
 import com.zheng.cms.dao.model.CmsTag;
 import com.zheng.cms.dao.model.CmsTagExample;
 import com.zheng.cms.service.CmsTagService;
@@ -9,15 +10,12 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.ObjectError;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.validation.Valid;
 import java.util.List;
 
 /**
@@ -25,7 +23,7 @@ import java.util.List;
  * Created by shuzheng on 2016/11/14.
  */
 @Controller
-@RequestMapping("/tag")
+@RequestMapping("/manage/tag")
 public class CmsTagController extends BaseController {
 
 	private final static Logger _log = LoggerFactory.getLogger(CmsTagController.class);
@@ -60,7 +58,7 @@ public class CmsTagController extends BaseController {
 
 		model.addAttribute("tags", tags);
 		model.addAttribute("paginator", paginator);
-		return "/tag/list";
+		return "/manage/tag/list";
 	}
 	
 	/**
@@ -69,7 +67,7 @@ public class CmsTagController extends BaseController {
 	 */
 	@RequestMapping(value = "/add", method = RequestMethod.GET)
 	public String add() {
-		return "/tag/add";
+		return "/manage/tag/add";
 	}
 	
 	/**
@@ -86,7 +84,7 @@ public class CmsTagController extends BaseController {
 		int count = cmsTagService.getMapper().insertSelective(cmsTag);
 		model.addAttribute("count", count);
 		_log.info("新增记录id为:{}", cmsTag.getTagId());
-		return "redirect:/tag/list";
+		return "redirect:/manage/tag/list";
 	}
 
 	/**
@@ -99,7 +97,7 @@ public class CmsTagController extends BaseController {
 	public String delete(@PathVariable("ids") String ids, Model model) {
 		int count = cmsTagService.deleteByPrimaryKeys(ids);
 		model.addAttribute("count", count);
-		return "redirect:/tag/list";
+		return "redirect:/manage/tag/list";
 	}
 	
 	/**
@@ -112,7 +110,7 @@ public class CmsTagController extends BaseController {
 	public String update(@PathVariable("id") int id, Model model) {
 		CmsTag tag = cmsTagService.getMapper().selectByPrimaryKey(id);
 		model.addAttribute("tag", tag);
-		return "/tag/update";
+		return "/manage/tag/update";
 	}
 	
 	/**
@@ -127,7 +125,7 @@ public class CmsTagController extends BaseController {
 		int count = cmsTagService.getMapper().updateByPrimaryKeySelective(cmsTag);
 		model.addAttribute("count", count);
 		model.addAttribute("id", id);
-		return "redirect:/tag/list";
+		return "redirect:/manage/tag/list";
 	}
 
 }

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

@@ -12,9 +12,6 @@
     <title>首页</title>
 </head>
 <body>
-<ul>
-    <li><a href="${basePath}/tag/list">标签管理</a></li>
-    <li><a href="${basePath}/category/list">类目管理</a></li>
-</ul>
+<a href="${basePath}/manage">后台首页</a>
 </body>
 </html>

+ 2 - 2
cms/cms-web/src/main/webapp/WEB-INF/jsp/category/add.jsp → cms/cms-web/src/main/webapp/WEB-INF/jsp/manage/category/add.jsp

@@ -13,7 +13,7 @@
 </head>
 <body>
 <div>
-	<a href="${basePath}/">首页</a> &gt; <a href="${basePath}/category/list">类目列表</a> &gt; 新增
+	<a href="${basePath}/manage">首页</a> &gt; <a href="${basePath}/manage/category/list">类目列表</a> &gt; 新增
 </div>
 <div>
 	<form method="post">
@@ -33,7 +33,7 @@
 			</td>
 		</tr>
 		<tr><td>别名:</td><td><input type="text" name="alias"/></td></tr>
-		<tr><td></td><td><a href="${basePath}/category/list">取消</a> <input type="submit" value="保存"/></td></tr>
+		<tr><td></td><td><a href="${basePath}/manage/category/list">取消</a> <input type="submit" value="保存"/></td></tr>
 	</table>
 	</form>
 </div>

+ 4 - 4
cms/cms-web/src/main/webapp/WEB-INF/jsp/category/list.jsp → cms/cms-web/src/main/webapp/WEB-INF/jsp/manage/category/list.jsp

@@ -13,11 +13,11 @@
 </head>
 <body>
 <div>
-	<a href="${basePath}/">首页</a> &gt; 类目列表
+	<a href="${basePath}/manage">首页</a> &gt; 类目列表
 </div>
 <div>
 	<table border="1">
-		<caption><a href="${basePath}/category/add">新增</a> <a href="${basePath}/category/batchDelete">批量删除</a></caption>
+		<caption><a href="${basePath}/manage/category/add">新增</a> <a href="${basePath}/manage/category/batchDelete">批量删除</a></caption>
 		<thead>
 			<tr>
 				<th>ID</th>
@@ -52,8 +52,8 @@
 					<fmt:formatDate value="${date}" type="both" pattern="yyyy-MM-dd HH:mm:ss" timeZone="Asia/Shanghai"/>
 				</td>
 				<td>
-					<a href="${basePath}/category/update/${category.categoryId}">修改</a>
-					<a href="${basePath}/category/delete/${category.categoryId}" onclick="return confirm('确认删除吗?');">删除</a>
+					<a href="${basePath}/manage/category/update/${category.categoryId}">修改</a>
+					<a href="${basePath}/manage/category/delete/${category.categoryId}" onclick="return confirm('确认删除吗?');">删除</a>
 				</td>
 			</tr>
 			</c:forEach>

+ 2 - 2
cms/cms-web/src/main/webapp/WEB-INF/jsp/category/update.jsp → cms/cms-web/src/main/webapp/WEB-INF/jsp/manage/category/update.jsp

@@ -13,7 +13,7 @@
 </head>
 <body>
 <div>
-	<a href="${basePath}/">首页</a> &gt; <a href="${basePath}/category/list">类目列表</a> &gt; 编辑
+	<a href="${basePath}/manage">首页</a> &gt; <a href="${basePath}/manage/category/list">类目列表</a> &gt; 编辑
 </div>
 <div>
 	<form method="post">
@@ -34,7 +34,7 @@
 			</td>
 		</tr>
 		<tr><td>别名:</td><td><input type="text" name="alias" value="${category.alias}"/></td></tr>
-		<tr><td></td><td><a href="${basePath}/category/list">取消</a> <input type="submit" value="保存"/></td></tr>
+		<tr><td></td><td><a href="${basePath}/manage/category/list">取消</a> <input type="submit" value="保存"/></td></tr>
 	</table>
 	</form>
 </div>

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

@@ -9,6 +9,9 @@
     <title>后台首页</title>
 </head>
 <body>
-/manage/index
+<ul>
+    <li><a href="${basePath}/manage/tag/list">标签管理</a></li>
+    <li><a href="${basePath}/manage/category/list">类目管理</a></li>
+</ul>
 </body>
 </html>

+ 2 - 2
cms/cms-web/src/main/webapp/WEB-INF/jsp/tag/add.jsp → cms/cms-web/src/main/webapp/WEB-INF/jsp/manage/tag/add.jsp

@@ -13,7 +13,7 @@
 </head>
 <body>
 <div>
-	<a href="${basePath}/">首页</a> &gt; <a href="${basePath}/tag/list">标签列表</a> &gt; 新增
+	<a href="${basePath}/manage">首页</a> &gt; <a href="${basePath}/manage/tag/list">标签列表</a> &gt; 新增
 </div>
 <div>
 	<form method="post">
@@ -31,7 +31,7 @@
 			</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>
+		<tr><td></td><td><a href="${basePath}/manage/tag/list">取消</a> <input type="submit" value="保存"/></td></tr>
 	</table>
 	</form>
 </div>

+ 4 - 4
cms/cms-web/src/main/webapp/WEB-INF/jsp/tag/list.jsp → cms/cms-web/src/main/webapp/WEB-INF/jsp/manage/tag/list.jsp

@@ -13,11 +13,11 @@
 </head>
 <body>
 <div>
-	<a href="${basePath}/">首页</a> &gt; 标签列表
+	<a href="${basePath}/manage">首页</a> &gt; 标签列表
 </div>
 <div>
 	<table border="1">
-		<caption><a href="${basePath}/tag/add">新增</a> <a href="${basePath}/tag/batchDelete">批量删除</a></caption>
+		<caption><a href="${basePath}/manage/tag/add">新增</a> <a href="${basePath}/manage/tag/batchDelete">批量删除</a></caption>
 		<thead>
 			<tr>
 				<th>ID</th>
@@ -48,8 +48,8 @@
 					<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>
+					<a href="${basePath}/manage/tag/update/${tag.tagId}">修改</a>
+					<a href="${basePath}/manage/tag/delete/${tag.tagId}" onclick="return confirm('确认删除吗?');">删除</a>
 				</td>
 			</tr>
 			</c:forEach>

+ 2 - 2
cms/cms-web/src/main/webapp/WEB-INF/jsp/tag/update.jsp → cms/cms-web/src/main/webapp/WEB-INF/jsp/manage/tag/update.jsp

@@ -13,7 +13,7 @@
 </head>
 <body>
 <div>
-	<a href="${basePath}/">首页</a> &gt; <a href="${basePath}/tag/list">标签列表</a> &gt; 编辑
+	<a href="${basePath}/manage">首页</a> &gt; <a href="${basePath}/manage/tag/list">标签列表</a> &gt; 编辑
 </div>
 <div>
 	<form method="post">
@@ -32,7 +32,7 @@
 			</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>
+		<tr><td></td><td><a href="${basePath}/manage/tag/list">取消</a> <input type="submit" value="保存"/></td></tr>
 	</table>
 	</form>
 </div>

Некоторые файлы не были показаны из-за большого количества измененных файлов