From 19228e4269a74381885eadcf6e91767111689529 Mon Sep 17 00:00:00 2001 From: lu-yg <128358973+lu-yg@users.noreply.github.com> Date: Tue, 20 May 2025 10:59:52 +0800 Subject: [PATCH 01/12] fix: Switch JDK version to 17 (#221) * fix: Switch JDK version to 17 --- .github/workflows/checkstyle.yml | 4 ++-- pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index a2f41cb3..74529b84 100644 --- 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/pom.xml b/pom.xml index 6faa8c7e..d7cd9480 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ - 1.8 + 17 2.0.50 5.8.27 1.5.5.Final @@ -159,8 +159,8 @@ maven-compiler-plugin 3.8.1 - 1.8 - 1.8 + 17 + 17 From fdae65a67709178a427739052c5ef8b4d15c6ac2 Mon Sep 17 00:00:00 2001 From: lu-yg <128358973+lu-yg@users.noreply.github.com> Date: Tue, 27 May 2025 15:58:53 +0800 Subject: [PATCH 02/12] fix: Switch JDK version to 17 (#231) * fix: Switch JDK version to 17 * fix: Switch JDK version to 17 --- .github/workflows/checkstyle.yml | 4 ++-- pom.xml | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index a2f41cb3..74529b84 100644 --- 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/pom.xml b/pom.xml index 6faa8c7e..d7cd9480 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ - 1.8 + 17 2.0.50 5.8.27 1.5.5.Final @@ -159,8 +159,8 @@ maven-compiler-plugin 3.8.1 - 1.8 - 1.8 + 17 + 17 From d8f3d39bc4ee07fd4e072c9490680f119d31594d Mon Sep 17 00:00:00 2001 From: lu-yg <128358973+lu-yg@users.noreply.github.com> Date: Tue, 27 May 2025 20:54:08 +0800 Subject: [PATCH 03/12] fix: Fix i18n test (#232) (#233) --- .../tinyengine/it/controller/I18nEntryController.java | 4 ++-- .../it/controller/I18nEntryControllerTest.java | 9 +++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java b/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java index c8b8dad0..42a7705d 100644 --- a/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java +++ b/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java @@ -70,7 +70,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 +79,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 getI18nEntriesByApp( @RequestParam(value = "host", required = false) Integer host, @RequestParam(value = "host_type", required = false) String hostType) { diff --git a/base/src/test/java/com/tinyengine/it/controller/I18nEntryControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/I18nEntryControllerTest.java index 3650b72f..0068ef75 100644 --- a/base/src/test/java/com/tinyengine/it/controller/I18nEntryControllerTest.java +++ b/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 result = i18nEntryController.getAllI18nEntries(); + when(i18nEntryService.findI18nEntryByApp(anyInt(), anyString())).thenReturn(mockData); + Integer host = 1; + String hostType = "app"; + Result result = i18nEntryController.getI18nEntriesByApp(host, hostType); Assertions.assertEquals(mockData, result.getData()); } From b30cbd3703e4fb2a25b8c5f769d8836a6dbcf00b Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 27 May 2025 05:51:27 -0700 Subject: [PATCH 04/12] fix: Modify the springboot version --- app/pom.xml | 9 +++++++++ .../it/config/filter/RequestIdFilter.java | 18 +++++------------- base/pom.xml | 7 +++++++ .../exception/GlobalExceptionAdvice.java | 3 +-- .../it/controller/AppController.java | 2 +- .../it/controller/AppExtensionController.java | 3 +-- .../it/controller/BlockController.java | 3 +-- .../it/controller/BlockGroupController.java | 3 +-- .../it/controller/ComponentController.java | 3 +-- .../controller/ComponentLibraryController.java | 4 ++-- .../it/controller/DataSourceController.java | 2 +- .../it/controller/I18nEntryController.java | 3 +-- .../it/controller/MaterialController.java | 5 ++--- .../it/controller/PageController.java | 3 +-- .../it/controller/PageHistoryController.java | 3 +-- .../it/controller/PageTemplateController.java | 3 +-- .../it/controller/PlatformController.java | 5 ++--- .../controller/PlatformHistoryController.java | 4 ++-- pom.xml | 14 ++++++++++++-- 19 files changed, 52 insertions(+), 45 deletions(-) diff --git a/app/pom.xml b/app/pom.xml index 640b1e25..d6e219e8 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -19,6 +19,15 @@ tiny-engine-base 1.0-SNAPSHOT + + org.apache.tomcat.embed + tomcat-embed-core + 9.0.54 + + + org.apache.tomcat.embed + tomcat-embed-core + 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 index 20706dc3..f9f5bf4b 100644 --- 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/pom.xml b/base/pom.xml index 06e78402..edcff259 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -4,6 +4,13 @@ tiny-engine-base jar + + + jakarta.servlet + jakarta.servlet-api + 6.0.0 + + 1.0-SNAPSHOT tiny engine base module 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 index 4e0e0f30..1b07b66d 100644 --- 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 index f1995ec3..b4c07a90 100644 --- 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 index 97c7cc7c..2ae2c1c4 100644 --- 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; - /** *

* 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 index ba6139b2..8665b243 100644 --- 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 index f4782dae..f090c927 100644 --- 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; - /** *

* 区块分组 diff --git a/base/src/main/java/com/tinyengine/it/controller/ComponentController.java b/base/src/main/java/com/tinyengine/it/controller/ComponentController.java index 833e3a44..b4b0b109 100644 --- 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 index e4d4ece1..b30e2017 100644 --- 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 index 7add4ddc..a538011e 100644 --- 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; /** *

diff --git a/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java b/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java index 4be56b81..f00fd550 100644 --- 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; - /** *

* 国际化词条 diff --git a/base/src/main/java/com/tinyengine/it/controller/MaterialController.java b/base/src/main/java/com/tinyengine/it/controller/MaterialController.java index cde9dc51..27f8609b 100644 --- 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 index 7f8ac710..208c7baa 100644 --- 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; - /** *

* 页面管理 diff --git a/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java b/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java index 0a260090..ff1509b0 100644 --- 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; - /** *

* 页面历史记录管理 diff --git a/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java b/base/src/main/java/com/tinyengine/it/controller/PageTemplateController.java index 78f5cae5..f490d1fd 100644 --- 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; - /** *

* 页面模版 diff --git a/base/src/main/java/com/tinyengine/it/controller/PlatformController.java b/base/src/main/java/com/tinyengine/it/controller/PlatformController.java index a20b7107..ed007a98 100644 --- 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 index f076b1c6..54ebd19a 100644 --- 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 index d7cd9480..9e9b653c 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.springframework.boot spring-boot-starter-parent - 2.7.18 + 3.1.9 @@ -31,6 +31,8 @@ 2.3.32 2.5.4 1.6.14 + 4.11.0 + 6.0.0 1.0-SNAPSHOT @@ -108,6 +110,13 @@ ${springdoc-openapi-ui.version} + + jakarta.servlet + jakarta.servlet-api + ${jakarta.servlet-api.version} + provided + + com.h2database h2 @@ -122,6 +131,7 @@ org.mockito mockito-inline test + ${mockito.version} org.junit.vintage @@ -157,7 +167,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.8.1 + 3.11.0 17 17 From eccb60a31b426125379d07a79f4f699a57067b66 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 27 May 2025 06:15:39 -0700 Subject: [PATCH 05/12] fix: Modify the springboot version --- base/pom.xml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/base/pom.xml b/base/pom.xml index edcff259..06e78402 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -4,13 +4,6 @@ tiny-engine-base jar - - - jakarta.servlet - jakarta.servlet-api - 6.0.0 - - 1.0-SNAPSHOT tiny engine base module From 315a2980e5b3037a12f2270868490fbeed160971 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 27 May 2025 18:22:59 -0700 Subject: [PATCH 06/12] fix: Modify the pom --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index 9e9b653c..1e5f9b7e 100644 --- a/pom.xml +++ b/pom.xml @@ -31,8 +31,8 @@ 2.3.32 2.5.4 1.6.14 - 4.11.0 - 6.0.0 + 4.11.0 + 6.1.0 1.0-SNAPSHOT @@ -131,7 +131,7 @@ org.mockito mockito-inline test - ${mockito.version} + ${mockito-inline.version} org.junit.vintage From d1c3164d4d9a15eebd10f5211494fb0a3bff51d5 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Tue, 27 May 2025 19:20:52 -0700 Subject: [PATCH 07/12] fix: Modify the pom --- app/pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/app/pom.xml b/app/pom.xml index d6e219e8..640b1e25 100644 --- a/app/pom.xml +++ b/app/pom.xml @@ -19,15 +19,6 @@ tiny-engine-base 1.0-SNAPSHOT - - org.apache.tomcat.embed - tomcat-embed-core - 9.0.54 - - - org.apache.tomcat.embed - tomcat-embed-core - From fd7154f5291d93d27ebc89e7a83e740f9427cdbf Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Wed, 28 May 2025 01:05:05 -0700 Subject: [PATCH 08/12] fix: Fix page history version bug --- .../com/tinyengine/it/service/app/impl/PageServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java index 39533e97..da72236a 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java @@ -379,7 +379,7 @@ public Result updatePage(Page page) { pageHistory.setPage(pageTemp.getId()); pageHistory.setId(null); pageHistory.setIsPublished(false); - pageHistory.setVersion("draft"); + pageHistory.setVersion("0"); int resultPageHistory = pageHistoryService.createPageHistory(pageHistory); if (resultPageHistory < 1) { return Result.failed(ExceptionEnum.CM001); From 0852e2d26bd736f9c0931570034032001f812bb5 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Wed, 28 May 2025 01:05:17 -0700 Subject: [PATCH 09/12] fix: Fix page history version bug --- .../it/common/exception/ExceptionEnum.java | 4 ++-- .../common/utils/SecurityFileCheckUtil.java | 2 +- .../com/tinyengine/it/common/utils/Utils.java | 2 ++ .../tinyengine/it/config/AiChatConfig.java | 2 +- .../it/controller/BlockGroupController.java | 2 +- .../it/controller/CanvasController.java | 12 +++++------ .../it/controller/DataSourceController.java | 1 - .../it/controller/I18nEntryController.java | 2 +- .../it/controller/PageHistoryController.java | 7 +++---- .../com/tinyengine/it/model/entity/User.java | 1 - .../it/service/app/PageHistoryService.java | 9 ++++++++ .../service/app/impl/CanvasServiceImpl.java | 2 +- .../app/impl/PageHistoryServiceImpl.java | 21 +++++++++++++++++++ .../it/service/app/impl/PageServiceImpl.java | 9 ++++---- .../material/impl/ComponentServiceImpl.java | 7 +++---- .../resources/mappers/PageHistoryMapper.xml | 1 + .../it/controller/BlockControllerTest.java | 2 +- .../controller/BlockGroupControllerTest.java | 2 +- .../it/gateway/ai/AiChatClientTest.java | 1 - 19 files changed, 59 insertions(+), 30 deletions(-) diff --git a/base/src/main/java/com/tinyengine/it/common/exception/ExceptionEnum.java b/base/src/main/java/com/tinyengine/it/common/exception/ExceptionEnum.java index 3e604e12..1f5c5113 100644 --- a/base/src/main/java/com/tinyengine/it/common/exception/ExceptionEnum.java +++ b/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", "文件校验失败"); /** * 错误码 diff --git a/base/src/main/java/com/tinyengine/it/common/utils/SecurityFileCheckUtil.java b/base/src/main/java/com/tinyengine/it/common/utils/SecurityFileCheckUtil.java index 2b6e6b49..8687e99a 100644 --- a/base/src/main/java/com/tinyengine/it/common/utils/SecurityFileCheckUtil.java +++ b/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; diff --git a/base/src/main/java/com/tinyengine/it/common/utils/Utils.java b/base/src/main/java/com/tinyengine/it/common/utils/Utils.java index bf173001..af23969c 100644 --- a/base/src/main/java/com/tinyengine/it/common/utils/Utils.java +++ b/base/src/main/java/com/tinyengine/it/common/utils/Utils.java @@ -400,6 +400,7 @@ public static Result 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; } + /** * 校验文件流合法性 * diff --git a/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java b/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java index b72bc3fd..d69dfc25 100644 --- a/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java +++ b/base/src/main/java/com/tinyengine/it/config/AiChatConfig.java @@ -70,7 +70,7 @@ public static Map 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; } diff --git a/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java b/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java index f090c927..133fa936 100644 --- a/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java +++ b/base/src/main/java/com/tinyengine/it/controller/BlockGroupController.java @@ -119,7 +119,7 @@ public Result createBlockGroups(@Valid @RequestBody BlockGroup block }, responses = { @ApiResponse(responseCode = "200", description = "返回信息", content = @Content(mediaType = "application/json", schema = @Schema(implementation = BlockGroup.class))), - @ApiResponse(responseCode = "400", description = "请求失败") + @ApiResponse(responseCode = "400", description = "请求失败") }) @SystemControllerLog(description = "修改区块分组") @PostMapping("/block-groups/update/{id}") diff --git a/base/src/main/java/com/tinyengine/it/controller/CanvasController.java b/base/src/main/java/com/tinyengine/it/controller/CanvasController.java index 575cfc7e..a9a3ba40 100644 --- a/base/src/main/java/com/tinyengine/it/controller/CanvasController.java +++ b/base/src/main/java/com/tinyengine/it/controller/CanvasController.java @@ -56,13 +56,13 @@ public class CanvasController { * @return CanvasDto */ @Operation(summary = "区块及页面锁", description = "区块及页面锁", parameters = { - @Parameter(name = "id", description = "页面id"), - @Parameter(name = "state", description = "状态"), - @Parameter(name = "type", description = "区分是页面还是区块") + @Parameter(name = "id", description = "页面id"), + @Parameter(name = "state", description = "状态"), + @Parameter(name = "type", description = "区分是页面还是区块") }, responses = { - @ApiResponse(responseCode = "200", description = "返回信息", - content = @Content(mediaType = "application/json", schema = @Schema())), - @ApiResponse(responseCode = "400", description = "请求失败")} + @ApiResponse(responseCode = "200", description = "返回信息", + content = @Content(mediaType = "application/json", schema = @Schema())), + @ApiResponse(responseCode = "400", description = "请求失败")} ) @SystemControllerLog(description = "区块及页面锁") @GetMapping("apps/canvas/lock") diff --git a/base/src/main/java/com/tinyengine/it/controller/DataSourceController.java b/base/src/main/java/com/tinyengine/it/controller/DataSourceController.java index a538011e..4b6ae3c3 100644 --- a/base/src/main/java/com/tinyengine/it/controller/DataSourceController.java +++ b/base/src/main/java/com/tinyengine/it/controller/DataSourceController.java @@ -36,7 +36,6 @@ import java.util.List; - /** *

* 前端控制器 diff --git a/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java b/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java index 9eb5c841..f16a2248 100644 --- a/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java +++ b/base/src/main/java/com/tinyengine/it/controller/I18nEntryController.java @@ -80,7 +80,7 @@ public class I18nEntryController { }) @SystemControllerLog(description = "通过app获取国际化词条列表") @GetMapping("/i18n/entries") - public Result getI18nEntriesByApp( @RequestParam(value = "host", required = false) Integer host, + public Result getI18nEntriesByApp(@RequestParam(value = "host", required = false) Integer host, @RequestParam(value = "host_type", required = false) String hostType) { I18nEntryListResult i18nEntriesList = i18nEntryService.findI18nEntryByApp(host, hostType); return Result.success(i18nEntriesList); diff --git a/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java b/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java index ff1509b0..b156c418 100644 --- a/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java +++ b/base/src/main/java/com/tinyengine/it/controller/PageHistoryController.java @@ -111,7 +111,7 @@ public Result> getLatestPublishPage(@RequestBody PageQuer @Parameter(name = "id", description = "页面历史主键id") }, responses = { @ApiResponse(responseCode = "200", description = "返回信息", - content = @Content(mediaType = "application/json", schema = @Schema(implementation = PageHistory.class))), + content = @Content(mediaType = "application/json", schema = @Schema(implementation = PageHistory.class))), @ApiResponse(responseCode = "400", description = "请求失败") }) @SystemControllerLog(description = "获取页面历史记录明细") @@ -182,9 +182,8 @@ public Result deletePageHistory(@PathVariable Integer historyId) { @Parameter(name = "app", description = "appId") }, responses = { @ApiResponse(responseCode = "200", description = "返回信息", - content = @Content(mediaType = "application/json", - schema = @Schema(implementation = PageHistory.class))), - @ApiResponse(responseCode = "400", description = "请求失败") + content = @Content(mediaType = "application/json", schema = @Schema(implementation = PageHistory.class))), + @ApiResponse(responseCode = "400", description = "请求失败") }) @SystemControllerLog(description = "根据名称查询页面历史记录") @GetMapping("/pages/histories/find") diff --git a/base/src/main/java/com/tinyengine/it/model/entity/User.java b/base/src/main/java/com/tinyengine/it/model/entity/User.java index 1c664c14..3570a20f 100644 --- a/base/src/main/java/com/tinyengine/it/model/entity/User.java +++ b/base/src/main/java/com/tinyengine/it/model/entity/User.java @@ -19,7 +19,6 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import com.tinyengine.it.common.base.BaseEntity; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Getter; diff --git a/base/src/main/java/com/tinyengine/it/service/app/PageHistoryService.java b/base/src/main/java/com/tinyengine/it/service/app/PageHistoryService.java index 4b4d5821..3e0a1f9c 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/PageHistoryService.java +++ b/base/src/main/java/com/tinyengine/it/service/app/PageHistoryService.java @@ -90,4 +90,13 @@ public interface PageHistoryService { * @return page history */ IPage findLatestPublishPage(PageQueryVo pageQueryVo); + + /** + * 查询页面历史的最大版本号 + * + * @param app the app + * @param name the name + * @return 页面历史的最大版本号 + */ + String selectMaxVersionOfPageHistory(String name, Integer app); } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java index 143e7d72..fb1a8656 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/CanvasServiceImpl.java @@ -47,7 +47,7 @@ public Result lockCanvas(Integer id, String state, String type) { String occupier; // needTODO 先试用mock数据，后续添加登录及权限后从session获取, User user = userMapper.queryUserById(loginUserContext.getLoginUserId()); - if(user == null) { + if (user == null) { user = new User(); user.setId(loginUserContext.getLoginUserId()); } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java index a8dcc883..797ea66e 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java @@ -25,7 +25,9 @@ import org.apache.ibatis.annotations.Param; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.util.CollectionUtils; +import java.util.Collection; import java.util.List; /** @@ -36,6 +38,8 @@ @Service @Slf4j public class PageHistoryServiceImpl implements PageHistoryService { + private static final String DEFAULT_PAGE_HISTORY_VERSION = "0"; + @Autowired private PageHistoryMapper pageHistoryMapper; @@ -123,4 +127,21 @@ public IPage findLatestPublishPage(PageQueryVo PublishedPageVo queryData = pageQueryVo.getData(); return pageHistoryMapper.findLatestPublishPage(pageQueryVo.getPage(), queryData); } + + /** + * 查询页面历史的最大版本号 + * + * @param app the app + * @param name the name + * @return 页面历史的最大版本号 + */ + @Override + public String selectMaxVersionOfPageHistory(String name, Integer app) { + List pageHistories = pageHistoryMapper.queryPageHistoryByName(name, app); + if (CollectionUtils.isEmpty(pageHistories)) { + return DEFAULT_PAGE_HISTORY_VERSION; + } + PageHistory lastPageHistory = pageHistories.get(pageHistories.size() - 1); + return lastPageHistory.getVersion(); + } } diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java index da72236a..620fbfc9 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/PageServiceImpl.java @@ -53,7 +53,6 @@ import org.apache.ibatis.annotations.Param; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.context.ApplicationEvent; import org.springframework.context.ApplicationEventPublisher; import org.springframework.stereotype.Service; @@ -285,7 +284,7 @@ public Result createPage(Page page) { pageHistory.setId(null); pageHistory.setMessage(page.getMessage()); pageHistory.setIsPublished(false); - pageHistory.setVersion("draft"); + pageHistory.setVersion("0"); int resultPageHistory = pageHistoryService.createPageHistory(pageHistory); if (resultPageHistory < 1) { return Result.failed(ExceptionEnum.CM001); @@ -379,7 +378,9 @@ public Result updatePage(Page page) { pageHistory.setPage(pageTemp.getId()); pageHistory.setId(null); pageHistory.setIsPublished(false); - pageHistory.setVersion("0"); + String maxVersion = + pageHistoryService.selectMaxVersionOfPageHistory(pageHistory.getName(), pageHistory.getApp()); + pageHistory.setVersion(maxVersion); int resultPageHistory = pageHistoryService.createPageHistory(pageHistory); if (resultPageHistory < 1) { return Result.failed(ExceptionEnum.CM001); @@ -541,7 +542,7 @@ public Result checkDelete(Integer id) { // needTODO 从缓存中获取的user信息 User user = userService.queryUserById(loginUserContext.getLoginUserId()); // 逻辑不对，如果没有同步用户数据，就用登录用户的 - if(user == null) { + if (user == null) { user = new User(); user.setId(loginUserContext.getLoginUserId()); user.setUsername(loginUserContext.getLoginUserId()); diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java index 1ec6d595..2b7b7abd 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java @@ -36,7 +36,6 @@ import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.annotations.Param; -import org.checkerframework.checker.units.qual.C; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; @@ -221,7 +220,7 @@ public Result parseBundle(BundleDto bundleDto) { if (components == null || components.isEmpty()) { return Result.failed(ExceptionEnum.CM009); } - List componentList = buildComponentList(bundleDto,components,snippets); + List componentList = buildComponentList(bundleDto, components, snippets); List> packages = bundleDto.getMaterials().getPackages(); BundleResultDto bundleList = new BundleResultDto(); @@ -293,7 +292,7 @@ public Result bulkCreate(List componentList) { List queryComponent = findComponentByCondition(componentParam); // 查询组件库id String packageName = null; - if (component.getNpm() != null &&component.getNpm().get("package") != null) { + if (component.getNpm() != null && component.getNpm().get("package") != null) { packageName = String.valueOf(component.getNpm().get("package")); } if (packageName != null && !packageName.isEmpty()) { @@ -355,7 +354,7 @@ private String toPascalCase(String input) { return result.toString(); } - private List buildComponentList(BundleDto bundleDto, List> components, + private List buildComponentList(BundleDto bundleDto, List> components, List snippets) { List componentList = new ArrayList<>(); for (Map comp : components) { diff --git a/base/src/main/resources/mappers/PageHistoryMapper.xml b/base/src/main/resources/mappers/PageHistoryMapper.xml index d75d5b43..9158dd38 100644 --- a/base/src/main/resources/mappers/PageHistoryMapper.xml +++ b/base/src/main/resources/mappers/PageHistoryMapper.xml @@ -239,6 +239,7 @@ WHERE name like concat('%',#{name},'%') and app_id = #{app} and is_published = 1 + ORDER BY last_updated_time ASC diff --git a/base/src/test/java/com/tinyengine/it/controller/BlockControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/BlockControllerTest.java index 3f078915..2372099d 100644 --- a/base/src/test/java/com/tinyengine/it/controller/BlockControllerTest.java +++ b/base/src/test/java/com/tinyengine/it/controller/BlockControllerTest.java @@ -205,6 +205,6 @@ void testUpdateBlocks() { Result result = blockController.updateBlocks(blockParam, Integer.valueOf(0), Integer.valueOf(1)); Assertions.assertEquals(returnData, result.getData()); verify(blockService).updateBlockById( - argThat(param -> param.getName().equals("Updated Block") && param.getId().equals(0)), eq(1)); + argThat(param -> param.getName().equals("Updated Block") && param.getId().equals(0)), eq(1)); } } diff --git a/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java b/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java index 8b3ea646..9a595ceb 100644 --- a/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java +++ b/base/src/test/java/com/tinyengine/it/controller/BlockGroupControllerTest.java @@ -58,7 +58,7 @@ void testGetAllBlockGroups() { Arrays.asList(mockData)); Result> result = blockGroupController.getAllBlockGroups( - Arrays.asList(Integer.valueOf(0)), Integer.valueOf(0), "block"); + Arrays.asList(Integer.valueOf(0)), Integer.valueOf(0), "block"); Assertions.assertEquals(mockData, result.getData().get(0)); } diff --git a/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java b/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java index d66b34d8..7918bc4e 100644 --- a/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java +++ b/base/src/test/java/com/tinyengine/it/gateway/ai/AiChatClientTest.java @@ -29,7 +29,6 @@ import org.junit.jupiter.api.Test; import org.mockito.Answers; import org.mockito.InjectMocks; -import org.mockito.Mock; import org.mockito.Mockito; import org.mockito.MockitoAnnotations; import org.springframework.http.HttpMethod; From a8d5739c308a2308e339dcc6c6b94360305618ce Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Wed, 28 May 2025 01:15:46 -0700 Subject: [PATCH 10/12] fix: Fix page history version bug --- .../tinyengine/it/service/app/impl/PageHistoryServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java index 797ea66e..6f2b87c6 100644 --- a/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/app/impl/PageHistoryServiceImpl.java @@ -27,7 +27,6 @@ import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; -import java.util.Collection; import java.util.List; /** From 659a18347c865889b4d6cdbc296d6021401dec27 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Wed, 28 May 2025 02:01:30 -0700 Subject: [PATCH 11/12] fix: Fix code check maven version --- .codecheck/check.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.codecheck/check.yml b/.codecheck/check.yml index 6e3da7b4..12b0ef23 100644 --- a/.codecheck/check.yml +++ b/.codecheck/check.yml @@ -5,11 +5,11 @@ steps: - 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 + cd ${WORKSPACE}/code && 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/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/cbu-maven-user-settings.xml -s /usr1/maven/settings/cbu-maven-user-settings.xml spotbugs: compileScriptCmd: workingPath: ./ From 92e245ff2ecb8aeae6bf702243fcad4baf422db7 Mon Sep 17 00:00:00 2001 From: lu17301156525 Date: Wed, 28 May 2025 20:05:01 -0700 Subject: [PATCH 12/12] fix: Fix code check --- .codecheck/check.yml | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/.codecheck/check.yml b/.codecheck/check.yml index 12b0ef23..eb177e0e 100644 --- a/.codecheck/check.yml +++ b/.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.9.0/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.9.0/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