升级jdk17、springboot3

Author: zhuxiao

conf/devCommons/config/application.yml

@@ -5,13 +5,13 @@ server:
   servlet:
     context-path: / #设置应用的目录.  前缀需要带/, 无需设置后缀, 示例 【 /xxx 】 or 【 / 】
 spring:
+  main:
+    allow-circular-references: true
   servlet:
     multipart:
       enabled: true #是否启用http上传处理
       max-request-size: 10MB #最大请求文件的大小
       max-file-size: 10MB #设置单个文件最大长度
-  resources:
-    static-locations: classpath:/static #项目静态资源路径 （可直接通过http访问）
   freemarker:
     template-loader-path: classpath:/templates  #freemarker模板目录
     template-encoding: UTF-8
@@ -45,11 +45,12 @@ spring:
       connection-properties: druid.stat.mergeSql=true;druid.stat.slowSqlMillis=5000
   cache:
     type: redis
-  redis:
-    host: 127.0.0.1
-    port: 6379
-    timeout: 1000
-    password:
+  data:
+    redis:
+      host: 127.0.0.1
+      port: 6379
+      timeout: 1000
+      password:
 
 # #activeMQ配置 ( 注意： activeMQ配置项需在spring的下级 )
   activemq:
@@ -86,15 +87,32 @@ spring:
   #日志配置参数。
   # 当存在logback-spring.xml文件时： 该配置将引进到logback配置，  springboot配置不生效。
   # 不存在logback-spring.xml 文件时， 使用springboot的配置， 同样可用。
+  web:
+    resources:
+      static-locations: classpath:/static
 logging:
   level:
     root: info   #主日志级别
     com.jeequan.jeepay: debug   #该项目日志级别，当需要打印sql时请开启为debug
-  path: ./logs  #日志存放地址
+  file:
+    path: ./logs
 
+springdoc:
+  swagger-ui:
+    path: /swagger-ui.html
+    tags-sorter: alpha
+    operations-sorter: alpha
+  api-docs:
+    path: /v3/api-docs
+  group-configs:
+    - group: 'default'
+      paths-to-match: '/**'
+      packages-to-scan: com.jeequan.jeepay.mgr.ctrl.isv
 # knife4j APIDOC文档
 knife4j:
   enable: true
+  setting:
+    language: zh_cn
 
 #系统业务参数
 isys:

jeepay-components/jeepay-components-mq/pom.xml

@@ -25,12 +25,6 @@
       <artifactId>jeepay-core</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <scope>provided</scope> <!-- 仅编译依赖该jar， 运行时存在 -->
-    </dependency>
-
     <!-- ↓↓↓↓↓↓ MQ依赖包 ↓↓↓↓↓↓ -->
     <!-- 使用的厂商 scope=compile,  否则需要scope=provided(仅编译，不依赖) -->
 

jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/activemq/ActiveMQConfig.java

@@ -26,8 +26,8 @@
 import org.springframework.jms.config.JmsListenerContainerFactory;
 import org.springframework.stereotype.Component;
 
-import javax.jms.ConnectionFactory;
-import javax.jms.Destination;
+import jakarta.jms.ConnectionFactory;
+import jakarta.jms.Destination;
 import java.util.Map;
 import java.util.concurrent.ConcurrentHashMap;
 

jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/activemq/ActiveMQSender.java

@@ -24,7 +24,7 @@
 import org.springframework.jms.core.JmsTemplate;
 import org.springframework.stereotype.Component;
 
