接口文档生成

krock-core-common/pom.xml

@@ -94,19 +94,19 @@
 			<version>5.0.7.RELEASE</version>
 			<scope>provided</scope>
 		</dependency>
-		
+
 		 <!-- swagger2 -->
-		<!--<dependency>
+		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger2</artifactId>
 			<version>2.9.2</version>
 		</dependency>
-		
+
 		<dependency>
 			<groupId>io.springfox</groupId>
 			<artifactId>springfox-swagger-ui</artifactId>
 			<version>2.9.2</version>
-		</dependency>-->
+		</dependency>
 
 
 		<!--knife4j-->
@@ -115,11 +115,6 @@
 			<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-pm/krock-web-pm/pom.xml

@@ -24,11 +24,11 @@
 
 	<dependencies>
 	<!-- https://mvnrepository.com/artifact/com.tmsps/ne4Weixin -->
-<dependency>
-    <groupId>com.tmsps</groupId>
-    <artifactId>ne4Weixin</artifactId>
-    <version>0.8.1</version>
-</dependency>
+		<dependency>
+			<groupId>com.tmsps</groupId>
+			<artifactId>ne4Weixin</artifactId>
+			<version>0.8.1</version>
+		</dependency>
 	
 		<!-- common Utils -->
 		<dependency>
@@ -142,6 +142,13 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-undertow</artifactId>
 		</dependency>
+
+		<!-- 解决导入的依赖冲突 -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>20.0</version>
+		</dependency>
 	</dependencies>
 
 	<dependencyManagement>

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/KrockWebPMApplication.java

@@ -4,12 +4,14 @@ import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.annotation.ComponentScan;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 @EnableScheduling
 @EnableEurekaClient
 @EnableFeignClients
 @SpringBootApplication
