fix: Switch JDK version to 17 (opentiny#234)

lu-yg · web-flow · commit de764d363b41 · 2025-05-28T11:09:54.000+08:00
diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml
@@ -18,10 +18,10 @@ jobs:
         uses: actions/checkout@v4
 
       # 设置 JDK（如果是 Java 项目）
-      - name: Set up JDK 8.*
+      - name: Set up JDK 17.*
         uses: actions/setup-java@v4
         with:
-          java-version: '8.*'
+          java-version: '17.*'
           distribution: 'temurin'
 
       # 安装依赖并运行 Checkstyle（如果是 Maven 项目）
diff --git a/app/src/main/java/com/tinyengine/it/config/filter/RequestIdFilter.java b/app/src/main/java/com/tinyengine/it/config/filter/RequestIdFilter.java
@@ -12,29 +12,21 @@
 
 package com.tinyengine.it.config.filter;
 
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
 import org.slf4j.MDC;
 
 import java.io.IOException;
 import java.util.UUID;
 
-import javax.servlet.Filter;
-import javax.servlet.FilterChain;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
-
 /**
  * The type Request id filter.
  *
  * @since 2024-10-20
  */
-public class RequestIdFilter implements Filter {
-    @Override
-    public void init(FilterConfig filterConfig) {
-        // 初始化方法
-    }
-
+public class RequestIdFilter implements jakarta.servlet.Filter {
     @Override
     public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain)
             throws IOException, ServletException {
diff --git a/base/src/main/java/com/tinyengine/it/common/exception/GlobalExceptionAdvice.java b/base/src/main/java/com/tinyengine/it/common/exception/GlobalExceptionAdvice.java
@@ -14,6 +14,7 @@
 
 import com.tinyengine.it.common.base.Result;
 
+import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.slf4j.Slf4j;
 
 import org.springframework.http.HttpStatus;
@@ -25,8 +26,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import javax.servlet.http.HttpServletRequest;
-
 /**
  * The type Global exception.
  *
diff --git a/base/src/main/java/com/tinyengine/it/controller/AppController.java b/base/src/main/java/com/tinyengine/it/controller/AppController.java
@@ -23,6 +23,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -37,7 +38,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.Valid;
 
 /**
  * 应用api
diff --git a/base/src/main/java/com/tinyengine/it/controller/AppExtensionController.java b/base/src/main/java/com/tinyengine/it/controller/AppExtensionController.java
@@ -23,6 +23,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -36,8 +37,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.Valid;
-
 /**
  * <p>
  * app的桥接或工具
diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockController.java b/base/src/main/java/com/tinyengine/it/controller/BlockController.java
@@ -33,6 +33,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -49,8 +50,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.Valid;
-
 /**
  * 区块
  *
diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java b/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java
@@ -25,6 +25,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -39,8 +40,6 @@
 import java.util.Collections;
 import java.util.List;
 
-import javax.validation.Valid;
-
 /**
  * <p>
  * 区块分组
diff --git a/base/src/main/java/com/tinyengine/it/controller/ComponentController.java b/base/src/main/java/com/tinyengine/it/controller/ComponentController.java
@@ -27,6 +27,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -37,8 +38,6 @@
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.validation.Valid;
-
 /**
  * 组件api
  *
diff --git a/base/src/main/java/com/tinyengine/it/controller/ComponentLibraryController.java b/base/src/main/java/com/tinyengine/it/controller/ComponentLibraryController.java
@@ -22,6 +22,8 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -34,8 +36,6 @@
 
 import java.util.List;
 
-import javax.validation.Valid;
-
 /**
  * 组件库API
  *
diff --git a/base/src/main/java/com/tinyengine/it/controller/DataSourceController.java b/base/src/main/java/com/tinyengine/it/controller/DataSourceController.java
@@ -23,6 +23,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -35,7 +36,6 @@
 
 import java.util.List;
 
-import javax.validation.Valid;
 
 /**
  * <p>
diff --git a/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java b/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java
@@ -32,6 +32,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -48,8 +49,6 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.validation.Valid;
-
 /**
  * <p>
  * 国际化词条
diff --git a/base/src/main/java/com/tinyengine/it/controller/MaterialController.java b/base/src/main/java/com/tinyengine/it/controller/MaterialController.java
@@ -22,6 +22,8 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -34,9 +36,6 @@
 
 import java.util.List;
 
-import javax.validation.Valid;
-
-
 /**
  * 物料历史api
  *
diff --git a/base/src/main/java/com/tinyengine/it/controller/PageController.java b/base/src/main/java/com/tinyengine/it/controller/PageController.java
@@ -26,6 +26,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -39,8 +40,6 @@
 
 import java.util.List;
 
-import javax.validation.Valid;
-
 /**
  * <p>
  * 页面管理
diff --git a/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java b/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java
@@ -26,6 +26,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -40,8 +41,6 @@
 import java.util.List;
 import java.util.regex.Pattern;
 
-import javax.validation.Valid;
-
 /**
  * <p>
  * 页面历史记录管理
diff --git a/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java b/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java
@@ -23,6 +23,7 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -36,8 +37,6 @@
 
 import java.util.List;
 
-import javax.validation.Valid;
-
 /**
  * <p>
  * 页面模版
diff --git a/base/src/main/java/com/tinyengine/it/controller/PlatformController.java b/base/src/main/java/com/tinyengine/it/controller/PlatformController.java
@@ -22,6 +22,8 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -34,9 +36,6 @@
 
 import java.util.List;
 
-import javax.validation.Valid;
-
-
 /**
  * 设计器api
  *
diff --git a/base/src/main/java/com/tinyengine/it/controller/PlatformHistoryController.java b/base/src/main/java/com/tinyengine/it/controller/PlatformHistoryController.java
@@ -22,6 +22,8 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import jakarta.validation.Valid;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -35,8 +37,6 @@
 
 import java.util.List;
 
-import javax.validation.Valid;
-
 /**
  * 设计器api
  *
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.18</version>
+        <version>3.1.9</version>
     </parent>
 
     <modules>
@@ -19,7 +19,7 @@
     </modules>
 
     <properties>
-        <java.version>1.8</java.version>
+        <java.version>17</java.version>
         <fastjson.version>2.0.50</fastjson.version>
         <hutool.version>5.8.27</hutool.version>
         <org.mapstruct.version>1.5.5.Final</org.mapstruct.version>
@@ -31,6 +31,8 @@
         <freemarker.version>2.3.32</freemarker.version>
         <spring-data-commons.version>2.5.4</spring-data-commons.version>
         <springdoc-openapi-ui.version>1.6.14</springdoc-openapi-ui.version>
+        <mockito-inline.version>4.11.0</mockito-inline.version>
+        <jakarta.servlet-api.version>6.1.0</jakarta.servlet-api.version>
         <tiny-engine.version>1.0-SNAPSHOT</tiny-engine.version>
     </properties>
     <dependencies>
@@ -108,6 +110,13 @@
             <version>${springdoc-openapi-ui.version}</version>
         </dependency>
 
+        <dependency>
+            <groupId>jakarta.servlet</groupId>
+            <artifactId>jakarta.servlet-api</artifactId>
+            <version>${jakarta.servlet-api.version}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>com.h2database</groupId>
             <artifactId>h2</artifactId>
@@ -122,6 +131,7 @@
             <groupId>org.mockito</groupId>
             <artifactId>mockito-inline</artifactId>
             <scope>test</scope>
+            <version>${mockito-inline.version}</version>
         </dependency>
         <dependency>
             <groupId>org.junit.vintage</groupId>
@@ -157,10 +167,10 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version> <!-- 选择合适的版本 -->
+                <version>3.11.0</version> <!-- 选择合适的版本 -->
                 <configuration>
-                    <source>1.8</source>   <!-- 编译源码的 Java 版本 -->
-                    <target>1.8</target>   <!-- 生成字节码的 Java 版本 -->
+                    <source>17</source>   <!-- 编译源码的 Java 版本 -->
+                    <target>17</target>   <!-- 生成字节码的 Java 版本 -->
                 </configuration>
             </plugin>
 