-import javax.jms.TextMessage;
+import jakarta.jms.TextMessage;
 
 /**
 *  activeMQ 消息发送器的实现

jeepay-components/jeepay-components-mq/src/main/java/com/jeequan/jeepay/components/mq/vender/rabbitmq/RabbitMQConfig.java

@@ -21,14 +21,14 @@
 import com.jeequan.jeepay.components.mq.constant.MQVenderCS;
 import com.jeequan.jeepay.components.mq.model.AbstractMQ;
 import com.jeequan.jeepay.core.utils.SpringBeansUtil;
+import jakarta.annotation.PostConstruct;
 import org.springframework.amqp.core.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.support.BeanDefinitionBuilder;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.util.Set;
 
 /**

jeepay-components/jeepay-components-oss/pom.xml

@@ -50,18 +50,16 @@
       <scope>provided</scope> <!-- 仅编译依赖该jar， 运行时存在 -->
     </dependency>
 
-    <dependency>
-      <groupId>javax.annotation</groupId>
-      <artifactId>javax.annotation-api</artifactId>
-      <scope>provided</scope> <!-- 仅编译依赖该jar， 运行时存在 -->
-    </dependency>
-
     <!-- 阿里云oss组件  -->
     <dependency>
       <groupId>com.aliyun.oss</groupId>
       <artifactId>aliyun-sdk-oss</artifactId>
       <scope>provided</scope> <!-- 当对象存储使用aliyunOSS时，需要改为：compile， 否则使用provided仅用于编译代码 -->
     </dependency>
+    <dependency>
+        <groupId>jakarta.annotation</groupId>
+        <artifactId>jakarta.annotation-api</artifactId>
+    </dependency>
 
   </dependencies>
 

jeepay-components/jeepay-components-oss/src/main/java/com/jeequan/jeepay/components/oss/service/AliyunOssService.java

@@ -20,13 +20,13 @@
 import com.aliyun.oss.model.GetObjectRequest;
 import com.jeequan.jeepay.components.oss.config.AliyunOssYmlConfig;
 import com.jeequan.jeepay.components.oss.constant.OssSavePlaceEnum;
+import jakarta.annotation.PostConstruct;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.annotation.PostConstruct;
 import java.io.File;
 
 /**

jeepay-core/pom.xml

@@ -41,15 +41,15 @@
     </dependency>
 
     <dependency>
-      <groupId>javax.servlet</groupId>
-      <artifactId>javax.servlet-api</artifactId>
+      <groupId>jakarta.servlet</groupId>
+      <artifactId>jakarta.servlet-api</artifactId>
       <scope>provided</scope> <!-- 仅编译依赖该jar， 运行时存在 -->
     </dependency>
 
     <!-- mybatis plus -->
     <dependency>
       <groupId>com.baomidou</groupId>
-      <artifactId>mybatis-plus-boot-starter</artifactId>
+      <artifactId>mybatis-plus-spring-boot3-starter</artifactId>
       <version>${mybatis.plus.starter.version}</version>
       <scope>provided</scope>
     </dependency>

jeepay-core/src/main/java/com/jeequan/jeepay/core/beans/RequestKitBean.java

@@ -25,10 +25,7 @@
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 
-import javax.servlet.http.HttpServletRequest;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
+import jakarta.servlet.http.HttpServletRequest;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.stream.Collectors;

jeepay-core/src/main/java/com/jeequan/jeepay/core/ctrls/AbstractCtrl.java

@@ -33,8 +33,8 @@
 import org.springframework.util.ObjectUtils;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.Date;

jeepay-core/src/main/java/com/jeequan/jeepay/core/exception/BizExceptionResolver.java

@@ -25,8 +25,8 @@
 import org.springframework.web.servlet.HandlerExceptionResolver;
 import org.springframework.web.servlet.ModelAndView;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import java.io.IOException;
 
 /*

jeepay-manager/pom.xml

@@ -103,7 +103,7 @@
         <!-- Knife4j  -->
         <dependency>
             <groupId>com.github.xiaoymin</groupId>
-            <artifactId>knife4j-openapi2-spring-boot-starter</artifactId>
+            <artifactId>knife4j-openapi3-jakarta-spring-boot-starter</artifactId>
         </dependency>
 
     </dependencies>

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/aop/MethodLogAop.java

@@ -38,7 +38,7 @@
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 import java.lang.reflect.Method;
 import java.util.Date;
 import java.util.concurrent.Executors;

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/bootstrap/JeepayMgrApplication.java

@@ -18,8 +18,9 @@
 import com.alibaba.fastjson.parser.ParserConfig;
 import com.alibaba.fastjson.support.config.FastJsonConfig;
 import com.alibaba.fastjson.support.spring.FastJsonHttpMessageConverter;
-import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor;
-import io.swagger.annotations.ApiOperation;
+import com.baomidou.mybatisplus.annotation.DbType;
+import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
+import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -29,11 +30,6 @@
 import org.springframework.context.annotation.Configuration;
 import org.springframework.http.MediaType;
 import org.springframework.scheduling.annotation.EnableScheduling;
-import springfox.documentation.builders.ApiInfoBuilder;
-import springfox.documentation.builders.RequestHandlerSelectors;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spring.web.plugins.Docket;
-import springfox.documentation.swagger2.annotations.EnableSwagger2WebMvc;
 
 import java.util.Arrays;
 
@@ -46,7 +42,6 @@
 */
 @SpringBootApplication
 @EnableScheduling
-@EnableSwagger2WebMvc
 @MapperScan("com.jeequan.jeepay.service.mapper")    //Mybatis mapper接口路径
 @ComponentScan(basePackages = "com.jeequan.jeepay.*")   //由于MainApplication没有在项目根目录， 需要配置basePackages属性使得成功扫描所有Spring组件；
 @Configuration
