From 8e8a7c9dd42fdc71c2b3cb8475aa4e7b6b839158 Mon Sep 17 00:00:00 2001 From: YunaiV <> Date: Mon, 30 Mar 2020 20:56:12 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20spring=20cloud=20x=20jenki?= =?UTF-8?q?ns?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lab-40/lab-40-zipkin-dubbo/pom.xml | 2 +- .../src/main/resources/application-dev.yaml | 2 +- .../src/main/resources/application-local.yaml | 2 +- .../src/main/resources/application-pre.yaml | 2 +- .../src/main/resources/application-prod.yaml | 2 +- .../src/main/resources/application-uat.yaml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- labx-02/pom.xml | 1 + .../labx-03-sc-feign-demo01-consumer/pom.xml | 2 +- .../labx-03-sc-feign-demo01-provider/pom.xml | 2 +- .../labx-03-sc-feign-demo02A-consumer/pom.xml | 2 +- .../labx-03-sc-feign-demo02B-consumer/pom.xml | 2 +- .../labx-03-sc-feign-demo03-consumer/pom.xml | 2 +- .../pom.xml | 2 +- .../labx-03-sc-feign-demo03-provider/pom.xml | 14 +- .../labx-03-sc-feign-demo04-consumer/pom.xml | 14 +- .../labx-03-sc-feign-demo04-provider/pom.xml | 2 +- .../labx-03-sc-feign-demo05-consumer/pom.xml | 2 +- .../labx-03-sc-feign-demo06A-consumer/pom.xml | 2 +- .../labx-03-sc-feign-demo06B-consumer/pom.xml | 2 +- .../labx-03-sc-feign-demo07-consumer/pom.xml | 2 +- labx-03/pom.xml | 1 + .../labx-07-sca-dubbo-demo04-provider/pom.xml | 2 +- labx-07/pom.xml | 1 - labx-11/pom.xml | 5 +- .../pom.xml | 2 +- .../pom.xml | 2 +- .../pom.xml | 2 +- labx-13/pom.xml | 1 + .../pom.xml | 2 +- .../pom.xml | 2 +- labx-14/pom.xml | 1 + labx-15/pom.xml | 1 + labx-16/deploy.sh | 166 ++++++++++++++++++ labx-16/labx-16-demo-01/pom.xml | 9 + .../lab16/jenkinsdemo/Application.java | 23 +++ .../src/main/resources/application-dev.yaml | 7 +- .../src/main/resources/application-local.yaml | 2 +- .../src/main/resources/application-pre.yaml | 2 +- .../src/main/resources/application-prod.yaml | 2 +- .../src/main/resources/application-uat.yaml | 2 +- labx-16/pom.xml | 1 - 49 files changed, 249 insertions(+), 66 deletions(-) create mode 100644 labx-16/deploy.sh diff --git a/lab-40/lab-40-zipkin-dubbo/pom.xml b/lab-40/lab-40-zipkin-dubbo/pom.xml index 6295596b0..5fe8ebffb 100644 --- a/lab-40/lab-40-zipkin-dubbo/pom.xml +++ b/lab-40/lab-40-zipkin-dubbo/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-13 + lab-40 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/lab-41/lab-41-demo01/src/main/resources/application-dev.yaml b/lab-41/lab-41-demo01/src/main/resources/application-dev.yaml index 5475f936b..e41dc5643 100644 --- a/lab-41/lab-41-demo01/src/main/resources/application-dev.yaml +++ b/lab-41/lab-41-demo01/src/main/resources/application-dev.yaml @@ -5,7 +5,7 @@ management: server: port: 8078 # 自定义端口，避免 Nginx 暴露出去 - endpoint: + endpoints: web: exposure: include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 diff --git a/lab-41/lab-41-demo01/src/main/resources/application-local.yaml b/lab-41/lab-41-demo01/src/main/resources/application-local.yaml index 5475f936b..e41dc5643 100644 --- a/lab-41/lab-41-demo01/src/main/resources/application-local.yaml +++ b/lab-41/lab-41-demo01/src/main/resources/application-local.yaml @@ -5,7 +5,7 @@ management: server: port: 8078 # 自定义端口，避免 Nginx 暴露出去 - endpoint: + endpoints: web: exposure: include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 diff --git a/lab-41/lab-41-demo01/src/main/resources/application-pre.yaml b/lab-41/lab-41-demo01/src/main/resources/application-pre.yaml index 5475f936b..e41dc5643 100644 --- a/lab-41/lab-41-demo01/src/main/resources/application-pre.yaml +++ b/lab-41/lab-41-demo01/src/main/resources/application-pre.yaml @@ -5,7 +5,7 @@ management: server: port: 8078 # 自定义端口，避免 Nginx 暴露出去 - endpoint: + endpoints: web: exposure: include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 diff --git a/lab-41/lab-41-demo01/src/main/resources/application-prod.yaml b/lab-41/lab-41-demo01/src/main/resources/application-prod.yaml index 5475f936b..e41dc5643 100644 --- a/lab-41/lab-41-demo01/src/main/resources/application-prod.yaml +++ b/lab-41/lab-41-demo01/src/main/resources/application-prod.yaml @@ -5,7 +5,7 @@ management: server: port: 8078 # 自定义端口，避免 Nginx 暴露出去 - endpoint: + endpoints: web: exposure: include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 diff --git a/lab-41/lab-41-demo01/src/main/resources/application-uat.yaml b/lab-41/lab-41-demo01/src/main/resources/application-uat.yaml index 5475f936b..e41dc5643 100644 --- a/lab-41/lab-41-demo01/src/main/resources/application-uat.yaml +++ b/lab-41/lab-41-demo01/src/main/resources/application-uat.yaml @@ -5,7 +5,7 @@ management: server: port: 8078 # 自定义端口，避免 Nginx 暴露出去 - endpoint: + endpoints: web: exposure: include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 diff --git a/labx-02/labx-02-scn-ribbon-demo01-consumer/pom.xml b/labx-02/labx-02-scn-ribbon-demo01-consumer/pom.xml index d04e05d4b..89cbbab05 100644 --- a/labx-02/labx-02-scn-ribbon-demo01-consumer/pom.xml +++ b/labx-02/labx-02-scn-ribbon-demo01-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-02 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo01-provider/pom.xml b/labx-02/labx-02-scn-ribbon-demo01-provider/pom.xml index 480e0ee85..e20609af2 100644 --- a/labx-02/labx-02-scn-ribbon-demo01-provider/pom.xml +++ b/labx-02/labx-02-scn-ribbon-demo01-provider/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-02 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo02A-consumer/pom.xml b/labx-02/labx-02-scn-ribbon-demo02A-consumer/pom.xml index f5b38e292..f8e7d87b3 100644 --- a/labx-02/labx-02-scn-ribbon-demo02A-consumer/pom.xml +++ b/labx-02/labx-02-scn-ribbon-demo02A-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-02 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo02B-consumer/pom.xml b/labx-02/labx-02-scn-ribbon-demo02B-consumer/pom.xml index c43f368b3..e44fe281d 100644 --- a/labx-02/labx-02-scn-ribbon-demo02B-consumer/pom.xml +++ b/labx-02/labx-02-scn-ribbon-demo02B-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-02 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo03-consumer/pom.xml b/labx-02/labx-02-scn-ribbon-demo03-consumer/pom.xml index d7547ee1b..01297a022 100644 --- a/labx-02/labx-02-scn-ribbon-demo03-consumer/pom.xml +++ b/labx-02/labx-02-scn-ribbon-demo03-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-02 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo04-consumer/pom.xml b/labx-02/labx-02-scn-ribbon-demo04-consumer/pom.xml index e7e8be3e9..5d4800ff1 100644 --- a/labx-02/labx-02-scn-ribbon-demo04-consumer/pom.xml +++ b/labx-02/labx-02-scn-ribbon-demo04-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-02 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo05-consumer/pom.xml b/labx-02/labx-02-scn-ribbon-demo05-consumer/pom.xml index 77bb5e0ea..008b881c7 100644 --- a/labx-02/labx-02-scn-ribbon-demo05-consumer/pom.xml +++ b/labx-02/labx-02-scn-ribbon-demo05-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-02 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/labx-02-scn-ribbon-demo06-consumer/pom.xml b/labx-02/labx-02-scn-ribbon-demo06-consumer/pom.xml index eeff33684..9256f304b 100644 --- a/labx-02/labx-02-scn-ribbon-demo06-consumer/pom.xml +++ b/labx-02/labx-02-scn-ribbon-demo06-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-02 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-02/pom.xml b/labx-02/pom.xml index 51e48835e..138886233 100644 --- a/labx-02/pom.xml +++ b/labx-02/pom.xml @@ -10,6 +10,7 @@ 4.0.0 labx-02 + pom labx-02-scn-ribbon-demo01-provider diff --git a/labx-03/labx-03-sc-feign-demo01-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo01-consumer/pom.xml index 1697d651d..0be682a82 100644 --- a/labx-03/labx-03-sc-feign-demo01-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo01-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo01-provider/pom.xml b/labx-03/labx-03-sc-feign-demo01-provider/pom.xml index 85d180c0d..20331f36d 100644 --- a/labx-03/labx-03-sc-feign-demo01-provider/pom.xml +++ b/labx-03/labx-03-sc-feign-demo01-provider/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml index 9a87f79c2..b8ebcdb55 100644 --- a/labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo02A-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml index abee67825..d943e9a2e 100644 --- a/labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo02B-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo03-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo03-consumer/pom.xml index e8c9c795c..6c49e27d4 100644 --- a/labx-03/labx-03-sc-feign-demo03-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo03-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml b/labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml index a34d27103..2be91b189 100644 --- a/labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml +++ b/labx-03/labx-03-sc-feign-demo03-provider-api/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo03-provider/pom.xml b/labx-03/labx-03-sc-feign-demo03-provider/pom.xml index d78bcec80..31d2200db 100644 --- a/labx-03/labx-03-sc-feign-demo03-provider/pom.xml +++ b/labx-03/labx-03-sc-feign-demo03-provider/pom.xml @@ -3,25 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT 4.0.0 labx-03-sc-feign-demo03-provider - - - - org.apache.maven.plugins - maven-compiler-plugin - - 6 - 6 - - - - 2.2.4.RELEASE diff --git a/labx-03/labx-03-sc-feign-demo04-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo04-consumer/pom.xml index 2d6eb8a32..d6296809e 100644 --- a/labx-03/labx-03-sc-feign-demo04-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo04-consumer/pom.xml @@ -3,25 +3,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT 4.0.0 labx-03-sc-feign-demo04-consumer - - - - org.apache.maven.plugins - maven-compiler-plugin - - 7 - 7 - - - - 2.2.4.RELEASE diff --git a/labx-03/labx-03-sc-feign-demo04-provider/pom.xml b/labx-03/labx-03-sc-feign-demo04-provider/pom.xml index 5ea6741c5..53d60913c 100644 --- a/labx-03/labx-03-sc-feign-demo04-provider/pom.xml +++ b/labx-03/labx-03-sc-feign-demo04-provider/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo05-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo05-consumer/pom.xml index 42de456c7..2eb1ed849 100644 --- a/labx-03/labx-03-sc-feign-demo05-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo05-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml index 839e8ad30..ae7f52e40 100644 --- a/labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo06A-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml index d3024892a..f7265736a 100644 --- a/labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo06B-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/labx-03-sc-feign-demo07-consumer/pom.xml b/labx-03/labx-03-sc-feign-demo07-consumer/pom.xml index acadc66c7..a1574416a 100644 --- a/labx-03/labx-03-sc-feign-demo07-consumer/pom.xml +++ b/labx-03/labx-03-sc-feign-demo07-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-01 + labx-03 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-03/pom.xml b/labx-03/pom.xml index 19f8fbdca..33edef2c5 100644 --- a/labx-03/pom.xml +++ b/labx-03/pom.xml @@ -10,6 +10,7 @@ 4.0.0 labx-03 + pom labx-03-sc-feign-demo01-provider diff --git a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/pom.xml b/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/pom.xml index 29ba06562..135b0a42c 100644 --- a/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/pom.xml +++ b/labx-07/labx-07-sca-dubbo-demo04-filter/labx-07-sca-dubbo-demo04-provider/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-07-sca-dubbo-demo01 + labx-07-sca-dubbo-demo04-filter cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-07/pom.xml b/labx-07/pom.xml index 1e2cb73d5..ed4b3bc0a 100644 --- a/labx-07/pom.xml +++ b/labx-07/pom.xml @@ -17,7 +17,6 @@ labx-07-sca-dubbo-demo03-validation labx-07-sca-dubbo-demo04-filter labx-07-sca-dubbo-demo05-sentinel - labx-07-sca-dubbo-demo06-actuator diff --git a/labx-11/pom.xml b/labx-11/pom.xml index 8cf8fe1cb..1d92ae6a9 100644 --- a/labx-11/pom.xml +++ b/labx-11/pom.xml @@ -10,6 +10,7 @@ 4.0.0 labx-11 + pom labx-11-sc-stream-kafka-producer-demo @@ -28,7 +29,7 @@ labx-11-sc-stream-kafka-consumer-concurrency labx-11-sc-stream-kafka-producer-partitioning - labx-11-sc-stream-kafka-consumer-concurrency + labx-11-sc-stream-kafka-consumer-partitioning @@ -43,7 +44,7 @@ labx-11-sc-stream-kafka-producer-batch - labx-11-sc-stream-kafka-producer-demo + labx-11-sc-stream-kafka-consumer-batch labx-11-sc-stream-kafka-producer-actuator diff --git a/labx-13/labx-13-sc-sleuth-mq-kafka/labx-13-sc-stream-mq-kafka-consumer/pom.xml b/labx-13/labx-13-sc-sleuth-mq-kafka/labx-13-sc-stream-mq-kafka-consumer/pom.xml index 1914b04ba..efbb2ed9a 100644 --- a/labx-13/labx-13-sc-sleuth-mq-kafka/labx-13-sc-stream-mq-kafka-consumer/pom.xml +++ b/labx-13/labx-13-sc-sleuth-mq-kafka/labx-13-sc-stream-mq-kafka-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-10 + labx-13-sc-sleuth-mq-kafka cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-13/labx-13-sc-sleuth-mq-rabbitmq/labx-13-sc-stream-mq-rabbitmq-consumer/pom.xml b/labx-13/labx-13-sc-sleuth-mq-rabbitmq/labx-13-sc-stream-mq-rabbitmq-consumer/pom.xml index 68d2ad7e0..2cec821d4 100644 --- a/labx-13/labx-13-sc-sleuth-mq-rabbitmq/labx-13-sc-stream-mq-rabbitmq-consumer/pom.xml +++ b/labx-13/labx-13-sc-sleuth-mq-rabbitmq/labx-13-sc-stream-mq-rabbitmq-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-10 + labx-13-sc-sleuth-mq-rabbitmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-13/labx-13-sc-sleuth-springcloudgateway/pom.xml b/labx-13/labx-13-sc-sleuth-springcloudgateway/pom.xml index 39ff30128..aa2cf2ce9 100644 --- a/labx-13/labx-13-sc-sleuth-springcloudgateway/pom.xml +++ b/labx-13/labx-13-sc-sleuth-springcloudgateway/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-13 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-13/pom.xml b/labx-13/pom.xml index 474f4c979..cc4caab2f 100644 --- a/labx-13/pom.xml +++ b/labx-13/pom.xml @@ -11,6 +11,7 @@ labx-13 pom + labx-13-sc-sleuth-zipkin-server-demo-in-memory diff --git a/labx-14/labx-14-sc-skywalking-mq-rocketmq/labx-14-sc-skywalking-mq-rocketmq-consumer/pom.xml b/labx-14/labx-14-sc-skywalking-mq-rocketmq/labx-14-sc-skywalking-mq-rocketmq-consumer/pom.xml index eb775528a..6c87765ed 100644 --- a/labx-14/labx-14-sc-skywalking-mq-rocketmq/labx-14-sc-skywalking-mq-rocketmq-consumer/pom.xml +++ b/labx-14/labx-14-sc-skywalking-mq-rocketmq/labx-14-sc-skywalking-mq-rocketmq-consumer/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-14 + labx-14-sc-skywalking-mq-rocketmq cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-14/labx-14-sc-skywalking-springcloudgateway/pom.xml b/labx-14/labx-14-sc-skywalking-springcloudgateway/pom.xml index ef7fabc10..3139308b8 100644 --- a/labx-14/labx-14-sc-skywalking-springcloudgateway/pom.xml +++ b/labx-14/labx-14-sc-skywalking-springcloudgateway/pom.xml @@ -3,7 +3,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - labx-08 + labx-14 cn.iocoder.springboot.labs 1.0-SNAPSHOT diff --git a/labx-14/pom.xml b/labx-14/pom.xml index d14a8acac..92a6a8f46 100644 --- a/labx-14/pom.xml +++ b/labx-14/pom.xml @@ -10,6 +10,7 @@ 4.0.0 labx-14 + pom labx-14-sc-skywalking-springmvc diff --git a/labx-15/pom.xml b/labx-15/pom.xml index 53e00a73e..3f7d1513e 100644 --- a/labx-15/pom.xml +++ b/labx-15/pom.xml @@ -10,6 +10,7 @@ 4.0.0 labx-15 + pom labx-15-admin-02-adminserver diff --git a/labx-16/deploy.sh b/labx-16/deploy.sh new file mode 100644 index 000000000..60e23423e --- /dev/null +++ b/labx-16/deploy.sh @@ -0,0 +1,166 @@ +#!/bin/bash +set -e + +# 基础 +# export JAVA_HOME=/work/programs/jdk/jdk1.8.0_181 +# export PATH=PATH=$PATH:$JAVA_HOME/bin +# export CLASSPATH=$JAVA_HOME/jre/lib/rt.jar:$JAVA_HOME/lib/dt.jar:$JAVA_HOME/lib/tools.jar + +DATE=$(date +%Y%m%d%H%M) +# 基础路径 +BASE_PATH=/work/projects/labx-16-demo-01 +# 编译后 jar 的地址。部署时，Jenkins 会上传 jar 包到该目录下 +SOURCE_PATH=$BASE_PATH/build +# 服务名称。同时约定部署服务的 jar 包名字也为它。 +SERVER_NAME=labx-16-demo-01 +# 环境 +PROFILES_ACTIVE=prod +# 健康检查 URL +HEALTH_CHECK_URL=http://127.0.0.1:8078/actuator/health/ +# 修改状态 URL +STATUS_URL=http://127.0.0.1:8078/actuator/service-registry/ + +# heapError 存放路径 +HEAP_ERROR_PATH=$BASE_PATH/heapError +# JVM 参数 +JAVA_OPS="-Xms1024m -Xmx1024m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$HEAP_ERROR_PATH" +# JavaAgent 参数。可用于配置 SkyWalking 等链路追踪 +JAVA_AGENT= + +# 备份 +function backup() { + # 如果不存在，则无需备份 + if [ ! -f "$BASE_PATH/$SERVER_NAME.jar" ]; then + echo "[backup] $BASE_PATH/$SERVER_NAME.jar 不存在，跳过备份" + # 如果存在，则备份到 backup 目录下，使用时间作为后缀 + else + echo "[backup] 开始备份 $SERVER_NAME ..." + cp $BASE_PATH/$SERVER_NAME.jar $BASE_PATH/backup/$SERVER_NAME-$DATE.jar + echo "[backup] 备份 $SERVER_NAME 完成" + fi +} + +# 最新构建代码 移动到项目环境 +function transfer() { + echo "[transfer] 开始转移 $SERVER_NAME.jar" + + # 删除原 jar 包 + if [ ! -f "$BASE_PATH/$SERVER_NAME.jar" ]; then + echo "[transfer] $BASE_PATH/$SERVER_NAME.jar 不存在，跳过删除" + else + echo "[transfer] 移除 $BASE_PATH/$SERVER_NAME.jar 完成" + rm $BASE_PATH/$SERVER_NAME.jar + fi + + # 复制新 jar 包 + echo "[transfer] 从 $SOURCE_PATH 中获取 $SERVER_NAME.jar 并迁移至 $BASE_PATH ...." + cp $SOURCE_PATH/$SERVER_NAME.jar $BASE_PATH + + echo "[transfer] 转移 $SERVER_NAME.jar 完成" +} + +# 停止 +function stop() { + echo "[stop] 开始停止 $BASE_PATH/$SERVER_NAME" + PID=$(ps -ef | grep $BASE_PATH/$SERVER_NAME | grep -v "grep" | awk '{print $2}') + # 如果 Java 服务启动中，则进行关闭 + if [ -n "$PID" ]; then + # 从注册中心下线 + echo "[stop] 从注册中心下线当前实例，并 sleep 20 秒" + curl -X POST $STATUS_URL -d '{"status": "DOWN"}' -H 'content-type: application/json' + sleep 20 + # 正常关闭 + echo "[stop] $BASE_PATH/$SERVER_NAME 运行中，开始 kill [$PID]" + kill -15 $PID + # 等待最大 60 秒，直到关闭完成。 + for ((i = 0; i < 60; i++)) + do + sleep 1 + PID=$(ps -ef | grep $BASE_PATH/$SERVER_NAME | grep -v "grep" | awk '{print $2}') + if [ -n "$PID" ]; then + echo -e ".\c" + else + echo '[stop] 停止 $BASE_PATH/$SERVER_NAME 成功' + break + fi + done + + # 如果正常关闭失败，那么进行强制 kill -9 进行关闭 + if [ -n "$PID" ]; then + echo "[stop] $BASE_PATH/$SERVER_NAME 失败，强制 kill -9 $PID" + kill -9 $PID + fi + # 如果 Java 服务未启动，则无需关闭 + else + echo "[stop] $BASE_PATH/$SERVER_NAME 未启动，无需停止" + fi +} + +# 启动 +function start() { + # 开启启动前，打印启动参数 + echo "[start] 开始启动 $BASE_PATH/$SERVER_NAME" + echo "[start] JAVA_OPS: $JAVA_OPS" + echo "[start] JAVA_AGENT: $JAVA_AGENT" + echo "[start] PROFILES: $PROFILES_ACTIVE" + + # 开始启动 + BUILD_ID=dontKillMe nohup java -server $JAVA_OPS $JAVA_AGENT -jar $BASE_PATH/$SERVER_NAME.jar --spring.profiles.active=$PROFILES_ACTIVE & + echo "[start] 启动 $BASE_PATH/$SERVER_NAME 完成" +} + +# 健康检查 +function healthCheck() { + # 如果配置健康检查，则进行健康检查 + if [ -n "$HEALTH_CHECK_URL" ]; then + # 健康检查最大 60 秒，直到健康检查通过 + echo "[healthCheck] 开始通过 $HEALTH_CHECK_URL 地址，进行健康检查"; + for ((i = 0; i < 60; i++)) + do + # 请求健康检查地址，只获取状态码。 + result=`curl -I -m 10 -o /dev/null -s -w %{http_code} $HEALTH_CHECK_URL || echo "000"` + # 如果状态码为 200，则说明健康检查通过 + if [ "$result" == "200" ]; then + echo "[healthCheck] 健康检查通过"; + break + # 如果状态码非 200，则说明未通过。sleep 1 秒后，继续重试 + else + echo -e ".\c" + sleep 1 + fi + done + + # 健康检查未通过，则异常退出 shell 脚本，不继续部署。 + if [ ! "$result" == "200" ]; then + echo "[healthCheck] 健康检查不通过，可能部署失败。查看日志，自行判断是否启动成功"; + tail -n 10 nohup.out + exit 1; + # 健康检查通过，打印最后 10 行日志，可能部署的人想看下日志。 + else + tail -n 10 nohup.out + fi + # 如果未配置健康检查，则 slepp 60 秒，人工看日志是否部署成功。 + else + echo "[healthCheck] HEALTH_CHECK_URL 未配置，开始 sleep 60 秒"; + sleep 60 + echo "[healthCheck] sleep 60 秒完成，查看日志，自行判断是否启动成功"; + tail -n 50 nohup.out + fi +} + +# 部署 +function deploy() { + cd $BASE_PATH + # 备份原 jar + backup + # 停止 Java 服务 + stop + # 部署新 jar + transfer + # 启动 Java 服务 + start + # 健康检查 + healthCheck +} + +deploy diff --git a/labx-16/labx-16-demo-01/pom.xml b/labx-16/labx-16-demo-01/pom.xml index 267138813..30e5027db 100644 --- a/labx-16/labx-16-demo-01/pom.xml +++ b/labx-16/labx-16-demo-01/pom.xml @@ -10,6 +10,7 @@ 4.0.0 labx-16-demo-01 + jar @@ -78,6 +79,14 @@ org.springframework.boot spring-boot-maven-plugin + ${spring.boot.version} + + + + repackage + + + diff --git a/labx-16/labx-16-demo-01/src/main/java/cn/iocoder/springcloud/lab16/jenkinsdemo/Application.java b/labx-16/labx-16-demo-01/src/main/java/cn/iocoder/springcloud/lab16/jenkinsdemo/Application.java index cefd35efc..e1755a583 100644 --- a/labx-16/labx-16-demo-01/src/main/java/cn/iocoder/springcloud/lab16/jenkinsdemo/Application.java +++ b/labx-16/labx-16-demo-01/src/main/java/cn/iocoder/springcloud/lab16/jenkinsdemo/Application.java @@ -2,6 +2,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationEvent; +import org.springframework.context.ApplicationListener; +import org.springframework.context.event.ContextClosedEvent; +import org.springframework.stereotype.Component; @SpringBootApplication public class Application { @@ -10,4 +14,23 @@ public static void main(String[] args) { SpringApplication.run(Application.class, args); } + @Component + public class Listener implements ApplicationListener { + + @Override + public void onApplicationEvent(ApplicationEvent event) { + if (event instanceof ContextClosedEvent) { + this.sleep(10); + } + } + + private void sleep(int seconds) { + try { + Thread.sleep(seconds * 1000L); + } catch (InterruptedException ignore) { + } + } + + } + } diff --git a/labx-16/labx-16-demo-01/src/main/resources/application-dev.yaml b/labx-16/labx-16-demo-01/src/main/resources/application-dev.yaml index f3aeee677..b0355d15f 100644 --- a/labx-16/labx-16-demo-01/src/main/resources/application-dev.yaml +++ b/labx-16/labx-16-demo-01/src/main/resources/application-dev.yaml @@ -5,13 +5,18 @@ management: server: port: 8078 # 自定义端口，避免 Nginx 暴露出去 - endpoint: + endpoints: web: exposure: include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 +spring: + application: + name: demo-service + cloud: nacos: # Nacos 作为注册中心的配置项，对应 NacosDiscoveryProperties 配置类 discovery: server-addr: 127.0.0.1:8848 # Nacos 服务器地址 + diff --git a/labx-16/labx-16-demo-01/src/main/resources/application-local.yaml b/labx-16/labx-16-demo-01/src/main/resources/application-local.yaml index 5e7e7dd75..4a136ce70 100644 --- a/labx-16/labx-16-demo-01/src/main/resources/application-local.yaml +++ b/labx-16/labx-16-demo-01/src/main/resources/application-local.yaml @@ -5,7 +5,7 @@ management: server: port: 8078 # 自定义端口，避免 Nginx 暴露出去 - endpoint: + endpoints: web: exposure: include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 diff --git a/labx-16/labx-16-demo-01/src/main/resources/application-pre.yaml b/labx-16/labx-16-demo-01/src/main/resources/application-pre.yaml index 5e7e7dd75..4a136ce70 100644 --- a/labx-16/labx-16-demo-01/src/main/resources/application-pre.yaml +++ b/labx-16/labx-16-demo-01/src/main/resources/application-pre.yaml @@ -5,7 +5,7 @@ management: server: port: 8078 # 自定义端口，避免 Nginx 暴露出去 - endpoint: + endpoints: web: exposure: include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 diff --git a/labx-16/labx-16-demo-01/src/main/resources/application-prod.yaml b/labx-16/labx-16-demo-01/src/main/resources/application-prod.yaml index 5e7e7dd75..4a136ce70 100644 --- a/labx-16/labx-16-demo-01/src/main/resources/application-prod.yaml +++ b/labx-16/labx-16-demo-01/src/main/resources/application-prod.yaml @@ -5,7 +5,7 @@ management: server: port: 8078 # 自定义端口，避免 Nginx 暴露出去 - endpoint: + endpoints: web: exposure: include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 diff --git a/labx-16/labx-16-demo-01/src/main/resources/application-uat.yaml b/labx-16/labx-16-demo-01/src/main/resources/application-uat.yaml index 5e7e7dd75..4a136ce70 100644 --- a/labx-16/labx-16-demo-01/src/main/resources/application-uat.yaml +++ b/labx-16/labx-16-demo-01/src/main/resources/application-uat.yaml @@ -5,7 +5,7 @@ management: server: port: 8078 # 自定义端口，避免 Nginx 暴露出去 - endpoint: + endpoints: web: exposure: include: '*' # 需要开放的端点。默认值只打开 health 和 info 两个端点。通过设置 * ，可以开放所有端点。 diff --git a/labx-16/pom.xml b/labx-16/pom.xml index 0a88a0ef9..4a9f09c8a 100644 --- a/labx-16/pom.xml +++ b/labx-16/pom.xml @@ -15,5 +15,4 @@ labx-16-demo-01 -