From b48d89f22e11c26f9487424172506b652cc1d78c Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Tue, 9 Apr 2024 20:46:54 +0800 Subject: [PATCH 1/5] =?UTF-8?q?debug:=20=E5=86=85=E5=AE=B9=20Debug=20?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/jsl/oa/JslOrganizeInternalOaApplication.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/jsl/oa/JslOrganizeInternalOaApplication.java b/src/main/java/com/jsl/oa/JslOrganizeInternalOaApplication.java index 0691c6b..66322b9 100755 --- a/src/main/java/com/jsl/oa/JslOrganizeInternalOaApplication.java +++ b/src/main/java/com/jsl/oa/JslOrganizeInternalOaApplication.java @@ -7,7 +7,6 @@ import org.springframework.scheduling.annotation.EnableScheduling; @SpringBootApplication @EnableScheduling public class JslOrganizeInternalOaApplication { -// debug public static void main(String[] args) { SpringApplication.run(JslOrganizeInternalOaApplication.class, args); } -- 2.43.0 From c324ce2bca37c0ca9b5ca5f3a4c6ab173dce8909 Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Tue, 9 Apr 2024 20:50:55 +0800 Subject: [PATCH 2/5] =?UTF-8?q?debug:=20=E5=8E=BB=E9=99=A4=20Jenkinsfile?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 24 ------------------------ 1 file changed, 24 deletions(-) delete mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile deleted file mode 100644 index 5f60b1d..0000000 --- a/Jenkinsfile +++ /dev/null @@ -1,24 +0,0 @@ -pipeline { - environment { - QODANA_TOKEN=credentials('qodana-token') - } - agent { - docker { - args ''' - -v "${WORKSPACE}":/data/project - --entrypoint="" - ''' - image 'jetbrains/qodana-jvm' - } - } - stages { - stage('Qodana') { - when { - branch 'feature' - } - steps { - sh '''qodana''' - } - } - } -} \ No newline at end of file -- 2.43.0 From f4ef0ce63bb7aec7e9fcc48c464e7bb8b3b80f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E9=94=8Bxiao=5Flfeng?= Date: Tue, 9 Apr 2024 20:56:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 筱锋xiao_lfeng --- .github/workflows/code-check.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/code-check.yaml b/.github/workflows/code-check.yaml index c3d4309..a4673ee 100644 --- a/.github/workflows/code-check.yaml +++ b/.github/workflows/code-check.yaml @@ -5,7 +5,9 @@ on: branches: - master pull_request: - - develop + branches: + - master + - develop jobs: build: -- 2.43.0 From d2d761deb57df93cf935c7422f20f91db12b28f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AD=B1=E9=94=8Bxiao=5Flfeng?= Date: Tue, 9 Apr 2024 23:02:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20.github/workflows/code?= =?UTF-8?q?-check.yaml?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/code-check.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/code-check.yaml b/.github/workflows/code-check.yaml index a4673ee..f49f3de 100644 --- a/.github/workflows/code-check.yaml +++ b/.github/workflows/code-check.yaml @@ -12,7 +12,7 @@ on: jobs: build: name: 代码检查 - runs-on: linux_amd64 + runs-on: ubuntu-22.04 permissions: contents: read -- 2.43.0 From 34c6ea1a8bea9247e3295c33293ff78722cb8dea Mon Sep 17 00:00:00 2001 From: XiaoLFeng Date: Tue, 9 Apr 2024 23:56:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?debug:=20=E5=8E=BB=E9=99=A4=20qodana,?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20=E6=A3=80=E6=9F=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/checkstyle.xml | 63 +++++++++++++++++++++++++++++++ .github/workflows/code-check.yaml | 4 +- qodana.yaml | 41 -------------------- 3 files changed, 65 insertions(+), 43 deletions(-) create mode 100644 .github/workflows/checkstyle.xml delete mode 100644 qodana.yaml diff --git a/.github/workflows/checkstyle.xml b/.github/workflows/checkstyle.xml new file mode 100644 index 0000000..4089867 --- /dev/null +++ b/.github/workflows/checkstyle.xml @@ -0,0 +1,63 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.github/workflows/code-check.yaml b/.github/workflows/code-check.yaml index f49f3de..cc4bae7 100644 --- a/.github/workflows/code-check.yaml +++ b/.github/workflows/code-check.yaml @@ -30,5 +30,5 @@ jobs: - name: Super-linter uses: super-linter/super-linter@v6.3.1 env: - # To report GitHub Actions status checks - GITHUB_TOKEN: ${{ secrets.MyGitHubToken }} \ No newline at end of file + GITHUB_TOKEN: ${{ secrets.MyGitHubToken }} + CHECKSTYLE_FILTER_PATH: ".github/workflows/checkstyle.xml" \ No newline at end of file diff --git a/qodana.yaml b/qodana.yaml deleted file mode 100644 index b76de5f..0000000 --- a/qodana.yaml +++ /dev/null @@ -1,41 +0,0 @@ -#-------------------------------------------------------------------------------# -# Qodana analysis is configured by qodana.yaml file # -# https://www.jetbrains.com/help/qodana/qodana-yaml.html # -#-------------------------------------------------------------------------------# -version: "1.0" -#Specify inspection profile for code analysis -profile: - name: qodana.starter -#Enable inspections -#include: -# - name: -#Disable inspections -#exclude: -# - name: -# paths: -# - -projectJDK: 17 #(Applied in CI/CD pipeline) -#Execute shell command before Qodana execution (Applied in CI/CD pipeline) -#bootstrap: sh ./prepare-qodana.sh -#Install IDE plugins before Qodana execution (Applied in CI/CD pipeline) -#plugins: -# - id: #(plugin id can be found at https://plugins.jetbrains.com) -#Specify Qodana linter for analysis (Applied in CI/CD pipeline) -linter: jetbrains/qodana-jvm:latest -include: - - name: ClassLoaderInstantiation - - name: NonThreadSafeLazyInitialization - - name: DoubleBraceInitialization - - name: JavaLangImport - - name: UNUSED_IMPORT - - name: SamePackageImport - - name: ArgNamesErrorsInspection - - name: ArgNamesWarningsInspection - - name: AssertMessageNotString - - name: EqualsCalledOnEnumConstant - - name: ListIndexOfReplaceableByContains - - name: ObjectsEqualsCanBeSimplified - - name: SizeReplaceableByIsEmpty - - name: ArrayCreationWithoutNewKeyword -exclude: - - name: VulnerableLibrariesLocal -- 2.43.0