From 62dfdc670f9ee91bcd20c494b5dd356edacf6e46 Mon Sep 17 00:00:00 2001
From: shuzheng <469741414@qq.com>
Date: Thu, 19 Jan 2017 18:09:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0swagger2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../manage/CmsCategoryController.java | 6 +++++
zheng-common/pom.xml | 26 +++++++++++++++++++
.../src/main/resources/springMVC-servlet.xml | 3 +++
3 files changed, 35 insertions(+)
diff --git a/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java b/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java
index 1edab83b..7e1b2acf 100644
--- a/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java
+++ b/zheng-cms/zheng-cms-admin/src/main/java/com/zheng/cms/admin/controller/manage/CmsCategoryController.java
@@ -5,6 +5,8 @@ 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 io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +42,7 @@ public class CmsCategoryController extends BaseController {
* @param modelMap
* @return
*/
+ @ApiOperation(value = "类目列表", notes = "获取类目列表并分页")
@RequestMapping("/list")
public String list(
@RequestParam(required = false, defaultValue = "1", value = "page") int page,
@@ -78,6 +81,9 @@ public class CmsCategoryController extends BaseController {
* @param modelMap
* @return
*/
+ @ApiOperation(value = "创建类目", notes = "根据CmsCategory对象创建类目")
+ @ApiImplicitParam(name = "cmsCategory", value = "类目实体cmsCategory", required = true, dataType = "CmsCategory")
+
@RequestMapping(value = "/add", method = RequestMethod.POST)
public String add(CmsCategory cmsCategory, ModelMap modelMap) {
long time = System.currentTimeMillis();
diff --git a/zheng-common/pom.xml b/zheng-common/pom.xml
index 8b3de1ed..3db98357 100644
--- a/zheng-common/pom.xml
+++ b/zheng-common/pom.xml
@@ -176,6 +176,17 @@
commons-fileupload
1.3.1
+
+
+ io.springfox
+ springfox-swagger2
+ 2.4.0
+
+
+ io.springfox
+ springfox-swagger-ui
+ 2.4.0
+
commons-beanutils
@@ -246,6 +257,21 @@
fastjson
1.2.22
+
+ com.fasterxml.jackson.core
+ jackson-core
+ 2.6.5
+
+
+ com.fasterxml.jackson.core
+ jackson-databind
+ 2.6.5
+
+
+ com.fasterxml.jackson.core
+ jackson-annotations
+ 2.6.5
+
javax.mail
diff --git a/zheng-common/src/main/resources/springMVC-servlet.xml b/zheng-common/src/main/resources/springMVC-servlet.xml
index d96f272d..97ee646b 100644
--- a/zheng-common/src/main/resources/springMVC-servlet.xml
+++ b/zheng-common/src/main/resources/springMVC-servlet.xml
@@ -14,6 +14,7 @@
+
@@ -53,6 +54,8 @@
+
+