完善阅读接口

更新 springboot 版本，解决 静态资源访问 问题

book-dao/src/main/java/com/book/dao/VO/BookContentVO.java

@@ -6,6 +6,6 @@ import lombok.Data;
 public class BookContentVO {
     Long userId;
     Long bookId;
-    Integer contentId;
+    Long contentId;
     String contentName;
 }

book-server/pom.xml

@@ -62,10 +62,6 @@
             <artifactId>spring-boot-starter-log4j2</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-cache</artifactId>
-        </dependency>
         <!--异步日志依赖-->
         <dependency>
             <groupId>com.lmax</groupId>

book-server/src/main/java/com/book/server/controller/BookController.java

@@ -18,6 +18,7 @@ import java.util.List;
  * 书籍
  */
 @RestController
+@CrossOrigin
 @RequestMapping("/api/book")
 @Slf4j
 public class BookController extends BaseController {

book-server/src/main/java/com/book/server/controller/UserController.java

@@ -4,6 +4,7 @@ import com.book.dao.cps.pojo.User;
 import com.book.server.common.entity.Result;
 import com.book.server.service.UserService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
@@ -11,6 +12,7 @@ import org.springframework.web.bind.annotation.RestController;
 /**
  * 用户
  */
+@CrossOrigin
 @RestController
 @RequestMapping("/api/user")
 public class UserController extends BaseController {

book-server/src/main/java/com/book/server/filter/CorsFilter.java

@@ -1,19 +0,0 @@
-package com.book.server.filter;
-
-import org.springframework.stereotype.Component;
-import org.springframework.web.servlet.config.annotation.CorsRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
-
-@Component
-public class CorsFilter extends WebMvcConfigurationSupport {
-    @Override
-    protected void addCorsMappings(CorsRegistry registry) {
-        System.out.println(123456);
-        registry.addMapping("/**").
-                allowCredentials(true)
-                .allowedHeaders("*")
-                .allowedMethods("*")
-                .allowedOrigins("*");
-        super.addCorsMappings(registry);
-    }
-}

book-server/src/main/java/com/book/server/service/impl/BookServiceImpl.java

@@ -309,8 +309,9 @@ public class BookServiceImpl implements BookService {
         if (bookContentVO.getContentId() > freeChapterNum) { //收费
             //是否已购买
             Consume consume = consumeMapper.selectOneByExample(ConsumeExample.newAndCreateCriteria()
-                    .andBookIdEqualTo(bookContentVO.getBookId())
                     .andUserIdEqualTo(bookContentVO.getUserId())
+                    .andBookIdEqualTo(bookContentVO.getBookId())
+                    .andChapterIdEqualTo(bookContentVO.getContentId())
                     .example()
             );
             if (consume == null) { // 没有购买记录
@@ -387,7 +388,7 @@ public class BookServiceImpl implements BookService {
                 int i = userRecentlyReadMapper.insert(UserRecentlyRead.builder()
                         .userId(bookContentVO.getUserId())
                         .bookId(book.getId())
-                        .chapterId(Long.valueOf(bookContentVO.getContentId()))
+                        .chapterId(bookContentVO.getContentId())
                         .chapterName(bookContentVO.getContentName())
                         .createtime(DateUtils.getNow())
                         .updatetime(DateUtils.getNow())
@@ -396,7 +397,7 @@ public class BookServiceImpl implements BookService {
                         .build());
                 //checkUpdate(i);
             } else {
-                userRecentlyRead.setChapterId(Long.valueOf(bookContentVO.getContentId()));
+                userRecentlyRead.setChapterId(bookContentVO.getContentId());
                 userRecentlyRead.setChapterName(bookContentVO.getContentName());
                 userRecentlyRead.setUpdatetime(DateUtils.getNow());
                 int i = userRecentlyReadMapper.updateByPrimaryKeySelective(userRecentlyRead,
@@ -432,7 +433,7 @@ public class BookServiceImpl implements BookService {
                 .type("1") // 订购章节
                 .bookId(book.getId())
                 .bookName(book.getName())
-                .chapterId(Long.valueOf(bookContentVO.getContentId()))
+                .chapterId(bookContentVO.getContentId())
                 .chapterName(bookContentVO.getContentName())
                 .ddKandian(kandian)
                 .ddFreeKandian(freeKandian)
@@ -486,7 +487,7 @@ public class BookServiceImpl implements BookService {
      */
     private BookContent getBookContentFromRemote(BookContentVO bookContentVO) {
         Long bookId = bookContentVO.getBookId();
-        Integer contentId = bookContentVO.getContentId();
+        Long contentId = bookContentVO.getContentId();
         String contentUrl = "http://new.emeixs.com/index.php/Home/Interface/content/bid/%s/cid/%s";
         if (bookId == null || contentId == null) {
             return null;

book-server/src/main/resources/static/index.html

@@ -1,10 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-test
-</body>
-</html>

pom.xml

@@ -23,7 +23,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.1.5.RELEASE</version>
+        <version>2.1.17.RELEASE</version>
         <relativePath/>
     </parent>
     <build>
@@ -42,9 +42,6 @@
     <!--锁定springCloud版本-->
     <dependencyManagement>
         <dependencies>
-
-
-
             <dependency>
                 <groupId>org.springframework.cloud</groupId>
                 <artifactId>spring-cloud-dependencies</artifactId>