Merge branch 'opentiny:develop' into lu/develop

Author: lu-yg

.codecheck/check.yml

@@ -3,16 +3,13 @@ version: 2.0
 steps:
   pre_codecheck:
     - checkout
-    - sh:
-        command: |
-          cd ${WORKSPACE}/code && export PATH=/opt/buildtools/maven/apache-maven-3.6.3/bin:$PATH && mvn -version && mvn clean compile -Dmaven.test.skip=true -gs /usr1/maven/settings/cbu-maven-user-settings.xml -s /usr1/maven/settings/cbu-maven-user-settings.xml
-        effect_tool: spotbugs
 tool_params:
   secsolar:
-    compile_script: export PATH=/opt/buildtools/maven/apache-maven-3.6.3/bin:$PATH && mvn -version && mvn clean compile -Dmaven.test.skip=true -gs /usr1/maven/settings/cbu-maven-user-settings.xml -s /usr1/maven/settings/cbu-maven-user-settings.xml
+    compile_script: export PATH=/opt/buildtools/maven/apache-maven-3.9.0/bin:$PATH && mvn -version && mvn clean compile -Dmaven.test.skip=true -gs /usr1/maven/settings/huawei-maven-settings.xml -s /usr1/maven/settings/huawei-maven-settings.xml
+    java_version: jdk17
   spotbugs:
-    compileScriptCmd:
+    compileScriptCmd: mvn clean compile -Dmaven.test.skip=true -gs /usr1/maven/settings/huawei-maven-settings.xml -s /usr1/maven/settings/huawei-maven-settings.xml
     workingPath: ./
     compileScriptNote:
-    compileScriptType:
-    jdkVersion:
+    compileScriptType: maven-3.9.0
+    jdkVersion: jdk17

.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/ExceptionEnum.java

@@ -245,12 +245,12 @@ public enum ExceptionEnum implements IBaseError {
     /**
      * Cm 324 exception enum.
      */
-    CM324("CM324","文件名或路径无效"),
+    CM324("CM324", "文件名或路径无效"),
 
     /**
      * Cm 325 exception enum.
      */
-    CM325("CM325","文件校验失败");
+    CM325("CM325", "文件校验失败");
 
     /**
      * 错误码

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/common/utils/SecurityFileCheckUtil.java

@@ -42,7 +42,7 @@ public class SecurityFileCheckUtil {
     public static boolean checkPathHasCrossDir(String dirOrFileName) {
         if (!dirOrFileName.contains("../") && !dirOrFileName.contains("/..")) {
             if (!dirOrFileName.contains("..\\") && !dirOrFileName.contains("\\..")) {
-                return dirOrFileName.contains("./") || dirOrFileName.contains(".\\.\\") 
+                return dirOrFileName.contains("./") || dirOrFileName.contains(".\\.\\")
                     || dirOrFileName.contains("%00");
             } else {
                 return true;

base/src/main/java/com/tinyengine/it/common/utils/Utils.java

@@ -400,6 +400,7 @@ public static Result<JsonFile> parseJsonFileStream(MultipartFile file) {
         log.info("Successfully parsed JSON file: {}", fileName);
         return Result.success(jsonFile);
     }
+
     /**
      * 去除文件BOM字符
      *
@@ -412,6 +413,7 @@ public static String removeBOM(String input) {
         }
         return input;
     }
+
     /**
      * 校验文件流合法性
      *

base/src/main/java/com/tinyengine/it/config/AiChatConfig.java

@@ -70,7 +70,7 @@ public static Map<String, AiChatConfigData> getAiChatConfig(String model, String
         String ernieBotAccessToken = Enums.FoundationModel.ERNIBOT_TURBO.getValue().equals(model) ? token : null;
         config.put(Enums.FoundationModel.ERNIBOT_TURBO.getValue(), new AiChatConfigData(
 "https://aip.baidubce.com/rpc/2.0/ai_custom/v1/wenxinworkshop/chat/completions_pro?access_token="
-                 + ernieBotAccessToken, createCommonRequestOption(), ernieBotHeaders, "baidu"));
+                + ernieBotAccessToken, createCommonRequestOption(), ernieBotHeaders, "baidu"));
         return config;
     }
 

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