@@ -83,13 +78,10 @@ public HttpMessageConverters fastJsonConfig(){
 
     /** Mybatis plus 分页插件 **/
     @Bean
-    public PaginationInterceptor paginationInterceptor() {
-        PaginationInterceptor paginationInterceptor = new PaginationInterceptor();
-        // 设置请求的页面大于最大页后操作， true调回到首页，false 继续请求  默认false
-        // paginationInterceptor.setOverflow(false);
-        // 设置最大单页限制数量，默认 500 条，-1 不受限制
-        // paginationInterceptor.setLimit(500);
-        return paginationInterceptor;
+    public MybatisPlusInterceptor mybatisPlusInterceptor() {
+        MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor();
+        interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL));
+        return interceptor;
     }
 
 
@@ -101,14 +93,14 @@ public PaginationInterceptor paginationInterceptor() {
      * @Author: terrfly
      * @Date: 2023/6/13 15:04
      */
-    @Bean(value = "knife4jDockerBean")
+    /*@Bean(value = "knife4jDockerBean")
     public Docket knife4jDockerBean() {
         return new Docket(DocumentationType.SWAGGER_2)  //指定使用Swagger2规范
                 .apiInfo(new ApiInfoBuilder().version("1.0").build()) //描述字段支持Markdown语法
                 .groupName("运营平台") //分组名称
                 .select() // 配置： 如何扫描
                 .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) // 只扫描： ApiOperation 注解文档。 也支持配置包名、 路径等扫描模式。
                 .build();
-    }
+    }*/
 
 }

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/config/RedisConfig.java

@@ -33,19 +33,19 @@
 @Configuration
 public class RedisConfig {
 
-    @Value("${spring.redis.host}")
+    @Value("${spring.data.redis.host}")
     private String host;
 
-    @Value("${spring.redis.port}")
+    @Value("${spring.data.redis.port}")
     private Integer port;
 
-    @Value("${spring.redis.timeout}")
+    @Value("${spring.data.redis.timeout}")
     private Integer timeout;
 
     @Value("${spring.redis.database}")
     private Integer defaultDatabase;
 
-    @Value("${spring.redis.password}")
+    @Value("${spring.data.redis.password}")
     private String password;
 
     /** 当前系统的redis缓存操作对象 (主对象) **/

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/config/SwaggerConfig.java

@@ -0,0 +1,31 @@
+package com.jeequan.jeepay.mgr.config;
+
+import io.swagger.v3.oas.models.OpenAPI;
+import io.swagger.v3.oas.models.info.Contact;
+import io.swagger.v3.oas.models.info.Info;
+import io.swagger.v3.oas.models.info.License;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @description:
+ * @author: zx
+ * @date: 2024/12/27 23:02
+ */
+@Configuration
+public class SwaggerConfig {
+
+    @Bean
+    public OpenAPI customOpenAPI(){
+        return new OpenAPI()
+            .info(new Info() // 基本信息配置
+                .title("Jeepay运营平台 Api接口文档") // 标题
+                .version("1.0") // 版本
+                // 设置OpenAPI文档的联系信息，包括联系人姓名为"patrick"，邮箱为"[email protected]"。
+                .contact(new Contact().name("jeequan"))
+                // 设置OpenAPI文档的许可证信息，包括许可证名称为"Apache 2.0"，许可证URL为"http://springdoc.org"。
+                .license(new License().name("Apache 2.0").url("https://www.jeequan.com"))
+            );
+    }
+
+}

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/CommonCtrl.java

@@ -20,7 +20,6 @@
 import com.jeequan.jeepay.core.entity.MchInfo;
 import com.jeequan.jeepay.core.model.BaseModel;
 import com.jeequan.jeepay.core.model.security.JeeUserDetails;
-import com.jeequan.jeepay.mgr.config.SystemYmlConfig;
 import com.jeequan.jeepay.service.impl.MchInfoService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -38,8 +37,6 @@
 */
 public abstract class CommonCtrl extends AbstractCtrl {
 
-    @Autowired
-    protected SystemYmlConfig mainConfig;
     @Autowired
     protected MchInfoService mchInfoService;
 

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/ctrl/common/StaticController.java

@@ -43,7 +43,7 @@ public class StaticController extends CommonCtrl {
     @Autowired private OssYmlConfig ossYmlConfig;
 
     /** 图片预览 **/
-    @GetMapping("/api/anon/localOssFiles/**/*.*")
+    @GetMapping("/api/anon/localOssFiles/*/*.*")
     public ResponseEntity<?> imgView() {
 
         try {

jeepay-manager/src/main/java/com/jeequan/jeepay/mgr/secruity/JeeAuthenticationEntryPoint.java

@@ -15,12 +15,12 @@
  */
 package com.jeequan.jeepay.mgr.secruity;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;
 import org.springframework.stereotype.Component;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.Serializable;