接口文档生成

krock-api/krock-api-all/src/main/java/com/ydw/yunbuyer/api/pm/entity/PmOfflineApply.java

@@ -1,6 +1,7 @@
 package com.ydw.yunbuyer.api.pm.entity;
 
 
+import io.swagger.annotations.ApiModel;
 import org.tmsps.ne4spring.annotation.NotMap;
 import org.tmsps.ne4spring.annotation.PK;
 import org.tmsps.ne4spring.annotation.Table;

krock-core-common/pom.xml

@@ -96,7 +96,7 @@
 		</dependency>
 		
 		 <!-- swagger2 -->
-		<dependency>
+		<!--<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
 			<version>2.9.2</version>
@@ -106,8 +106,20 @@
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger-ui</artifactId>
 			<version>2.9.2</version>
-		</dependency>
+		</dependency>-->
 
+
+		<!--knife4j-->
+		<dependency>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>knife4j-spring-boot-starter</artifactId>
+			<version>2.0.7</version>
+		</dependency>
+		<dependency>
+			<groupId>com.github.xiaoymin</groupId>
+			<artifactId>knife4j-spring-boot-starter</artifactId>
+			<version>2.0.7</version>
+		</dependency>
 	</dependencies>
 
 	<build>

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/ChartManagementController.java

@@ -3,8 +3,12 @@ package com.ydw.yunbuyer.web.cp.business.pm;
 import java.util.List;
 import java.util.Map;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -20,6 +24,7 @@ import com.ydw.yunbuyer.web.cp.util.json.JsonTools;
  * 
  * @author Administrator
  */
