From e5cde1b30ec95d08f04ac47b630729657ba737f9 Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 10 Jul 2026 03:07:52 -0700 Subject: [PATCH 01/14] fix:Checkstyle check --- .github/workflows/checkstyle.yml | 33 +++++++++++++++++++------------- pom.xml | 23 ++++++++++++++++++++++ 2 files changed, 43 insertions(+), 13 deletions(-) diff --git a/.github/workflows/checkstyle.yml b/.github/workflows/checkstyle.yml index 74529b84..3d0c1283 100644 --- a/.github/workflows/checkstyle.yml +++ b/.github/workflows/checkstyle.yml @@ -3,35 +3,42 @@ name: Checkstyle Code Quality on: push: branches: - - develop # 或者你想要检查的分支 + - develop pull_request: branches: - - develop # 你可以在 PR 时检查代码 + - develop jobs: - check: + checkstyle: runs-on: ubuntu-24.04 steps: - # 检出代码 - name: Checkout code uses: actions/checkout@v4 - # 设置 JDK(如果是 Java 项目) - - name: Set up JDK 17.* + - name: Set up JDK 17 uses: actions/setup-java@v4 with: - java-version: '17.*' + java-version: '17' distribution: 'temurin' - # 安装依赖并运行 Checkstyle(如果是 Maven 项目) - - name: Install dependencies and run Checkstyle - run: | - mvn clean package + # 缓存 Maven 依赖,加速构建 + - name: Cache Maven dependencies + uses: actions/cache@v4 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + + # 直接运行 Checkstyle 检查(不执行完整的 package) + - name: Run Checkstyle + run: mvn checkstyle:check - # 查看 Checkstyle 检查报告 + # 如果检查失败,仍然上传报告供查看 - name: Upload Checkstyle report + if: always() # 即使失败也上传报告 uses: actions/upload-artifact@v4 with: name: checkstyle-report - path: target/checkstyle-result.xml # 这个路径应该是 Maven 生成的检查报告路径 + path: target/checkstyle-result.xml diff --git a/pom.xml b/pom.xml index c651a73c..1734cb4a 100644 --- a/pom.xml +++ b/pom.xml @@ -235,6 +235,29 @@ 17 + + + org.apache.maven.plugins + maven-checkstyle-plugin + 3.3.1 + + + settings/checkstyle.xml + + true + + xml + + + + checkstyle-check + validate + + check + + + + From 95b5fb32fb6366fe99dbbe30d8253ea417a3b33a Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 10 Jul 2026 03:40:24 -0700 Subject: [PATCH 02/14] fix:Checkstyle check --- codestyle/huawei-codestyle.xml | 287 +++++++++++++++++++++++++++++++++ pom.xml | 2 +- 2 files changed, 288 insertions(+), 1 deletion(-) create mode 100644 codestyle/huawei-codestyle.xml diff --git a/codestyle/huawei-codestyle.xml b/codestyle/huawei-codestyle.xml new file mode 100644 index 00000000..e7ab75b1 --- /dev/null +++ b/codestyle/huawei-codestyle.xml @@ -0,0 +1,287 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 1734cb4a..c1390dc5 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ 3.3.1 - settings/checkstyle.xml + checkstyle/huawei-checkstyle.xml true From e48f78a49f00a7828d1cdb0f02aae5af5a6b16ed Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 10 Jul 2026 03:47:05 -0700 Subject: [PATCH 03/14] fix:Checkstyle check --- .../huawei-codestyle.xml => checkstyle/huawei-checkstyle.xml | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename codestyle/huawei-codestyle.xml => checkstyle/huawei-checkstyle.xml (100%) diff --git a/codestyle/huawei-codestyle.xml b/checkstyle/huawei-checkstyle.xml similarity index 100% rename from codestyle/huawei-codestyle.xml rename to checkstyle/huawei-checkstyle.xml From f7978bed20592583edf9930d85ae17a87d0ddfcb Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 10 Jul 2026 03:58:14 -0700 Subject: [PATCH 04/14] fix:Checkstyle check --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index c1390dc5..b7ddff00 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ 3.3.1 - checkstyle/huawei-checkstyle.xml + ${project.basedir}/checkstyle/huawei-checkstyle.xml true From 426994319c253f635d9b309aa8f9f23fa67c0e61 Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 10 Jul 2026 04:03:53 -0700 Subject: [PATCH 05/14] fix:Checkstyle check --- checkstyle/huawei-checkstyle.xml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/checkstyle/huawei-checkstyle.xml b/checkstyle/huawei-checkstyle.xml index e7ab75b1..0d68712a 100644 --- a/checkstyle/huawei-checkstyle.xml +++ b/checkstyle/huawei-checkstyle.xml @@ -35,17 +35,6 @@ - diff --git a/pom.xml b/pom.xml index b7ddff00..fc00b947 100644 --- a/pom.xml +++ b/pom.xml @@ -245,6 +245,7 @@ ${project.basedir}/checkstyle/huawei-checkstyle.xml true + warning xml From b58e79f265ccd7dad82484b34e9b302d28cb8661 Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 10 Jul 2026 04:15:40 -0700 Subject: [PATCH 07/14] fix:Checkstyle check --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fc00b947..6358bacb 100644 --- a/pom.xml +++ b/pom.xml @@ -242,7 +242,7 @@ 3.3.1 - ${project.basedir}/checkstyle/huawei-checkstyle.xml + ./checkstyle/huawei-checkstyle.xml true warning From 45714f7e8fb698aa2307a97ce09006bbac6e539e Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 10 Jul 2026 04:19:53 -0700 Subject: [PATCH 08/14] fix:Checkstyle check --- checkstyle/huawei-checkstyle.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/checkstyle/huawei-checkstyle.xml b/checkstyle/huawei-checkstyle.xml index d3d44b62..2512af0c 100644 --- a/checkstyle/huawei-checkstyle.xml +++ b/checkstyle/huawei-checkstyle.xml @@ -61,8 +61,7 @@ - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + \ No newline at end of file From 7d231981aeb127a5a0131649d8c3e188b3594677 Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 10 Jul 2026 04:32:59 -0700 Subject: [PATCH 10/14] fix:Checkstyle check --- checkstyle/huawei-checkstyle.xml | 298 +++++++++++++++++++++++++++---- 1 file changed, 267 insertions(+), 31 deletions(-) diff --git a/checkstyle/huawei-checkstyle.xml b/checkstyle/huawei-checkstyle.xml index c97cd6fd..897c4e52 100644 --- a/checkstyle/huawei-checkstyle.xml +++ b/checkstyle/huawei-checkstyle.xml @@ -1,31 +1,267 @@ - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file From 35a3220d1811fa744376d941302287a9bc35c567 Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 10 Jul 2026 04:33:21 -0700 Subject: [PATCH 11/14] fix:Checkstyle check --- checkstyle/huawei-checkstyle.xml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/checkstyle/huawei-checkstyle.xml b/checkstyle/huawei-checkstyle.xml index 897c4e52..ee7c30aa 100644 --- a/checkstyle/huawei-checkstyle.xml +++ b/checkstyle/huawei-checkstyle.xml @@ -14,6 +14,11 @@ + + From 35bfea8f8206551c44a6d756dbf5fa4798e4a95d Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 10 Jul 2026 04:38:31 -0700 Subject: [PATCH 12/14] fix:Checkstyle check --- checkstyle/huawei-checkstyle.xml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/checkstyle/huawei-checkstyle.xml b/checkstyle/huawei-checkstyle.xml index ee7c30aa..fa1d4b64 100644 --- a/checkstyle/huawei-checkstyle.xml +++ b/checkstyle/huawei-checkstyle.xml @@ -56,11 +56,6 @@ - - - - - From 3843ac132749bcc10a75ac17ed19820a7d17871f Mon Sep 17 00:00:00 2001 From: msslulu <1484036491@qq.com> Date: Fri, 10 Jul 2026 04:40:50 -0700 Subject: [PATCH 13/14] fix:Checkstyle check --- checkstyle/huawei-checkstyle.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/checkstyle/huawei-checkstyle.xml b/checkstyle/huawei-checkstyle.xml index fa1d4b64..b8052b05 100644 --- a/checkstyle/huawei-checkstyle.xml +++ b/checkstyle/huawei-checkstyle.xml @@ -56,7 +56,6 @@ - - ./checkstyle/huawei-checkstyle.xml + ./app/src/main/resources/checkstyle.xml true warning