fix: Switch JDK version to 17

.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 项目）

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 {

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.
  *

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

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的桥接或工具

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;
-
 /**
  * 区块
  *

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>
  * 区块分组

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
  *

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
  *

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>

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>
  * 国际化词条
@@ -70,7 +69,7 @@ public class I18nEntryController {
     private I18nEntryService i18nEntryService;
 
     /**
-     * Gets all i 18 n entries by app.
+     * Gets i 18 n entries by app.
      *
      * @return 获取国际化词条列表 i 18 n entries
      */
@@ -79,7 +78,7 @@ public class I18nEntryController {
             content = @Content(mediaType = "application/json", schema = @Schema())),
         @ApiResponse(responseCode = "400", description = "请求失败")
     })
-    @SystemControllerLog(description = "获取国际化词条列表")
+    @SystemControllerLog(description = "通过app获取国际化词条列表")
     @GetMapping("/i18n/entries")
     public Result<I18nEntryListResult> getI18nEntriesByApp( @RequestParam(value = "host", required = false) Integer host,
         @RequestParam(value = "host_type", required = false) String hostType) {

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
  *

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>
  * 页面管理

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>
  * 页面历史记录管理

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>
  * 页面模版

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
  *

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
  *

base/src/test/java/com/tinyengine/it/controller/I18nEntryControllerTest.java

@@ -58,11 +58,12 @@ void setUp() {
     }
 
     @Test
-    void testGetAllI18nEntries() {
+    void testGetI18nEntriesByApp() {
         I18nEntryListResult mockData = new I18nEntryListResult();
-        when(i18nEntryService.findAllI18nEntry()).thenReturn(mockData);
-
-        Result<I18nEntryListResult> result = i18nEntryController.getAllI18nEntries();
+        when(i18nEntryService.findI18nEntryByApp(anyInt(), anyString())).thenReturn(mockData);
+        Integer host = 1;
+        String hostType = "app";
+        Result<I18nEntryListResult> result = i18nEntryController.getI18nEntriesByApp(host, hostType);
         Assertions.assertEquals(mockData, result.getData());
     }