升级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;