diff --git a/community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeQo.java b/community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeQo.java index b038fb5bc8f1d2b7beec16bc6109c603c83d62ad..a8031f3f5e8a19bc09ceaf8eb7fdca4f516e8789 100644 --- a/community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeQo.java +++ b/community-api/src/main/java/com/tanpu/community/api/beans/qo/ThemeQo.java @@ -27,9 +27,6 @@ public class ThemeQo { @ApiModelProperty(value = "内容") private List<ThemeContentQo> content; - - - @ApiModelProperty(value = "作者id") private String authorId; diff --git a/community-api/src/main/java/com/tanpu/community/api/beans/req/topic/TopicSearchReq.java b/community-api/src/main/java/com/tanpu/community/api/beans/req/topic/TopicSearchReq.java index 8c1a2b7503e6d66d7f3811b2320c7fa86eea44b0..59709daa4c80f04e8b23eb061ff81b276170b809 100644 --- a/community-api/src/main/java/com/tanpu/community/api/beans/req/topic/TopicSearchReq.java +++ b/community-api/src/main/java/com/tanpu/community/api/beans/req/topic/TopicSearchReq.java @@ -7,8 +7,9 @@ import lombok.Data; @Data public class TopicSearchReq { - @ApiModelProperty(value = "æœç´¢å…³é”®å—") + @ApiModelProperty(value = "æœç´¢å…³é”®å—,å¯ä»¥ä¸ºç©º") private String searchKeyword; + @ApiModelProperty(value = "分页") private Pageable page; } diff --git a/community-service/src/main/java/com/tanpu/community/controller/AdminController.java b/community-service/src/main/java/com/tanpu/community/controller/AdminController.java index 11d4d4597ef042f84c1481fbd0037cf27563427f..abf7eebd9c6c1b99a0e1e0cfbc86edf3bde9cd69 100644 --- a/community-service/src/main/java/com/tanpu/community/controller/AdminController.java +++ b/community-service/src/main/java/com/tanpu/community/controller/AdminController.java @@ -37,7 +37,7 @@ public class AdminController { } @ApiOperation("å•个è¯é¢˜è¯¦ç»†æ•°æ®") - @PostMapping("/detailData") + @GetMapping("/detailData") @ResponseBody public CommonResp<TopicDO> selectOne(@RequestParam String topicId) throws MissingServletRequestParameterException { if (StringUtils.isEmpty(topicId)){ @@ -71,7 +71,7 @@ public class AdminController { return CommonResp.success(); } - @PostMapping(value = "/dataAnalyse") + @GetMapping(value = "/dataAnalyse") @ApiOperation("è¯é¢˜æ•°æ®åˆ†æž") @ResponseBody public CommonResp<TopicDataAnalysDTO> dataAnalyse(@RequestParam String topicId) throws MissingServletRequestParameterException { diff --git a/community-service/src/main/java/com/tanpu/community/controller/CommentController.java b/community-service/src/main/java/com/tanpu/community/controller/CommentController.java index bc084757b017b354c9e7dc3e185545cf5c9545be..4900c1989abf2c82946184f1f1818fda6409b4ce 100644 --- a/community-service/src/main/java/com/tanpu/community/controller/CommentController.java +++ b/community-service/src/main/java/com/tanpu/community/controller/CommentController.java @@ -30,7 +30,7 @@ public class CommentController { } @ApiOperation("查看评论") - @PostMapping(value = "/queryComment") + @GetMapping(value = "/queryComment") @ResponseBody public CommonResp<List<CommentQo>> queryComment(@RequestParam String themeId){ //todo @@ -40,7 +40,7 @@ public class CommentController { } @ApiOperation("点赞评论") - @PostMapping(value = "/likeComment") + @GetMapping(value = "/likeComment") @ResponseBody public CommonResp<Void> likeComment(@RequestParam String commentId){ //todo @@ -49,7 +49,7 @@ public class CommentController { } @ApiOperation("举报评论") - @PostMapping(value = "/reportComment") + @GetMapping(value = "/reportComment") @ResponseBody public CommonResp<Void> reportComment(@RequestParam String commentId){ //todo diff --git a/community-service/src/main/java/com/tanpu/community/controller/HomePageController.java b/community-service/src/main/java/com/tanpu/community/controller/HomePageController.java index 1874d42d9652e1de512c5a233d14ef6e83d0a94b..499f2d0fd214e313ac41a4b56511cf86c96efd4a 100644 --- a/community-service/src/main/java/com/tanpu/community/controller/HomePageController.java +++ b/community-service/src/main/java/com/tanpu/community/controller/HomePageController.java @@ -34,7 +34,7 @@ public class HomePageController { return CommonResp.success("修改æˆåŠŸ"); } - @GetMapping(value = "/queryMyFans") + @PostMapping(value = "/queryMyFans") @ApiOperation("查询关注/粉ä¸åˆ—表") @ResponseBody public CommonResp<Page<FollowQo>> queryMyFans(@RequestBody QueryFollowReq req) { diff --git a/community-service/src/main/java/com/tanpu/community/controller/ThemeController.java b/community-service/src/main/java/com/tanpu/community/controller/ThemeController.java index 20acdec51166abf73340b6429a62920f24a1ec68..1a5d8da655a4ff283c92f6029f71e1a15b26392f 100644 --- a/community-service/src/main/java/com/tanpu/community/controller/ThemeController.java +++ b/community-service/src/main/java/com/tanpu/community/controller/ThemeController.java @@ -2,14 +2,13 @@ package com.tanpu.community.controller; import com.tanpu.common.api.CommonResp; -import com.tanpu.community.api.beans.req.theme.ForwardThemeReq; import com.tanpu.community.api.beans.qo.MainTextQo; import com.tanpu.community.api.beans.qo.ThemeQo; import com.tanpu.community.api.beans.req.theme.CreateThemeReq; +import com.tanpu.community.api.beans.req.theme.ForwardThemeReq; import com.tanpu.community.api.beans.req.theme.ThemeListByTopicReq; import com.tanpu.community.api.beans.req.theme.ThemeListReq; import com.tanpu.community.manager.ThemeManager; -import com.tanpu.community.service.FollowRelService; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; @@ -26,8 +25,6 @@ public class ThemeController { @Autowired private ThemeManager themeManager; - @Autowired - private FollowRelService followRelService; @ApiOperation("å‘表主题") @PostMapping(value = "/publish") @@ -41,7 +38,7 @@ public class ThemeController { @ApiOperation("圈å首页-推è/关注") - @GetMapping(value = "/list") + @PostMapping(value = "/list") @ResponseBody public CommonResp<List<ThemeQo>> selectInterestList(@RequestBody ThemeListReq req) { String userId = "liujm"; @@ -52,7 +49,7 @@ public class ThemeController { @ApiOperation("è¯é¢˜è¯¦æƒ…页-最新/最çƒ") - @GetMapping(value = "/listByTopic") + @PostMapping(value = "/listByTopic") @ResponseBody public CommonResp<List<ThemeQo>> getThemeMainText(@RequestBody ThemeListByTopicReq req) { String userId = "liujm"; diff --git a/community-service/src/main/java/com/tanpu/community/controller/TopicController.java b/community-service/src/main/java/com/tanpu/community/controller/TopicController.java index 73cdd55b54422d8603d6ead223d6ae7ba95caa9d..df7f3a288faddd77f0c83b78b6e6dcbeecae25d3 100644 --- a/community-service/src/main/java/com/tanpu/community/controller/TopicController.java +++ b/community-service/src/main/java/com/tanpu/community/controller/TopicController.java @@ -27,7 +27,7 @@ public class TopicController { private UserHolder userHolder; - @GetMapping(value = "/list") + @PostMapping(value = "/list") @ApiOperation("APP全部è¯é¢˜é¡µé¢ï¼Œå¯æœç´¢") @ResponseBody public CommonResp<Page<TopicTitileQo>> getTopicBriefInfoList(TopicSearchReq req){