Răsfoiți Sursa

zheng-cms前后太分离,后台加入zheng-admin

shuzheng 9 ani în urmă
părinte
comite
e779caa7e1
34 a modificat fișierele cu 770 adăugiri și 26 ștergeri
  1. 35 0
      zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/Interceptor/ManageInterceptor.java
  2. 28 0
      zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/ManageController.java
  3. 134 0
      zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsArticleController.java
  4. 133 0
      zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java
  5. 131 0
      zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCommentController.java
  6. 133 0
      zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsTagController.java
  7. 47 0
      zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/jms/defaultQueueMessageListener.java
  8. 38 0
      zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/util/ZhengAdminUtil.java
  9. 53 0
      zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-activemq.xml
  10. 9 0
      zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-zhengAdmin.xml
  11. 1 0
      zheng-cms/zheng-cms-admin/src/main/resources/i18n/messages_en_US.properties
  12. 1 0
      zheng-cms/zheng-cms-admin/src/main/resources/i18n/messages_zh_CN.properties
  13. 1 6
      zheng-cms/zheng-cms-admin/src/main/resources/log4j.properties
  14. 3 1
      zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties
  15. 3 1
      zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties
  16. 3 1
      zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties
  17. 15 1
      zheng-cms/zheng-cms-admin/src/main/resources/springMVC-servlet.xml
  18. 1 1
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/index.jsp
  19. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/article/add.jsp
  20. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/article/list.jsp
  21. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/article/update.jsp
  22. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/category/add.jsp
  23. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/category/list.jsp
  24. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/category/update.jsp
  25. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/comment/add.jsp
  26. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/comment/list.jsp
  27. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/comment/update.jsp
  28. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/index.jsp
  29. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/login.jsp
  30. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/tag/add.jsp
  31. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/tag/list.jsp
  32. 0 0
      zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/tag/update.jsp
  33. 0 14
      zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml
  34. 1 1
      zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/index.jsp

+ 35 - 0
zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/Interceptor/ManageInterceptor.java

@@ -0,0 +1,35 @@
+package com.zheng.cms.admin.Interceptor;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.web.servlet.ModelAndView;
+import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * 后台过滤器
+ * Created by ZhangShuzheng on 2017/01/12.
+ */
+public class ManageInterceptor extends HandlerInterceptorAdapter {
+
+	private static Logger _log = LoggerFactory.getLogger(ManageInterceptor.class);
+
+	@Override
+	public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
+		_log.info("ManageInterceptor==>preHandle");
+		return true;
+	}
+
+	@Override
+	public void postHandle(HttpServletRequest request, HttpServletResponse response, Object handler, ModelAndView modelAndView) throws Exception {
+
+	}
+
+	@Override
+	public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
+
+	}
+
+}

+ 28 - 0
zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/ManageController.java

@@ -0,0 +1,28 @@
+package com.zheng.cms.admin.controller;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+/**
+ * 后台controller
+ * Created by ZhangShuzheng on 2017/01/12.
+ */
+@Controller
+@RequestMapping("/manage")
+public class ManageController extends BaseController {
+
+	private static Logger _log = LoggerFactory.getLogger(ManageController.class);
+
+	@RequestMapping(value = {"", "/index"})
+	public String index() {
+		return "/manage/index";
+	}
+
+	@RequestMapping("/login")
+	public String login() {
+		return "/manage/login";
+	}
+
+}

+ 134 - 0
zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsArticleController.java