+@Api(tags = "轮播图管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/chart_management")
@@ -31,11 +36,12 @@ public class ChartManagementController extends ProjBaseAction {
 	private IFileService fileService;
 
 	/**
-	 * TODO 轮播图列表
+	 * 轮播图列表
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/list_data")
+	@ApiOperation("轮播图列表")
+	@GetMapping("/list_data")
 	public String list_data() {
 		List<Map<String, Object>> list = slideShowApi.list_slideshow();
 		for (Map<String, Object> map : list) {
@@ -47,9 +53,10 @@ public class ChartManagementController extends ProjBaseAction {
 	}
 
 	/**
-	 * TODO 添加
+	 *  添加
 	 */
-	@RequestMapping("/add")
+	@ApiOperation("添加")
+	@PostMapping("/add")
 	public void add(String file_id) {
 		SlideFile slideFile = new SlideFile();
 		slideFile.setFile_id(file_id);
@@ -57,49 +64,53 @@ public class ChartManagementController extends ProjBaseAction {
 	}
 
 	/**
-	 * TODO 删除
+	 *  删除
 	 */
-	@RequestMapping("/del")
+	@ApiOperation("删除")
+	@PostMapping("/del")
 	public void del(String slide_kid) {
 		slideShowApi.del_slideshow(slide_kid);
 	}
 
 	/**
-	 * TODO 修改顺序(上移)
+	 *  修改顺序(上移)
 	 * 
 	 * @param up_kid   上一个id
 	 * @param this_kid 选中的id
 	 */
-	@RequestMapping("/edit_up")
+	@ApiOperation("修改顺序(上移)")
+	@PostMapping("/edit_up")
 	public void edit_up(String up_kid, String this_kid) {
 		slideShowApi.up_slideshow(up_kid, this_kid);
 	}
 
 	/**
-	 * TODO 修改顺序(下移)
+	 *  修改顺序(下移)
 	 * 
 	 * @param down_kid 下一个id
 	 * @param this_kid 选中的id
 	 */
-	@RequestMapping("/edit_down")
+	@ApiOperation("修改顺序(下移)")
+	@PostMapping("/edit_down")
 	public void edit_down(String down_kid, String this_kid) {
 		slideShowApi.down_slideshow(this_kid, down_kid);
 	}
 
 	/**
-	 * TODO 绑定url
+	 *  绑定url
 	 * 
 	 * @param kid
 	 * @param url
 	 */
-	@RequestMapping("/add_url")
+	@ApiOperation("绑定url")
+	@PostMapping("/add_url")
 	public void add_url(String kid, String url) {
 		SlideFile slideFile = slideShowApi.get(kid);
 		slideFile.setUrl(url);
 		slideShowApi.update(slideFile);
 	}
 
-	@RequestMapping("/edit_form")
+	@PostMapping("/edit_form")
 	public String edit_form(String kid) {
 		SlideFile slideFile = slideShowApi.get(kid);
 		result.put("slideFile", slideFile);

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/LiveRoomVerifyController.java

@@ -2,11 +2,12 @@ package com.ydw.yunbuyer.web.cp.business.pm;
 
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.tmsps.ne4spring.page.PagePackage;
 import com.ydw.yunbuyer.api.pm.api.LiveRoomApi;
 import com.ydw.yunbuyer.api.pm.entity.Liveroom;
@@ -18,6 +19,7 @@ import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
  * 
  * @author Administrator
  */
+@Api(tags = "直播间审核管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/live/verify")
@@ -31,7 +33,8 @@ public class LiveRoomVerifyController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/list_data")
+	@ApiOperation("直播间列表")
+	@GetMapping("/list_data")
 	public String list_data() {
 
 		PagePackage pagePackage = liveRoomApi.list_data(super.pagePackage);
@@ -48,14 +51,15 @@ public class LiveRoomVerifyController extends ProjBaseAction {
 	 * @param live_room_id
 	 * @param verify_status
 	 */
-	@RequestMapping("/update")
+	@ApiOperation("修改直播间审核状态")
+	@PostMapping("/update")
 	public void update(String live_room_id, String verify_status) {
 		Liveroom liveroom = liveRoomApi.get(live_room_id);
 		liveroom.setVerify_status(verify_status);
 		liveRoomApi.live_room_update(liveroom);
 	}
 
-	@RequestMapping("/edit_from")
+	@PostMapping("/edit_from")
 	@ResponseBody
 	public String edit_from(String live_room_id) {
 		Liveroom liveroom = liveRoomApi.get(live_room_id);
@@ -63,7 +67,7 @@ public class LiveRoomVerifyController extends ProjBaseAction {
 		return JsonTools.toJson(result);
 	}
 
-	@RequestMapping("/edit")
+	@PostMapping("/edit")
 	public void edit(String kid, String live_url) {
 		Liveroom liverRoomDb = liveRoomApi.get(kid);
 		liverRoomDb.setLive_url(live_url);

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/PayRecordController.java

@@ -2,8 +2,12 @@ package com.ydw.yunbuyer.web.cp.business.pm;
 
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.page.PagePackage;
@@ -16,6 +20,7 @@ import com.ydw.yunbuyer.web.cp.util.DateTools;
 /**
  * 支付记录管理
  */
+@Api(tags = "支付记录管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/pay_record")
@@ -30,7 +35,8 @@ public class PayRecordController extends ProjBaseAction {
 	/**
 	 * 支付列表
 	 */
-	@RequestMapping("/list_data")
+	@ApiOperation("支付列表")
+	@GetMapping("/list_data")
 	public String list_data() {
 
 		PagePackage pagePackage = pmItemApi.list_order_record(super.pagePackage);

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/PmBidOpeningController.java

@@ -5,9 +5,14 @@ import java.text.SimpleDateFormat;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.apache.http.client.ClientProtocolException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.page.PagePackage;
@@ -32,6 +37,7 @@ import com.ydw.yunbuyer.web.cp.web.WebTools;
  * @author Administrator
  *
  */
+@Api(tags = "开拍记录管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm")
@@ -47,9 +53,10 @@ public class PmBidOpeningController extends ProjBaseAction {
 	private ShopApi shopApi;
 
 	/**
-	 * TODO 查询所有标的物列表
+	 *  查询所有标的物列表
 	 */
-	@RequestMapping("/list_data_pm")
+	@ApiOperation("查询所有标的物列表")
+	@GetMapping("/list_data_pm")
 	public String list_data_pm() {
 
 		PagePackage pagePackage = pmItemApi.list_data(super.pagePackage);
@@ -61,12 +68,13 @@ public class PmBidOpeningController extends ProjBaseAction {
 	}
 
 	/**
-	 * TODO 修改当前标的物的开拍状态
+	 *  修改当前标的物的开拍状态
 	 * 
 	 * @param kid
 	 * @param bid_opening
 	 */
-	@RequestMapping("/pm_bid_opening")
+	@ApiOperation("修改当前标的物的开拍状态")
+	@PostMapping("/pm_bid_opening")
 	public void pm_bid_opening(String kid, String bid_opening) {
 		PmItem pmItem = pmItemApi.get(kid);
 		pmItem.setBid_opening(bid_opening);

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/PmOrderController.java

@@ -2,8 +2,13 @@ package com.ydw.yunbuyer.web.cp.business.pm;
 
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.page.PagePackage;
@@ -15,6 +20,7 @@ import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
 /**
  * 待收货管理
  */
+@Api(tags = "待收货管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/order")
@@ -28,7 +34,8 @@ public class PmOrderController extends ProjBaseAction {
 	/**
 	 * 所有待收货列表
 	 */
-	@RequestMapping("/list_data")
+	@ApiOperation("所有待收货列表")
+	@GetMapping("/list_data")
 	public String list_data() {
 
 		PagePackage pagePackage = pmItemApi.wait_for_receive(super.pagePackage);
@@ -47,7 +54,8 @@ public class PmOrderController extends ProjBaseAction {
 	 * 修改当前标的物的收货状态
 	 * @param kid
 	 */
-	@RequestMapping("/pm_receive")
+	@ApiOperation("修改当前标的物的收货状态")
+	@PostMapping("/pm_receive")
 	public void pm_receive(String pm_item_submit_id) {
 		pmItemApi.confirm_receipt(pm_item_submit_id);
 	}

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/PmUnLineController.java

@@ -1,7 +1,11 @@
 package com.ydw.yunbuyer.web.cp.business.pm;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.page.PagePackage;
@@ -17,6 +21,7 @@ import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
  * @author zhaoyun
  * @2019年6月20日
  */
+@Api(tags = "线下拍卖商品管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/item_unLine")
@@ -29,7 +34,8 @@ public class PmUnLineController extends ProjBaseAction {
 	 * 线下拍卖商品列表数据
 	 * @return
 	 */
-	@RequestMapping("/list_data")
+	@ApiOperation("线下拍卖商品列表数据")
+	@GetMapping("/list_data")
 	public String list_data() {
 
 		PagePackage pagePackage = pmItemApi.list_offline_data(super.pagePackage);
@@ -41,7 +47,7 @@ public class PmUnLineController extends ProjBaseAction {
 	 * @param kid
 	 * @return
 	 */
-	@RequestMapping("/edit_price_form")
+	@PostMapping("/edit_price_form")
 	public String edit_price_form(String kid) {
 		PmItem pmItem = pmItemApi.get(kid);
 		result.put("pmItem", pmItem);
@@ -49,20 +55,22 @@ public class PmUnLineController extends ProjBaseAction {
 	}
 	
 	/**
-	 * TODO 修改价格
+	 *  修改价格
 	 * @param pmItem
 	 */
-	@RequestMapping("/edit_price")
+	@ApiOperation("修改价格")
+	@PostMapping("/edit_price")
 	public void edit_price(PmItem pmItem) {
 		pmItemApi.set_price(pmItem);
 	}
 	
 
 	/**
-	 * TODO 修改脚本
+	 *  修改脚本
 	 * @param pmItem
 	 */
-	@RequestMapping("/edit_script")
+	@ApiOperation("修改脚本")
+	@PostMapping("/edit_script")
 	public void edit_script(PmItem pmItem) {
 		pmItemApi.set_script(pmItem.getKid(),pmItem.getScript_pm());
 	}

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/PmVerifyController.java

@@ -2,8 +2,13 @@ package com.ydw.yunbuyer.web.cp.business.pm;
 
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ydw.yunbuyer.api.pm.api.PmVerifyApi;
@@ -17,11 +22,12 @@ import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
 import com.ydw.yunbuyer.web.cp.util.DateTools;
 
 /**
- * TODO 标的物审核管理
+ *  标的物审核管理
  * 
  * @author Administrator
  *
  */
+@Api(tags = "标的物审核管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/verify")
@@ -37,9 +43,10 @@ public class PmVerifyController extends ProjBaseAction {
 	private PersionApi persionApi;
 
 	/**
-	 * TODO 查询所有待审核标的物列表
+	 *  查询所有待审核标的物列表
 	 */
-	@RequestMapping("/list_data_pm")
+	@ApiOperation("查询所有待审核标的物列表")
+	@GetMapping("/list_data_pm")
 	public String list_data_pm() {
 		List<Map<String, Object>> list = pmVerifyApi.list_not_verify();
 		for (Map<String, Object> map : list) {
@@ -50,12 +57,13 @@ public class PmVerifyController extends ProjBaseAction {
 	}
 
 	/**
-	 * TODO 修改标的物审核状态
+	 *  修改标的物审核状态
 	 * 
 	 * @param kid
 	 * @param verify_status
 	 */
-	@RequestMapping("/pm_verify")
+	@ApiOperation("修改标的物审核状态")
+	@PostMapping("/pm_verify")
 	public void pm_verify(String kid, String verify_status) {
 		ProjectItem projectItem = pmVerifyApi.get(kid);
 		projectItem.setVerify_status(verify_status);
@@ -65,11 +73,12 @@ public class PmVerifyController extends ProjBaseAction {
 	}
 
 	/**
-	 * TODO 查看标的物详情
+	 *  查看标的物详情
 	 * 
 	 * @param kid
 	 */
-	@RequestMapping("/select")
+	@ApiOperation("查看标的物详情")
+	@PostMapping("/select")
 	public String select(String kid) {
 		ProjectItem projectItem = pmVerifyApi.get(kid);
 		return JsonTools.toJson(projectItem);

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/PsersionController.java

@@ -2,8 +2,12 @@ package com.ydw.yunbuyer.web.cp.business.pm;
 
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.page.PagePackage;
@@ -17,6 +21,7 @@ import com.ydw.yunbuyer.web.cp.util.DateTools;
  * 
  * @author Administrator
  */
+@Api(tags = "用户管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/persion")
@@ -30,7 +35,8 @@ public class PsersionController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/list_data")
+	@ApiOperation("用户列表")
+	@GetMapping("/list_data")
 	public String list_data() {
 		PagePackage pagePackage = persionApi.list_data(super.pagePackage);
 		List<Map<String, Object>> list = pagePackage.getData();

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/ReFundVerifyController.java

@@ -2,8 +2,13 @@ package com.ydw.yunbuyer.web.cp.business.pm;
 
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.page.PagePackage;
@@ -14,10 +19,11 @@ import com.ydw.yunbuyer.api.user.entity.Persion;
 import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
 
 /**
- * TODO 退款审核管理
+ *  退款审核管理
  * 
  * @author Administrator
  */
+@Api(tags = "退款审核管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/refund_verify")
@@ -29,11 +35,12 @@ public class ReFundVerifyController extends ProjBaseAction {
 	PersionApi persionApi;
 
 	/**
-	 * TODO 退款审核列表
+	 *  退款审核列表
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/list_data")
+	@ApiOperation("退款审核列表")
+	@GetMapping("/list_data")
 	public String list_data() {
 
 		PagePackage pagePackage = pmItemApi.list_refund_all(super.pagePackage);
@@ -48,12 +55,13 @@ public class ReFundVerifyController extends ProjBaseAction {
 	}
 
 	/**
-	 * TODO 修改退款审核状态
+	 *  修改退款审核状态
 	 * 
 	 * @param live_room_id
 	 * @param verify_status
 	 */
-	@RequestMapping("/update")
+	@ApiOperation("修改退款审核状态")
+	@PostMapping("/update")
 	public void update(String pm_item_submit_id, String is_deposit_released) {
 		PmItemSubmit pmItemSubimt = pmItemApi.get_pm_item_submit(pm_item_submit_id);
 		pmItemSubimt.setIs_deposit_released(is_deposit_released);

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/ShopsVerifyController.java

@@ -2,8 +2,13 @@ package com.ydw.yunbuyer.web.cp.business.pm;
 
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import com.ydw.yunbuyer.api.pm.api.ShopApi;
@@ -17,6 +22,7 @@ import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
  * 
  * @author Administrator
  */
+@Api(tags = "商铺审核管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/shops/verify")
@@ -30,7 +36,8 @@ public class ShopsVerifyController extends ProjBaseAction {
 	/**
 	 * 查询所有待审核商铺列表
 	 */
-	@RequestMapping("/list_data")
+	@ApiOperation("查询所有待审核商铺列表")
+	@GetMapping("/list_data")
 	public String list_data() {
 		List<Map<String, Object>> list = shopApi.list_data();
 		result.put("list", list);
@@ -40,7 +47,8 @@ public class ShopsVerifyController extends ProjBaseAction {
 	/**
 	 * 商铺审核通过
 	 */
-	@RequestMapping("/edit_pass")
+	@ApiOperation("商铺审核通过")
+	@PostMapping("/edit_pass")
 	public void edit_pass(String kid, String verify_status) {
 		Shop shop = shopApi.get(kid);
 		shop.setVerify_status(verify_status);
@@ -54,7 +62,8 @@ public class ShopsVerifyController extends ProjBaseAction {
 	/**
 	 * 商铺审核拒绝
 	 */
-	@RequestMapping("/edit_nopass")
+	@ApiOperation("商铺审核拒绝")
+	@PostMapping("/edit_nopass")
 	public void edit_nopass(String kid, String verify_status, String note) {
 		Shop shop = shopApi.get(kid);
 		shop.setVerify_status(verify_status);
@@ -69,7 +78,8 @@ public class ShopsVerifyController extends ProjBaseAction {
 	/**
 	 * 根据persion_id查询个人信息
 	 */
-	@RequestMapping("/list")
+	@ApiOperation("根据persion_id查询个人信息")
+	@PostMapping("/list")
 	public String list(String persion_id) {
 		Persion persion = persionApi.get(persion_id);
 		result.put("list", persion);

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/UnLineController.java

@@ -3,8 +3,12 @@ package com.ydw.yunbuyer.web.cp.business.pm;
 import java.util.List;
 import java.util.Map;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.page.PagePackage;
@@ -17,6 +21,7 @@ import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
  * 
  * @author Administrator
  */
+@Api(tags = "线下报名管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/un_line")
@@ -25,7 +30,7 @@ public class UnLineController extends ProjBaseAction {
 	@Autowired
 	private OfflineSubmitApi submitApi;
 	
-	@RequestMapping("/list_data")
+	@GetMapping("/list_data")
 	public String list_data() {
 
 		PagePackage pagePackage = submitApi.list_data(super.pagePackage);
@@ -40,7 +45,8 @@ public class UnLineController extends ProjBaseAction {
 	 * 审核
 	 * @param kid
 	 */
-	@RequestMapping("/pass")
+	@ApiOperation("审核")
+	@PostMapping("/pass")
 	public void pass(String kid) {
 		submitApi.verify_apply(kid);
 	}

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/UnLineUserController.java

@@ -4,8 +4,12 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.page.PagePackage;
@@ -22,6 +26,7 @@ import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
  * 
  * @author Administrator
  */
+@Api(tags = "线下用户管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/un_line_user")
@@ -36,7 +41,8 @@ public class UnLineUserController extends ProjBaseAction {
 	 * 线下报名用户列表
 	 * @return
 	 */
-	@RequestMapping("/list_data")
+	@ApiOperation("线下报名用户列表")
+	@GetMapping("/list_data")
 	public String list_data() {
 
 		PagePackage pagePackage = submitApi.list_data_offline(super.pagePackage);
@@ -51,7 +57,8 @@ public class UnLineUserController extends ProjBaseAction {
 	 * 添加
 	 * @param pmOfflineApply
 	 */
-	@RequestMapping("/add")
+	@ApiOperation("添加")
+	@PostMapping("/add")
 	public void add(PmOfflineApply pmOfflineApply) {
 		submitApi.add(pmOfflineApply);
 	}
@@ -62,7 +69,8 @@ public class UnLineUserController extends ProjBaseAction {
 	 * @param item_id
 	 * @param code
 	 */
-	@RequestMapping("/add_code")
+	@ApiOperation("添加号牌选择标的")
+	@PostMapping("/add_code")
 	public void add_code(String kid, String item_id, String code) {
 		if(ChkTools.isNotNull(code)) {
 			submitApi.offline_apply_bind_code(kid, item_id, code);
@@ -75,7 +83,8 @@ public class UnLineUserController extends ProjBaseAction {
 	 * 查询可选择标的物列表
 	 * @return
 	 */
-	@RequestMapping("/item_list_data")
+	@ApiOperation("查询可选择标的物列表")
+	@PostMapping("/item_list_data")
 	public String item_list_data() {
 		PagePackage pagePackage = submitApi.list_item_data(super.pagePackage);
 		pagePackage.getPage().setList(pagePackage.getData());
@@ -88,7 +97,8 @@ public class UnLineUserController extends ProjBaseAction {
 	 * @param kid
 	 * @return
 	 */
-	@RequestMapping("/data")
+	@ApiOperation("查询所有已选择标的信息")
+	@PostMapping("/data")
 	public String data(String kid) {
 		PagePackage pagePackage = submitApi.list_submit_by_user_id(super.pagePackage, kid);
 		pagePackage.getPage().setList(pagePackage.getData());
@@ -103,7 +113,8 @@ public class UnLineUserController extends ProjBaseAction {
 	 * @param price
 	 * @return
 	 */
-	@RequestMapping("/add_price")
+	@ApiOperation("加价")
+	@PostMapping("/add_price")
 	public String add_price(String kid, String item_id, BigDecimal price) {
 		boolean offline_offer = submitApi.offline_offer(kid, item_id, price);
 		if (!offline_offer) {
@@ -120,7 +131,8 @@ public class UnLineUserController extends ProjBaseAction {
 	 * @param item_id
 	 * @return
 	 */
-	@RequestMapping("/price_log")
+	@ApiOperation("出价记录")
+	@PostMapping("/price_log")
 	public String price_log(String kid, String item_id) {
 		PagePackage pagePackage = submitApi.offer_record(super.pagePackage, kid, item_id);
 		pagePackage.getPage().setList(pagePackage.getData());
@@ -128,7 +140,7 @@ public class UnLineUserController extends ProjBaseAction {
 		return super.getPageResult(pagePackage);
 	}
 
-	@RequestMapping("/code_data")
+	@PostMapping("/code_data")
 	public String code_data(String item_id) {
 
 		PagePackage pagePackage = submitApi.list_submit_by_item_id_offline(super.pagePackage, item_id);
@@ -143,7 +155,8 @@ public class UnLineUserController extends ProjBaseAction {
 	 * @param user_id
 	 * @return
 	 */
-	@RequestMapping("/item_submit")
+	@ApiOperation("判断是否已经报过名")
+	@PostMapping("/item_submit")
 	public String item_submit(String item_id, String user_id) {
 		PmItemSubmit itemSubmit = pmItemApi.find_item_submit(item_id, user_id);
 		if(ChkTools.isNotNull(itemSubmit.getKid())) {

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/pm/UnpaidController.java

@@ -2,8 +2,13 @@ package com.ydw.yunbuyer.web.cp.business.pm;
 
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.page.PagePackage;
@@ -19,6 +24,7 @@ import com.ydw.yunbuyer.web.cp.base.action.ProjBaseAction;
  * @author zhaoyun
  * @2019年3月11日
  */
+@Api(tags = "未成功报名人管理")
 @RestController
 @Scope("prototype")
 @RequestMapping("/cp/pm/unpid")
@@ -35,7 +41,8 @@ public class UnpaidController extends ProjBaseAction {
 	 * 未生效报名人列表
 	 * @return
 	 */
-	@RequestMapping("/list_data")
+	@ApiOperation("未生效报名人列表")
+	@GetMapping("/list_data")
 	public String list_data() {
 
 		PagePackage pagePackage = pmItemApi.select_pay_no_by_status_pay(super.pagePackage);
@@ -52,7 +59,8 @@ public class UnpaidController extends ProjBaseAction {
 	/**
 	 * 更改
 	 */
-	@RequestMapping("/edit")
+	@ApiOperation("更改")
+	@PostMapping("/edit")
 	public void edit(String kid) {
 		payApi.pay_success(kid);
 	}

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/rest/ImgController2.java

@@ -2,6 +2,8 @@ package com.ydw.yunbuyer.web.cp.business.rest;
 
 import java.io.File;
 import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.net.URLEncoder;
 
 import javax.servlet.ServletOutputStream;
@@ -117,12 +119,48 @@ public class ImgController2 extends ProjBaseAction {
 			resp.setDateHeader("Expires", 0);
 			//System.out.println(3);
 			//System.out.println(img);
-			ImgTools.thumbnail_w_h(img, width, height, os);
+			if ("video/mp4".equals(file.getContent_type())) {
+				play(img, req, resp);
+			} else {
+				ImgTools.thumbnail_w_h(img, width, height, (OutputStream)os);
+			}
 		} catch (Exception e) {
 			logger.info("图片找不到:" + e);
 		} finally {
 			os.close();
 		}
 	}
-
+	public void play(File file, HttpServletRequest request, HttpServletResponse response) {
+		ServletOutputStream servletOutputStream = null;
+		FileInputStream fileInputStream = null;
+		OutputStream outputStream = null;
+		try {
+			servletOutputStream = response.getOutputStream();
+			fileInputStream = new FileInputStream(file);
+			byte[] cache = new byte[1024];
+			response.setHeader("Content-Type", "video/mp4");
+			response.setHeader("Content-Length", fileInputStream.available() + "");
+			int flag;
+			while ((flag = fileInputStream.read(cache)) != -1)
+				servletOutputStream.write(cache, 0, flag);
+			servletOutputStream.flush();
+			servletOutputStream.close();
+		} catch (Exception e) {
+			logger.error("文件传输错误",e);
+			throw new RuntimeException("文件传输错误");
+		} finally {
+			if (servletOutputStream != null)
+				try {
+					servletOutputStream.close();
+				} catch (IOException e) {
+					this.logger.error("流释放错误", e);
+				}
+			if (fileInputStream != null)
+				try {
+					fileInputStream.close();
+				} catch (IOException e) {
+					this.logger.error("文件流释放错误", e);
+				}
+		}
+	}
 }

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/rest/swagger/Knife4jConfiguration.java

@@ -0,0 +1,69 @@
+package com.ydw.yunbuyer.web.cp.business.rest.swagger;
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+import com.google.common.base.Predicate;
+import io.swagger.annotations.Api;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.service.Contact;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+@Configuration
+@EnableSwagger2
+@EnableKnife4j
+@ConditionalOnProperty(prefix = "ydw", name = "swagger", havingValue = "true")
+public class Knife4jConfiguration {
+    // 组织Docket对象，翻译过来就是摘要的意思，它是生成API文档的核心对象，里面配置一些必要的信息
+    @Bean
+    public Docket swaggerSpringMvcPlugin() {
+        // 指定规范，这里是SWAGGER_2
+        return new Docket(DocumentationType.SWAGGER_2)
+                // 设定Api文档头信息，这个信息会展示在文档UI的头部位置，用来创建该Api的基本信息（这些基本信息会展现在文档页面中）
+                .apiInfo(apiInfo())
+                // 返回一个ApiSelectorBuilder实例用来控制哪些接口暴露给Swagger来展现
+                .select()
+                // 只生成被Api这个注解注解过的类接口
+                .apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+                // 只生成被ApiOperation这个注解注解过的api接口
+                // .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+                // 生成所有API接口
+                // .apis(RequestHandlerSelectors.basePackage("com.ydw.yunbuyer.web.cp"))
+                // 添加过滤条件，自定义注解
+                // .apis(not(withMethodAnnotion(SwaggerIgnore.class)))
+                // 这里配合@ComponentScan一起使用，又再次细化了匹配规则(当然，我们也可以只选择@ComponentScan、paths()方法当中的一中)
+                .paths(allowPaths()).build();
+    }
+
+    /**
+     * 自定义API文档基本信息实体
+     *
+     * @return
+     */
+    private ApiInfo apiInfo() {
+        // 构建联系实体，在UI界面会显示
+        Contact contact = new Contact("云买卖监督平台(cp)", "http://localhost:16025/web-cp-all/frame/frame.html", null);
+        return new ApiInfoBuilder().contact(contact)
+                // 文档标题
+                .title("云买卖监督平台API文档(cp)")
+                // 文档描述
+                .description("云买卖监督平台API文档(cp)")
+                // 文档版本
+                .version("1.0.0").build();
+    }
+
+    /**
+     * path匹配规则
+     *
+     * @return
+     */
+    private Predicate<String> allowPaths() {
+        return PathSelectors.any();
+    }
+}

krock-jcebid-cp/krock-web-cp-all/src/main/java/com/ydw/yunbuyer/web/cp/business/rest/swagger/SpringFoxSwaggerConfig.java

@@ -1,79 +1,79 @@
-package com.ydw.yunbuyer.web.cp.business.rest.swagger;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.google.common.base.Predicate;
-
-import io.swagger.annotations.Api;
-
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.service.Contact;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * TODO Swagger配置文件
- * 
- * @author hxj
- */
-@Configuration
-@EnableSwagger2
-@ConditionalOnProperty(prefix = "ydw", name = "swagger", havingValue = "true")
-public class SpringFoxSwaggerConfig {
-	// 组织Docket对象，翻译过来就是摘要的意思，它是生成API文档的核心对象，里面配置一些必要的信息
-	@Bean
-	public Docket swaggerSpringMvcPlugin() {
-		// 指定规范，这里是SWAGGER_2
-		return new Docket(DocumentationType.SWAGGER_2)
-				// 设定Api文档头信息，这个信息会展示在文档UI的头部位置，用来创建该Api的基本信息（这些基本信息会展现在文档页面中）
-				.apiInfo(apiInfo())
-				// 返回一个ApiSelectorBuilder实例用来控制哪些接口暴露给Swagger来展现
-				.select()
-				// 只生成被Api这个注解注解过的类接口
-				.apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
-				// 只生成被ApiOperation这个注解注解过的api接口
-				// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-				// 生成所有API接口
-				// .apis(RequestHandlerSelectors.basePackage("com.ydw.yunbuyer.web.cp"))
-				// 添加过滤条件，自定义注解
-				// .apis(not(withMethodAnnotion(SwaggerIgnore.class)))
-				// 这里配合@ComponentScan一起使用，又再次细化了匹配规则(当然，我们也可以只选择@ComponentScan、paths()方法当中的一中)
-				.paths(allowPaths()).build();
-	}
-
-	/**
-	 * 自定义API文档基本信息实体
-	 * 
-	 * @return
-	 */
-	private ApiInfo apiInfo() {
-		// 构建联系实体，在UI界面会显示
-		Contact contact = new Contact("云买卖监督平台(cp)", "http://localhost:16025/web-cp-all/frame/frame.html", null);
-		return new ApiInfoBuilder().contact(contact)
-				// 文档标题
-				.title("云买卖监督平台API文档(cp)")
-				// 文档描述
-				.description("云买卖监督平台API文档(cp)")
-				// 文档版本
-				.version("1.0.0").build();
-	}
-
-	/**
-	 * path匹配规则
-	 * 
-	 * @return
-	 */
-	private Predicate<String> allowPaths() {
-		return PathSelectors.any();
-	}
-}
-// 自定义忽略接口注解
-// @Target({ElementType.METHOD})
-// @Retention(RetentionPolicy.RUNTIME)
-// public @interface SeaggerIgnore{}
+//package com.ydw.yunbuyer.web.cp.business.rest.swagger;
+//
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//import com.google.common.base.Predicate;
+//
+//import io.swagger.annotations.Api;
+//
+//import springfox.documentation.builders.ApiInfoBuilder;
+//import springfox.documentation.builders.PathSelectors;
+//import springfox.documentation.builders.RequestHandlerSelectors;
+//import springfox.documentation.service.ApiInfo;
+//import springfox.documentation.service.Contact;
+//import springfox.documentation.spi.DocumentationType;
+//import springfox.documentation.spring.web.plugins.Docket;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
+//
+///**
+// *  Swagger配置文件 使用另一个文档生成工具
+// *
+// * @author hxj
+// */
+//@Configuration
+//@EnableSwagger2
+//@ConditionalOnProperty(prefix = "ydw", name = "swagger", havingValue = "true")
+//public class SpringFoxSwaggerConfig {
+//	// 组织Docket对象，翻译过来就是摘要的意思，它是生成API文档的核心对象，里面配置一些必要的信息
+//	@Bean
+//	public Docket swaggerSpringMvcPlugin() {
+//		// 指定规范，这里是SWAGGER_2
+//		return new Docket(DocumentationType.SWAGGER_2)
+//				// 设定Api文档头信息，这个信息会展示在文档UI的头部位置，用来创建该Api的基本信息（这些基本信息会展现在文档页面中）
+//				.apiInfo(apiInfo())
+//				// 返回一个ApiSelectorBuilder实例用来控制哪些接口暴露给Swagger来展现
+//				.select()
+//				// 只生成被Api这个注解注解过的类接口
+//				.apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+//				// 只生成被ApiOperation这个注解注解过的api接口
+//				// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+//				// 生成所有API接口
+//				// .apis(RequestHandlerSelectors.basePackage("com.ydw.yunbuyer.web.cp"))
+//				// 添加过滤条件，自定义注解
+//				// .apis(not(withMethodAnnotion(SwaggerIgnore.class)))
+//				// 这里配合@ComponentScan一起使用，又再次细化了匹配规则(当然，我们也可以只选择@ComponentScan、paths()方法当中的一中)
+//				.paths(allowPaths()).build();
+//	}
+//
+//	/**
+//	 * 自定义API文档基本信息实体
+//	 *
+//	 * @return
+//	 */
+//	private ApiInfo apiInfo() {
+//		// 构建联系实体，在UI界面会显示
+//		Contact contact = new Contact("云买卖监督平台(cp)", "http://localhost:16025/web-cp-all/frame/frame.html", null);
+//		return new ApiInfoBuilder().contact(contact)
+//				// 文档标题
+//				.title("云买卖监督平台API文档(cp)")
+//				// 文档描述
+//				.description("云买卖监督平台API文档(cp)")
+//				// 文档版本
+//				.version("1.0.0").build();
+//	}
+//
+//	/**
+//	 * path匹配规则
+//	 *
+//	 * @return
+//	 */
+//	private Predicate<String> allowPaths() {
+//		return PathSelectors.any();
+//	}
+//}
+//// 自定义忽略接口注解
+//// @Target({ElementType.METHOD})
+//// @Retention(RetentionPolicy.RUNTIME)
+//// public @interface SeaggerIgnore{}

krock-jcebid-cp/krock-web-cp-all/src/main/resources/application-test.yml

@@ -1,6 +1,7 @@
 ydw:
   env: test
   env_old: test
+  swagger: true
 server:
   port: 16025
   max-http-header-size: 30920

krock-jcebid-cp/krock-web-cp-all/src/main/resources/application.yml

@@ -6,6 +6,7 @@ ydw:
   pub : public-service
   back-url: http://127.0.0.1:16027
   pub-url : http://127.0.0.1:16028
+  swagger : true
 server:
   port: 16025
   max-http-header-size: 30920

krock-jcebid/krock-service-pubservices/pom.xml

@@ -30,6 +30,12 @@
 				<artifactId>spring-boot-starter-tomcat</artifactId> </exclusion> </exclusions> -->
 		</dependency>
 
+		<!-- common Utils -->
+		<dependency>
+			<groupId>com.ydw.yunbuyer.common</groupId>
+			<artifactId>krock-core-common</artifactId>
+			<version>0.0.1</version>
+		</dependency>
 		<dependency>
 			<groupId>com.google.guava</groupId>
 			<artifactId>guava</artifactId>

krock-jcebid/krock-service-pubservices/src/main/java/com/ydw/yunbuyer/service/ztb/pubservices/base/swagger/Knife4jSpringFoxConfig.java

@@ -0,0 +1,71 @@
+package com.ydw.yunbuyer.service.ztb.pubservices.base.swagger;
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+import com.google.common.base.Predicate;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import springfox.documentation.builders.ApiInfoBuilder;
+import springfox.documentation.builders.PathSelectors;
+import springfox.documentation.builders.RequestHandlerSelectors;
+import springfox.documentation.service.ApiInfo;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spring.web.plugins.Docket;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+/**
+ * TODO Swagger配置文件
+ * 
+ * @author hxj
+ * 
+ */
+@Configuration
+@EnableSwagger2
+@EnableKnife4j
+@ConditionalOnProperty(prefix = "ydw", value= "swagger", havingValue = "true")
+public class Knife4jSpringFoxConfig {
+	// 组织Docket对象，翻译过来就是摘要的意思，它是生成API文档的核心对象，里面配置一些必要的信息
+	@Bean
+	public Docket swaggerSpringMvcPlugin() {
+		
+		// 指定规范，这里是SWAGGER_2
+		return new Docket(DocumentationType.SWAGGER_2)
+				// 设定Api文档头信息，这个信息会展示在文档UI的头部位置
+				.apiInfo(apiInfo()).select()
+				// 只生成被Api这个注解注解过的类接口           
+//				.apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+				// 只生成被ApiOperation这个注解注解过的api接口  
+				.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+				// 生成所有API接口            
+//				.apis(RequestHandlerSelectors.basePackage("com.ydw.yunbuyer.api.ztb.pubservices"))
+				// 这里配合@ComponentScan一起使用，又再次细化了匹配规则(当然，我们也可以只选择@ComponentScan、paths()方法当中的一中)
+				.paths(allowPaths()).build();
+	}
+
+	/**
+	 * 自定义API文档基本信息实体
+	 * 
+	 * @return
+	 */
+	private ApiInfo apiInfo() {
+		// 构建联系实体，在UI界面会显示
+		return new ApiInfoBuilder()
+				// 文档标题
+				.title("krock-api-pubservices")
+				// 文档描述
+				.description("省公共服务平台数据推送服务功能文档")
+				// 文档版本
+				.version("5.0").build();
+	}
+
+	/**
+	 * path匹配规则
+	 * 
+	 * @return
+	 */
+	private Predicate<String> allowPaths() {
+		return PathSelectors.any();
+	}
+
+}

krock-jcebid/krock-service-pubservices/src/main/java/com/ydw/yunbuyer/service/ztb/pubservices/base/swagger/SpringFoxSwagger2Config.java

@@ -1,71 +1,71 @@
-package com.ydw.yunbuyer.service.ztb.pubservices.base.swagger;
-
-import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import com.google.common.base.Predicate;
-
-import io.swagger.annotations.ApiOperation;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.PathSelectors;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.service.ApiInfo;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
-
-/**
- * TODO Swagger配置文件
- * 
- * @author hxj
- * 
- */
-@Configuration
-@EnableSwagger2
-@ConditionalOnProperty(prefix = "ydw", value= "swagger", havingValue = "true")
-public class SpringFoxSwagger2Config {
-	// 组织Docket对象，翻译过来就是摘要的意思，它是生成API文档的核心对象，里面配置一些必要的信息
-	@Bean
-	public Docket swaggerSpringMvcPlugin() {
-		
-		// 指定规范，这里是SWAGGER_2
-		return new Docket(DocumentationType.SWAGGER_2)
-				// 设定Api文档头信息，这个信息会展示在文档UI的头部位置
-				.apiInfo(apiInfo()).select()
-				// 只生成被Api这个注解注解过的类接口           
-//				.apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
-				// 只生成被ApiOperation这个注解注解过的api接口  
-				.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
-				// 生成所有API接口            
-//				.apis(RequestHandlerSelectors.basePackage("com.ydw.yunbuyer.api.ztb.pubservices"))
-				// 这里配合@ComponentScan一起使用，又再次细化了匹配规则(当然，我们也可以只选择@ComponentScan、paths()方法当中的一中)
-				.paths(allowPaths()).build();
-	}
-
-	/**
-	 * 自定义API文档基本信息实体
-	 * 
-	 * @return
-	 */
-	private ApiInfo apiInfo() {
-		// 构建联系实体，在UI界面会显示
-		return new ApiInfoBuilder()
-				// 文档标题
-				.title("krock-api-pubservices")
-				// 文档描述
-				.description("省公共服务平台数据推送服务功能文档")
-				// 文档版本
-				.version("5.0").build();
-	}
-
-	/**
-	 * path匹配规则
-	 * 
-	 * @return
-	 */
-	private Predicate<String> allowPaths() {
-		return PathSelectors.any();
-	}
-
-}
+//package com.ydw.yunbuyer.service.ztb.pubservices.base.swagger;
+//
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//import com.google.common.base.Predicate;
+//
+//import io.swagger.annotations.ApiOperation;
+//import springfox.documentation.builders.ApiInfoBuilder;
+//import springfox.documentation.builders.PathSelectors;
+//import springfox.documentation.builders.RequestHandlerSelectors;
+//import springfox.documentation.service.ApiInfo;
+//import springfox.documentation.spi.DocumentationType;
+//import springfox.documentation.spring.web.plugins.Docket;
+//import springfox.documentation.swagger2.annotations.EnableSwagger2;
+//
+///**
+// *  Swagger配置文件 选用其他文档生成器
+// *
+// * @author hxj
+// *
+// */
+//@Configuration
+//@EnableSwagger2
+//@ConditionalOnProperty(prefix = "ydw", value= "swagger", havingValue = "true")
+//public class SpringFoxSwagger2Config {
+//	// 组织Docket对象，翻译过来就是摘要的意思，它是生成API文档的核心对象，里面配置一些必要的信息
+//	@Bean
+//	public Docket swaggerSpringMvcPlugin() {
+//
+//		// 指定规范，这里是SWAGGER_2
+//		return new Docket(DocumentationType.SWAGGER_2)
+//				// 设定Api文档头信息，这个信息会展示在文档UI的头部位置
+//				.apiInfo(apiInfo()).select()
+//				// 只生成被Api这个注解注解过的类接口           
+////				.apis(RequestHandlerSelectors.withClassAnnotation(Api.class))
+//				// 只生成被ApiOperation这个注解注解过的api接口  
+//				.apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class))
+//				// 生成所有API接口            
+////				.apis(RequestHandlerSelectors.basePackage("com.ydw.yunbuyer.api.ztb.pubservices"))
+//				// 这里配合@ComponentScan一起使用，又再次细化了匹配规则(当然，我们也可以只选择@ComponentScan、paths()方法当中的一中)
+//				.paths(allowPaths()).build();
+//	}
+//
+//	/**
+//	 * 自定义API文档基本信息实体
+//	 *
+//	 * @return
+//	 */
+//	private ApiInfo apiInfo() {
+//		// 构建联系实体，在UI界面会显示
+//		return new ApiInfoBuilder()
+//				// 文档标题
+//				.title("krock-api-pubservices")
+//				// 文档描述
+//				.description("省公共服务平台数据推送服务功能文档")
+//				// 文档版本
+//				.version("5.0").build();
+//	}
+//
+//	/**
+//	 * path匹配规则
+//	 *
+//	 * @return
+//	 */
+//	private Predicate<String> allowPaths() {
+//		return PathSelectors.any();
+//	}
+//
+//}