build: Spring Boot 升级到 3.4.0

2025-06-24 04:46:37 +00:00 · 2025-03-15 23:35:47 +08:00
parent 8d35aa80ab
commit d77ce5b446
39 changed files with 201 additions and 192 deletions
--- a/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/AuthorController.java
@ -12,11 +12,11 @@ import com.java2nb.novel.entity.AuthorIncomeDetail;
 import com.java2nb.novel.entity.Book;
 import com.java2nb.novel.service.AuthorService;
 import com.java2nb.novel.service.BookService;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

-import javax.servlet.http.HttpServletRequest;
 import java.util.Date;

 /**
@ -54,7 +54,7 @@ public class AuthorController extends BaseController{
     * 发布小说
     * */
    @PostMapping("addBook")
-    public RestResult<Void> addBook(@RequestParam("bookDesc") String bookDesc,Book book,HttpServletRequest request){
+    public RestResult<Void> addBook(@RequestParam("bookDesc") String bookDesc, Book book, HttpServletRequest request){

        Author author = checkAuthor(request);

--- a/novel-front/src/main/java/com/java2nb/novel/controller/BaseController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/BaseController.java
@ -3,11 +3,10 @@ package com.java2nb.novel.controller;
 import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.utils.CookieUtil;
 import com.java2nb.novel.core.utils.JwtTokenUtil;
+import jakarta.servlet.http.HttpServletRequest;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;

-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;

 /**
 * @author 11797
--- a/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/BookController.java
@ -15,11 +15,11 @@ import com.java2nb.novel.vo.BookVO;
 import io.github.xxyopen.model.page.PageBean;
 import io.github.xxyopen.model.page.builder.pagehelper.PageBuilder;
 import io.github.xxyopen.model.resp.RestResult;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;

-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
--- a/novel-front/src/main/java/com/java2nb/novel/controller/FileController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/FileController.java
@ -10,6 +10,8 @@ import com.java2nb.novel.core.utils.RandomValidateCodeUtil;
 import io.github.xxyopen.model.resp.RestResult;
 import io.github.xxyopen.util.UUIDUtil;
 import io.github.xxyopen.web.exception.BusinessException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@ -19,8 +21,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.util.Date;

--- a/novel-front/src/main/java/com/java2nb/novel/controller/PayController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/PayController.java
@ -12,6 +12,8 @@ import com.java2nb.novel.core.bean.UserDetails;
 import com.java2nb.novel.core.config.AlipayProperties;
 import com.java2nb.novel.core.utils.ThreadLocalUtil;
 import com.java2nb.novel.service.OrderService;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@ -19,8 +21,6 @@ import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;

-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.PrintWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.HashMap;
--- a/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/UserController.java
@ -13,13 +13,13 @@ import com.java2nb.novel.service.UserService;
 import io.github.xxyopen.model.resp.RestResult;
 import io.github.xxyopen.web.valid.AddGroup;
 import io.github.xxyopen.web.valid.UpdateGroup;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

-import javax.servlet.http.HttpServletRequest;
 import java.util.HashMap;
 import java.util.Map;

--- a/novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java
+++ b/novel-front/src/main/java/com/java2nb/novel/controller/page/PageController.java
@ -8,6 +8,7 @@ import com.java2nb.novel.service.*;
 import com.java2nb.novel.vo.BookCommentVO;
 import com.java2nb.novel.vo.BookSettingVO;
 import io.github.xxyopen.model.page.PageBean;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
@ -17,7 +18,6 @@ import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;

-import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
--- a/novel-front/src/main/java/com/java2nb/novel/core/config/FilterConfig.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/FilterConfig.java
@ -2,13 +2,13 @@ package com.java2nb.novel.core.config;

 import com.java2nb.novel.core.filter.NovelFilter;
 import com.java2nb.novel.core.filter.XssFilter;
+import jakarta.servlet.DispatcherType;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.web.servlet.FilterRegistrationBean;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

-import javax.servlet.DispatcherType;
 import java.util.HashMap;
 import java.util.Map;

--- a/novel-front/src/main/java/com/java2nb/novel/core/config/WebMvcConfig.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/config/WebMvcConfig.java
@ -3,13 +3,13 @@ package com.java2nb.novel.core.config;
 import com.java2nb.novel.core.converter.DateConverter;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;

 /**
 * @author xiongxiaoyang
 */
@Configuration
-public class WebMvcConfig extends WebMvcConfigurerAdapter {
+public class WebMvcConfig implements WebMvcConfigurer {
    @Override
    public void addFormatters(FormatterRegistry registry) {
        registry.addConverter(new DateConverter());
--- a/novel-front/src/main/java/com/java2nb/novel/core/filter/NovelFilter.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/filter/NovelFilter.java
@ -4,13 +4,14 @@ import com.java2nb.novel.core.cache.CacheKey;
 import com.java2nb.novel.core.cache.CacheService;
 import com.java2nb.novel.core.utils.*;
 import io.github.xxyopen.util.UUIDUtil;
-import io.github.xxyopen.web.util.SpringUtil;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

-import javax.servlet.*;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.*;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;

 /**
 * 项目核心过滤器
--- a/novel-front/src/main/java/com/java2nb/novel/core/filter/XssFilter.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/filter/XssFilter.java
@ -1,11 +1,11 @@
 package com.java2nb.novel.core.filter;

 import com.java2nb.novel.core.wrapper.XssHttpServletRequestWrapper;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.SneakyThrows;
 import org.apache.commons.lang3.StringUtils;

-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
--- a/novel-front/src/main/java/com/java2nb/novel/core/listener/StarterListener.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/listener/StarterListener.java
@ -3,12 +3,12 @@ package com.java2nb.novel.core.listener;
 import com.java2nb.novel.core.config.WebsiteProperties;
 import com.java2nb.novel.entity.WebsiteInfo;
 import com.java2nb.novel.mapper.WebsiteInfoMapper;
+import jakarta.servlet.ServletContext;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.boot.web.servlet.ServletContextInitializer;
 import org.springframework.stereotype.Component;

-import javax.servlet.ServletContext;

 /**
 * 启动监听器
--- a/novel-front/src/main/java/com/java2nb/novel/core/utils/BrowserUtil.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/utils/BrowserUtil.java
@ -1,6 +1,7 @@
 package com.java2nb.novel.core.utils;

-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
+
 import java.util.regex.Pattern;

 public class BrowserUtil {
--- a/novel-front/src/main/java/com/java2nb/novel/core/utils/CookieUtil.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/utils/CookieUtil.java
@ -1,15 +1,15 @@
 package com.java2nb.novel.core.utils;

-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;

 /**
 * @author Administrator
 */
 public class CookieUtil {

-    public static String getCookie(HttpServletRequest request,String key){
+    public static String getCookie(HttpServletRequest request, String key){
        Cookie[] cookies = request.getCookies();
        if(cookies != null) {
            for (Cookie cookie : cookies) {
--- a/novel-front/src/main/java/com/java2nb/novel/core/utils/ThreadLocalUtil.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/utils/ThreadLocalUtil.java
@ -2,7 +2,6 @@ package com.java2nb.novel.core.utils;

 import com.java2nb.novel.core.cache.CacheKey;
 import com.java2nb.novel.core.cache.CacheService;
-import io.github.xxyopen.web.util.SpringUtil;

 /**
 * 模板操作工具类
--- a/novel-front/src/main/java/com/java2nb/novel/core/wrapper/XssHttpServletRequestWrapper.java
+++ b/novel-front/src/main/java/com/java2nb/novel/core/wrapper/XssHttpServletRequestWrapper.java
@ -1,11 +1,7 @@
 package com.java2nb.novel.core.wrapper;

-import org.apache.commons.lang3.StringUtils;
-
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-import java.util.Arrays;
-import java.util.List;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;

 /**
 * XSS过滤处理
--- a/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
+++ b/novel-front/src/main/java/com/java2nb/novel/service/impl/BookServiceImpl.java
@ -29,19 +29,16 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.mybatis.dynamic.sql.SortSpecification;
 import org.mybatis.dynamic.sql.render.RenderingStrategies;
+import org.mybatis.dynamic.sql.select.QueryExpressionDSL;
 import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import tk.mybatis.orderbyhelper.OrderByHelper;

 import java.math.BigDecimal;
 import java.math.RoundingMode;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;

 import static com.java2nb.novel.mapper.BookCategoryDynamicSqlSupport.bookCategory;
@ -201,9 +198,6 @@ public class BookServiceImpl implements BookService {

        PageHelper.startPage(page, pageSize);

-        if (StringUtils.isNotBlank(params.getSort())) {
-            OrderByHelper.orderBy(params.getSort() + " desc");
-        }
        return PageBuilder.build(bookMapper.searchByPage(params));

    }
@ -231,23 +225,22 @@ public class BookServiceImpl implements BookService {

    @Override
    public List<BookIndex> queryIndexList(Long bookId, String orderBy, Integer page, Integer pageSize) {
-        if (StringUtils.isNotBlank(orderBy)) {
-            OrderByHelper.orderBy(orderBy);
-        }
        if (page != null && pageSize != null) {
            PageHelper.startPage(page, pageSize);
        }
-
-        SelectStatementProvider selectStatement = select(BookIndexDynamicSqlSupport.id,
+        QueryExpressionDSL<org.mybatis.dynamic.sql.select.SelectModel>.QueryExpressionWhereBuilder where = select(
+            BookIndexDynamicSqlSupport.id,
            BookIndexDynamicSqlSupport.bookId, BookIndexDynamicSqlSupport.indexNum,
            BookIndexDynamicSqlSupport.indexName, BookIndexDynamicSqlSupport.updateTime,
            BookIndexDynamicSqlSupport.isVip)
            .from(bookIndex)
-            .where(BookIndexDynamicSqlSupport.bookId, isEqualTo(bookId))
+            .where(BookIndexDynamicSqlSupport.bookId, isEqualTo(bookId));
+        if("index_num desc".equals(orderBy)){
+            where.orderBy(BookIndexDynamicSqlSupport.indexNum.descending());
+        }
+        return bookIndexMapper.selectMany(where
            .build()
-            .render(RenderingStrategies.MYBATIS3);
-
-        return bookIndexMapper.selectMany(selectStatement);
+            .render(RenderingStrategies.MYBATIS3));
    }


@ -384,7 +377,6 @@ public class BookServiceImpl implements BookService {
    @Override
    public PageBean<BookCommentVO> listCommentByPage(Long userId, Long bookId, int page, int pageSize) {
        PageHelper.startPage(page, pageSize);
-        OrderByHelper.orderBy("t1.create_time desc");
        return PageBuilder.build(bookCommentMapper.listCommentByPage(userId, bookId));
    }

--- a/novel-front/src/main/java/com/java2nb/novel/vo/BookCommentVO.java
+++ b/novel-front/src/main/java/com/java2nb/novel/vo/BookCommentVO.java
@ -6,7 +6,6 @@ import com.java2nb.novel.core.serialize.CommentUserNameSerialize;
 import com.java2nb.novel.entity.BookComment;
 import lombok.Data;

-import javax.annotation.Generated;
 import java.util.Date;

 /**
--- a/novel-front/src/main/resources/application-dev.yml
+++ b/novel-front/src/main/resources/application-dev.yml
@ -1,6 +1,6 @@
 spring:
-  profiles:
-    include: [ common-dev ]
+  config:
+    import: classpath:application-common-dev.yml


 pic:
--- a/novel-front/src/main/resources/application-prod.yml
+++ b/novel-front/src/main/resources/application-prod.yml
@ -1,6 +1,6 @@
 spring:
-  profiles:
-    include: [ common-prod ]
+  config:
+    import: classpath:application-common-prod.yml

  #静态文件路径配置
  resources:
--- a/novel-front/src/main/resources/logback-boot.xml
+++ b/novel-front/src/main/resources/logback-boot.xml
@ -12,9 +12,6 @@
    <!-- ConsoleAppender：把日志输出到控制台 -->
    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
        <encoder>
-            <!--
-            <pattern>%d %p (%file:%line\)- %m%n</pattern>
-             -->
            <pattern>${CONSOLE_LOG_PATTERN}</pattern>
            <!-- 控制台也要使用UTF-8，不要使用GBK，否则会中文乱码 -->
            <charset>UTF-8</charset>
@ -22,43 +19,43 @@
    </appender>

    <!-- RollingFileAppender：滚动记录文件，先将日志记录到指定文件，当符合某个条件时，将日志记录到其他文件 -->
-    <!-- 以下的大概意思是：1.先按日期存日志，日期变了，将前一天的日志文件名重命名为XXX%日期%索引，新的日志仍然是demo.log -->
-    <!-- 2.如果日期没有发生变化，但是当前日志的文件大小超过1KB时，对当前日志进行分割 重命名 -->
+    <!-- 以下的大概意思是：1.先按日期存日志，日期变了，将前一天的日志文件名重命名为XXX%日期%索引，新的日志仍然是novel-front.log -->
+    <!-- 2.如果日期没有发生变化，但是当前日志的文件大小超过10MB时，对当前日志进行分割 重命名 -->
    <appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
-
-        <File>logs/novel-front.log</File>
+        <!-- 设置日志文件路径 -->
+        <file>logs/novel-front.log</file>
        <!-- rollingPolicy:当发生滚动时，决定 RollingFileAppender 的行为，涉及文件移动和重命名。 -->
-        <!-- TimeBasedRollingPolicy： 最常用的滚动策略，它根据时间来制定滚动策略，既负责滚动也负责出发滚动 -->
-        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+        <!-- SizeAndTimeBasedRollingPolicy：基于时间和文件大小的滚动策略 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
            <!-- 活动文件的名字会根据fileNamePattern的值，每隔一段时间改变一次 -->
-            <!-- 文件名：logs/demo.2017-12-05.0.log -->
-            <fileNamePattern>logs/debug.%d.%i.log</fileNamePattern>
+            <!-- 文件名：logs/debug.2023-10-01.0.log -->
+            <fileNamePattern>logs/debug.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
            <!-- 每产生一个日志文件，该日志文件的保存期限为30天 -->
            <maxHistory>30</maxHistory>
-            <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
-                <!-- maxFileSize:这是活动文件的大小，默认值是10MB，测试时可改成1KB看效果 -->
-                <maxFileSize>10MB</maxFileSize>
-            </timeBasedFileNamingAndTriggeringPolicy>
+            <!-- 单个日志文件的最大大小 -->
+            <maxFileSize>10MB</maxFileSize>
+            <!-- 所有日志文件的总大小限制 -->
+            <totalSizeCap>1GB</totalSizeCap>
        </rollingPolicy>
        <encoder>
            <!-- pattern节点，用来设置日志的输入格式 -->
-            <pattern>
-                %d %p (%file:%line\)- %m%n
-            </pattern>
+            <pattern>%d %p (%file:%line\)- %m%n</pattern>
            <!-- 记录日志的编码:此处设置字符集 - -->
            <charset>UTF-8</charset>
        </encoder>
    </appender>
+
    <!-- 控制台输出日志级别 -->
    <root level="INFO">
        <appender-ref ref="STDOUT" />
        <appender-ref ref="FILE" />
    </root>
+
    <!-- 指定项目中某个包，当有日志操作行为时的日志记录级别 -->
-    <!-- com.maijinjie.springboot 为根包，也就是只要是发生在这个根包下面的所有日志操作行为的权限都是DEBUG -->
+    <!-- com.java2nb 为根包，也就是只要是发生在这个根包下面的所有日志操作行为的权限都是DEBUG -->
    <!-- 级别依次为【从高到低】：FATAL > ERROR > WARN > INFO > DEBUG > TRACE -->
-    <logger name="com.java2nb" level="DEBUG"  additivity="false">
+    <logger name="com.java2nb" level="DEBUG" additivity="false">
        <appender-ref ref="STDOUT" />
        <appender-ref ref="FILE" />
    </logger>
-</configuration>
+</configuration>
--- a/novel-front/src/main/resources/mybatis/mapping/BookCommentMapper.xml
+++ b/novel-front/src/main/resources/mybatis/mapping/BookCommentMapper.xml
@ -14,7 +14,7 @@
                and t1.create_user_id = #{userId}
            </if>
        </trim>
-
+        order by t1.create_time desc

    </select>

--- a/novel-front/src/main/resources/mybatis/mapping/BookMapper.xml
+++ b/novel-front/src/main/resources/mybatis/mapping/BookMapper.xml
@ -31,6 +31,9 @@
        <if test="updateTimeMin != null">
            and last_index_update_time >= #{updateTimeMin}
        </if>
+        <if test="sort != null">
+            order by ${sort} desc
+        </if>

    </select>