@@ -0,0 +1,134 @@
+package com.zheng.cms.admin.controller.manage;
+
+import com.zheng.cms.dao.model.CmsArticle;
+import com.zheng.cms.dao.model.CmsArticleExample;
+import com.zheng.cms.rpc.api.CmsArticleService;
+import com.zheng.cms.web.controller.BaseController;
+import com.zheng.common.util.Paginator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+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 java.util.List;
+
+/**
+ * 文章控制器
+ * Created by shuzheng on 2016/11/14.
+ */
+@Controller
+@RequestMapping("/manage/article")
+public class CmsArticleController extends BaseController {
+
+	private final static Logger _log = LoggerFactory.getLogger(CmsArticleController.class);
+	
+	@Autowired
+	private CmsArticleService cmsArticleService;
+
+	/**
+	 * 列表
+	 * @param page 当前页码
+	 * @param rows 每页条数
+	 * @param desc 降序排序
+	 * @param request
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping("/list")
+	public String list(
+			@RequestParam(required = false, defaultValue = "1", value = "page") int page,
+			@RequestParam(required = false, defaultValue = "20", value = "rows") int rows,
+			@RequestParam(required = false, defaultValue = "true", value = "desc") boolean desc,
+			HttpServletRequest request, ModelMap modelMap) {
+
+		// 数据列表
+		CmsArticleExample cmsArticleExample = new CmsArticleExample();
+		cmsArticleExample.setOffset((page - 1) * rows);
+		cmsArticleExample.setLimit(rows);
+		cmsArticleExample.setOrderByClause(desc ? "orders desc" : "orders asc");
+		List<CmsArticle> articles = cmsArticleService.selectByExample(cmsArticleExample);
+
+		// 分页对象
+		long total = cmsArticleService.countByExample(cmsArticleExample);
+		Paginator paginator = new Paginator(total, page, rows, request);
+
+		modelMap.put("articles", articles);
+		modelMap.put("paginator", paginator);
+		return "/manage/article/list";
+	}
+	
+	/**
+	 * 新增get
+	 * @return
+	 */
+	@RequestMapping(value = "/add", method = RequestMethod.GET)
+	public String add() {
+		return "/manage/article/add";
+	}
+	
+	/**
+	 * 新增post
+	 * @param cmsArticle
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	public String add(CmsArticle cmsArticle, ModelMap modelMap) {
+		long time = System.currentTimeMillis();
+		cmsArticle.setCtime(time);
+		cmsArticle.setOrders(time);
+		int count = cmsArticleService.insertSelective(cmsArticle);
+		modelMap.put("count", count);
+		_log.info("新增记录id为:{}", cmsArticle.getArticleId());
+		return "redirect:/manage/article/list";
+	}
+
+	/**
+	 * 删除
+	 * @param ids
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/delete/{ids}",method = RequestMethod.GET)
+	public String delete(@PathVariable("ids") String ids, ModelMap modelMap) {
+		int count = cmsArticleService.deleteByPrimaryKeys(ids);
+		modelMap.put("count", count);
+		return "redirect:/manage/article/list";
+	}
+	
+	/**
+	 * 修改get
+	 * @param id
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/update/{id}", method = RequestMethod.GET)
+	public String update(@PathVariable("id") int id, ModelMap modelMap) {
+		CmsArticle article = cmsArticleService.selectByPrimaryKey(id);
+		modelMap.put("article", article);
+		return "/manage/article/update";
+	}
+	
+	/**
+	 * 修改post
+	 * @param id
+	 * @param cmsArticle
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+	public String update(@PathVariable("id") int id, CmsArticle cmsArticle, ModelMap modelMap) {
+		int count = cmsArticleService.updateByPrimaryKeySelective(cmsArticle);
+		modelMap.put("count", count);
+		modelMap.put("id", id);
+		return "redirect:/manage/article/list";
+	}
+
+
+}

+ 133 - 0
zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java

@@ -0,0 +1,133 @@
+package com.zheng.cms.admin.controller.manage;
+
+import com.zheng.cms.admin.controller.BaseController;
+import com.zheng.cms.dao.model.CmsCategory;
+import com.zheng.cms.dao.model.CmsCategoryExample;
+import com.zheng.cms.rpc.api.CmsCategoryService;
+import com.zheng.common.util.Paginator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+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 java.util.List;
+
+/**
+ * 类目控制器
+ * Created by shuzheng on 2016/11/14.
+ */
+@Controller
+@RequestMapping("/manage/category")
+public class CmsCategoryController extends BaseController {
+
+	private final static Logger _log = LoggerFactory.getLogger(CmsCategoryController.class);
+	
+	@Autowired
+	private CmsCategoryService cmsCategoryService;
+
+	/**
+	 * 列表
+	 * @param page 当前页码
+	 * @param rows 每页条数
+	 * @param desc 降序排序
+	 * @param request
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping("/list")
+	public String list(
+			@RequestParam(required = false, defaultValue = "1", value = "page") int page,
+			@RequestParam(required = false, defaultValue = "20", value = "rows") int rows,
+			@RequestParam(required = false, defaultValue = "false", value = "desc") boolean desc,
+			HttpServletRequest request, ModelMap modelMap) {
+
+		// 数据列表
+		CmsCategoryExample cmsCategoryExample = new CmsCategoryExample();
+		cmsCategoryExample.setOffset((page - 1) * rows);
+		cmsCategoryExample.setLimit(rows);
+		cmsCategoryExample.setOrderByClause(desc ? "orders desc" : "orders asc");
+		List<CmsCategory> categorys = cmsCategoryService.selectByExample(cmsCategoryExample);
+
+		// 分页对象
+		long total = cmsCategoryService.countByExample(cmsCategoryExample);
+		Paginator paginator = new Paginator(total, page, rows, request);
+
+		modelMap.put("categorys", categorys);
+		modelMap.put("paginator", paginator);
+		return "/manage/category/list";
+	}
+	
+	/**
+	 * 新增get
+	 * @return
+	 */
+	@RequestMapping(value = "/add", method = RequestMethod.GET)
+	public String add() {
+		return "/manage/category/add";
+	}
+	
+	/**
+	 * 新增post
+	 * @param cmsCategory
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	public String add(CmsCategory cmsCategory, ModelMap modelMap) {
+		long time = System.currentTimeMillis();
+		cmsCategory.setCtime(time);
+		cmsCategory.setOrders(time);
+		int count = cmsCategoryService.insertSelective(cmsCategory);
+		modelMap.put("count", count);
+		_log.info("新增记录id为:{}", cmsCategory.getCategoryId());
+		return "redirect:/manage/category/list";
+	}
+
+	/**
+	 * 删除
+	 * @param ids
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/delete/{ids}",method = RequestMethod.GET)
+	public String delete(@PathVariable("ids") String ids, ModelMap modelMap) {
+		int count = cmsCategoryService.deleteByPrimaryKeys(ids);
+		modelMap.put("count", count);
+		return "redirect:/manage/category/list";
+	}
+	
+	/**
+	 * 修改get
+	 * @param id
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/update/{id}", method = RequestMethod.GET)
+	public String update(@PathVariable("id") int id, ModelMap modelMap) {
+		CmsCategory category = cmsCategoryService.selectByPrimaryKey(id);
+		modelMap.put("category", category);
+		return "/manage/category/update";
+	}
+	
+	/**
+	 * 修改post
+	 * @param id
+	 * @param cmsCategory
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+	public String update(@PathVariable("id") int id, CmsCategory cmsCategory, ModelMap modelMap) {
+		int count = cmsCategoryService.updateByPrimaryKeySelective(cmsCategory);
+		modelMap.put("count", count);
+		modelMap.put("id", id);
+		return "redirect:/manage/category/list";
+	}
+
+}

+ 131 - 0
zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCommentController.java

@@ -0,0 +1,131 @@
+package com.zheng.cms.admin.controller.manage;
+
+import com.zheng.cms.admin.controller.BaseController;
+import com.zheng.cms.dao.model.CmsComment;
+import com.zheng.cms.dao.model.CmsCommentExample;
+import com.zheng.cms.rpc.api.CmsCommentService;
+import com.zheng.common.util.Paginator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+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 java.util.List;
+
+/**
+ * 评论控制器
+ * Created by shuzheng on 2016/11/14.
+ */
+@Controller
+@RequestMapping("/manage/comment")
+public class CmsCommentController extends BaseController {
+
+	private final static Logger _log = LoggerFactory.getLogger(CmsCommentController.class);
+	
+	@Autowired
+	private CmsCommentService cmsCommentService;
+
+	/**
+	 * 列表
+	 * @param page 当前页码
+	 * @param rows 每页条数
+	 * @param desc 降序排序
+	 * @param request
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping("/list")
+	public String list(
+			@RequestParam(required = false, defaultValue = "1", value = "page") int page,
+			@RequestParam(required = false, defaultValue = "20", value = "rows") int rows,
+			@RequestParam(required = false, defaultValue = "true", value = "desc") boolean desc,
+			HttpServletRequest request, ModelMap modelMap) {
+
+		// 数据列表
+		CmsCommentExample cmsCommentExample = new CmsCommentExample();
+		cmsCommentExample.setOffset((page - 1) * rows);
+		cmsCommentExample.setLimit(rows);
+		cmsCommentExample.setOrderByClause(desc ? "comment_id desc" : "comment_id asc");
+		List<CmsComment> comments = cmsCommentService.selectByExample(cmsCommentExample);
+
+		// 分页对象
+		long total = cmsCommentService.countByExample(cmsCommentExample);
+		Paginator paginator = new Paginator(total, page, rows, request);
+
+		modelMap.put("comments", comments);
+		modelMap.put("paginator", paginator);
+		return "/manage/comment/list";
+	}
+	
+	/**
+	 * 新增get
+	 * @return
+	 */
+	@RequestMapping(value = "/add", method = RequestMethod.GET)
+	public String add() {
+		return "/manage/comment/add";
+	}
+	
+	/**
+	 * 新增post
+	 * @param cmsComment
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	public String add(CmsComment cmsComment, ModelMap modelMap) {
+		cmsComment.setCtime(System.currentTimeMillis());
+		int count = cmsCommentService.insertSelective(cmsComment);
+		modelMap.put("count", count);
+		_log.info("新增记录id为:{}", cmsComment.getArticleId());
+		return "redirect:/manage/comment/list";
+	}
+
+	/**
+	 * 删除
+	 * @param ids
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/delete/{ids}",method = RequestMethod.GET)
+	public String delete(@PathVariable("ids") String ids, ModelMap modelMap) {
+		int count = cmsCommentService.deleteByPrimaryKeys(ids);
+		modelMap.put("count", count);
+		return "redirect:/manage/comment/list";
+	}
+	
+	/**
+	 * 修改get
+	 * @param id
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/update/{id}", method = RequestMethod.GET)
+	public String update(@PathVariable("id") int id, ModelMap modelMap) {
+		CmsComment comment = cmsCommentService.selectByPrimaryKey(id);
+		modelMap.put("comment", comment);
+		return "/manage/comment/update";
+	}
+	
+	/**
+	 * 修改post
+	 * @param id
+	 * @param cmsComment
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+	public String update(@PathVariable("id") int id, CmsComment cmsComment, ModelMap modelMap) {
+		int count = cmsCommentService.updateByPrimaryKeySelective(cmsComment);
+		modelMap.put("count", count);
+		modelMap.put("id", id);
+		return "redirect:/manage/comment/list";
+	}
+
+}

+ 133 - 0
zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsTagController.java

@@ -0,0 +1,133 @@
+package com.zheng.cms.admin.controller.manage;
+
+import com.zheng.cms.admin.controller.BaseController;
+import com.zheng.cms.dao.model.CmsTag;
+import com.zheng.cms.dao.model.CmsTagExample;
+import com.zheng.cms.rpc.api.CmsTagService;
+import com.zheng.common.util.Paginator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.ModelMap;
+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 java.util.List;
+
+/**
+ * 标签控制器
+ * Created by shuzheng on 2016/11/14.
+ */
+@Controller
+@RequestMapping("/manage/tag")
+public class CmsTagController extends BaseController {
+
+	private final static Logger _log = LoggerFactory.getLogger(CmsTagController.class);
+	
+	@Autowired
+	private CmsTagService cmsTagService;
+
+	/**
+	 * 列表
+	 * @param page 当前页码
+	 * @param rows 每页条数
+	 * @param desc 降序排序
+	 * @param request
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping("/list")
+	public String list(
+			@RequestParam(required = false, defaultValue = "1", value = "page") int page,
+			@RequestParam(required = false, defaultValue = "20", value = "rows") int rows,
+			@RequestParam(required = false, defaultValue = "false", value = "desc") boolean desc,
+			HttpServletRequest request, ModelMap modelMap) {
+
+		// 数据列表
+		CmsTagExample cmsTagExample = new CmsTagExample();
+		cmsTagExample.setOffset((page - 1) * rows);
+		cmsTagExample.setLimit(rows);
+		cmsTagExample.setOrderByClause(desc ? "orders desc" : "orders asc");
+		List<CmsTag> tags = cmsTagService.selectByExample(cmsTagExample);
+
+		// 分页对象
+		long total = cmsTagService.countByExample(cmsTagExample);
+		Paginator paginator = new Paginator(total, page, rows, request);
+
+		modelMap.put("tags", tags);
+		modelMap.put("paginator", paginator);
+		return "/manage/tag/list";
+	}
+	
+	/**
+	 * 新增get
+	 * @return
+	 */
+	@RequestMapping(value = "/add", method = RequestMethod.GET)
+	public String add() {
+		return "/manage/tag/add";
+	}
+	
+	/**
+	 * 新增post
+	 * @param cmsTag
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/add", method = RequestMethod.POST)
+	public String add(CmsTag cmsTag, ModelMap modelMap) {
+		long time = System.currentTimeMillis();
+		cmsTag.setCtime(time);
+		cmsTag.setOrders(time);
+		int count = cmsTagService.insertSelective(cmsTag);
+		modelMap.put("count", count);
+		_log.info("新增记录id为:{}", cmsTag.getTagId());
+		return "redirect:/manage/tag/list";
+	}
+
+	/**
+	 * 删除
+	 * @param ids
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/delete/{ids}",method = RequestMethod.GET)
+	public String delete(@PathVariable("ids") String ids, ModelMap modelMap) {
+		int count = cmsTagService.deleteByPrimaryKeys(ids);
+		modelMap.put("count", count);
+		return "redirect:/manage/tag/list";
+	}
+	
+	/**
+	 * 修改get
+	 * @param id
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/update/{id}", method = RequestMethod.GET)
+	public String update(@PathVariable("id") int id, ModelMap modelMap) {
+		CmsTag tag = cmsTagService.selectByPrimaryKey(id);
+		modelMap.put("tag", tag);
+		return "/manage/tag/update";
+	}
+	
+	/**
+	 * 修改post
+	 * @param id
+	 * @param cmsTag
+	 * @param modelMap
+	 * @return
+	 */
+	@RequestMapping(value = "/update/{id}", method = RequestMethod.POST)
+	public String update(@PathVariable("id") int id, CmsTag cmsTag, ModelMap modelMap) {
+		int count = cmsTagService.updateByPrimaryKeySelective(cmsTag);
+		modelMap.put("count", count);
+		modelMap.put("id", id);
+		return "redirect:/manage/tag/list";
+	}
+
+}

+ 47 - 0
zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/jms/defaultQueueMessageListener.java

@@ -0,0 +1,47 @@
+package com.zheng.cms.admin.jms;
+
+import com.zheng.cms.dao.model.CmsUser;
+import com.zheng.cms.rpc.api.UserService;
+import net.sf.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
+
+import javax.jms.Message;
+import javax.jms.MessageListener;
+import javax.jms.TextMessage;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+
+/**
+ * MQ消费者
+ * Created by ZhangShuzheng on 2017/01/12.
+ */
+public class defaultQueueMessageListener implements MessageListener {
+
+	private static Logger _log = LoggerFactory.getLogger(defaultQueueMessageListener.class);
+
+	@Autowired
+	ThreadPoolTaskExecutor threadPoolTaskExecutor;
+
+    @Autowired
+    UserService userService;
+
+	public void onMessage(final Message message) {
+		// 使用线程池多线程处理
+		threadPoolTaskExecutor.execute(new Runnable() {
+			public void run() {
+				if (message instanceof TextMessage) {
+					TextMessage textMessage = (TextMessage) message;
+					try {
+						_log.info("消费消息:{}", textMessage.getText());
+					} catch (Exception e){
+						e.printStackTrace();
+					}
+				}
+			}
+		});
+	}
+
+}

+ 38 - 0
zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/util/ZhengAdminUtil.java

@@ -0,0 +1,38 @@
+package com.zheng.cms.admin.util;
+
+import com.zheng.common.util.JarUtil;
+import com.zheng.common.util.PropertiesFileUtil;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.InitializingBean;
+import org.springframework.web.context.ServletContextAware;
+
+import javax.servlet.ServletContext;
+
+/**
+ * 启动解压zhengAdmin-x.x.x.jar到resources目录
+ * Created by shuzheng on 2016/12/18.
+ */
+public class ZhengAdminUtil implements InitializingBean, ServletContextAware {
+
+    private static Logger _log = LoggerFactory.getLogger(ZhengAdminUtil.class);
+
+    @Override
+    public void afterPropertiesSet() throws Exception {
+
+    }
+
+    @Override
+    public void setServletContext(ServletContext servletContext) {
+        _log.info("===== 开始解压zheng-admin =====");
+        String version = PropertiesFileUtil.getInstance().get("zheng-admin.version");
+        _log.info("zheng-admin.jar 版本: {}", version);
+        String jarPath = servletContext.getRealPath("/WEB-INF/lib/zheng-admin-" + version + ".jar");
+        _log.info("zheng-admin.jar 包路径: {}", jarPath);
+        String resources = servletContext.getRealPath("/resources/zheng-admin");
+        _log.info("zheng-admin.jar 解压到: {}", resources);
+        JarUtil.decompress(jarPath, resources);
+        _log.info("===== 解压zheng-admin完成 =====");
+    }
+
+}

+ 53 - 0
zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-activemq.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 查找最新的schemaLocation 访问 http://www.springframework.org/schema/ -->
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:context="http://www.springframework.org/schema/context" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:amq="http://activemq.apache.org/schema/core"
+	   xmlns:jms="http://www.springframework.org/schema/jms"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+		http://www.springframework.org/schema/beans/spring-beans-3.2.xsd
+		http://www.springframework.org/schema/context
+		http://www.springframework.org/schema/context/spring-context-3.2.xsd
+		http://www.springframework.org/schema/jms
+		http://www.springframework.org/schema/jms/spring-jms-4.1.xsd
+		http://activemq.apache.org/schema/core
+		http://activemq.apache.org/schema/core/activemq-core-5.8.0.xsd">
+
+	<!-- 连接工厂 -->
+	<bean id="activeMqConnectionFactory" class="org.apache.activemq.ActiveMQConnectionFactory">
+		<property name="brokerURL" value="${AvtiveMQ.brokerURL}"/>
+		<property name="useAsyncSend" value="true"/>
+	</bean>
+	<bean id="connectionFactory" class="org.springframework.jms.connection.CachingConnectionFactory">
+		<property name="targetConnectionFactory" ref="activeMqConnectionFactory"/>
+		<property name="sessionCacheSize" value="100"/>
+	</bean>
+
+	<!-- 点对点队列 -->
+	<bean id="defaultQueueDestination" class="org.apache.activemq.command.ActiveMQQueue">
+		<constructor-arg index="0" value="com.zheng.cms.admin.queue.default"/>
+	</bean>
+	<!-- 一对多队列 -->
+	<bean id="defaultTopicDestination" class="org.apache.activemq.command.ActiveMQTopic">
+		<constructor-arg index="0" value="com.zheng.cms.admin.topic.default"/>
+	</bean>
+
+	<!-- 生产者 -->
+	<bean id="jmsQueueTemplate" class="org.springframework.jms.core.JmsTemplate">
+		<property name="connectionFactory" ref="connectionFactory"/>
+		<property name="pubSubDomain" value="false" />
+	</bean>
+	<bean id="jmsTopicTemplate" class="org.springframework.jms.core.JmsTemplate">
+		<property name="connectionFactory" ref="connectionFactory"/>
+		<property name="pubSubDomain" value="true" />
+	</bean>
+
+	<!-- 消费者 -->
+	<bean id="defaultQueueMessageListener" class="com.zheng.cms.admin.jms.defaultQueueMessageListener"/>
+	<bean id="jmsContainer" class="org.springframework.jms.listener.DefaultMessageListenerContainer">
+		<property name="connectionFactory" ref="connectionFactory"/>
+		<property name="destination" ref="defaultQueueDestination"/>
+		<property name="messageListener" ref="defaultQueueMessageListener"/>
+		<property name="sessionTransacted" value="true"/>
+		<!--<property name="concurrency" value="4-10"/>-->
+	</bean>
+
+</beans>

+ 9 - 0
zheng-cms/zheng-cms-admin/src/main/resources/applicationContext-zhengAdmin.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+
+	<!-- 启动解压zhengAdmin-x.x.x.jar到resources目录 -->
+	<bean id="zhengAdminUtil" class="com.zheng.cms.admin.util.ZhengAdminUtil"></bean>
+
+</beans>

+ 1 - 0
zheng-cms/zheng-cms-admin/src/main/resources/i18n/messages_en_US.properties

@@ -0,0 +1 @@
+404=page not found!

+ 1 - 0
zheng-cms/zheng-cms-admin/src/main/resources/i18n/messages_zh_CN.properties

@@ -0,0 +1 @@
+404=\u9875\u9762\u6CA1\u6709\u627E\u5230\uFF01

+ 1 - 6
zheng-cms/zheng-cms-admin/src/main/resources/log4j.properties

@@ -15,9 +15,4 @@ log4j.logger.druid.sql=warn,stdout
 log4j.logger.druid.sql.DataSource=warn,stdout
 log4j.logger.druid.sql.Connection=warn,stdout
 log4j.logger.druid.sql.Statement=warn,stdout
-log4j.logger.druid.sql.ResultSet=warn,stdout
-
-# MyBatis logging configuration
-log4j.logger.com.zheng.cms.dao.mapper=debug
-#log4j.logger.com.zheng.cms.dao.mapper.UserMapper=debug
-#log4j.logger.com.zheng.cms.dao.mapper.UserMapper.selectUser=debug
+log4j.logger.druid.sql.ResultSet=warn,stdout

+ 3 - 1
zheng-cms/zheng-cms-admin/src/main/resources/profiles/dev.properties

@@ -1 +1,3 @@
-profile.env=dev
+profile.env=dev
+### activeMq
+AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)

+ 3 - 1
zheng-cms/zheng-cms-admin/src/main/resources/profiles/prod.properties

@@ -1 +1,3 @@
-profile.env=prod
+profile.env=prod
+### activeMq
+AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)

+ 3 - 1
zheng-cms/zheng-cms-admin/src/main/resources/profiles/test.properties

@@ -1 +1,3 @@
-profile.env=test
+profile.env=test
+### activeMq
+AvtiveMQ.brokerURL=failover:(tcp://127.0.0.1:61616?wireFormat.maxInactivityDuration=0)

+ 15 - 1
zheng-cms/zheng-cms-admin/src/main/resources/springMVC-servlet.xml

@@ -8,6 +8,20 @@
         http://www.springframework.org/schema/mvc
         http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
-	
+	<!-- 根目录'/'对应页面 -->
+	<mvc:view-controller path="/" view-name="/index"/>
+
+	<!-- 拦截器配置 -->
+	<mvc:interceptors>
+		<!-- 后台拦截器 -->
+		<mvc:interceptor>
+			<!-- 拦截路径 -->
+			<mvc:mapping path="/manage/**"/>
+			<!-- 非拦截路径 -->
+			<mvc:exclude-mapping path="/manage/login"/>
+			<!-- 拦截器对象 -->
+			<bean id="manageInterceptor" class="com.zheng.cms.admin.Interceptor.ManageInterceptor"/>
+		</mvc:interceptor>
+	</mvc:interceptors>
 
 </beans>

+ 1 - 1
zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/index.jsp

@@ -12,6 +12,6 @@
     <title>首页</title>
 </head>
 <body>
-
+<a href="${basePath}/manage">后台首页</a>
 </body>
 </html>

+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/manage/article/add.jsp → zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/article/add.jsp


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/manage/article/list.jsp → zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/article/list.jsp


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/manage/article/update.jsp → zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/article/update.jsp


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


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


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


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/manage/comment/add.jsp → zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/comment/add.jsp


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/manage/comment/list.jsp → zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/comment/list.jsp


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/manage/comment/update.jsp → zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/comment/update.jsp


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/manage/index.jsp → zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/index.jsp


+ 0 - 0
zheng-cms/zheng-cms-web/src/main/webapp/WEB-INF/jsp/manage/login.jsp → zheng-cms/zheng-cms-admin/src/main/webapp/WEB-INF/jsp/manage/login.jsp


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


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


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


+ 0 - 14
zheng-cms/zheng-cms-web/src/main/resources/springMVC-servlet.xml

@@ -8,20 +8,6 @@
         http://www.springframework.org/schema/mvc
         http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
-	<!-- 根目录'/'对应页面 -->
-	<mvc:view-controller path="/" view-name="/index"/>
 
-	<!-- 拦截器配置 -->
-	<mvc:interceptors>
-		<!-- 后台拦截器 -->
-		<mvc:interceptor>
-			<!-- 拦截路径 -->
-			<mvc:mapping path="/manage/**"/>
-			<!-- 非拦截路径 -->
-			<mvc:exclude-mapping path="/manage/login"/>
-			<!-- 拦截器对象 -->
-			<bean id="manageInterceptor" class="com.zheng.cms.web.Interceptor.ManageInterceptor"/>
-		</mvc:interceptor>
-	</mvc:interceptors>
 
 </beans>

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

@@ -12,6 +12,6 @@
     <title>首页</title>
 </head>
 <body>
-<a href="${basePath}/manage">后台首页</a>
+<a href="${basePath}/">首页</a>
 </body>
 </html>