From 8a57ad232ce6141a62c78b4c18083531a3196182 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 11:20:15 +0800 Subject: [PATCH 01/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone-images.yml b/.drone-images.yml index f7bb99060..308bdc51b 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -21,7 +21,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn package -Dmaven.test.skip=true # 应用打包命令 + - mvn package -Dmaven.test.skip=true -Dmaven.repo.remote=http://maven.aliyun.com/nexus/content/groups/public/,http://maven.aliyun.com/nexus/content/repositories/central/,http://repo2.maven.org/maven2/ # 应用打包命令 - | if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target From 02740c701ef09b059b3594c29ac894c105b6d4f2 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 11:25:52 +0800 Subject: [PATCH 02/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone-images.yml b/.drone-images.yml index 308bdc51b..d629534b0 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -21,7 +21,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn package -Dmaven.test.skip=true -Dmaven.repo.remote=http://maven.aliyun.com/nexus/content/groups/public/,http://maven.aliyun.com/nexus/content/repositories/central/,http://repo2.maven.org/maven2/ # 应用打包命令 + - mvn clean package -Dmaven.test.skip=true -Dmaven.repo.remote=http://maven.aliyun.com/nexus/content/groups/public/,http://maven.aliyun.com/nexus/content/repositories/central/,http://repo2.maven.org/maven2/ # 应用打包命令 - | if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target From 497c101b5b9a81400ba26735e0be227e2d7ee3b6 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 11:39:16 +0800 Subject: [PATCH 03/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 2 +- script/docker/docker-compose.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone-images.yml b/.drone-images.yml index d629534b0..a6e77b848 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -21,7 +21,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn clean package -Dmaven.test.skip=true -Dmaven.repo.remote=http://maven.aliyun.com/nexus/content/groups/public/,http://maven.aliyun.com/nexus/content/repositories/central/,http://repo2.maven.org/maven2/ # 应用打包命令 + - mvn clean package -Dmaven.test.skip=true # 应用打包命令 - | if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 8566dad9d..38fa8a2c5 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.8' services: yudao-gateway: - image: 120.46.37.243:8080/lundu/yudao-gateway:1.0.0 + image: 120.46.37.243:8080/lundu/yudao-gateway:1.0.2 container_name: yudao-gateway networks: - ludu_network From dda07281f055ad3ca355711da941ef2b981fe60e Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 11:39:48 +0800 Subject: [PATCH 04/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- script/docker/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/script/docker/docker-compose.yml b/script/docker/docker-compose.yml index 38fa8a2c5..8566dad9d 100644 --- a/script/docker/docker-compose.yml +++ b/script/docker/docker-compose.yml @@ -1,7 +1,7 @@ version: '3.8' services: yudao-gateway: - image: 120.46.37.243:8080/lundu/yudao-gateway:1.0.2 + image: 120.46.37.243:8080/lundu/yudao-gateway:1.0.0 container_name: yudao-gateway networks: - ludu_network From b4b37221cd0cfe950b98ef130af40e002c7e22c7 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 11:55:20 +0800 Subject: [PATCH 05/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone.yml | 2 +- pom.xml | 27 ++++++++------------------- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/.drone.yml b/.drone.yml index 4dc88897b..e7152124c 100644 --- a/.drone.yml +++ b/.drone.yml @@ -50,7 +50,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 - chmod +x run.sh - ./run.sh || echo "job build failed" - - cd ludu-module-datacenter/ludu-module-datacenter-biz/ + - cd /root/ludu-cloud/ludu-module-datacenter/ludu-module-datacenter-biz/ - chmod +x run.sh - ./run.sh || echo "datacenter build failed" diff --git a/pom.xml b/pom.xml index c5a145adc..4a2997f23 100644 --- a/pom.xml +++ b/pom.xml @@ -128,29 +128,18 @@ + - public - aliyun nexus + huaweicloud + huawei + https://mirrors.huaweicloud.com/repository/maven/ + + + aliyunmaven + aliyun https://maven.aliyun.com/repository/public - - true - - - - public - aliyun nexus - https://maven.aliyun.com/repository/public - - true - - - false - - - - From 08bf2d1433b1a684767793d7be6269280650454d Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 13:29:32 +0800 Subject: [PATCH 06/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 2 +- settings.xml | 302 ++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 303 insertions(+), 1 deletion(-) create mode 100644 settings.xml diff --git a/.drone-images.yml b/.drone-images.yml index a6e77b848..f7bb99060 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -21,7 +21,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn clean package -Dmaven.test.skip=true # 应用打包命令 + - mvn package -Dmaven.test.skip=true # 应用打包命令 - | if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target diff --git a/settings.xml b/settings.xml new file mode 100644 index 000000000..6c82c9a8a --- /dev/null +++ b/settings.xml @@ -0,0 +1,302 @@ + + + + + + + +D:\Maven\apache-maven-3.5.2\repository + + + + + + + + + + + + + + + + + + + + + + + + + + + alimaven + aliyun maven + http://maven.aliyun.com/nexus/content/groups/public/ + central + + + alimaven + central + aliyun maven + http://maven.aliyun.com/nexus/content/repositories/central/ + + + repo2 + central + Human Readable Name for this Mirror. + http://repo2.maven.org/maven2/ + + + maven-default-http-blocker + external:http:* + Pseudo repository to mirror external repositories initially using HTTP. + http://0.0.0.0/ + + + + + + + + + + + + + + + From b76b8f110b1668389f3487b0cab791468d66145c Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 13:30:28 +0800 Subject: [PATCH 07/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone-images.yml b/.drone-images.yml index f7bb99060..062d7dde5 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -21,7 +21,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn package -Dmaven.test.skip=true # 应用打包命令 + - mvn package -s settings.xml -Dmaven.test.skip=true # 应用打包命令 - | if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target From da85b4b46166872cebe88c84f6cb9162e0a9dddd Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 13:50:47 +0800 Subject: [PATCH 08/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone-images.yml b/.drone-images.yml index 062d7dde5..d0603ba6e 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -8,7 +8,7 @@ name: ludu-drone-images # 定义流水线名称 steps: # 定义流水线执行步骤，这些步骤将顺序执行 - name: package # 流水线名称 - image: maven:3-jdk-8 # 定义创建容器的Docker镜像 + image: maven:3.9.4-jdk-8 # 定义创建容器的Docker镜像 volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置 @@ -142,4 +142,4 @@ volumes: # 定义流水线挂载目录，用于共享数据 - name: maven-cache host: - path: /ludu/cache # 从宿主机中挂载的目录 \ No newline at end of file + path: /root/.m2 # 从宿主机中挂载的目录 \ No newline at end of file From 5292f7c3f47ff265f4d4444daa8d329ebcaaa5e9 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 13:53:08 +0800 Subject: [PATCH 09/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone-images.yml b/.drone-images.yml index d0603ba6e..62b42cdb5 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -8,7 +8,7 @@ name: ludu-drone-images # 定义流水线名称 steps: # 定义流水线执行步骤，这些步骤将顺序执行 - name: package # 流水线名称 - image: maven:3.9.4-jdk-8 # 定义创建容器的Docker镜像 + image: maven:3-jdk-8 # 定义创建容器的Docker镜像 volumes: # 将容器内目录挂载到宿主机，仓库需要开启Trusted设置 From 6dcfba3b748ca9a7358d21bf1b979e7b9e181a73 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 14:02:23 +0800 Subject: [PATCH 10/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone-images.yml b/.drone-images.yml index 62b42cdb5..f7bb99060 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -21,7 +21,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn package -s settings.xml -Dmaven.test.skip=true # 应用打包命令 + - mvn package -Dmaven.test.skip=true # 应用打包命令 - | if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target @@ -142,4 +142,4 @@ volumes: # 定义流水线挂载目录，用于共享数据 - name: maven-cache host: - path: /root/.m2 # 从宿主机中挂载的目录 \ No newline at end of file + path: /ludu/cache # 从宿主机中挂载的目录 \ No newline at end of file From e58be046fca04ed07152454f9ae1b0ab41746cac Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 14:13:33 +0800 Subject: [PATCH 11/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone-images.yml b/.drone-images.yml index f7bb99060..062d7dde5 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -21,7 +21,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn package -Dmaven.test.skip=true # 应用打包命令 + - mvn package -s settings.xml -Dmaven.test.skip=true # 应用打包命令 - | if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target From 34f7df819deac151cc036a7b8486c92a347d112a Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 13 Sep 2024 14:23:22 +0800 Subject: [PATCH 12/18] =?UTF-8?q?=E9=95=9C=E5=83=8F=E6=BA=90=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone-images.yml b/.drone-images.yml index 062d7dde5..8a2e17a9d 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -21,7 +21,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn package -s settings.xml -Dmaven.test.skip=true # 应用打包命令 + - mvn clean package -s settings.xml -Dmaven.test.skip=true # 应用打包命令 - | if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target From 32329dff77ec5ae23ed3533efd9c5f2d6b2bdb7c Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 18 Sep 2024 11:09:44 +0800 Subject: [PATCH 13/18] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=93=E5=8C=85?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=85=B6=E5=AE=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 222 +++++++++++++++++++++++----------------------- 1 file changed, 111 insertions(+), 111 deletions(-) diff --git a/.drone-images.yml b/.drone-images.yml index 8a2e17a9d..5bf5282b0 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -22,118 +22,118 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 commands: # 定义在Docker容器中执行的shell命令 - mvn clean package -s settings.xml -Dmaven.test.skip=true # 应用打包命令 - - | - if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then - cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target - cp ./yudao-gateway/Dockerfile /app/build/yudao-gateway - cp ./yudao-gateway/run.sh /app/build/yudao-gateway - fi - if [ "${service}" = "system" ] || [ "${service}" = "all" ]; then - cp ./yudao-module-system/yudao-module-system-biz/target/yudao-module-system-biz.jar /app/build/yudao-module-system/target - cp ./yudao-module-system/yudao-module-system-biz/Dockerfile /app/build/yudao-module-system - cp ./yudao-module-system/yudao-module-system-biz/run.sh /app/build/yudao-module-system - fi - if [ "${service}" = "infra" ] || [ "${service}" = "all" ]; then - cp ./yudao-module-infra/yudao-module-infra-biz/target/yudao-module-infra-biz.jar /app/build/yudao-module-infra/target - cp ./yudao-module-infra/yudao-module-infra-biz/Dockerfile /app/build/yudao-module-infra - cp ./yudao-module-infra/yudao-module-infra-biz/run.sh /app/build/yudao-module-infra - fi - if [ "${service}" = "job" ] || [ "${service}" = "all" ]; then - cp ./ludu-job-admin/ludu-job-admin-biz/target/ludu-job-admin-biz.jar /app/build/ludu-job-admin/target - cp ./ludu-job-admin/ludu-job-admin-biz/Dockerfile /app/build/ludu-job-admin - cp ./ludu-job-admin/ludu-job-admin-biz/run.sh /app/build/ludu-job-admin - fi - if [ "${service}" = "ticketing" ] || [ "${service}" = "all" ]; then - cp ./ludu-module-ticketing/ludu-module-ticketing-biz/target/ludu-module-ticketing-biz.jar /app/build/ludu-module-ticketing/target - cp ./ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile /app/build/ludu-module-ticketing - cp ./ludu-module-ticketing/ludu-module-ticketing-biz/run.sh /app/build/ludu-module-ticketing - fi - if [ "${service}" = "parking" ] || [ "${service}" = "all" ]; then - cp ./ludu-module-parking/ludu-module-parking-biz/target/ludu-module-parking-biz.jar /app/build/ludu-module-parking/target - cp ./ludu-module-parking/ludu-module-parking-biz/Dockerfile /app/build/ludu-module-parking - cp ./ludu-module-parking/ludu-module-parking-biz/run.sh /app/build/ludu-module-parking - fi - if [ "${service}" = "datacenter" ] || [ "${service}" = "all" ]; then - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar /app/build/ludu-module-datacenter/target - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile /app/build/ludu-module-datacenter - cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter - fi +# - | +# if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then +# cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target +# cp ./yudao-gateway/Dockerfile /app/build/yudao-gateway +# cp ./yudao-gateway/run.sh /app/build/yudao-gateway +# fi +# if [ "${service}" = "system" ] || [ "${service}" = "all" ]; then +# cp ./yudao-module-system/yudao-module-system-biz/target/yudao-module-system-biz.jar /app/build/yudao-module-system/target +# cp ./yudao-module-system/yudao-module-system-biz/Dockerfile /app/build/yudao-module-system +# cp ./yudao-module-system/yudao-module-system-biz/run.sh /app/build/yudao-module-system +# fi +# if [ "${service}" = "infra" ] || [ "${service}" = "all" ]; then +# cp ./yudao-module-infra/yudao-module-infra-biz/target/yudao-module-infra-biz.jar /app/build/yudao-module-infra/target +# cp ./yudao-module-infra/yudao-module-infra-biz/Dockerfile /app/build/yudao-module-infra +# cp ./yudao-module-infra/yudao-module-infra-biz/run.sh /app/build/yudao-module-infra +# fi +# if [ "${service}" = "job" ] || [ "${service}" = "all" ]; then +# cp ./ludu-job-admin/ludu-job-admin-biz/target/ludu-job-admin-biz.jar /app/build/ludu-job-admin/target +# cp ./ludu-job-admin/ludu-job-admin-biz/Dockerfile /app/build/ludu-job-admin +# cp ./ludu-job-admin/ludu-job-admin-biz/run.sh /app/build/ludu-job-admin +# fi +# if [ "${service}" = "ticketing" ] || [ "${service}" = "all" ]; then +# cp ./ludu-module-ticketing/ludu-module-ticketing-biz/target/ludu-module-ticketing-biz.jar /app/build/ludu-module-ticketing/target +# cp ./ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile /app/build/ludu-module-ticketing +# cp ./ludu-module-ticketing/ludu-module-ticketing-biz/run.sh /app/build/ludu-module-ticketing +# fi +# if [ "${service}" = "parking" ] || [ "${service}" = "all" ]; then +# cp ./ludu-module-parking/ludu-module-parking-biz/target/ludu-module-parking-biz.jar /app/build/ludu-module-parking/target +# cp ./ludu-module-parking/ludu-module-parking-biz/Dockerfile /app/build/ludu-module-parking +# cp ./ludu-module-parking/ludu-module-parking-biz/run.sh /app/build/ludu-module-parking +# fi +# if [ "${service}" = "datacenter" ] || [ "${service}" = "all" ]; then +# cp ./ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar /app/build/ludu-module-datacenter/target +# cp ./ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile /app/build/ludu-module-datacenter +# cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter +# fi +# +# - name: push-images +# +# image: appleboy/drone-ssh # SSH工具镜像 +# +# settings: +# +# host: 101.43.112.107 # 远程连接地址 +# +# username: root # 远程连接账号 +# +# password: +# +# from_secret: ssh_password # 从Secret中读取SSH密码 +# +# port: 22 # 远程连接端口 +# +# command_timeout: 30m # 远程执行命令超时时间 +# +# script: +# - | +# deploy_service() { +# local image_name=$1 +# local container_name=$2 +# +# cd /ludu/build/${image_name} +# docker stop ${container_name} +# docker rm ${container_name} +# docker rmi -f ${image_name}:1.0.0 +# docker buildx build -f Dockerfile -t ${image_name}:1.0.0 . +# docker tag ${image_name}:1.0.0 120.46.37.243:8080/lundu/${image_name}:1.0.0 +# docker pull 120.46.37.243:8080/lundu/${image_name}:1.0.0 +# } +# if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then +# deploy_service "yudao-gateway" "yudao-gateway" +# fi +# if [ "${service}" = "system" ] || [ "${service}" = "all" ]; then +# deploy_service "yudao-module-system" "yudao-system" +# fi +# if [ "${service}" = "infra" ] || [ "${service}" = "all" ]; then +# deploy_service "yudao-module-infra" "yudao-infra" +# fi +# if [ "${service}" = "job" ] || [ "${service}" = "all" ]; then +# deploy_service "ludu-job-admin" "ludu-job-admin" +# fi +# if [ "${service}" = "ticketing" ] || [ "${service}" = "all" ]; then +# deploy_service "ludu-module-ticketing" "ludu-ticketing" +# fi +# if [ "${service}" = "parking" ] || [ "${service}" = "all" ]; then +# deploy_service "ludu-module-parking" "ludu-parking" +# fi +# if [ "${service}" = "datacenter" ] || [ "${service}" = "all" ]; then +# deploy_service "ludu-module-datacenter" "ludu-datacenter" +# fi - - name: push-images - - image: appleboy/drone-ssh # SSH工具镜像 - - settings: - - host: 101.43.112.107 # 远程连接地址 - - username: root # 远程连接账号 - - password: - - from_secret: ssh_password # 从Secret中读取SSH密码 - - port: 22 # 远程连接端口 - - command_timeout: 30m # 远程执行命令超时时间 - - script: - - | - deploy_service() { - local image_name=$1 - local container_name=$2 - - cd /ludu/build/${image_name} - docker stop ${container_name} - docker rm ${container_name} - docker rmi -f ${image_name}:1.0.0 - docker buildx build -f Dockerfile -t ${image_name}:1.0.0 . - docker tag ${image_name}:1.0.0 120.46.37.243:8080/lundu/${image_name}:1.0.0 - docker pull 120.46.37.243:8080/lundu/${image_name}:1.0.0 - } - if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then - deploy_service "yudao-gateway" "yudao-gateway" - fi - if [ "${service}" = "system" ] || [ "${service}" = "all" ]; then - deploy_service "yudao-module-system" "yudao-system" - fi - if [ "${service}" = "infra" ] || [ "${service}" = "all" ]; then - deploy_service "yudao-module-infra" "yudao-infra" - fi - if [ "${service}" = "job" ] || [ "${service}" = "all" ]; then - deploy_service "ludu-job-admin" "ludu-job-admin" - fi - if [ "${service}" = "ticketing" ] || [ "${service}" = "all" ]; then - deploy_service "ludu-module-ticketing" "ludu-ticketing" - fi - if [ "${service}" = "parking" ] || [ "${service}" = "all" ]; then - deploy_service "ludu-module-parking" "ludu-parking" - fi - if [ "${service}" = "datacenter" ] || [ "${service}" = "all" ]; then - deploy_service "ludu-module-datacenter" "ludu-datacenter" - fi - - - name: pull-image-and-run - - image: appleboy/drone-ssh # SSH工具镜像 - - settings: - - host: 121.36.203.133 # 远程连接地址 - - username: root # 远程连接账号 - - password: - - from_secret: ssh_password3 # 从Secret中读取SSH密码 - - port: 22 # 远程连接端口 - - command_timeout: 20m # 远程执行命令超时时间 - - script: - - cd /ludu - - ./start_service.sh ${service} +# - name: pull-image-and-run +# +# image: appleboy/drone-ssh # SSH工具镜像 +# +# settings: +# +# host: 121.36.203.133 # 远程连接地址 +# +# username: root # 远程连接账号 +# +# password: +# +# from_secret: ssh_password3 # 从Secret中读取SSH密码 +# +# port: 22 # 远程连接端口 +# +# command_timeout: 20m # 远程执行命令超时时间 +# +# script: +# - cd /ludu +# - ./start_service.sh ${service} volumes: # 定义流水线挂载目录，用于共享数据 - name: maven-build From d1876c76a5ac36f38104d55a2fbbebf30548e6e3 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 18 Sep 2024 11:42:11 +0800 Subject: [PATCH 14/18] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone-images.yml b/.drone-images.yml index 5bf5282b0..e4e78d1f7 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -21,7 +21,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn clean package -s settings.xml -Dmaven.test.skip=true # 应用打包命令 + - mvn package -s settings.xml -Dmaven.test.skip=true # 应用打包命令 # - | # if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then # cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target From 2e3ebd0383f9251357e9df8dad0756ac2b084cd3 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 18 Sep 2024 11:51:55 +0800 Subject: [PATCH 15/18] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.drone-images.yml b/.drone-images.yml index e4e78d1f7..1e200e0d2 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -138,8 +138,8 @@ volumes: # 定义流水线挂载目录，用于共享数据 - name: maven-build host: - path: /ludu/build # 从宿主机中挂载的目录 + path: /ludu/maven/build # 从宿主机中挂载的目录 - name: maven-cache host: - path: /ludu/cache # 从宿主机中挂载的目录 \ No newline at end of file + path: /ludu/maven/cache # 从宿主机中挂载的目录 \ No newline at end of file From f95361ad23a9f439fbb625231230d738864e2e3e Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Wed, 18 Sep 2024 14:42:02 +0800 Subject: [PATCH 16/18] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone-images.yml b/.drone-images.yml index 1e200e0d2..123005e2a 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -21,7 +21,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 path: /app/build # 将应用打包好的Jar和执行脚本挂载出来 commands: # 定义在Docker容器中执行的shell命令 - - mvn package -s settings.xml -Dmaven.test.skip=true # 应用打包命令 + - mvn package -Dmaven.test.skip=true # 应用打包命令 # - | # if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then # cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target From c6f26841500d4e2a4e763500444ac957dd76c0e7 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 20 Sep 2024 09:03:12 +0800 Subject: [PATCH 17/18] =?UTF-8?q?pom=E9=95=9C=E5=83=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 2 +- pom.xml | 27 +++++++++++++++++++-------- 2 files changed, 20 insertions(+), 9 deletions(-) diff --git a/.drone-images.yml b/.drone-images.yml index 123005e2a..baabd5efe 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -89,7 +89,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 # docker rmi -f ${image_name}:1.0.0 # docker buildx build -f Dockerfile -t ${image_name}:1.0.0 . # docker tag ${image_name}:1.0.0 120.46.37.243:8080/lundu/${image_name}:1.0.0 -# docker pull 120.46.37.243:8080/lundu/${image_name}:1.0.0 +# docker push 120.46.37.243:8080/lundu/${image_name}:1.0.0 # } # if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then # deploy_service "yudao-gateway" "yudao-gateway" diff --git a/pom.xml b/pom.xml index 4a2997f23..c5a145adc 100644 --- a/pom.xml +++ b/pom.xml @@ -128,18 +128,29 @@ - - huaweicloud - huawei - https://mirrors.huaweicloud.com/repository/maven/ - - - aliyunmaven - aliyun + public + aliyun nexus https://maven.aliyun.com/repository/public + + true + + + + public + aliyun nexus + https://maven.aliyun.com/repository/public + + true + + + false + + + + From 2e99b505c6f2e714fc63946d3bb32b89c6b15b71 Mon Sep 17 00:00:00 2001 From: XinWei <2718030729@qq.com> Date: Fri, 20 Sep 2024 10:18:35 +0800 Subject: [PATCH 18/18] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .drone-images.yml | 229 ++++++++++++++++++++++++---------------------- 1 file changed, 118 insertions(+), 111 deletions(-) diff --git a/.drone-images.yml b/.drone-images.yml index baabd5efe..2ef9201b1 100644 --- a/.drone-images.yml +++ b/.drone-images.yml @@ -22,118 +22,125 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行 commands: # 定义在Docker容器中执行的shell命令 - mvn package -Dmaven.test.skip=true # 应用打包命令 -# - | -# if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then -# cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target -# cp ./yudao-gateway/Dockerfile /app/build/yudao-gateway -# cp ./yudao-gateway/run.sh /app/build/yudao-gateway -# fi -# if [ "${service}" = "system" ] || [ "${service}" = "all" ]; then -# cp ./yudao-module-system/yudao-module-system-biz/target/yudao-module-system-biz.jar /app/build/yudao-module-system/target -# cp ./yudao-module-system/yudao-module-system-biz/Dockerfile /app/build/yudao-module-system -# cp ./yudao-module-system/yudao-module-system-biz/run.sh /app/build/yudao-module-system -# fi -# if [ "${service}" = "infra" ] || [ "${service}" = "all" ]; then -# cp ./yudao-module-infra/yudao-module-infra-biz/target/yudao-module-infra-biz.jar /app/build/yudao-module-infra/target -# cp ./yudao-module-infra/yudao-module-infra-biz/Dockerfile /app/build/yudao-module-infra -# cp ./yudao-module-infra/yudao-module-infra-biz/run.sh /app/build/yudao-module-infra -# fi -# if [ "${service}" = "job" ] || [ "${service}" = "all" ]; then -# cp ./ludu-job-admin/ludu-job-admin-biz/target/ludu-job-admin-biz.jar /app/build/ludu-job-admin/target -# cp ./ludu-job-admin/ludu-job-admin-biz/Dockerfile /app/build/ludu-job-admin -# cp ./ludu-job-admin/ludu-job-admin-biz/run.sh /app/build/ludu-job-admin -# fi -# if [ "${service}" = "ticketing" ] || [ "${service}" = "all" ]; then -# cp ./ludu-module-ticketing/ludu-module-ticketing-biz/target/ludu-module-ticketing-biz.jar /app/build/ludu-module-ticketing/target -# cp ./ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile /app/build/ludu-module-ticketing -# cp ./ludu-module-ticketing/ludu-module-ticketing-biz/run.sh /app/build/ludu-module-ticketing -# fi -# if [ "${service}" = "parking" ] || [ "${service}" = "all" ]; then -# cp ./ludu-module-parking/ludu-module-parking-biz/target/ludu-module-parking-biz.jar /app/build/ludu-module-parking/target -# cp ./ludu-module-parking/ludu-module-parking-biz/Dockerfile /app/build/ludu-module-parking -# cp ./ludu-module-parking/ludu-module-parking-biz/run.sh /app/build/ludu-module-parking -# fi -# if [ "${service}" = "datacenter" ] || [ "${service}" = "all" ]; then -# cp ./ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar /app/build/ludu-module-datacenter/target -# cp ./ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile /app/build/ludu-module-datacenter -# cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter -# fi -# -# - name: push-images -# -# image: appleboy/drone-ssh # SSH工具镜像 -# -# settings: -# -# host: 101.43.112.107 # 远程连接地址 -# -# username: root # 远程连接账号 -# -# password: -# -# from_secret: ssh_password # 从Secret中读取SSH密码 -# -# port: 22 # 远程连接端口 -# -# command_timeout: 30m # 远程执行命令超时时间 -# -# script: -# - | -# deploy_service() { -# local image_name=$1 -# local container_name=$2 -# -# cd /ludu/build/${image_name} -# docker stop ${container_name} -# docker rm ${container_name} -# docker rmi -f ${image_name}:1.0.0 -# docker buildx build -f Dockerfile -t ${image_name}:1.0.0 . -# docker tag ${image_name}:1.0.0 120.46.37.243:8080/lundu/${image_name}:1.0.0 -# docker push 120.46.37.243:8080/lundu/${image_name}:1.0.0 -# } -# if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then -# deploy_service "yudao-gateway" "yudao-gateway" -# fi -# if [ "${service}" = "system" ] || [ "${service}" = "all" ]; then -# deploy_service "yudao-module-system" "yudao-system" -# fi -# if [ "${service}" = "infra" ] || [ "${service}" = "all" ]; then -# deploy_service "yudao-module-infra" "yudao-infra" -# fi -# if [ "${service}" = "job" ] || [ "${service}" = "all" ]; then -# deploy_service "ludu-job-admin" "ludu-job-admin" -# fi -# if [ "${service}" = "ticketing" ] || [ "${service}" = "all" ]; then -# deploy_service "ludu-module-ticketing" "ludu-ticketing" -# fi -# if [ "${service}" = "parking" ] || [ "${service}" = "all" ]; then -# deploy_service "ludu-module-parking" "ludu-parking" -# fi -# if [ "${service}" = "datacenter" ] || [ "${service}" = "all" ]; then -# deploy_service "ludu-module-datacenter" "ludu-datacenter" -# fi + - | + if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then + mkdir -p /app/build/yudao-gateway/target + cp ./yudao-gateway/target/yudao-gateway.jar /app/build/yudao-gateway/target/ + cp ./yudao-gateway/Dockerfile /app/build/yudao-gateway/ + cp ./yudao-gateway/run.sh /app/build/yudao-gateway/ + fi + if [ "${service}" = "system" ] || [ "${service}" = "all" ]; then + mkdir -p /app/build/yudao-module-system/target + cp ./yudao-module-system/yudao-module-system-biz/target/yudao-module-system-biz.jar /app/build/yudao-module-system/target/ + cp ./yudao-module-system/yudao-module-system-biz/Dockerfile /app/build/yudao-module-system/ + cp ./yudao-module-system/yudao-module-system-biz/run.sh /app/build/yudao-module-system/ + fi + if [ "${service}" = "infra" ] || [ "${service}" = "all" ]; then + mkdir -p /app/build/yudao-module-infra/target + cp ./yudao-module-infra/yudao-module-infra-biz/target/yudao-module-infra-biz.jar /app/build/yudao-module-infra/target/ + cp ./yudao-module-infra/yudao-module-infra-biz/Dockerfile /app/build/yudao-module-infra/ + cp ./yudao-module-infra/yudao-module-infra-biz/run.sh /app/build/yudao-module-infra/ + fi + if [ "${service}" = "job" ] || [ "${service}" = "all" ]; then + mkdir -p /app/build/ludu-job-admin/target + cp ./ludu-job-admin/ludu-job-admin-biz/target/ludu-job-admin-biz.jar /app/build/ludu-job-admin/target/ + cp ./ludu-job-admin/ludu-job-admin-biz/Dockerfile /app/build/ludu-job-admin/ + cp ./ludu-job-admin/ludu-job-admin-biz/run.sh /app/build/ludu-job-admin/ + fi + if [ "${service}" = "ticketing" ] || [ "${service}" = "all" ]; then + mkdir -p /app/build/ludu-module-ticketing/target + cp ./ludu-module-ticketing/ludu-module-ticketing-biz/target/ludu-module-ticketing-biz.jar /app/build/ludu-module-ticketing/target/ + cp ./ludu-module-ticketing/ludu-module-ticketing-biz/Dockerfile /app/build/ludu-module-ticketing/ + cp ./ludu-module-ticketing/ludu-module-ticketing-biz/run.sh /app/build/ludu-module-ticketing/ + fi + if [ "${service}" = "parking" ] || [ "${service}" = "all" ]; then + mkdir -p /app/build/ludu-module-parking/target + cp ./ludu-module-parking/ludu-module-parking-biz/target/ludu-module-parking-biz.jar /app/build/ludu-module-parking/target/ + cp ./ludu-module-parking/ludu-module-parking-biz/Dockerfile /app/build/ludu-module-parking/ + cp ./ludu-module-parking/ludu-module-parking-biz/run.sh /app/build/ludu-module-parking/ + fi + if [ "${service}" = "datacenter" ] || [ "${service}" = "all" ]; then + mkdir -p /app/build/ludu-module-datacenter/target + cp ./ludu-module-datacenter/ludu-module-datacenter-biz/target/ludu-module-datacenter-biz.jar /app/build/ludu-module-datacenter/target + cp ./ludu-module-datacenter/ludu-module-datacenter-biz/Dockerfile /app/build/ludu-module-datacenter/ + cp ./ludu-module-datacenter/ludu-module-datacenter-biz/run.sh /app/build/ludu-module-datacenter/ + fi -# - name: pull-image-and-run -# -# image: appleboy/drone-ssh # SSH工具镜像 -# -# settings: -# -# host: 121.36.203.133 # 远程连接地址 -# -# username: root # 远程连接账号 -# -# password: -# -# from_secret: ssh_password3 # 从Secret中读取SSH密码 -# -# port: 22 # 远程连接端口 -# -# command_timeout: 20m # 远程执行命令超时时间 -# -# script: -# - cd /ludu -# - ./start_service.sh ${service} + - name: push-images + + image: appleboy/drone-ssh # SSH工具镜像 + + settings: + + host: 101.43.112.107 # 远程连接地址 + + username: root # 远程连接账号 + + password: + + from_secret: ssh_password # 从Secret中读取SSH密码 + + port: 22 # 远程连接端口 + + command_timeout: 30m # 远程执行命令超时时间 + + script: + - | + deploy_service() { + local image_name=$1 + local container_name=$2 + + cd /ludu/build/${image_name} + docker stop ${container_name} + docker rm ${container_name} + docker rmi -f ${image_name}:1.0.0 + docker buildx build -f Dockerfile -t ${image_name}:1.0.0 . + docker tag ${image_name}:1.0.0 120.46.37.243:8080/lundu/${image_name}:1.0.0 + docker push 120.46.37.243:8080/lundu/${image_name}:1.0.0 + } + if [ "${service}" = "gateway" ] || [ "${service}" = "all" ]; then + deploy_service "yudao-gateway" "yudao-gateway" + fi + if [ "${service}" = "system" ] || [ "${service}" = "all" ]; then + deploy_service "yudao-module-system" "yudao-system" + fi + if [ "${service}" = "infra" ] || [ "${service}" = "all" ]; then + deploy_service "yudao-module-infra" "yudao-infra" + fi + if [ "${service}" = "job" ] || [ "${service}" = "all" ]; then + deploy_service "ludu-job-admin" "ludu-job-admin" + fi + if [ "${service}" = "ticketing" ] || [ "${service}" = "all" ]; then + deploy_service "ludu-module-ticketing" "ludu-ticketing" + fi + if [ "${service}" = "parking" ] || [ "${service}" = "all" ]; then + deploy_service "ludu-module-parking" "ludu-parking" + fi + if [ "${service}" = "datacenter" ] || [ "${service}" = "all" ]; then + deploy_service "ludu-module-datacenter" "ludu-datacenter" + fi + + - name: pull-image-and-run + + image: appleboy/drone-ssh # SSH工具镜像 + + settings: + + host: 121.36.203.133 # 远程连接地址 + + username: root # 远程连接账号 + + password: + + from_secret: ssh_password3 # 从Secret中读取SSH密码 + + port: 22 # 远程连接端口 + + command_timeout: 20m # 远程执行命令超时时间 + + script: + - cd /ludu + - ./start_service.sh ${service} volumes: # 定义流水线挂载目录，用于共享数据 - name: maven-build