From be84cab758d90b5997bc16b2efe88e371bdff982 Mon Sep 17 00:00:00 2001 From: zengsb Date: Wed, 14 Jun 2023 10:42:53 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0=20'hly-service/hly-ser?= =?UTF-8?q?vice-all/src/main/java/com/hlbd/provider/all/ClientApplication.?= =?UTF-8?q?java'?= 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 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 7793502..e3b4637 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,6 @@ public class ClientApplication { public static void main(String[] args) { - SpringApplication.run(ClientApplication.class, args); } From a472edb88f7e35bf583b1b72ddff3bc88b129345 Mon Sep 17 00:00:00 2001 From: zengsb Date: Wed, 14 Jun 2023 13:16:59 +0800 Subject: [PATCH 02/28] 2 --- .../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 e3b4637..7ef6fca 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) { + SpringApplication.run(ClientApplication.class, args); } From 5b3214503396c34eaa9404088f03917511e1b68b Mon Sep 17 00:00:00 2001 From: zengsb Date: Wed, 14 Jun 2023 13:18:32 +0800 Subject: [PATCH 03/28] 23 --- .../src/main/java/com/hlbd/provider/all/ClientApplication.java | 2 -- 1 file changed, 2 deletions(-) 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..b51680e 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 @@ -17,8 +17,6 @@ import springfox.documentation.oas.annotations.EnableOpenApi; public class ClientApplication { public static void main(String[] args) { - - SpringApplication.run(ClientApplication.class, args); } From d4c17b18981578428f601083af96de140d9b53ef Mon Sep 17 00:00:00 2001 From: zengsb Date: Wed, 14 Jun 2023 14:32:38 +0800 Subject: [PATCH 04/28] =?UTF-8?q?feat:=E7=89=88=E6=9C=AC=E5=8F=91=E5=B8=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 13 +++++++++++++ sonar-project.properties | 2 ++ 2 files changed, 15 insertions(+) create mode 100644 .drone.yml create mode 100644 sonar-project.properties diff --git a/.drone.yml b/.drone.yml new file mode 100644 index 0000000..3557917 --- /dev/null +++ b/.drone.yml @@ -0,0 +1,13 @@ +kind: pipeline +type: docker +name: 代码分析 + +steps: + - name: 代码分析 + image: aosapps/drone-sonar-plugin + settings: + sonar_host: http://124.221.150.102:9000 + sonar_token: squ_2f0d436632d5d7c0a5a9242fefb42ff3b9e30028 + +node: + role: sonarqube \ No newline at end of file diff --git a/sonar-project.properties b/sonar-project.properties new file mode 100644 index 0000000..e6b61f9 --- /dev/null +++ b/sonar-project.properties @@ -0,0 +1,2 @@ +sonar.projectKey=pert +sonar.sources=. \ No newline at end of file From 869a4d8fc43677c0234fbcdb21a7cbd6f1d9684a Mon Sep 17 00:00:00 2001 From: zengsb Date: Wed, 14 Jun 2023 15:02:00 +0800 Subject: [PATCH 05/28] 22 --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 3557917..33d8077 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,9 +1,9 @@ kind: pipeline type: docker -name: 代码分析 +name: 代码分析1 steps: - - name: 代码分析 + - name: 代码分析1 image: aosapps/drone-sonar-plugin settings: sonar_host: http://124.221.150.102:9000 From cbe93bfb07a6d7ab81359ef342a00d56137b8340 Mon Sep 17 00:00:00 2001 From: zengsb Date: Wed, 14 Jun 2023 16:26:31 +0800 Subject: [PATCH 06/28] 2244 --- .drone.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index 33d8077..3557917 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,9 +1,9 @@ kind: pipeline type: docker -name: 代码分析1 +name: 代码分析 steps: - - name: 代码分析1 + - name: 代码分析 image: aosapps/drone-sonar-plugin settings: sonar_host: http://124.221.150.102:9000 From 551a3d593c5acca940e1aab7f6d21e6c74c48833 Mon Sep 17 00:00:00 2001 From: zengsb Date: Wed, 14 Jun 2023 16:38:56 +0800 Subject: [PATCH 07/28] 224433 --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 3557917..0b82dc7 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,4 +10,4 @@ steps: sonar_token: squ_2f0d436632d5d7c0a5a9242fefb42ff3b9e30028 node: - role: sonarqube \ No newline at end of file + role: pi-runner \ No newline at end of file From ba6ae7f2e9257a9514bb91fe0e25fd74a156bf44 Mon Sep 17 00:00:00 2001 From: zengsb Date: Wed, 14 Jun 2023 16:51:20 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.drone.yml b/.drone.yml index 0b82dc7..7f067e0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,13 +1,16 @@ kind: pipeline type: docker -name: 代码分析 +name: code-analysis steps: - - name: 代码分析 - image: aosapps/drone-sonar-plugin + - name: code-analysis + image: drone-plugins/sonarqube-scanner:latest settings: - sonar_host: http://124.221.150.102:9000 - sonar_token: squ_2f0d436632d5d7c0a5a9242fefb42ff3b9e30028 - + sonar_host: + from_secret: http://124.221.150.102:9000 + sonar_token: + from_secret: squ_2f0d436632d5d7c0a5a9242fefb42ff3b9e30028 + sonar_name: pert + sonar_key: pert node: role: pi-runner \ No newline at end of file From 2ac395acffdf04492806108b1d2ef102c8053959 Mon Sep 17 00:00:00 2001 From: zengsb Date: Wed, 14 Jun 2023 17:05:12 +0800 Subject: [PATCH 09/28] =?UTF-8?q?=E6=9B=B4=E6=96=B044?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 7f067e0..b3cc34b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,5 @@ kind: pipeline -type: docker +type: Plugin name: code-analysis steps: From 421b066953e17d1f7f5eb638777925cafc5cf555 Mon Sep 17 00:00:00 2001 From: zengsb Date: Wed, 14 Jun 2023 17:47:47 +0800 Subject: [PATCH 10/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0443535?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.drone.yml b/.drone.yml index b3cc34b..61c4d83 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,10 +6,8 @@ steps: - name: code-analysis image: drone-plugins/sonarqube-scanner:latest settings: - sonar_host: - from_secret: http://124.221.150.102:9000 - sonar_token: - from_secret: squ_2f0d436632d5d7c0a5a9242fefb42ff3b9e30028 + sonar_host: http://124.221.150.102:9000 + sonar_token: squ_2f0d436632d5d7c0a5a9242fefb42ff3b9e30028 sonar_name: pert sonar_key: pert node: From bf1fdb999ff7cf5f2f4f822e5ef9cac8485b9805 Mon Sep 17 00:00:00 2001 From: zengsb Date: Wed, 14 Jun 2023 18:31:22 +0800 Subject: [PATCH 11/28] =?UTF-8?q?=E6=9B=B4=E6=96=B0443535344?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 61c4d83..2a1e2e4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,7 @@ name: code-analysis steps: - name: code-analysis - image: drone-plugins/sonarqube-scanner:latest + image: plugins/sonarqube-scanner:linux-amd64 settings: sonar_host: http://124.221.150.102:9000 sonar_token: squ_2f0d436632d5d7c0a5a9242fefb42ff3b9e30028 From 65c17c6f547d9ca5ee0d7c07507502c1b80a2241 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 09:26:33 +0800 Subject: [PATCH 12/28] =?UTF-8?q?=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- .../src/main/java/com/hlbd/provider/all/ClientApplication.java | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 2a1e2e4..9ba7c8d 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,5 +1,5 @@ kind: pipeline -type: Plugin +type: docker name: code-analysis steps: 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 b51680e..7ef6fca 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 @@ -17,6 +17,8 @@ import springfox.documentation.oas.annotations.EnableOpenApi; public class ClientApplication { public static void main(String[] args) { + + SpringApplication.run(ClientApplication.class, args); } From edb5ced0a63d4210069bb1e5660ffeb31cefab59 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 09:36:42 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E6=B5=8B=E8=AF=953?= 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..2f54a49 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("111"); SpringApplication.run(ClientApplication.class, args); } From 9f015e73a6ab8ce71cd3326151838851cf2dbb71 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 10:08:10 +0800 Subject: [PATCH 14/28] =?UTF-8?q?=E6=B5=8B=E8=AF=95355?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 9ba7c8d..a470dd4 100644 --- a/.drone.yml +++ b/.drone.yml @@ -7,7 +7,7 @@ steps: image: plugins/sonarqube-scanner:linux-amd64 settings: sonar_host: http://124.221.150.102:9000 - sonar_token: squ_2f0d436632d5d7c0a5a9242fefb42ff3b9e30028 + sonar_token: sqp_1f8c46141040c583d8e1f81f4f8302230ee1317e sonar_name: pert sonar_key: pert node: From af66a0fd3e9d0d3cef922d49382e8c7a482efd73 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 10:48:12 +0800 Subject: [PATCH 15/28] =?UTF-8?q?=E6=B5=8B=E8=AF=95355444?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 ++ .../src/main/java/com/hlbd/provider/all/ClientApplication.java | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone.yml b/.drone.yml index a470dd4..27c17fe 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,5 +10,7 @@ steps: sonar_token: sqp_1f8c46141040c583d8e1f81f4f8302230ee1317e sonar_name: pert sonar_key: pert + level: TRACE + showProfiling: true node: role: pi-runner \ No newline at end of file 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 2f54a49..e3b4637 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,8 +18,6 @@ public class ClientApplication { public static void main(String[] args) { - System.out.println("111"); - SpringApplication.run(ClientApplication.class, args); } From 32954e4deab3349dd7ba9d0028c01067ed9a1b6a Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 11:13:54 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E6=B5=8B=E8=AF=95355444344?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/.drone.yml b/.drone.yml index 27c17fe..196115f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,4 +1,18 @@ kind: pipeline +type: exec +name: default + +platform: + os: linux + arch: amd64 + +steps: + - name: greeting + commands: + - echo hello world + +--- +kind: pipeline type: docker name: code-analysis From 69f9dc1babc95a42d847c51f813af4228b8eb654 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 11:16:48 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E6=B5=8B=E8=AF=9535544434444?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 196115f..8683212 100644 --- a/.drone.yml +++ b/.drone.yml @@ -10,7 +10,8 @@ steps: - name: greeting commands: - echo hello world - +node: + role: pi-runner --- kind: pipeline type: docker From abed806361f09fb8610a5478dff52a207b34b34d Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 11:34:06 +0800 Subject: [PATCH 18/28] =?UTF-8?q?=E6=B5=8B=E8=AF=953554443444433?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 60 +++++++++++++++++++++++++++++++----------------------- 1 file changed, 35 insertions(+), 25 deletions(-) diff --git a/.drone.yml b/.drone.yml index 8683212..910036a 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,31 +1,41 @@ kind: pipeline -type: exec +type: docker name: default -platform: - os: linux - arch: amd64 - steps: - name: greeting + image: golang:1.12 commands: - - echo hello world -node: - role: pi-runner ---- -kind: pipeline -type: docker -name: code-analysis - -steps: - - name: code-analysis - image: plugins/sonarqube-scanner:linux-amd64 - settings: - sonar_host: http://124.221.150.102:9000 - sonar_token: sqp_1f8c46141040c583d8e1f81f4f8302230ee1317e - sonar_name: pert - sonar_key: pert - level: TRACE - showProfiling: true -node: - role: pi-runner \ No newline at end of file + - go build + - go test +#kind: pipeline +#type: exec +#name: default +# +#platform: +# os: linux +# arch: amd64 +# +#steps: +# - name: greeting +# commands: +# - echo hello world +#node: +# role: pi-runner +#--- +#kind: pipeline +#type: docker +#name: code-analysis +# +#steps: +# - name: code-analysis +# image: plugins/sonarqube-scanner:linux-amd64 +# settings: +# sonar_host: http://124.221.150.102:9000 +# sonar_token: sqp_1f8c46141040c583d8e1f81f4f8302230ee1317e +# sonar_name: pert +# sonar_key: pert +# level: TRACE +# showProfiling: true +#node: +# role: pi-runner \ No newline at end of file From bb2bc4d1ce20efa3536a0ddade0d688a675c3e71 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 11:40:02 +0800 Subject: [PATCH 19/28] =?UTF-8?q?=E6=B5=8B=E8=AF=953554443444433444?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.drone.yml b/.drone.yml index 910036a..b5f4968 100644 --- a/.drone.yml +++ b/.drone.yml @@ -8,6 +8,8 @@ steps: commands: - go build - go test +node: + role: pi-runner #kind: pipeline #type: exec #name: default From 30be4c950f6d7327529ef549c347297b90852d1e Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 13:32:52 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E6=B5=8B=E8=AF=95drone=E6=89=A7=E8=A1=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.drone.yml b/.drone.yml index b5f4968..bb26c38 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,15 +1,12 @@ -kind: pipeline -type: docker -name: default +kind: pipeline # 定义一个管道 +type: docker # 当前管道的类型 +name: test # 当前管道的名称 +steps: # 定义管道的执行步骤 + - name: test # 步骤名称 + image: node:latest # 当前步骤使用的镜像 + commands: # 当前步骤执行的命令 + - echo 测试drone执行 -steps: - - name: greeting - image: golang:1.12 - commands: - - go build - - go test -node: - role: pi-runner #kind: pipeline #type: exec #name: default From 78595df0b690665ee087d330037b40bd466d8f98 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 16:25:21 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E6=B5=8B=E8=AF=95drone=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/.drone.yml b/.drone.yml index bb26c38..6ab6004 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,11 +1,16 @@ -kind: pipeline # 定义一个管道 -type: docker # 当前管道的类型 -name: test # 当前管道的名称 -steps: # 定义管道的执行步骤 - - name: test # 步骤名称 - image: node:latest # 当前步骤使用的镜像 - commands: # 当前步骤执行的命令 - - echo 测试drone执行 +kind: pipeline # kind 属性定义了对象的种类。此示例定义了一个管道对象。 +type: docker # type 属性定义管道的类型。此示例定义了一个 Docker 管道，其中每个管道步骤都在 Docker 容器内执行。 +name: default # name 属性定义了管道的名称。您可以为您的项目定义一个或多个管道 +clone: + disable: true # 启用代码拉取 + +steps: # 步骤部分定义了一系列串行执行的管道步骤。如果管道中的任何步骤失败，管道将立即退出 + - name: greeting # name 属性定义管道步骤的名称 + image: alpine # image 属性定义了一个执行 shell 命令的 Docker 镜像。您可以使用来自任何 DockerHub 中的任何 Docker镜像。 + commands: # commands 属性将在 Docker 容器内执行的 shell 命令列表定义为容器入口点。如果任何命令返回非零退出代码，则管道步骤将失败。 + - echo hello + - echo world + #kind: pipeline #type: exec From 8fe4a80b0504cc1db2e27e436539d61fb9c693ad Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 16:27:08 +0800 Subject: [PATCH 22/28] =?UTF-8?q?=E6=B5=8B=E8=AF=95drone=E6=89=A7=E8=A1=8C?= =?UTF-8?q?=E8=A1=8C=E4=B8=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 30 +++++++------------ .../hlbd/provider/all/ClientApplication.java | 2 ++ 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/.drone.yml b/.drone.yml index 6ab6004..b3875d3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,16 +1,17 @@ kind: pipeline # kind 属性定义了对象的种类。此示例定义了一个管道对象。 type: docker # type 属性定义管道的类型。此示例定义了一个 Docker 管道，其中每个管道步骤都在 Docker 容器内执行。 name: default # name 属性定义了管道的名称。您可以为您的项目定义一个或多个管道 -clone: - disable: true # 启用代码拉取 - -steps: # 步骤部分定义了一系列串行执行的管道步骤。如果管道中的任何步骤失败，管道将立即退出 - - name: greeting # name 属性定义管道步骤的名称 - image: alpine # image 属性定义了一个执行 shell 命令的 Docker 镜像。您可以使用来自任何 DockerHub 中的任何 Docker镜像。 - commands: # commands 属性将在 Docker 容器内执行的 shell 命令列表定义为容器入口点。如果任何命令返回非零退出代码，则管道步骤将失败。 - - echo hello - - echo world +steps: + - name: code-analysis + image: plugins/sonarqube-scanner:linux-amd64 + settings: + sonar_host: http://124.221.150.102:9000 + sonar_token: sqp_1f8c46141040c583d8e1f81f4f8302230ee1317e + sonar_name: pert + sonar_key: pert + level: TRACE + showProfiling: true #kind: pipeline #type: exec @@ -31,15 +32,6 @@ steps: # 步骤部分定义了一系列串行执行的管道步骤。如果管 #type: docker #name: code-analysis # -#steps: -# - name: code-analysis -# image: plugins/sonarqube-scanner:linux-amd64 -# settings: -# sonar_host: http://124.221.150.102:9000 -# sonar_token: sqp_1f8c46141040c583d8e1f81f4f8302230ee1317e -# sonar_name: pert -# sonar_key: pert -# level: TRACE -# showProfiling: true + #node: # role: pi-runner \ No newline at end of file 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 e3b4637..487826b 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,8 @@ public class ClientApplication { public static void main(String[] args) { + System.out.println("testtest"); + SpringApplication.run(ClientApplication.class, args); } From c6633a2509af8a40bc0426567f816f369329be9e Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 16:28:53 +0800 Subject: [PATCH 23/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=86=85?= =?UTF-8?q?=E7=BD=91=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b3875d3..b9e7551 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,7 +6,7 @@ steps: - name: code-analysis image: plugins/sonarqube-scanner:linux-amd64 settings: - sonar_host: http://124.221.150.102:9000 + sonar_host: http://10.0.4.16:9000 sonar_token: sqp_1f8c46141040c583d8e1f81f4f8302230ee1317e sonar_name: pert sonar_key: pert From 02a4c7ddedd69cff543f5b3b3345ba9057d42ed3 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 16:33:54 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=86=85?= =?UTF-8?q?=E7=BD=91=E8=AE=BF=E9=97=AE2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index b9e7551..4ea57a1 100644 --- a/.drone.yml +++ b/.drone.yml @@ -4,7 +4,8 @@ name: default # name 属性定义了管道的名称。您可以为您的项目 steps: - name: code-analysis - image: plugins/sonarqube-scanner:linux-amd64 + #image: plugins/sonarqube-scanner:linux-amd64 + image: drone-plugins/sonarqube-scanner:latest settings: sonar_host: http://10.0.4.16:9000 sonar_token: sqp_1f8c46141040c583d8e1f81f4f8302230ee1317e From 67d8b7b3f0443538c0c8c44ccfabdf6a2565a7ff Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 16:36:41 +0800 Subject: [PATCH 25/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=86=85?= =?UTF-8?q?=E7=BD=91=E8=AE=BF=E9=97=AE244?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 4ea57a1..076a1b3 100644 --- a/.drone.yml +++ b/.drone.yml @@ -5,7 +5,7 @@ name: default # name 属性定义了管道的名称。您可以为您的项目 steps: - name: code-analysis #image: plugins/sonarqube-scanner:linux-amd64 - image: drone-plugins/sonarqube-scanner:latest + image: plugins/sonarqube-scanner:linux-amd64 settings: sonar_host: http://10.0.4.16:9000 sonar_token: sqp_1f8c46141040c583d8e1f81f4f8302230ee1317e From 4353ff48c96aa2f0896ad17eaaf3e542336aa056 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 17:00:56 +0800 Subject: [PATCH 26/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=86=85?= =?UTF-8?q?=E7=BD=91=E8=AE=BF=E9=97=AE24433?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 226f3a1..0c97e6f 100644 --- a/pom.xml +++ b/pom.xml @@ -25,7 +25,7 @@ hly_project Demo project for Spring Boot - 8 + 17 2020.0.2 From d0b912a3e7b006d82b3fbf5287d5d80b71c05db3 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 17:06:05 +0800 Subject: [PATCH 27/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=BA=E5=86=85?= =?UTF-8?q?=E7=BD=91=E8=AE=BF=E9=97=AE2443355?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.drone.yml b/.drone.yml index 076a1b3..a275d3f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,6 +13,7 @@ steps: sonar_key: pert level: TRACE showProfiling: true + binaries: . #kind: pipeline #type: exec From cf114e67a08eac2bef6df228781062f6898a6b38 Mon Sep 17 00:00:00 2001 From: zengsb Date: Thu, 15 Jun 2023 17:19:35 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=80=9A=E7=9F=A5?= =?UTF-8?q?=E4=B8=80=E4=B8=8B?= 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 487826b..acf7786 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("testtest"); + System.out.println("testtest22"); SpringApplication.run(ClientApplication.class, args); }