From 89f8550dff9cc35a57b1d0b6d416f95811deb6d5 Mon Sep 17 00:00:00 2001 From: ovo Date: Mon, 23 Dec 2024 17:07:44 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=9C=AC=E5=9C=B0=E7=BC=93=E5=AD=98):=20?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E6=9C=AC=E5=9C=B0=E7=BC=93=E5=AD=98=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1.项目第一次启动 查数据库 加入redis 加入本地缓存 2.第二次启动 查询redis 加入本地缓存 --- .../guwan/backend/aspect/OperationLogAspect.java | 2 +- .../controller/BookCategoryController.java | 2 +- .../guwan/backend/controller/BookController.java | 2 +- .../backend/controller/CommonController.java | 5 +---- .../backend/controller/ReadingNoteController.java | 2 +- .../controller/ReadingProgressController.java | 4 ++-- .../guwan/backend/controller/UserController.java | 3 +-- .../guwan/backend/mapper/BookCategoryMapper.java | 2 +- .../guwan/backend/mapper/BookContentMapper.java | 2 +- .../java/com/guwan/backend/mapper/BookMapper.java | 2 +- .../guwan/backend/mapper/ReadingNoteMapper.java | 2 +- .../backend/mapper/ReadingProgressMapper.java | 2 +- .../com/guwan/backend/mapper/SysLogMapper.java | 2 +- .../java/com/guwan/backend/mapper/UserMapper.java | 2 +- .../com/guwan/backend/mapper/VideoLikeMapper.java | 2 +- .../com/guwan/backend/mapper/VideoMapper.java | 2 +- .../backend/{ => pojo}/dto/ReadingStatistics.java | 2 +- .../{ => pojo}/dto/product/ProductDTO.java | 2 +- .../{ => pojo}/dto/user/ChangePasswordDTO.java | 2 +- .../backend/{ => pojo}/dto/user/EmailDto.java | 2 +- .../backend/{ => pojo}/dto/user/LoginDto.java | 2 +- .../backend/{ => pojo}/dto/user/PhoneDto.java | 2 +- .../backend/{ => pojo}/dto/user/RegisterDTO.java | 2 +- .../backend/{ => pojo}/dto/user/UserDTO.java | 2 +- .../backend/{ => pojo}/dto/video/VideoDTO.java | 2 +- .../com/guwan/backend/{ => pojo}/entity/Book.java | 2 +- .../backend/{ => pojo}/entity/BookCategory.java | 2 +- .../backend/{ => pojo}/entity/BookContent.java | 2 +- .../backend/{ => pojo}/entity/BookOfUser.java | 6 +++--- .../backend/{ => pojo}/entity/ReadingNote.java | 2 +- .../{ => pojo}/entity/ReadingProgress.java | 2 +- .../guwan/backend/{ => pojo}/entity/SysLog.java | 2 +- .../com/guwan/backend/{ => pojo}/entity/User.java | 2 +- .../guwan/backend/{ => pojo}/entity/UserRead.java | 2 +- .../guwan/backend/{ => pojo}/entity/Video.java | 2 +- .../backend/{ => pojo}/entity/VideoLike.java | 2 +- .../guwan/backend/{ => pojo}/enums/Evaluate.java | 2 +- .../backend/{ => pojo}/enums/ReadStatus.java | 2 +- .../guwan/backend/{ => pojo}/enums/UserEnums.java | 2 +- .../backend/security/UserDetailsServiceImpl.java | 2 +- .../backend/service/BookCategoryService.java | 2 +- .../guwan/backend/service/BookContentService.java | 2 +- .../com/guwan/backend/service/BookService.java | 2 +- .../backend/service/ProductSearchService.java | 2 +- .../guwan/backend/service/ReadingNoteService.java | 2 +- .../backend/service/ReadingProgressService.java | 4 ++-- .../com/guwan/backend/service/UserService.java | 8 ++++---- .../guwan/backend/service/VideoSearchService.java | 4 ++-- .../com/guwan/backend/service/VideoService.java | 2 +- .../service/impl/BookCategoryServiceImpl.java | 2 +- .../service/impl/BookContentServiceImpl.java | 2 +- .../backend/service/impl/BookServiceImpl.java | 6 ++---- .../service/impl/ReadingNoteServiceImpl.java | 2 +- .../service/impl/ReadingProgressServiceImpl.java | 4 ++-- .../backend/service/impl/UserServiceImpl.java | 15 ++++++--------- .../backend/service/impl/VideoServiceImpl.java | 6 +++--- .../com/guwan/backend/util/BookContentUtil.java | 2 +- src/main/resources/mapper/BookCategoryMapper.xml | 2 +- src/main/resources/mapper/SysLogMapper.xml | 2 +- .../guwan/backend/service/BookServiceTest.java | 2 +- 60 files changed, 77 insertions(+), 86 deletions(-) rename src/main/java/com/guwan/backend/{ => pojo}/dto/ReadingStatistics.java (92%) rename src/main/java/com/guwan/backend/{ => pojo}/dto/product/ProductDTO.java (93%) rename src/main/java/com/guwan/backend/{ => pojo}/dto/user/ChangePasswordDTO.java (88%) rename src/main/java/com/guwan/backend/{ => pojo}/dto/user/EmailDto.java (83%) rename src/main/java/com/guwan/backend/{ => pojo}/dto/user/LoginDto.java (91%) rename src/main/java/com/guwan/backend/{ => pojo}/dto/user/PhoneDto.java (85%) rename src/main/java/com/guwan/backend/{ => pojo}/dto/user/RegisterDTO.java (95%) rename src/main/java/com/guwan/backend/{ => pojo}/dto/user/UserDTO.java (94%) rename src/main/java/com/guwan/backend/{ => pojo}/dto/video/VideoDTO.java (96%) rename src/main/java/com/guwan/backend/{ => pojo}/entity/Book.java (95%) rename src/main/java/com/guwan/backend/{ => pojo}/entity/BookCategory.java (93%) rename src/main/java/com/guwan/backend/{ => pojo}/entity/BookContent.java (92%) rename src/main/java/com/guwan/backend/{ => pojo}/entity/BookOfUser.java (76%) rename src/main/java/com/guwan/backend/{ => pojo}/entity/ReadingNote.java (95%) rename src/main/java/com/guwan/backend/{ => pojo}/entity/ReadingProgress.java (95%) rename src/main/java/com/guwan/backend/{ => pojo}/entity/SysLog.java (94%) rename src/main/java/com/guwan/backend/{ => pojo}/entity/User.java (94%) rename src/main/java/com/guwan/backend/{ => pojo}/entity/UserRead.java (92%) rename src/main/java/com/guwan/backend/{ => pojo}/entity/Video.java (96%) rename src/main/java/com/guwan/backend/{ => pojo}/entity/VideoLike.java (89%) rename src/main/java/com/guwan/backend/{ => pojo}/enums/Evaluate.java (95%) rename src/main/java/com/guwan/backend/{ => pojo}/enums/ReadStatus.java (95%) rename src/main/java/com/guwan/backend/{ => pojo}/enums/UserEnums.java (93%) diff --git a/src/main/java/com/guwan/backend/aspect/OperationLogAspect.java b/src/main/java/com/guwan/backend/aspect/OperationLogAspect.java index 7eabe1b..c04b20d 100644 --- a/src/main/java/com/guwan/backend/aspect/OperationLogAspect.java +++ b/src/main/java/com/guwan/backend/aspect/OperationLogAspect.java @@ -2,7 +2,7 @@ package com.guwan.backend.aspect; import com.fasterxml.jackson.databind.ObjectMapper; import com.guwan.backend.annotation.OperationLog; -import com.guwan.backend.entity.SysLog; +import com.guwan.backend.pojo.entity.SysLog; import com.guwan.backend.mapper.SysLogMapper; import com.guwan.backend.security.CustomUserDetails; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/guwan/backend/controller/BookCategoryController.java b/src/main/java/com/guwan/backend/controller/BookCategoryController.java index 6700599..ee1bced 100644 --- a/src/main/java/com/guwan/backend/controller/BookCategoryController.java +++ b/src/main/java/com/guwan/backend/controller/BookCategoryController.java @@ -1,7 +1,7 @@ package com.guwan.backend.controller; import com.guwan.backend.common.Result; -import com.guwan.backend.entity.BookCategory; +import com.guwan.backend.pojo.entity.BookCategory; import com.guwan.backend.service.BookCategoryService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Page; diff --git a/src/main/java/com/guwan/backend/controller/BookController.java b/src/main/java/com/guwan/backend/controller/BookController.java index a3f3bff..44aadc5 100644 --- a/src/main/java/com/guwan/backend/controller/BookController.java +++ b/src/main/java/com/guwan/backend/controller/BookController.java @@ -2,7 +2,7 @@ package com.guwan.backend.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.guwan.backend.common.Result; -import com.guwan.backend.entity.Book; +import com.guwan.backend.pojo.entity.Book; import com.guwan.backend.service.BookService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; diff --git a/src/main/java/com/guwan/backend/controller/CommonController.java b/src/main/java/com/guwan/backend/controller/CommonController.java index 49970e5..8c5908a 100644 --- a/src/main/java/com/guwan/backend/controller/CommonController.java +++ b/src/main/java/com/guwan/backend/controller/CommonController.java @@ -1,16 +1,14 @@ package com.guwan.backend.controller; import com.guwan.backend.annotation.OperationLog; -import com.guwan.backend.common.BusinessException; import com.guwan.backend.common.Result; -import com.guwan.backend.entity.BookContent; +import com.guwan.backend.pojo.entity.BookContent; import com.guwan.backend.mongodb.EveryReadDetailOfMongodb; import com.guwan.backend.mongodb.EveryReadDetailOfMongodbService; import com.guwan.backend.mongodb.User; import com.guwan.backend.mongodb.MongodbUserService; import com.guwan.backend.service.BookContentService; import com.guwan.backend.util.MinioUtil; -import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import okhttp3.OkHttpClient; @@ -20,7 +18,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.ws.rs.POST; import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; diff --git a/src/main/java/com/guwan/backend/controller/ReadingNoteController.java b/src/main/java/com/guwan/backend/controller/ReadingNoteController.java index 554cb6b..7257180 100644 --- a/src/main/java/com/guwan/backend/controller/ReadingNoteController.java +++ b/src/main/java/com/guwan/backend/controller/ReadingNoteController.java @@ -2,7 +2,7 @@ package com.guwan.backend.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.guwan.backend.common.Result; -import com.guwan.backend.entity.ReadingNote; +import com.guwan.backend.pojo.entity.ReadingNote; import com.guwan.backend.service.ReadingNoteService; import com.guwan.backend.util.SecurityUtil; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/guwan/backend/controller/ReadingProgressController.java b/src/main/java/com/guwan/backend/controller/ReadingProgressController.java index 1ffc8b2..6eadf01 100644 --- a/src/main/java/com/guwan/backend/controller/ReadingProgressController.java +++ b/src/main/java/com/guwan/backend/controller/ReadingProgressController.java @@ -2,8 +2,8 @@ package com.guwan.backend.controller; import com.baomidou.mybatisplus.core.metadata.IPage; import com.guwan.backend.common.Result; -import com.guwan.backend.dto.ReadingStatistics; -import com.guwan.backend.entity.ReadingProgress; +import com.guwan.backend.pojo.dto.ReadingStatistics; +import com.guwan.backend.pojo.entity.ReadingProgress; import com.guwan.backend.service.ReadingProgressService; import com.guwan.backend.util.SecurityUtil; import io.swagger.v3.oas.annotations.Operation; diff --git a/src/main/java/com/guwan/backend/controller/UserController.java b/src/main/java/com/guwan/backend/controller/UserController.java index 6e8f804..ab3542a 100644 --- a/src/main/java/com/guwan/backend/controller/UserController.java +++ b/src/main/java/com/guwan/backend/controller/UserController.java @@ -3,13 +3,12 @@ package com.guwan.backend.controller; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.RandomUtil; import com.guwan.backend.common.Result; -import com.guwan.backend.dto.user.*; +import com.guwan.backend.pojo.dto.user.*; import com.guwan.backend.service.EmailService; import com.guwan.backend.service.UserService; import com.guwan.backend.util.RedisUtils; import com.guwan.backend.util.SmsUtils; import jakarta.validation.Valid; -import jakarta.validation.constraints.Email; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; diff --git a/src/main/java/com/guwan/backend/mapper/BookCategoryMapper.java b/src/main/java/com/guwan/backend/mapper/BookCategoryMapper.java index 3694355..91fb95d 100644 --- a/src/main/java/com/guwan/backend/mapper/BookCategoryMapper.java +++ b/src/main/java/com/guwan/backend/mapper/BookCategoryMapper.java @@ -1,6 +1,6 @@ package com.guwan.backend.mapper; -import com.guwan.backend.entity.BookCategory; +import com.guwan.backend.pojo.entity.BookCategory; import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** diff --git a/src/main/java/com/guwan/backend/mapper/BookContentMapper.java b/src/main/java/com/guwan/backend/mapper/BookContentMapper.java index 88c9cf6..24d4780 100644 --- a/src/main/java/com/guwan/backend/mapper/BookContentMapper.java +++ b/src/main/java/com/guwan/backend/mapper/BookContentMapper.java @@ -1,7 +1,7 @@ package com.guwan.backend.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.guwan.backend.entity.BookContent; +import com.guwan.backend.pojo.entity.BookContent; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/guwan/backend/mapper/BookMapper.java b/src/main/java/com/guwan/backend/mapper/BookMapper.java index 9f0bc90..a7fed8b 100644 --- a/src/main/java/com/guwan/backend/mapper/BookMapper.java +++ b/src/main/java/com/guwan/backend/mapper/BookMapper.java @@ -1,7 +1,7 @@ package com.guwan.backend.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.guwan.backend.entity.Book; +import com.guwan.backend.pojo.entity.Book; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/guwan/backend/mapper/ReadingNoteMapper.java b/src/main/java/com/guwan/backend/mapper/ReadingNoteMapper.java index 4cec6df..377e548 100644 --- a/src/main/java/com/guwan/backend/mapper/ReadingNoteMapper.java +++ b/src/main/java/com/guwan/backend/mapper/ReadingNoteMapper.java @@ -1,7 +1,7 @@ package com.guwan.backend.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.guwan.backend.entity.ReadingNote; +import com.guwan.backend.pojo.entity.ReadingNote; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/guwan/backend/mapper/ReadingProgressMapper.java b/src/main/java/com/guwan/backend/mapper/ReadingProgressMapper.java index c94b138..8c668c7 100644 --- a/src/main/java/com/guwan/backend/mapper/ReadingProgressMapper.java +++ b/src/main/java/com/guwan/backend/mapper/ReadingProgressMapper.java @@ -1,7 +1,7 @@ package com.guwan.backend.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.guwan.backend.entity.ReadingProgress; +import com.guwan.backend.pojo.entity.ReadingProgress; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/guwan/backend/mapper/SysLogMapper.java b/src/main/java/com/guwan/backend/mapper/SysLogMapper.java index 78c10e7..3931da8 100644 --- a/src/main/java/com/guwan/backend/mapper/SysLogMapper.java +++ b/src/main/java/com/guwan/backend/mapper/SysLogMapper.java @@ -1,7 +1,7 @@ package com.guwan.backend.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.guwan.backend.entity.SysLog; +import com.guwan.backend.pojo.entity.SysLog; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/guwan/backend/mapper/UserMapper.java b/src/main/java/com/guwan/backend/mapper/UserMapper.java index 169470c..273d4a0 100644 --- a/src/main/java/com/guwan/backend/mapper/UserMapper.java +++ b/src/main/java/com/guwan/backend/mapper/UserMapper.java @@ -1,7 +1,7 @@ package com.guwan.backend.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.guwan.backend.entity.User; +import com.guwan.backend.pojo.entity.User; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/guwan/backend/mapper/VideoLikeMapper.java b/src/main/java/com/guwan/backend/mapper/VideoLikeMapper.java index f189b14..02cd630 100644 --- a/src/main/java/com/guwan/backend/mapper/VideoLikeMapper.java +++ b/src/main/java/com/guwan/backend/mapper/VideoLikeMapper.java @@ -1,7 +1,7 @@ package com.guwan.backend.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.guwan.backend.entity.VideoLike; +import com.guwan.backend.pojo.entity.VideoLike; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/guwan/backend/mapper/VideoMapper.java b/src/main/java/com/guwan/backend/mapper/VideoMapper.java index 05c5c0e..8625734 100644 --- a/src/main/java/com/guwan/backend/mapper/VideoMapper.java +++ b/src/main/java/com/guwan/backend/mapper/VideoMapper.java @@ -1,7 +1,7 @@ package com.guwan.backend.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.guwan.backend.entity.Video; +import com.guwan.backend.pojo.entity.Video; import org.apache.ibatis.annotations.Mapper; @Mapper diff --git a/src/main/java/com/guwan/backend/dto/ReadingStatistics.java b/src/main/java/com/guwan/backend/pojo/dto/ReadingStatistics.java similarity index 92% rename from src/main/java/com/guwan/backend/dto/ReadingStatistics.java rename to src/main/java/com/guwan/backend/pojo/dto/ReadingStatistics.java index f055226..32d87e7 100644 --- a/src/main/java/com/guwan/backend/dto/ReadingStatistics.java +++ b/src/main/java/com/guwan/backend/pojo/dto/ReadingStatistics.java @@ -1,4 +1,4 @@ -package com.guwan.backend.dto; +package com.guwan.backend.pojo.dto; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/dto/product/ProductDTO.java b/src/main/java/com/guwan/backend/pojo/dto/product/ProductDTO.java similarity index 93% rename from src/main/java/com/guwan/backend/dto/product/ProductDTO.java rename to src/main/java/com/guwan/backend/pojo/dto/product/ProductDTO.java index 2d1e128..2a137d5 100644 --- a/src/main/java/com/guwan/backend/dto/product/ProductDTO.java +++ b/src/main/java/com/guwan/backend/pojo/dto/product/ProductDTO.java @@ -1,4 +1,4 @@ -package com.guwan.backend.dto.product; +package com.guwan.backend.pojo.dto.product; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/dto/user/ChangePasswordDTO.java b/src/main/java/com/guwan/backend/pojo/dto/user/ChangePasswordDTO.java similarity index 88% rename from src/main/java/com/guwan/backend/dto/user/ChangePasswordDTO.java rename to src/main/java/com/guwan/backend/pojo/dto/user/ChangePasswordDTO.java index bc42f9e..7286b1c 100644 --- a/src/main/java/com/guwan/backend/dto/user/ChangePasswordDTO.java +++ b/src/main/java/com/guwan/backend/pojo/dto/user/ChangePasswordDTO.java @@ -1,4 +1,4 @@ -package com.guwan.backend.dto.user; +package com.guwan.backend.pojo.dto.user; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/dto/user/EmailDto.java b/src/main/java/com/guwan/backend/pojo/dto/user/EmailDto.java similarity index 83% rename from src/main/java/com/guwan/backend/dto/user/EmailDto.java rename to src/main/java/com/guwan/backend/pojo/dto/user/EmailDto.java index 545f696..ef333fd 100644 --- a/src/main/java/com/guwan/backend/dto/user/EmailDto.java +++ b/src/main/java/com/guwan/backend/pojo/dto/user/EmailDto.java @@ -1,4 +1,4 @@ -package com.guwan.backend.dto.user; +package com.guwan.backend.pojo.dto.user; import jakarta.validation.constraints.Email; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/dto/user/LoginDto.java b/src/main/java/com/guwan/backend/pojo/dto/user/LoginDto.java similarity index 91% rename from src/main/java/com/guwan/backend/dto/user/LoginDto.java rename to src/main/java/com/guwan/backend/pojo/dto/user/LoginDto.java index 2c6dfab..77ef2bc 100644 --- a/src/main/java/com/guwan/backend/dto/user/LoginDto.java +++ b/src/main/java/com/guwan/backend/pojo/dto/user/LoginDto.java @@ -1,4 +1,4 @@ -package com.guwan.backend.dto.user; +package com.guwan.backend.pojo.dto.user; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/dto/user/PhoneDto.java b/src/main/java/com/guwan/backend/pojo/dto/user/PhoneDto.java similarity index 85% rename from src/main/java/com/guwan/backend/dto/user/PhoneDto.java rename to src/main/java/com/guwan/backend/pojo/dto/user/PhoneDto.java index 22ea3ce..f807d6b 100644 --- a/src/main/java/com/guwan/backend/dto/user/PhoneDto.java +++ b/src/main/java/com/guwan/backend/pojo/dto/user/PhoneDto.java @@ -1,4 +1,4 @@ -package com.guwan.backend.dto.user; +package com.guwan.backend.pojo.dto.user; import jakarta.validation.constraints.Pattern; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/dto/user/RegisterDTO.java b/src/main/java/com/guwan/backend/pojo/dto/user/RegisterDTO.java similarity index 95% rename from src/main/java/com/guwan/backend/dto/user/RegisterDTO.java rename to src/main/java/com/guwan/backend/pojo/dto/user/RegisterDTO.java index fade5eb..0247e67 100644 --- a/src/main/java/com/guwan/backend/dto/user/RegisterDTO.java +++ b/src/main/java/com/guwan/backend/pojo/dto/user/RegisterDTO.java @@ -1,4 +1,4 @@ -package com.guwan.backend.dto.user; +package com.guwan.backend.pojo.dto.user; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/guwan/backend/dto/user/UserDTO.java b/src/main/java/com/guwan/backend/pojo/dto/user/UserDTO.java similarity index 94% rename from src/main/java/com/guwan/backend/dto/user/UserDTO.java rename to src/main/java/com/guwan/backend/pojo/dto/user/UserDTO.java index 78f7704..84cdec8 100644 --- a/src/main/java/com/guwan/backend/dto/user/UserDTO.java +++ b/src/main/java/com/guwan/backend/pojo/dto/user/UserDTO.java @@ -1,4 +1,4 @@ -package com.guwan.backend.dto.user; +package com.guwan.backend.pojo.dto.user; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/dto/video/VideoDTO.java b/src/main/java/com/guwan/backend/pojo/dto/video/VideoDTO.java similarity index 96% rename from src/main/java/com/guwan/backend/dto/video/VideoDTO.java rename to src/main/java/com/guwan/backend/pojo/dto/video/VideoDTO.java index 190c6ca..36d89e7 100644 --- a/src/main/java/com/guwan/backend/dto/video/VideoDTO.java +++ b/src/main/java/com/guwan/backend/pojo/dto/video/VideoDTO.java @@ -1,4 +1,4 @@ -package com.guwan.backend.dto.video; +package com.guwan.backend.pojo.dto.video; import lombok.Data; import java.time.LocalDateTime; diff --git a/src/main/java/com/guwan/backend/entity/Book.java b/src/main/java/com/guwan/backend/pojo/entity/Book.java similarity index 95% rename from src/main/java/com/guwan/backend/entity/Book.java rename to src/main/java/com/guwan/backend/pojo/entity/Book.java index d9c9b90..de15287 100644 --- a/src/main/java/com/guwan/backend/entity/Book.java +++ b/src/main/java/com/guwan/backend/pojo/entity/Book.java @@ -1,4 +1,4 @@ -package com.guwan.backend.entity; +package com.guwan.backend.pojo.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/entity/BookCategory.java b/src/main/java/com/guwan/backend/pojo/entity/BookCategory.java similarity index 93% rename from src/main/java/com/guwan/backend/entity/BookCategory.java rename to src/main/java/com/guwan/backend/pojo/entity/BookCategory.java index 2c49171..9761b03 100644 --- a/src/main/java/com/guwan/backend/entity/BookCategory.java +++ b/src/main/java/com/guwan/backend/pojo/entity/BookCategory.java @@ -1,4 +1,4 @@ -package com.guwan.backend.entity; +package com.guwan.backend.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; diff --git a/src/main/java/com/guwan/backend/entity/BookContent.java b/src/main/java/com/guwan/backend/pojo/entity/BookContent.java similarity index 92% rename from src/main/java/com/guwan/backend/entity/BookContent.java rename to src/main/java/com/guwan/backend/pojo/entity/BookContent.java index 0310e8f..8e70c06 100644 --- a/src/main/java/com/guwan/backend/entity/BookContent.java +++ b/src/main/java/com/guwan/backend/pojo/entity/BookContent.java @@ -1,4 +1,4 @@ -package com.guwan.backend.entity; +package com.guwan.backend.pojo.entity; import com.baomidou.mybatisplus.annotation.IdType; diff --git a/src/main/java/com/guwan/backend/entity/BookOfUser.java b/src/main/java/com/guwan/backend/pojo/entity/BookOfUser.java similarity index 76% rename from src/main/java/com/guwan/backend/entity/BookOfUser.java rename to src/main/java/com/guwan/backend/pojo/entity/BookOfUser.java index f60b9de..0e872c3 100644 --- a/src/main/java/com/guwan/backend/entity/BookOfUser.java +++ b/src/main/java/com/guwan/backend/pojo/entity/BookOfUser.java @@ -1,7 +1,7 @@ -package com.guwan.backend.entity; +package com.guwan.backend.pojo.entity; -import com.guwan.backend.enums.Evaluate; -import com.guwan.backend.enums.ReadStatus; +import com.guwan.backend.pojo.enums.Evaluate; +import com.guwan.backend.pojo.enums.ReadStatus; import lombok.Data; @Data diff --git a/src/main/java/com/guwan/backend/entity/ReadingNote.java b/src/main/java/com/guwan/backend/pojo/entity/ReadingNote.java similarity index 95% rename from src/main/java/com/guwan/backend/entity/ReadingNote.java rename to src/main/java/com/guwan/backend/pojo/entity/ReadingNote.java index 05b78ea..437cf2e 100644 --- a/src/main/java/com/guwan/backend/entity/ReadingNote.java +++ b/src/main/java/com/guwan/backend/pojo/entity/ReadingNote.java @@ -1,4 +1,4 @@ -package com.guwan.backend.entity; +package com.guwan.backend.pojo.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/entity/ReadingProgress.java b/src/main/java/com/guwan/backend/pojo/entity/ReadingProgress.java similarity index 95% rename from src/main/java/com/guwan/backend/entity/ReadingProgress.java rename to src/main/java/com/guwan/backend/pojo/entity/ReadingProgress.java index 19889d1..3a95f32 100644 --- a/src/main/java/com/guwan/backend/entity/ReadingProgress.java +++ b/src/main/java/com/guwan/backend/pojo/entity/ReadingProgress.java @@ -1,4 +1,4 @@ -package com.guwan.backend.entity; +package com.guwan.backend.pojo.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/entity/SysLog.java b/src/main/java/com/guwan/backend/pojo/entity/SysLog.java similarity index 94% rename from src/main/java/com/guwan/backend/entity/SysLog.java rename to src/main/java/com/guwan/backend/pojo/entity/SysLog.java index 679c1b9..5c27a4a 100644 --- a/src/main/java/com/guwan/backend/entity/SysLog.java +++ b/src/main/java/com/guwan/backend/pojo/entity/SysLog.java @@ -1,4 +1,4 @@ -package com.guwan.backend.entity; +package com.guwan.backend.pojo.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/entity/User.java b/src/main/java/com/guwan/backend/pojo/entity/User.java similarity index 94% rename from src/main/java/com/guwan/backend/entity/User.java rename to src/main/java/com/guwan/backend/pojo/entity/User.java index 235d4f5..7ad1618 100644 --- a/src/main/java/com/guwan/backend/entity/User.java +++ b/src/main/java/com/guwan/backend/pojo/entity/User.java @@ -1,4 +1,4 @@ -package com.guwan.backend.entity; +package com.guwan.backend.pojo.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/entity/UserRead.java b/src/main/java/com/guwan/backend/pojo/entity/UserRead.java similarity index 92% rename from src/main/java/com/guwan/backend/entity/UserRead.java rename to src/main/java/com/guwan/backend/pojo/entity/UserRead.java index b850186..5ed7d6e 100644 --- a/src/main/java/com/guwan/backend/entity/UserRead.java +++ b/src/main/java/com/guwan/backend/pojo/entity/UserRead.java @@ -1,4 +1,4 @@ -package com.guwan.backend.entity; +package com.guwan.backend.pojo.entity; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/entity/Video.java b/src/main/java/com/guwan/backend/pojo/entity/Video.java similarity index 96% rename from src/main/java/com/guwan/backend/entity/Video.java rename to src/main/java/com/guwan/backend/pojo/entity/Video.java index eff638a..7fe3054 100644 --- a/src/main/java/com/guwan/backend/entity/Video.java +++ b/src/main/java/com/guwan/backend/pojo/entity/Video.java @@ -1,4 +1,4 @@ -package com.guwan.backend.entity; +package com.guwan.backend.pojo.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/entity/VideoLike.java b/src/main/java/com/guwan/backend/pojo/entity/VideoLike.java similarity index 89% rename from src/main/java/com/guwan/backend/entity/VideoLike.java rename to src/main/java/com/guwan/backend/pojo/entity/VideoLike.java index 70c6738..df37c9c 100644 --- a/src/main/java/com/guwan/backend/entity/VideoLike.java +++ b/src/main/java/com/guwan/backend/pojo/entity/VideoLike.java @@ -1,4 +1,4 @@ -package com.guwan.backend.entity; +package com.guwan.backend.pojo.entity; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; diff --git a/src/main/java/com/guwan/backend/enums/Evaluate.java b/src/main/java/com/guwan/backend/pojo/enums/Evaluate.java similarity index 95% rename from src/main/java/com/guwan/backend/enums/Evaluate.java rename to src/main/java/com/guwan/backend/pojo/enums/Evaluate.java index 2797cb0..31770a7 100644 --- a/src/main/java/com/guwan/backend/enums/Evaluate.java +++ b/src/main/java/com/guwan/backend/pojo/enums/Evaluate.java @@ -1,4 +1,4 @@ -package com.guwan.backend.enums; +package com.guwan.backend.pojo.enums; public enum Evaluate { yes("好看", 1), normal("一般", 2), no("不行", 3); diff --git a/src/main/java/com/guwan/backend/enums/ReadStatus.java b/src/main/java/com/guwan/backend/pojo/enums/ReadStatus.java similarity index 95% rename from src/main/java/com/guwan/backend/enums/ReadStatus.java rename to src/main/java/com/guwan/backend/pojo/enums/ReadStatus.java index 0b0936a..d779f2e 100644 --- a/src/main/java/com/guwan/backend/enums/ReadStatus.java +++ b/src/main/java/com/guwan/backend/pojo/enums/ReadStatus.java @@ -1,4 +1,4 @@ -package com.guwan.backend.enums; +package com.guwan.backend.pojo.enums; public enum ReadStatus { yes("在读", 1), normal("未读", 2), no("想读", 3); diff --git a/src/main/java/com/guwan/backend/enums/UserEnums.java b/src/main/java/com/guwan/backend/pojo/enums/UserEnums.java similarity index 93% rename from src/main/java/com/guwan/backend/enums/UserEnums.java rename to src/main/java/com/guwan/backend/pojo/enums/UserEnums.java index f473ec9..020aebe 100644 --- a/src/main/java/com/guwan/backend/enums/UserEnums.java +++ b/src/main/java/com/guwan/backend/pojo/enums/UserEnums.java @@ -1,4 +1,4 @@ -package com.guwan.backend.enums; +package com.guwan.backend.pojo.enums; public enum UserEnums { ACCOUNT("account"), diff --git a/src/main/java/com/guwan/backend/security/UserDetailsServiceImpl.java b/src/main/java/com/guwan/backend/security/UserDetailsServiceImpl.java index daeccff..9a0a98c 100644 --- a/src/main/java/com/guwan/backend/security/UserDetailsServiceImpl.java +++ b/src/main/java/com/guwan/backend/security/UserDetailsServiceImpl.java @@ -1,7 +1,7 @@ package com.guwan.backend.security; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.guwan.backend.entity.User; +import com.guwan.backend.pojo.entity.User; import com.guwan.backend.mapper.UserMapper; import lombok.RequiredArgsConstructor; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/src/main/java/com/guwan/backend/service/BookCategoryService.java b/src/main/java/com/guwan/backend/service/BookCategoryService.java index c414aad..a344aaa 100644 --- a/src/main/java/com/guwan/backend/service/BookCategoryService.java +++ b/src/main/java/com/guwan/backend/service/BookCategoryService.java @@ -1,6 +1,6 @@ package com.guwan.backend.service; -import com.guwan.backend.entity.BookCategory; +import com.guwan.backend.pojo.entity.BookCategory; import com.baomidou.mybatisplus.extension.service.IService; /** diff --git a/src/main/java/com/guwan/backend/service/BookContentService.java b/src/main/java/com/guwan/backend/service/BookContentService.java index 8158af7..bedae6b 100644 --- a/src/main/java/com/guwan/backend/service/BookContentService.java +++ b/src/main/java/com/guwan/backend/service/BookContentService.java @@ -1,7 +1,7 @@ package com.guwan.backend.service; import com.baomidou.mybatisplus.extension.service.IService; -import com.guwan.backend.entity.BookContent; +import com.guwan.backend.pojo.entity.BookContent; public interface BookContentService extends IService { diff --git a/src/main/java/com/guwan/backend/service/BookService.java b/src/main/java/com/guwan/backend/service/BookService.java index d31e8aa..11ebf50 100644 --- a/src/main/java/com/guwan/backend/service/BookService.java +++ b/src/main/java/com/guwan/backend/service/BookService.java @@ -1,7 +1,7 @@ package com.guwan.backend.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.guwan.backend.entity.Book; +import com.guwan.backend.pojo.entity.Book; public interface BookService { // 添加书籍 diff --git a/src/main/java/com/guwan/backend/service/ProductSearchService.java b/src/main/java/com/guwan/backend/service/ProductSearchService.java index ba66ded..cb43c6a 100644 --- a/src/main/java/com/guwan/backend/service/ProductSearchService.java +++ b/src/main/java/com/guwan/backend/service/ProductSearchService.java @@ -1,7 +1,7 @@ package com.guwan.backend.service; import cn.easyes.core.conditions.LambdaEsQueryWrapper; -import com.guwan.backend.dto.product.ProductDTO; +import com.guwan.backend.pojo.dto.product.ProductDTO; import com.guwan.backend.elasticsearch.document.ProductDocument; import com.guwan.backend.elasticsearch.mapper.ProductEsMapper; import jakarta.annotation.PostConstruct; diff --git a/src/main/java/com/guwan/backend/service/ReadingNoteService.java b/src/main/java/com/guwan/backend/service/ReadingNoteService.java index feb2c2e..7764c7d 100644 --- a/src/main/java/com/guwan/backend/service/ReadingNoteService.java +++ b/src/main/java/com/guwan/backend/service/ReadingNoteService.java @@ -1,7 +1,7 @@ package com.guwan.backend.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.guwan.backend.entity.ReadingNote; +import com.guwan.backend.pojo.entity.ReadingNote; public interface ReadingNoteService { // 添加笔记 diff --git a/src/main/java/com/guwan/backend/service/ReadingProgressService.java b/src/main/java/com/guwan/backend/service/ReadingProgressService.java index 40572ae..48c29e7 100644 --- a/src/main/java/com/guwan/backend/service/ReadingProgressService.java +++ b/src/main/java/com/guwan/backend/service/ReadingProgressService.java @@ -1,8 +1,8 @@ package com.guwan.backend.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.guwan.backend.dto.ReadingStatistics; -import com.guwan.backend.entity.ReadingProgress; +import com.guwan.backend.pojo.dto.ReadingStatistics; +import com.guwan.backend.pojo.entity.ReadingProgress; public interface ReadingProgressService { // 创建或更新阅读进度 diff --git a/src/main/java/com/guwan/backend/service/UserService.java b/src/main/java/com/guwan/backend/service/UserService.java index 9be6fec..60f67c9 100644 --- a/src/main/java/com/guwan/backend/service/UserService.java +++ b/src/main/java/com/guwan/backend/service/UserService.java @@ -1,9 +1,9 @@ package com.guwan.backend.service; -import com.guwan.backend.dto.user.ChangePasswordDTO; -import com.guwan.backend.dto.user.LoginDto; -import com.guwan.backend.dto.user.RegisterDTO; -import com.guwan.backend.dto.user.UserDTO; +import com.guwan.backend.pojo.dto.user.ChangePasswordDTO; +import com.guwan.backend.pojo.dto.user.LoginDto; +import com.guwan.backend.pojo.dto.user.RegisterDTO; +import com.guwan.backend.pojo.dto.user.UserDTO; public interface UserService { /** diff --git a/src/main/java/com/guwan/backend/service/VideoSearchService.java b/src/main/java/com/guwan/backend/service/VideoSearchService.java index cbcaad9..797a42f 100644 --- a/src/main/java/com/guwan/backend/service/VideoSearchService.java +++ b/src/main/java/com/guwan/backend/service/VideoSearchService.java @@ -2,8 +2,8 @@ package com.guwan.backend.service; import cn.easyes.core.conditions.LambdaEsQueryWrapper; import cn.easyes.core.conditions.LambdaEsUpdateWrapper; -import com.guwan.backend.dto.video.VideoDTO; -import com.guwan.backend.entity.Video; +import com.guwan.backend.pojo.dto.video.VideoDTO; +import com.guwan.backend.pojo.entity.Video; import com.guwan.backend.elasticsearch.document.VideoDocument; import com.guwan.backend.elasticsearch.mapper.VideoEsMapper; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/guwan/backend/service/VideoService.java b/src/main/java/com/guwan/backend/service/VideoService.java index 3d0552a..01486fb 100644 --- a/src/main/java/com/guwan/backend/service/VideoService.java +++ b/src/main/java/com/guwan/backend/service/VideoService.java @@ -1,7 +1,7 @@ package com.guwan.backend.service; import com.baomidou.mybatisplus.core.metadata.IPage; -import com.guwan.backend.dto.video.VideoDTO; +import com.guwan.backend.pojo.dto.video.VideoDTO; import java.util.List; diff --git a/src/main/java/com/guwan/backend/service/impl/BookCategoryServiceImpl.java b/src/main/java/com/guwan/backend/service/impl/BookCategoryServiceImpl.java index 9c07d01..0881e53 100644 --- a/src/main/java/com/guwan/backend/service/impl/BookCategoryServiceImpl.java +++ b/src/main/java/com/guwan/backend/service/impl/BookCategoryServiceImpl.java @@ -1,7 +1,7 @@ package com.guwan.backend.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.guwan.backend.entity.BookCategory; +import com.guwan.backend.pojo.entity.BookCategory; import com.guwan.backend.service.BookCategoryService; import com.guwan.backend.mapper.BookCategoryMapper; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/guwan/backend/service/impl/BookContentServiceImpl.java b/src/main/java/com/guwan/backend/service/impl/BookContentServiceImpl.java index 60aff5e..331650a 100644 --- a/src/main/java/com/guwan/backend/service/impl/BookContentServiceImpl.java +++ b/src/main/java/com/guwan/backend/service/impl/BookContentServiceImpl.java @@ -2,7 +2,7 @@ package com.guwan.backend.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; -import com.guwan.backend.entity.BookContent; +import com.guwan.backend.pojo.entity.BookContent; import com.guwan.backend.mapper.BookContentMapper; import com.guwan.backend.service.BookContentService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/guwan/backend/service/impl/BookServiceImpl.java b/src/main/java/com/guwan/backend/service/impl/BookServiceImpl.java index eaf12c5..9d919a6 100644 --- a/src/main/java/com/guwan/backend/service/impl/BookServiceImpl.java +++ b/src/main/java/com/guwan/backend/service/impl/BookServiceImpl.java @@ -6,10 +6,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.guwan.backend.annotation.OperationLog; import com.guwan.backend.common.BusinessException; -import com.guwan.backend.entity.Book; -import com.guwan.backend.entity.BookCategory; -import com.guwan.backend.entity.BookContent; -import com.guwan.backend.mapper.BookCategoryMapper; +import com.guwan.backend.pojo.entity.Book; +import com.guwan.backend.pojo.entity.BookContent; import com.guwan.backend.mapper.BookMapper; import com.guwan.backend.service.BookContentService; import com.guwan.backend.service.BookService; diff --git a/src/main/java/com/guwan/backend/service/impl/ReadingNoteServiceImpl.java b/src/main/java/com/guwan/backend/service/impl/ReadingNoteServiceImpl.java index cd5234a..2dff2b3 100644 --- a/src/main/java/com/guwan/backend/service/impl/ReadingNoteServiceImpl.java +++ b/src/main/java/com/guwan/backend/service/impl/ReadingNoteServiceImpl.java @@ -3,7 +3,7 @@ package com.guwan.backend.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.guwan.backend.entity.ReadingNote; +import com.guwan.backend.pojo.entity.ReadingNote; import com.guwan.backend.mapper.ReadingNoteMapper; import com.guwan.backend.service.ReadingNoteService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/guwan/backend/service/impl/ReadingProgressServiceImpl.java b/src/main/java/com/guwan/backend/service/impl/ReadingProgressServiceImpl.java index 6ca6475..98a9218 100644 --- a/src/main/java/com/guwan/backend/service/impl/ReadingProgressServiceImpl.java +++ b/src/main/java/com/guwan/backend/service/impl/ReadingProgressServiceImpl.java @@ -3,8 +3,8 @@ package com.guwan.backend.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.guwan.backend.dto.ReadingStatistics; -import com.guwan.backend.entity.ReadingProgress; +import com.guwan.backend.pojo.dto.ReadingStatistics; +import com.guwan.backend.pojo.entity.ReadingProgress; import com.guwan.backend.mapper.ReadingProgressMapper; import com.guwan.backend.service.ReadingProgressService; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/guwan/backend/service/impl/UserServiceImpl.java b/src/main/java/com/guwan/backend/service/impl/UserServiceImpl.java index 72620b6..e6b943c 100644 --- a/src/main/java/com/guwan/backend/service/impl/UserServiceImpl.java +++ b/src/main/java/com/guwan/backend/service/impl/UserServiceImpl.java @@ -2,17 +2,15 @@ package com.guwan.backend.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; -import com.baomidou.mybatisplus.extension.conditions.query.LambdaQueryChainWrapper; -import com.baomidou.mybatisplus.extension.conditions.update.LambdaUpdateChainWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.guwan.backend.annotation.OperationLog; import com.guwan.backend.common.BusinessException; -import com.guwan.backend.dto.user.ChangePasswordDTO; -import com.guwan.backend.dto.user.LoginDto; -import com.guwan.backend.dto.user.RegisterDTO; -import com.guwan.backend.dto.user.UserDTO; -import com.guwan.backend.entity.User; -import com.guwan.backend.enums.UserEnums; +import com.guwan.backend.pojo.dto.user.ChangePasswordDTO; +import com.guwan.backend.pojo.dto.user.LoginDto; +import com.guwan.backend.pojo.dto.user.RegisterDTO; +import com.guwan.backend.pojo.dto.user.UserDTO; +import com.guwan.backend.pojo.entity.User; +import com.guwan.backend.pojo.enums.UserEnums; import com.guwan.backend.mapper.BookMapper; import com.guwan.backend.mapper.UserMapper; import com.guwan.backend.mybatis.query.LambdaQueryWrapperX; @@ -32,7 +30,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.time.LocalDateTime; -import java.util.List; @Slf4j @Service diff --git a/src/main/java/com/guwan/backend/service/impl/VideoServiceImpl.java b/src/main/java/com/guwan/backend/service/impl/VideoServiceImpl.java index 2f1c41e..0f77634 100644 --- a/src/main/java/com/guwan/backend/service/impl/VideoServiceImpl.java +++ b/src/main/java/com/guwan/backend/service/impl/VideoServiceImpl.java @@ -4,9 +4,9 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.guwan.backend.annotation.OperationLog; -import com.guwan.backend.dto.video.VideoDTO; -import com.guwan.backend.entity.Video; -import com.guwan.backend.entity.VideoLike; +import com.guwan.backend.pojo.dto.video.VideoDTO; +import com.guwan.backend.pojo.entity.Video; +import com.guwan.backend.pojo.entity.VideoLike; import com.guwan.backend.mapper.VideoLikeMapper; import com.guwan.backend.mapper.VideoMapper; import com.guwan.backend.service.VideoService; diff --git a/src/main/java/com/guwan/backend/util/BookContentUtil.java b/src/main/java/com/guwan/backend/util/BookContentUtil.java index 2e78b6c..4286f1f 100644 --- a/src/main/java/com/guwan/backend/util/BookContentUtil.java +++ b/src/main/java/com/guwan/backend/util/BookContentUtil.java @@ -1,6 +1,6 @@ package com.guwan.backend.util; -import com.guwan.backend.entity.BookContent; +import com.guwan.backend.pojo.entity.BookContent; import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; diff --git a/src/main/resources/mapper/BookCategoryMapper.xml b/src/main/resources/mapper/BookCategoryMapper.xml index fc154bc..22da088 100644 --- a/src/main/resources/mapper/BookCategoryMapper.xml +++ b/src/main/resources/mapper/BookCategoryMapper.xml @@ -4,7 +4,7 @@ "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + diff --git a/src/main/resources/mapper/SysLogMapper.xml b/src/main/resources/mapper/SysLogMapper.xml index d76f157..0c049db 100644 --- a/src/main/resources/mapper/SysLogMapper.xml +++ b/src/main/resources/mapper/SysLogMapper.xml @@ -3,7 +3,7 @@ - SELECT * FROM sys_log diff --git a/src/test/java/com/guwan/backend/service/BookServiceTest.java b/src/test/java/com/guwan/backend/service/BookServiceTest.java index 6230171..f6bd545 100644 --- a/src/test/java/com/guwan/backend/service/BookServiceTest.java +++ b/src/test/java/com/guwan/backend/service/BookServiceTest.java @@ -1,6 +1,6 @@ package com.guwan.backend.service; -import com.guwan.backend.entity.Book; +import com.guwan.backend.pojo.entity.Book; import com.guwan.backend.mapper.BookMapper; import com.guwan.backend.service.impl.BookServiceImpl; import org.junit.jupiter.api.BeforeEach;