From 73e73cc538e9a63b0e32140f4a9f86250c77335a Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 21:02:22 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=E6=8E=A8=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hlbd/provider/all/ClientApplication.java | 1 + 1 file changed, 1 insertion(+) diff --git a/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java b/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java index 7ef6fca..02730b1 100644 --- a/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java +++ b/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java @@ -18,6 +18,7 @@ public class ClientApplication { public static void main(String[] args) { + System.out.println("testest"); SpringApplication.run(ClientApplication.class, args); } From 9169174943a8ac33e6b40074e32c68ec28d08287 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 21:04:03 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E4=BC=A0=E9=80=92=E5=8F=82=E6=95=B03?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 2641b8c..f24eca6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -26,11 +26,6 @@ steps: #image: plugins/sonarqube-scanner:linux-amd64 #https://github.com/drone-plugins/sonarqube-scanner/blob/main/DOCS.md image: plugins/sonarqube-scanner:linux-amd64 - commands: # commands 属性将在 Docker 容器内执行的 shell 命令列表定义为容器入口点。如果任何命令返回非零退出代码，则管道步骤将失败。 - - echo 1-${DRONE_BRANCH} - - echo 2-${DRONE_PULL_REQUEST} - - echo 3-${DRONE_SOURCE_BRANCH} - - echo 4-${DRONE_TARGET_BRANCH} settings: sonar_host: http://10.0.4.16:9000 sonar_token: squ_d37ffc4085858b55e0b379c68e09a8163b2ba81d From a6ee451fab5be1ca006807d46ad15a5797ab7c55 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 21:12:16 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=BC=A0=E9=80=92=E5=8F=82=E6=95=B04?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 1 + sonar-project.properties | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index f24eca6..6f655c6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,6 +37,7 @@ steps: build_number: ${DRONE_BUILD_NUMBER} build_version: ${DRONE_BUILD_VERSION} binaries: . + usingProperties: true sonar.branch.name: ${DRONE_BRANCH} # for branch analysis sonar.pullrequest.key: ${DRONE_PULL_REQUEST} # for pull request analysis and decoration sonar.pullrequest.branch: ${DRONE_SOURCE_BRANCH} # for pull request analysis and decoration diff --git a/sonar-project.properties b/sonar-project.properties index e6b61f9..12ffd46 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -1,2 +1,4 @@ -sonar.projectKey=pert -sonar.sources=. \ No newline at end of file +sonar.branch.name: ${DRONE_BRANCH} +sonar.pullrequest.key: ${DRONE_PULL_REQUEST} +sonar.pullrequest.branch: ${DRONE_SOURCE_BRANCH} +sonar.pullrequest.base: ${DRONE_TARGET_BRANCH} \ No newline at end of file From de5bb196c8184c41693177b2f7a35b346d974114 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 21:28:02 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BC=A0=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 11 ++++++----- sonar-project.properties | 4 ---- 2 files changed, 6 insertions(+), 9 deletions(-) delete mode 100644 sonar-project.properties diff --git a/.drone.yml b/.drone.yml index 6f655c6..ec6ea0f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -37,11 +37,12 @@ steps: build_number: ${DRONE_BUILD_NUMBER} build_version: ${DRONE_BUILD_VERSION} binaries: . - usingProperties: true - sonar.branch.name: ${DRONE_BRANCH} # for branch analysis - sonar.pullrequest.key: ${DRONE_PULL_REQUEST} # for pull request analysis and decoration - sonar.pullrequest.branch: ${DRONE_SOURCE_BRANCH} # for pull request analysis and decoration - sonar.pullrequest.base: ${DRONE_TARGET_BRANCH} # for pull request analysis and decoration + pr_key: ${DRONE_PULL_REQUEST} # for pull request analysis and decoration + pr_branch: ${DRONE_SOURCE_BRANCH} # for pull request analysis and decoration + pr_base: ${DRONE_TARGET_BRANCH} # for pull request analysis and decoration + sonar_pr_key: ${DRONE_PULL_REQUEST} # for pull request analysis and decoration + sonar_pr_branch: ${DRONE_SOURCE_BRANCH} # for pull request analysis and decoration + sonar_pr_base: ${DRONE_TARGET_BRANCH} # for pull request analysis and decoration #kind: pipeline #type: exec diff --git a/sonar-project.properties b/sonar-project.properties deleted file mode 100644 index 12ffd46..0000000 --- a/sonar-project.properties +++ /dev/null @@ -1,4 +0,0 @@ -sonar.branch.name: ${DRONE_BRANCH} -sonar.pullrequest.key: ${DRONE_PULL_REQUEST} -sonar.pullrequest.branch: ${DRONE_SOURCE_BRANCH} -sonar.pullrequest.base: ${DRONE_TARGET_BRANCH} \ No newline at end of file From 6bdcaf6caf4a1dba25fe8f6174649541dc135096 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 21:32:23 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BC=A0=E5=80=BC2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hlbd/provider/all/ClientApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java b/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java index 02730b1..461f97b 100644 --- a/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java +++ b/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java @@ -18,7 +18,7 @@ public class ClientApplication { public static void main(String[] args) { - System.out.println("testest"); + System.out.println("testes22t"); SpringApplication.run(ClientApplication.class, args); } From cabbcfc601642efe1e0e2b26027bd548af184716 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 21:39:00 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BC=A0=E5=80=BC3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/hlbd/provider/all/ClientApplication.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java b/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java index 461f97b..e77ae63 100644 --- a/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java +++ b/hly-service/hly-service-all/src/main/java/com/hlbd/provider/all/ClientApplication.java @@ -18,7 +18,7 @@ public class ClientApplication { public static void main(String[] args) { - System.out.println("testes22t"); + System.out.println("demo"); SpringApplication.run(ClientApplication.class, args); }