Merge branch 'master' of https://gitee.com/novel_dev_team/novel-cloud

novel-book/book-service/src/main/java/com/java2nb/novel/book/controller/BookController.java

@@ -1,9 +1,6 @@
 package com.java2nb.novel.book.controller;
 
-import com.java2nb.novel.book.entity.Book;
+import com.java2nb.novel.book.entity.*;
-import com.java2nb.novel.book.entity.BookCategory;
-import com.java2nb.novel.book.entity.BookContent;
-import com.java2nb.novel.book.entity.BookIndex;
 import com.java2nb.novel.book.service.BookService;
 import com.java2nb.novel.book.vo.BookCommentVO;
 import com.java2nb.novel.common.bean.PageBean;
@@ -106,7 +103,7 @@ public class BookController {
      * */
     @ApiOperation("书籍评论列表分页查询接口")
     @GetMapping("listCommentByPage")
-    public ResultBean<List<BookCommentVO>> listCommentByPage(@ApiParam("小说ID") @RequestParam("bookId") Long bookId, @ApiParam("当前页码") @RequestParam(value = "curr", defaultValue = "1") int page, @ApiParam("分页大小") @RequestParam(value = "limit", defaultValue = "5") int pageSize) {
+    public ResultBean<PageBean<BookComment>> listCommentByPage(@ApiParam("小说ID") @RequestParam("bookId") Long bookId, @ApiParam("当前页码") @RequestParam(value = "curr", defaultValue = "1") int page, @ApiParam("分页大小") @RequestParam(value = "limit", defaultValue = "5") int pageSize) {
         return ResultBean.ok(bookService.listBookCommentByPage(bookId,page,pageSize));
     }
 

novel-common/src/main/java/com/java2nb/novel/common/bean/ResultBean.java

@@ -47,30 +47,30 @@ public class ResultBean<T>{
     /**
      * 业务处理成功,无数据返回
      * */
-    public static ResultBean ok() {
+    public static ResultBean<Void> ok() {
-        return new ResultBean();
+        return new ResultBean<>();
     }
 
     /**
      * 业务处理成功，有数据返回
      * */
-    public static <T> ResultBean ok(T data) {
+    public static <T> ResultBean<T> ok(T data) {
-        return new ResultBean(data);
+        return new ResultBean<>(data);
     }
 
     /**
      * 业务处理失败
      * */
-    public static ResultBean fail(ResponseStatus ResponseStatus) {
+    public static ResultBean<Void> fail(ResponseStatus ResponseStatus) {
-        return new ResultBean(ResponseStatus);
+        return new ResultBean<>(ResponseStatus);
     }
 
 
     /**
      * 系统错误
      * */
-    public static ResultBean error() {
+    public static ResultBean<Void> error() {
-        return new ResultBean(ResponseStatus.ERROR);
+        return new ResultBean<>(ResponseStatus.ERROR);
     }
 }
 

novel-common/src/main/java/com/java2nb/novel/common/utils/BeanUtil.java

@@ -21,7 +21,7 @@ public class BeanUtil {
      * @return 新集合
      * */
     @SneakyThrows
-    public static <T> List<T> copyList(List source,Class<T> targetClass){
+    public static <T> List<T> copyList(List<? super T> source,Class<T> targetClass){
         List<T> target = new ArrayList<>(source.size());
         for( int i = 0 ; i < source.size() ; i++){
             Object sourceItem = source.get(i);

novel-news/news-service/src/main/java/com/java2nb/novel/news/controller/NewsController.java

@@ -1,6 +1,7 @@
 package com.java2nb.novel.news.controller;
 
 import com.github.pagehelper.PageInfo;
+import com.java2nb.novel.common.bean.PageBean;
 import com.java2nb.novel.common.bean.ResultBean;
 import com.java2nb.novel.news.entity.News;
 import com.java2nb.novel.news.service.NewsService;
@@ -37,8 +38,8 @@ public class NewsController {
      * */
     @ApiOperation("分页查询新闻列表接口")
     @GetMapping("listByPage")
-    public ResultBean<List<NewsVO>> listByPage(@ApiParam("当前页码") @RequestParam(value = "curr", defaultValue = "1") int page, @ApiParam("每页大小") @RequestParam(value = "limit", defaultValue = "5") int pageSize){
+    public ResultBean<PageBean<News>> listByPage(@ApiParam("当前页码") @RequestParam(value = "curr", defaultValue = "1") int page, @ApiParam("每页大小") @RequestParam(value = "limit", defaultValue = "5") int pageSize){
-        return ResultBean.ok(new PageInfo<>(newsService.listByPage(page,pageSize)));
+        return ResultBean.ok(newsService.listByPage(page,pageSize));
     }
 
     /**

novel-news/news-service/src/main/java/com/java2nb/novel/news/service/NewsService.java

@@ -1,6 +1,7 @@
 package com.java2nb.novel.news.service;
 
 
+import com.java2nb.novel.common.bean.PageBean;
 import com.java2nb.novel.news.entity.News;
 import com.java2nb.novel.news.vo.NewsVO;
 
@@ -20,7 +21,7 @@ public interface NewsService {
      * @param pageSize 分页大小
      * @return 新闻列表集合
      * */
-    List<NewsVO> listByPage(int page, int pageSize);
+    PageBean<News> listByPage(int page, int pageSize);
 
     /**
      * 查询最新新闻集合

novel-news/news-service/src/main/java/com/java2nb/novel/news/service/impl/NewsServiceImpl.java

@@ -1,6 +1,7 @@
 package com.java2nb.novel.news.service.impl;
 
 import com.github.pagehelper.PageHelper;
+import com.java2nb.novel.common.bean.PageBean;
 import com.java2nb.novel.common.utils.BeanUtil;
 import com.java2nb.novel.news.entity.News;
 import com.java2nb.novel.news.mapper.NewsDynamicSqlSupport;
@@ -32,7 +33,7 @@ public class NewsServiceImpl implements NewsService {
 
 
     @Override
-    public List<NewsVO> listByPage(int page, int pageSize) {
+    public PageBean<News> listByPage(int page, int pageSize) {
         PageHelper.startPage(page,pageSize);
         SelectStatementProvider selectStatement =
                 select(NewsDynamicSqlSupport.id, NewsDynamicSqlSupport.catName,
@@ -42,7 +43,11 @@ public class NewsServiceImpl implements NewsService {
                 .build()
                 .render(RenderingStrategies.MYBATIS3);
 
-        return BeanUtil.copyList(newsMapper.selectMany(selectStatement), NewsVO.class);
+        List<News> news = newsMapper.selectMany(selectStatement);
+
+        PageBean<News> pageBean = new PageBean<>(news);
+        pageBean.setList(BeanUtil.copyList(newsMapper.selectMany(selectStatement), NewsVO.class));
+        return pageBean;
     }
 
     @Override

novel-user/user-service/src/main/java/com/java2nb/novel/user/controller/UserController.java

@@ -2,7 +2,6 @@ package com.java2nb.novel.user.controller;
 
 import com.java2nb.novel.book.entity.BookComment;
 import com.java2nb.novel.common.base.BaseController;
-import com.java2nb.novel.common.bean.PageBean;
 import com.java2nb.novel.common.bean.ResultBean;
 import com.java2nb.novel.common.bean.UserDetails;
 import com.java2nb.novel.common.cache.CacheService;
@@ -11,11 +10,8 @@ import com.java2nb.novel.common.utils.RandomValidateCodeUtil;
 import com.java2nb.novel.common.valid.AddGroup;
 import com.java2nb.novel.common.valid.UpdateGroup;
 import com.java2nb.novel.user.entity.User;
-import com.java2nb.novel.user.entity.UserFeedback;
 import com.java2nb.novel.user.feign.BookFeignClient;
 import com.java2nb.novel.user.service.UserService;
-import com.java2nb.novel.user.vo.BookReadHistoryVO;
-import com.java2nb.novel.user.vo.BookShelfVO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
@@ -53,7 +49,7 @@ public class UserController extends BaseController {
      */
     @ApiOperation("用户登陆接口")
     @GetMapping("login")
-    public ResultBean login(User user) {
+    public ResultBean<Map<String, Object>> login(User user) {
         //登陆
         UserDetails userDetails = userService.login(user);
 
@@ -70,7 +66,7 @@ public class UserController extends BaseController {
      */
     @ApiOperation("用户注册接口")
     @PostMapping("register")
-    public ResultBean register(@Validated({AddGroup.class}) User user, @RequestParam(value = "velCode", defaultValue = "") String velCode) {
+    public ResultBean<?> register(@Validated({AddGroup.class}) User user, @RequestParam(value = "velCode", defaultValue = "") String velCode) {
 
 
         //判断验证码是否正确
@@ -93,7 +89,7 @@ public class UserController extends BaseController {
      */
     @ApiOperation("token刷新接口")
     @PostMapping("refreshToken")
-    public ResultBean<Map<String, Object>> refreshToken(HttpServletRequest request) {
+    public ResultBean<?> refreshToken(HttpServletRequest request) {
         String token = getToken(request);
         if (jwtTokenUtil.canRefresh(token)) {
             token = jwtTokenUtil.refreshToken(token);
@@ -115,7 +111,7 @@ public class UserController extends BaseController {
      */
     @ApiOperation("小说加入书架状态查询接口")
     @GetMapping("queryIsInShelf")
-    public ResultBean queryIsInShelf(Long bookId, HttpServletRequest request) {
+    public ResultBean<?> queryIsInShelf(Long bookId, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -128,7 +124,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("小说加入书架接口")
     @PostMapping("addToBookShelf")
-    public ResultBean addToBookShelf(Long bookId,Long preContentId, HttpServletRequest request) {
+    public ResultBean<?> addToBookShelf(Long bookId,Long preContentId, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -142,7 +138,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("小说移出书架接口")
     @DeleteMapping("removeFromBookShelf")
-    public ResultBean removeFromBookShelf(Long bookId, HttpServletRequest request) {
+    public ResultBean<?> removeFromBookShelf(Long bookId, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -156,7 +152,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("书架列表分页查询接口")
     @GetMapping("listBookShelfByPage")
-    public ResultBean<PageBean<BookShelfVO>> listBookShelfByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize, HttpServletRequest request) {
+    public ResultBean<?> listBookShelfByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -169,7 +165,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("阅读记录分页查询接口")
     @GetMapping("listReadHistoryByPage")
-    public ResultBean<PageBean<BookReadHistoryVO>> listReadHistoryByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize, HttpServletRequest request) {
+    public ResultBean<?> listReadHistoryByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "10") int pageSize, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -182,7 +178,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("阅读记录添加接口")
     @PostMapping("addReadHistory")
-    public ResultBean addReadHistory(Long bookId,Long preContentId, HttpServletRequest request) {
+    public ResultBean<?> addReadHistory(Long bookId,Long preContentId, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -196,7 +192,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("反馈添加接口")
     @PostMapping("addFeedBack")
-    public ResultBean addFeedBack(String content, HttpServletRequest request) {
+    public ResultBean<?> addFeedBack(String content, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -210,7 +206,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("反馈列表分页查询接口")
     @GetMapping("listUserFeedBackByPage")
-    public ResultBean<PageBean<UserFeedback>> listUserFeedBackByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize, HttpServletRequest request){
+    public ResultBean<?> listUserFeedBackByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize, HttpServletRequest request){
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -224,7 +220,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("人信息查询接口")
     @GetMapping("userInfo")
-    public ResultBean<User> userInfo(HttpServletRequest request) {
+    public ResultBean<?> userInfo(HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -238,7 +234,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("人信息更新接口")
     @PostMapping("updateUserInfo")
-    public ResultBean updateUserInfo(@Validated({UpdateGroup.class}) User user, HttpServletRequest request) {
+    public ResultBean<?> updateUserInfo(@Validated({UpdateGroup.class}) User user, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -258,7 +254,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("更新密码接口")
     @PostMapping("updatePassword")
-    public ResultBean updatePassword(String oldPassword,String newPassword1,String newPassword2,HttpServletRequest request) {
+    public ResultBean<?> updatePassword(String oldPassword,String newPassword1,String newPassword2,HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -275,7 +271,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("发布评价接口")
     @PostMapping("addBookComment")
-    public ResultBean addBookComment(BookComment comment, HttpServletRequest request) {
+    public ResultBean<?> addBookComment(BookComment comment, HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);
@@ -289,7 +285,7 @@ public class UserController extends BaseController {
      * */
     @ApiOperation("用户书评分页查询接口")
     @GetMapping("listCommentByPage")
-    public ResultBean<PageBean<BookComment>> listCommentByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,HttpServletRequest request) {
+    public ResultBean<?> listCommentByPage(@RequestParam(value = "curr", defaultValue = "1") int page, @RequestParam(value = "limit", defaultValue = "5") int pageSize,HttpServletRequest request) {
         UserDetails userDetails = getUserDetails(request);
         if (userDetails == null) {
             return ResultBean.fail(ResponseStatus.NO_LOGIN);

novel-user/user-service/src/main/java/com/java2nb/novel/user/service/impl/UserServiceImpl.java

@@ -224,7 +224,7 @@ public class UserServiceImpl implements UserService {
                 resultList.add(readHistoryVO);
             }
         });
-        PageBean<UserReadHistory> pageBean = new PageBean(userReadHistories);
+        PageBean<UserReadHistory> pageBean = new PageBean<>(userReadHistories);
         pageBean.setList(resultList);
         return pageBean;
     }