+@ComponentScan({ "com.ydw.yunbuyer.web.pm"})
 public class KrockWebPMApplication {
 
 	public static void main(String[] args) {

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/config/Knife4jPmConfiguration.java

@@ -0,0 +1,64 @@
+package com.ydw.yunbuyer.web.pm.config;
+
+
+import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
+import com.google.common.base.Predicate;
+import io.swagger.annotations.Api;
+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;
+
+@Configuration
+@EnableSwagger2
+@EnableKnife4j
+public class Knife4jPmConfiguration {
+    // 组织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-web-pm")
+                // 文档描述
+                .description("pm功能文档")
+                // 文档版本
+                .version("1.0").build();
+    }
+
+    /**
+     * path匹配规则
+     *
+     * @return
+     */
+    private Predicate<String> allowPaths() {
+        return PathSelectors.any();
+    }
+
+}

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/BiddingPayController.java

@@ -3,8 +3,12 @@ package com.ydw.yunbuyer.web.pm.controller_wxapp;
 import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
 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.alibaba.fastjson.JSONObject;
@@ -22,6 +26,7 @@ import com.ydw.yunbuyer.web.pm.web.SessionPersionService;
  * @author 吴思凡
  *
  */
+@Api(tags = "BiddingPayController")
 @RestController
 @Scope("prototype")
 @RequestMapping("/pmp/pm_item")
@@ -33,7 +38,7 @@ public class BiddingPayController extends ProjBaseAction {
 	@Autowired
 	private SessionPersionService sessionPersionService;
 
-	@RequestMapping("/compete_price")
+	@PostMapping("/compete_price")
 	public String compete_price(String pm_item_id, BigDecimal price_bidder) {
 		JSONObject persion = sessionPersionService.getCurrentLoginPersion();
 
@@ -47,7 +52,7 @@ public class BiddingPayController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/apply")
+	@PostMapping("/apply")
 	public String apply(String item_kid) {
 
 		JSONObject persion = sessionPersionService.getCurrentLoginPersion();
@@ -61,13 +66,13 @@ public class BiddingPayController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/check_is_login")
+	@GetMapping("/check_is_login")
 	public String check_is_login() {
 		result.put("loginVar", true);
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/check_is_pay")
+	@PostMapping("/check_is_pay")
 	public String check_is_pay(String pm_item_id, String pm_user_id) {
 
 		// 查询当前人员是否有t_pm_item_submit信息

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/LotteryController.java

@@ -2,8 +2,12 @@ package com.ydw.yunbuyer.web.pm.controller_wxapp;
 
 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.utils.ChkUtil;
@@ -25,6 +29,7 @@ import com.ydw.yunbuyer.web.pm.web.SessionWxService;
  * @author 吴思凡
  *
  */
+@Api(tags = "抽奖")
 @RestController
 @Scope("prototype")
 @RequestMapping("/wx/pm")
@@ -47,7 +52,8 @@ public class LotteryController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/wx_lottery_raffle")
+	@ApiOperation("微信抽奖")
+	@GetMapping("/wx_lottery_raffle")
 	public String wx_lottery_raffle() {
 		JSONObject persion = sessionWxService.getCurrentLoginLotteryPersion();
 		String persion_id = persion.getString("kid");
@@ -173,7 +179,8 @@ public class LotteryController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/lottery_raffle")
+	@ApiOperation("抽奖")
+	@GetMapping("/lottery_raffle")
 	public String lottery_raffle() {
 		JSONObject persion = sessionWxService.getCurrentLoginLotteryPersion();
 		String persion_id = persion.getString("kid");
@@ -251,7 +258,8 @@ public class LotteryController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/list_lottery")
+	@ApiOperation("查询我的中奖记录")
+	@GetMapping("/list_lottery")
 	public String list_lottery() {
 		JSONObject persion = sessionWxService.getCurrentLoginLotteryPersion();
 		String persion_id = persion.getString("kid");
@@ -265,7 +273,8 @@ public class LotteryController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/list_lottery_raffle_count")
+	@ApiOperation("查询不是第六名的抽奖信息")
+	@GetMapping("/list_lottery_raffle_count")
 	public String list_lottery_raffle_count() {
 		List<Map<String, Object>> list = lotteryServiceApi.list_lottery_raffle_count();
 		result.put("data", list);
@@ -277,7 +286,8 @@ public class LotteryController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/update_lottery_count")
+	@ApiOperation("初始化所有用户抽奖次数")
+	@GetMapping("/update_lottery_count")
 	public String update_lottery_count() {
 		lotteryPersionApi.update_lottery_count();
 		return result.toJSONString();

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxAddressController.java

@@ -2,8 +2,12 @@ package com.ydw.yunbuyer.web.pm.controller_wxapp;
 
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
 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.alibaba.fastjson.JSONObject;
@@ -19,6 +23,7 @@ import com.ydw.yunbuyer.web.pm.web.SessionWxService;
  * @author 吴思凡
  *
  */
+@Api(tags = "地址")
 @RestController
 @Scope("prototype")
 @RequestMapping("/wx/address")
@@ -30,7 +35,7 @@ public class WxAddressController extends ProjBaseAction {
 	@Autowired
 	private AddressApi addressApi;
 
-	@RequestMapping("/get_address")
+	@GetMapping("/get_address")
 	public String get_address() {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String persion_id = persion.getString("kid");
@@ -39,7 +44,7 @@ public class WxAddressController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/add")
+	@PostMapping("/add")
 	public String add(String province, String city, String district, String detail, String user_name,
 			String user_mobile, String is_default) {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
@@ -69,7 +74,7 @@ public class WxAddressController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/update")
+	@PostMapping("/update")
 	public String update(String province, String city, String district, String detail, String user_name,
 			String user_mobile, String is_default, String kid) {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
@@ -107,7 +112,7 @@ public class WxAddressController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/get")
+	@PostMapping("/get")
 	public String get(String kid) {
 		ReceiveAddress receive_address = addressApi.get(kid);
 
@@ -115,7 +120,7 @@ public class WxAddressController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/delete")
+	@PostMapping("/delete")
 	public String delete(String kid) {
 		ReceiveAddress receive_address = addressApi.get(kid);
 		addressApi.delete(receive_address);
@@ -123,7 +128,7 @@ public class WxAddressController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/update_is_default")
+	@PostMapping("/update_is_default")
 	public String update_is_default(String kid) {
 
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxItemController.java

@@ -6,9 +6,12 @@ import java.util.Date;
 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.utils.DateTools;
@@ -32,6 +35,7 @@ import com.ydw.yunbuyer.web.pm.web.WebTools;
  * @author 吴思凡
  *
  */
+@Api(tags = "店铺拍品")
 @RestController
 @Scope("prototype")
 @RequestMapping("/wx/pm")
@@ -49,13 +53,13 @@ public class WxItemController extends ProjBaseAction {
 	@Autowired
 	private LiveRoomService liveRoomService;
 
-	@RequestMapping("/new_add_item")
+	@PostMapping("/new_add_item")
 	public String new_add_item(t_project_item project_item) throws ParseException {
 		wxItemService.add(project_item);
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/new_update_item")
+	@PostMapping("/new_update_item")
 	public String new_update_item(t_project_item project_item) throws ParseException {
 		t_project_item project_itemDb = wxItemService.get(project_item.getKid());
 		project_itemDb.setBid_type(project_item.getBid_type());
@@ -86,7 +90,8 @@ public class WxItemController extends ProjBaseAction {
 	 * @param item_kid
 	 * @return
 	 */
-	@RequestMapping("/get_item")
+	@ApiOperation("获取标的物信息")
+	@PostMapping("/get_item")
 	public String get_item(String item_kid) {
 		t_project_item project_item = wxItemService.get(item_kid);
 		result.put("data", project_item);
@@ -99,7 +104,8 @@ public class WxItemController extends ProjBaseAction {
 	 * @param item_kid
 	 * @return
 	 */
-	@RequestMapping("/del_item")
+	@ApiOperation("删除标的物")
+	@PostMapping("/del_item")
 	public String del_item(String item_kid) {
 		wxItemService.deleteById(item_kid);
 		return result.toJSONString();
@@ -111,7 +117,8 @@ public class WxItemController extends ProjBaseAction {
 	 * @param shop_id
 	 * @return
 	 */
-	@RequestMapping("list_all_item")
+	@ApiOperation("所有标的物")
+	@PostMapping("list_all_item")
 	public String list_all_item(String shop_id) {
 		List<Map<String, Object>> list = ChkTools.getFileId(wxItemService.list_item_wait_verify(shop_id));
 		List<Map<String, Object>> list1 = ChkTools.getFileId(wxItemService.list_item_verify_pass(shop_id));
@@ -129,7 +136,8 @@ public class WxItemController extends ProjBaseAction {
 	 * @param shop_id
 	 * @return
 	 */
-	@RequestMapping("/list_item_wait_verify")
+	@ApiOperation("查询正在等待审核的标的物")
+	@PostMapping("/list_item_wait_verify")
 	public String list_item_wait_verify(String shop_id) {
 
 		List<Map<String, Object>> list = wxItemService.list_item_wait_verify(shop_id);
@@ -143,7 +151,8 @@ public class WxItemController extends ProjBaseAction {
 	 * @param shop_id
 	 * @return
 	 */
-	@RequestMapping("/list_item_verify_pass")
+	@ApiOperation("查询审核通过的标的物")
+	@PostMapping("/list_item_verify_pass")
 	public String list_item_verify_pass(String shop_id) {
 		List<Map<String, Object>> list = wxItemService.list_item_verify_pass(shop_id);
 		result.put("data", list);
@@ -156,7 +165,8 @@ public class WxItemController extends ProjBaseAction {
 	 * @param shop_id
 	 * @return
 	 */
-	@RequestMapping("/list_live_item_verify_pass")
+	@ApiOperation("查询审核通过的标的物")
+	@PostMapping("/list_live_item_verify_pass")
 	public String list_live_item_verify_pass(String shop_id) {
 		List<Map<String, Object>> list = wxItemService.list_live_item_verify_pass(shop_id);
 		result.put("data", list);
@@ -169,7 +179,8 @@ public class WxItemController extends ProjBaseAction {
 	 * @param shop_id
 	 * @return
 	 */
-	@RequestMapping("/list_item_verify_reject")
+	@ApiOperation("查询审核拒绝的标的物")
+	@PostMapping("/list_item_verify_reject")
 	public String list_item_verify_reject(String shop_id) {
 		List<Map<String, Object>> list = ChkTools.getFileId(wxItemService.list_item_verify_reject(shop_id));
 		result.put("data", list);
@@ -182,7 +193,8 @@ public class WxItemController extends ProjBaseAction {
 	 * @param item_kid
 	 * @return
 	 */
-	@RequestMapping("/start_countdown")
+	@ApiOperation("点击关拍开始倒计时，返回系统当前时间")
+	@PostMapping("/start_countdown")
 	public String start_countdown(String item_kid) {
 		long nowtime = System.currentTimeMillis();
 		result.put("nowtime", nowtime);
@@ -199,7 +211,8 @@ public class WxItemController extends ProjBaseAction {
 	 * @param item_kid
 	 * @return
 	 */
-	@RequestMapping("/get_countdown")
+	@ApiOperation("倒计时每秒获取是否有竞价记录")
+	@PostMapping("/get_countdown")
 	public String get_countdown(long start_time, String item_kid) {
 		List<Map<String, Object>> list = wxItemService.select_offer(start_time, item_kid);
 		if (list.size() > 0) {
@@ -217,7 +230,8 @@ public class WxItemController extends ProjBaseAction {
 	 * @param is_open
 	 * @return
 	 */
-	@RequestMapping("/bidding_status")
+	@ApiOperation("更改直播拍品状态")
+	@PostMapping("/bidding_status")
 	public String bidding_opening(String item_kid, boolean is_open) {
 		String s = is_open ? "开拍" : "关拍";
 		wxItemService.pm_update_status(item_kid, is_open);
@@ -263,7 +277,8 @@ public class WxItemController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/is_delived")
+	@ApiOperation("查询已卖出未发货的宝贝")
+	@PostMapping("/is_delived")
 	public String is_delived() {
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
 		String shop_id = json.getString("shop_id");

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxLiveRoomController.java

@@ -4,8 +4,11 @@ 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.utils.ChkUtil;
@@ -31,6 +34,7 @@ import com.ydw.yunbuyer.web.pm.web.WebTools;
  * @author 吴思凡
  *
  */
+@Api(tags = "直播间")
 @RestController
 @Scope("prototype")
 @RequestMapping("/wx/pm")
@@ -55,7 +59,8 @@ public class WxLiveRoomController extends ProjBaseAction {
 	 * @param content
 	 * @return
 	 */
-	@RequestMapping(value = "/create_live_room")
+	@ApiOperation("创建直播间")
+	@PostMapping(value = "/create_live_room")
 	public String register_shop(String name, String content) {
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
 		String persion_id = json.getString("kid");
@@ -81,7 +86,7 @@ public class WxLiveRoomController extends ProjBaseAction {
 	 * @param shop_id
 	 * @return
 	 */
-	@RequestMapping("/check_live_room")
+	@PostMapping("/check_live_room")
 	public String check_live_room(String shop_id) {
 		List<Map<String, Object>> list = liveRoomService.list_verify_pass(shop_id);
 
@@ -106,7 +111,8 @@ public class WxLiveRoomController extends ProjBaseAction {
 	 * @param content
 	 * @return
 	 */
-	@RequestMapping(value = "/update_live_room")
+	@ApiOperation("修改直播间")
+	@PostMapping(value = "/update_live_room")
 	public String update_live_room(String live_room_id, String name, String content) {
 		t_liveroom liveroom = liveRoomService.get(live_room_id);
 		liveroom.setName(name);
@@ -124,7 +130,8 @@ public class WxLiveRoomController extends ProjBaseAction {
 	 * @param live_room_id
 	 * @return
 	 */
-	@RequestMapping(value = "/get_live_room")
+	@ApiOperation("获取直播间信息")
+	@PostMapping(value = "/get_live_room")
 	public String get_live_room(String live_room_id) {
 
 		t_liveroom liveroom = liveRoomService.get(live_room_id);
@@ -139,7 +146,8 @@ public class WxLiveRoomController extends ProjBaseAction {
 	 * @param live_room_id
 	 * @return
 	 */
-	@RequestMapping(value = "/del_live_room")
+	@ApiOperation("删除直播间")
+	@PostMapping(value = "/del_live_room")
 	public String del_live_room(String live_room_id) {
 
 		liveRoomService.deleteById(live_room_id);
@@ -153,7 +161,8 @@ public class WxLiveRoomController extends ProjBaseAction {
 	 * @param shop_id
 	 * @return
 	 */
-	@RequestMapping(value = "/list_verify_pass")
+	@ApiOperation("获取审核通过的直播间")
+	@PostMapping(value = "/list_verify_pass")
 	public String list_live_room(String shop_id) {
 
 		List<Map<String, Object>> list = liveRoomService.list_verify_pass(shop_id);
@@ -167,7 +176,8 @@ public class WxLiveRoomController extends ProjBaseAction {
 	 * @param shop_id
 	 * @return
 	 */
-	@RequestMapping(value = "/list_wait_verify")
+	@ApiOperation("获取正在审核的")
+	@PostMapping(value = "/list_wait_verify")
 	public String list_wait_verify(String shop_id) {
 		List<Map<String, Object>> list = liveRoomService.list_wait_verify(shop_id);
 		result.put("data", list);
@@ -180,7 +190,8 @@ public class WxLiveRoomController extends ProjBaseAction {
 	 * @param shop_id
 	 * @return
 	 */
-	@RequestMapping(value = "/list_verify_reject")
+	@ApiOperation("获取审核未通过")
+	@PostMapping(value = "/list_verify_reject")
 	public String list_verify_reject(String shop_id) {
 		List<Map<String, Object>> list = liveRoomService.list_verify_reject(shop_id);
 		result.put("data", list);
@@ -193,7 +204,8 @@ public class WxLiveRoomController extends ProjBaseAction {
 	 * @param live_room_id
 	 * @return
 	 */
-	@RequestMapping(value = "/live_room_detail")
+	@ApiOperation("进入直播间详情")
+	@PostMapping(value = "/live_room_detail")
 	public String live_room_detail(String live_room_id) {
 		List<Map<String, Object>> list = ChkTools.getFileId(liveRoomService.live_room_detail(live_room_id));
 		if (list.size() > 0) {
@@ -231,7 +243,8 @@ public class WxLiveRoomController extends ProjBaseAction {
 	 * @param item_kid
 	 * @return
 	 */
-	@RequestMapping(value = "/get_item_detail")
+	@ApiOperation("获取标的物详情")
+	@PostMapping(value = "/get_item_detail")
 	public String get_item_detail(String item_kid) {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String pm_user_id = persion.getString("kid");
@@ -259,7 +272,7 @@ public class WxLiveRoomController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping(value = "/get_live_room_item_detail")
+	@PostMapping(value = "/get_live_room_item_detail")
 	public String get_live_room_item_detail(String item_kid) {
 		List<Map<String, Object>> list = ChkTools.getFileId(pmItemService.item_detail(item_kid));
 		List<Map<String, Object>> offer = pmItemService.select_offer_count(item_kid);
@@ -271,7 +284,7 @@ public class WxLiveRoomController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping(value = "/select_live_item")
+	@PostMapping(value = "/select_live_item")
 	public String select_live_item(String live_room_id) {
 
 		List<Map<String, Object>> list = ChkTools.getFileId(liveRoomService.select_live_item(live_room_id));

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxMsgController.java

@@ -2,9 +2,11 @@ package com.ydw.yunbuyer.web.pm.controller_wxapp;
 
 import java.io.IOException;
 
+import io.swagger.annotations.Api;
 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.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.tmsps.ne4spring.utils.DateTools;
@@ -27,6 +29,7 @@ import com.ydw.yunbuyer.web.pm.web.WebTools;
  * @author 吴思凡
  *
  */
+@Api(tags = "模板消息")
 @RestController
 @Scope("prototype")
 @RequestMapping("/wx/pm")
@@ -47,7 +50,7 @@ public class WxMsgController {
 	@Autowired
 	private ShopService shopService;
 
-	@RequestMapping("/push_one_user")
+	@PostMapping("/push_one_user")
 	public String pushOneUser(String payno_id, String formId) throws ClientProtocolException, IOException {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		t_pay_no pay_no = wxPmService.get_pay_no(payno_id);

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmApiController.java

@@ -6,8 +6,12 @@ import java.util.HashMap;
 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.utils.ChkUtil;
@@ -30,6 +34,7 @@ import com.ydw.yunbuyer.web.pm.service.WxPmService;
  * @author 吴思凡
  *
  */
+@Api(tags = "WxPmApiController")
 @RestController
 @Scope("prototype")
 @RequestMapping("/api/wx")
@@ -50,7 +55,7 @@ public class WxPmApiController extends ProjBaseAction {
 	@Autowired
 	private ShopService shopService;
 
-	@RequestMapping("/list_item")
+	@GetMapping("/list_item")
 	public String list_item() {
 		List<Map<String, Object>> list = pmItemService.list_all_open();
 		List<Map<String, Object>> list1 = pmItemService.list_all_not_open();
@@ -62,7 +67,7 @@ public class WxPmApiController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/list_slideshow")
+	@GetMapping("/list_slideshow")
 	public String list_slideshow() {
 		List<Map<String, Object>> list = slideShowService.list_slideshow();
 		result.put("data", list);
@@ -75,7 +80,8 @@ public class WxPmApiController extends ProjBaseAction {
 	 * @param kid
 	 * @return
 	 */
-	@RequestMapping("/select_list")
+	@ApiOperation("详情页")
+	@PostMapping("/select_list")
 	public String select_list(String kid) {
 		// count.put(kid, );
 		List<Map<String, Object>> list = pmItemService.select_list(kid);
@@ -120,14 +126,15 @@ public class WxPmApiController extends ProjBaseAction {
 	 * @param kid
 	 * @return
 	 */
-	@RequestMapping("/add_circusee_num")
+	@ApiOperation("增加围观人数")
+	@PostMapping("/add_circusee_num")
 	public String add_circusee_num(String kid) {
 		System.out.println(kid);
 		pmItemService.add_circusee_num(kid);// 增加围观次数
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/check_item_status")
+	@PostMapping("/check_item_status")
 	public String check_item_status(String pm_item_id, BigDecimal price, String live_room_id, long chat_time) {
 
 		t_pm_item_submit_offer pm_item_submit_offer = pmItemService.get_newbigdecimal(pm_item_id);

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxPmController.java

@@ -9,10 +9,14 @@ import java.util.List;
 import java.util.Map;
 
 import com.ydw.yunbuyer.common.base.enums.TimeEnum;
+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.util.StringUtils;
+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.utils.ChkUtil;
@@ -59,6 +63,7 @@ import com.ydw.yunbuyer.web.pm.web.WebTools;
  * @author 吴思凡
  *
  */
+@Api(tags = "WxPmController")
 @RestController
 @Scope("prototype")
 @RequestMapping("/wx/pm")
@@ -108,7 +113,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param mobile
 	 * @return
 	 */
-	@RequestMapping(value = "/send_mobile_wx")
+	@ApiOperation("发送短信")
+	@PostMapping(value = "/send_mobile_wx")
 	public String send_mobile_wx(String mobile) {
 		if (persionApi.check_mobile(mobile)) {
 			String random = ((int) ((Math.random() * 9 + 1) * 1000)) + "";
@@ -132,7 +138,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param code
 	 * @return
 	 */
-	@RequestMapping(value = "/check_mobile_and_code_wx")
+	@ApiOperation("检测手机号")
+	@PostMapping(value = "/check_mobile_and_code_wx")
 	public String check_mobile_and_code_wx(String mobile, String code) {
 		Object m = WebTools.getSession().getAttribute(mobile);
 		if (ChkTools.isNull(m)) {
@@ -156,7 +163,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping(value = "/list_item_classify")
+	@ApiOperation("查询分类")
+	@GetMapping(value = "/list_item_classify")
 	public String list_item_classify() {
 		List<Map<String, Object>> list = pmItemService.list_item_classify();
 		LinkedList<Map<String, Object>> list1 = new LinkedList<Map<String, Object>>();
@@ -194,7 +202,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param userinfo
 	 * @return
 	 */
-	@RequestMapping(value = "/update_userinfo")
+	@ApiOperation("更新用户信息")
+	@PostMapping(value = "/update_userinfo")
 	public String update_userinfo(String userinfo) {
 		JSONObject json1 = sessionWxService.getCurrentLoginPersion();
 		JSONObject json = JsonUtil.jsonStrToJsonObject(userinfo);
@@ -223,7 +232,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping(value = "/get_bidderinfo")
+	@ApiOperation("获取我的中拍信息")
+	@GetMapping(value = "/get_bidderinfo")
 	public String get_bidderinfo() {
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
 		String persion_id = json.getString("kid");
@@ -246,7 +256,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param item_kid
 	 * @return
 	 */
-	@RequestMapping("/apply")
+	@ApiOperation("去支付保证金")
+	@PostMapping("/apply")
 	public String apply(String item_kid) {
 
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
@@ -266,7 +277,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param item_kid
 	 * @return
 	 */
-	@RequestMapping("/payment")
+	@ApiOperation("去支付成交价")
+	@PostMapping("/payment")
 	public String payment(String item_kid, String address_id, String message, BigDecimal red_pack_balance) {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String persion_kid = persion.getString("kid");
@@ -288,7 +300,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/list_item")
+	@ApiOperation("查询全部已开拍和未开拍的")
+	@GetMapping("/list_item")
 	public String list_item() {
 		List<Map<String, Object>> list = ChkTools.getFileId(pmItemService.list_all_open());
 		if (list.size() > 0) {
@@ -313,7 +326,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param kid
 	 * @return
 	 */
-	@RequestMapping("/add_circusee_num")
+	@ApiOperation("增加围观人数")
+	@PostMapping("/add_circusee_num")
 	public String add_circusee_num(String kid) {
 		pmItemService.add_circusee_num(kid);// 增加围观次数
 		return result.toJSONString();
@@ -325,7 +339,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param kid
 	 * @return
 	 */
-	@RequestMapping("/select_list")
+	@ApiOperation("详情页")
+	@PostMapping("/select_list")
 	public String select_list(String kid) {
 		if (ChkUtil.isNull(kid)) {
 			super.setTipMsg(false, "商品不存在", Tip.Type.error);
@@ -398,7 +413,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param price_bidder
 	 * @return
 	 */
-	@RequestMapping("/compete_price")
+	@ApiOperation("竞价")
+	@PostMapping("/compete_price")
 	public String compete_price(String pm_item_id, BigDecimal price_bidder) {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String pm_user_id = persion.getString("kid");
@@ -457,7 +473,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/wait_pay_money")
+	@ApiOperation("待付款")
+	@GetMapping("/wait_pay_money")
 	public String wait_pay_money() {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String persion_id = persion.getString("kid");
@@ -476,7 +493,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/wait_receive")
+	@ApiOperation("待收货")
+	@GetMapping("/wait_receive")
 	public String wait_receive() {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String persion_id = persion.getString("kid");
@@ -496,7 +514,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/update_address")
+	@ApiOperation("修改地址")
+	@GetMapping("/update_address")
 	public String update_address() {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String persion_id = persion.getString("kid");
@@ -515,7 +534,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/verify_receive")
+	@ApiOperation("确认收货")
+	@PostMapping("/verify_receive")
 	public String verify_receive(String item_kid) {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String persion_id = persion.getString("kid");
@@ -529,7 +549,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/get_bidding")
+	@ApiOperation("获取我正在拍的")
+	@GetMapping("/get_bidding")
 	public String get_bidding() {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String persion_id = persion.getString("kid");
@@ -558,7 +579,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/wait_deliver")
+	@ApiOperation("等待发货的列表")
+	@GetMapping("/wait_deliver")
 	public String wait_deliver() {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String persion_id = persion.getString("kid");
@@ -578,7 +600,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param item_kid
 	 * @return
 	 */
-	@RequestMapping("/logistics_detail")
+	@ApiOperation("物流详情")
+	@PostMapping("/logistics_detail")
 	public String logistics_detail(String item_kid) {
 
 		t_pm_item_submit pm_item_submit = pmItemService.logistics_detail(item_kid);
@@ -597,7 +620,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/list_live_item")
+	@ApiOperation("买家查看的直播间列表")
+	@GetMapping("/list_live_item")
 	public String list_live_item() {
 		/*
 		 * String url =
@@ -627,7 +651,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param live_room_id
 	 * @return
 	 */
-	@RequestMapping("/live_item_detail")
+	@ApiOperation("进入直播间详情页面 返回直播间信息和直播间下的所有标的物信息、已开拍的标的物信息 买家报名信息，出价次数")
+	@PostMapping("/live_item_detail")
 	public String live_item_lsit(String live_room_id) {
 		List<Map<String, Object>> list = ChkTools.getFileId(pmItemService.live_detail(live_room_id));
 
@@ -651,7 +676,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @throws IOException
 	 * @throws ClientProtocolException
 	 */
-	@RequestMapping("/deliver")
+	@ApiOperation("发货")
+	@PostMapping("/deliver")
 	public String deliver(String item_kid, String type_code, long logistics_number, String expressage)
 			throws ClientProtocolException, IOException {
 		pmProjectItemService.deliver(item_kid, type_code, logistics_number, expressage);
@@ -691,7 +717,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/list_express")
+	@ApiOperation("查询所有快递")
+	@PostMapping("/list_express")
 	public String list_express(String pm_item_id) {
 		List<Map<String, Object>> list = wxPmService.list_express();
 		t_pm_item_submit pm_item_submit = wxPmService.get_address(pm_item_id);
@@ -704,7 +731,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 准备付款 跳到订单页面
 	 * 
 	 */
-	@RequestMapping("/prepare_payment")
+	@ApiOperation("准备付款 跳到订单页面")
+	@PostMapping("/prepare_payment")
 	public String prepare_payment(String kid) {
 
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
@@ -744,7 +772,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param item_kid
 	 * @return
 	 */
-	@RequestMapping("/get_bid_man")
+	@ApiOperation("获取标的物下的中拍人")
+	@PostMapping("/get_bid_man")
 	public String get_bid_man(String item_kid) {
 
 		t_pm_item pm_item = wxPmService.get_bid_man(item_kid);
@@ -762,7 +791,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/list_refund")
+	@ApiOperation("保证金退还列表")
+	@GetMapping("/list_refund")
 	public String list_refund() {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String persion_id = persion.getString("kid");
@@ -799,7 +829,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param persion_id
 	 * @return
 	 */
-	@RequestMapping("/initiate_refund")
+	@ApiOperation("发起退款")
+	@PostMapping("/initiate_refund")
 	public String initiate_refund(String item_kid) {
 
 		return result.toJSONString();
@@ -814,7 +845,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param chat_time
 	 * @return
 	 */
-	@RequestMapping("/check_item_status")
+	@ApiOperation("查询拍品状态")
+	@PostMapping("/check_item_status")
 	public String check_item_status(String pm_item_id, BigDecimal price, String live_room_id, long chat_time) {
 		List<Map<String, Object>> l1 = pmItemService.select_submit_count(pm_item_id);
 		t_pm_item_submit_offer pm_item_submit_offer = pmItemService.get_newbigdecimal(pm_item_id);
@@ -856,7 +888,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param chat_time
 	 * @return
 	 */
-	@RequestMapping("/check_live_item_status")
+	@ApiOperation("查询直播拍品状态")
+	@PostMapping("/check_live_item_status")
 	public String check_live_item_status(String pm_item_id, BigDecimal price, String live_room_id, long chat_time) {
 
 		t_pm_item_submit_offer pm_item_submit_offer = pmItemService.get_newbigdecimal(pm_item_id);
@@ -906,7 +939,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param feedback_message
 	 * @return
 	 */
-	@RequestMapping("/add_feedback_message")
+	@ApiOperation("提交意见")
+	@PostMapping("/add_feedback_message")
 	public String add_feedback_message(String feedback_message) {
 		try {
 			SensitiveWord sw = new SensitiveWord("src/main/java/CensorWords");
@@ -929,7 +963,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param bid_from
 	 * @return
 	 */
-	@RequestMapping("/select_item_by_chassify")
+	@ApiOperation("根据分类查询拍品")
+	@PostMapping("/select_item_by_chassify")
 	public String select_item_by_chassify(String bid_type, String bid_from) {
 		System.out.println("bid_type:" + bid_type);
 		System.out.println("bid_from:" + bid_from);
@@ -943,7 +978,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/list_slideshow")
+	@ApiOperation("轮播图")
+	@GetMapping("/list_slideshow")
 	public String list_slideshow() {
 		List<Map<String, Object>> list = slideShowService.list_slideshow();
 		result.put("data", list);
@@ -957,7 +993,8 @@ public class WxPmController extends ProjBaseAction {
 	 * @param form_id
 	 * @return
 	 */
-	@RequestMapping("/add_collect")
+	@ApiOperation("设置收藏")
+	@PostMapping("/add_collect")
 	public String add_collect(String pm_item_id, String form_id) {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String pm_user_id = persion.getString("kid");
@@ -977,7 +1014,7 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/select_pay_record_by_persion")
+	@GetMapping("/select_pay_record_by_persion")
 	public String get_pay_record() {
 		// JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		// String pm_user_id = persion.getString("kid");
@@ -989,7 +1026,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/select_count")
+	@ApiOperation("查询消息数量")
+	@GetMapping("/select_count")
 	public String select_count() {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String persion_id = persion.getString("kid");
@@ -1007,7 +1045,8 @@ public class WxPmController extends ProjBaseAction {
 	 * 
 	 * @return
 	 */
-	@RequestMapping("/select_bidding_record")
+	@ApiOperation("查询中拍记录")
+	@GetMapping("/select_bidding_record")
 	public String select_bidding_record() {
 		JSONObject persion = sessionWxService.getCurrentLoginPersion();
 		String pm_user_id = persion.getString("kid");

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxRedPackController.java

@@ -4,8 +4,11 @@ import java.math.BigDecimal;
 import java.util.List;
 import java.util.Map;
 
+import io.swagger.annotations.Api;
 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.utils.DateTools;
@@ -25,6 +28,7 @@ import com.ydw.yunbuyer.web.pm.web.SessionWxService;
  * @author 吴思凡
  *
  */
+@Api(tags = "红包")
 @RestController
 @Scope("prototype")
 @RequestMapping("/wx/pm")
@@ -42,7 +46,7 @@ public class WxRedPackController extends ProjBaseAction {
 	@Autowired
 	private SessionWxService sessionWxService;
 
-	@RequestMapping(value = "/get_balance")
+	@GetMapping(value = "/get_balance")
 	public String get_balance() {
 		JSONObject json1 = sessionWxService.getCurrentLoginPersion();
 		String persion_id = json1.getString("kid");
@@ -51,7 +55,7 @@ public class WxRedPackController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping(value = "/list_redpack")
+	@GetMapping(value = "/list_redpack")
 	public String list_redback() {
 
 		JSONObject json1 = sessionWxService.getCurrentLoginPersion();
@@ -73,7 +77,7 @@ public class WxRedPackController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping(value = "/add_redpack")
+	@PostMapping(value = "/add_redpack")
 	public String add_redback(String persion_id) {
 		RedPack red_pack = new RedPack();
 		red_pack.setBalance(new BigDecimal(1));

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxShopController.java

@@ -2,8 +2,12 @@ package com.ydw.yunbuyer.web.pm.controller_wxapp;
 
 import java.util.List;
 import java.util.Map;
+
+import io.swagger.annotations.Api;
 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.utils.ChkUtil;
@@ -23,6 +27,7 @@ import com.ydw.yunbuyer.web.pm.web.SessionWxService;
  * @author 吴思凡
  *
  */
+@Api(tags = "店铺")
 @RestController
 @Scope("prototype")
 @RequestMapping("/wx/pm")
@@ -40,14 +45,14 @@ public class WxShopController extends ProjBaseAction {
 	@Autowired
 	private WxPmService wxPmService;
 
-	@RequestMapping("list_bank")
+	@GetMapping("list_bank")
 	public String list_bank() {
 		List<Map<String, Object>> list = wxPmService.list_bank();
 		result.put("data", list);
 		return result.toJSONString();
 	}
 
-	@RequestMapping(value = "/get_shop_info")
+	@GetMapping(value = "/get_shop_info")
 	public String get_shop_info() {
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
 		String persion_id = json.getString("kid");
@@ -69,7 +74,7 @@ public class WxShopController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping(value = "/new_register_shop")
+	@PostMapping(value = "/new_register_shop")
 	public String new_register_shop(t_shop shop) {
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
 		String persion_id = json.getString("kid");

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxSubmitController.java

@@ -1,8 +1,10 @@
 package com.ydw.yunbuyer.web.pm.controller_wxapp;
 
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
 import org.springframework.util.StringUtils;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -21,6 +23,7 @@ import com.ydw.yunbuyer.web.pm.web.SessionWxService;
  * @author 吴思凡
  *
  */
+@Api(tags = "店铺")
 @RestController
 @Scope("prototype")
 @RequestMapping("/wx/submit")
@@ -32,7 +35,7 @@ public class WxSubmitController extends ProjBaseAction {
 	@Autowired
 	private WxSubmitService wxSubmitService;
 
-	@RequestMapping(value = "/offline_apply")
+	@PostMapping(value = "/offline_apply")
 	public String offline_apply(t_pm_offline_apply pm_offline_apply) {
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
 		String persion_id = json.getString("kid");

krock-pm/krock-web-pm/src/main/java/com/ydw/yunbuyer/web/pm/controller_wxapp/WxchatController.java

@@ -3,8 +3,10 @@ package com.ydw.yunbuyer.web.pm.controller_wxapp;
 import java.util.List;
 import java.util.Map;
 
+import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Scope;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -22,6 +24,7 @@ import com.ydw.yunbuyer.web.pm.web.SessionWxService;
  * @author 吴思凡
  *
  */
+@Api(tags = "直播间聊天信息")
 @RestController
 @Scope("prototype")
 @RequestMapping("/wx/pm")
@@ -39,7 +42,7 @@ public class WxchatController extends ProjBaseAction {
 	@Autowired
 	private PersionApi persionApi;
 
-	@RequestMapping("/get_chatting_records")
+	@PostMapping("/get_chatting_records")
 	public String get_chatting_records(String live_room_id, long chat_time) {
 		List<Map<String, Object>> list = pmItemService.get_chatting_records(live_room_id, chat_time);
 		for (Map<String, Object> map : list) {
@@ -52,7 +55,7 @@ public class WxchatController extends ProjBaseAction {
 		return result.toJSONString();
 	}
 
-	@RequestMapping("/add_chitchat")
+	@PostMapping("/add_chitchat")
 	public String add_chitchat(String content, String liveroom_id) {
 		JSONObject json = sessionWxService.getCurrentLoginPersion();
 		String persion_id = json.getString("kid");