From 7a6a06763c1b7c8a345e71f450301e408c43befe Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 11:33:52 +0800
Subject: [PATCH 01/13] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 183 ++++++++++++++++++++++++++++++-----------------------
 1 file changed, 104 insertions(+), 79 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b7ece57f5..c5ba71ddc 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,6 +4,8 @@ type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型
 
 name: ludu-system-drone # 定义流水线名称
 
+environment:
+  module: ${module}
 
 steps: # 定义流水线执行步骤，这些步骤将顺序执行
 
@@ -25,62 +27,85 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
 
       - mvn package -Dmaven.test.skip=true # 应用打包命令
 
-#      - 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
-#
-#      - 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
-#
-#      - 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
-#
-#      - 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
-#
-#      - 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
-#
-#      - 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
+      - |
+          if echo "$module" | grep -q "gateway" || echo "$module" | grep -q "all"; then
+            echo "gateway start copy to volumes..."
+        #          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 echo "$module" | grep -q "system" || echo "$module" | grep -q "all"; then
+          echo "system start copy to volumes..."
+        #          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 echo "$module" | grep -q "infra" || echo "$module" | grep -q "all"; then
+          echo "infra start copy to volumes..."
+        #          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 echo "$module" | grep -q "job" || echo "$module" | grep -q "all"; then
+          echo "job start copy to volumes..."
+        #          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 echo "$module" | grep -q "ticketing" || echo "$module" | grep -q "all"; then
+          echo "ticketing start copy to volumes..."
+        #          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 echo "$module" | grep -q "parking" || echo "$module" | grep -q "all"; then
+          echo "parking start copy to volumes..."
+        #          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 echo "$module" | grep -q "datacenter" || echo "$module" | grep -q "all"; then
+          echo "datacenter start copy to volumes..."
+        #          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
 
-      - 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
 
-  - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
- 
-    image: appleboy/drone-ssh # SSH工具镜像
- 
-    settings:
- 
-      host: 101.43.112.107 # 远程连接地址
- 
-      username: root # 远程连接账号
- 
-      password: 
- 
-        from_secret: ssh_password # 从Secret中读取SSH密码
- 
-      port: 22 # 远程连接端口
- 
-      command_timeout: 15m # 远程执行命令超时时间
- 
-      script:
-
-        - echo "start copy"
+#  - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
+#
+#    image: appleboy/drone-ssh # SSH工具镜像
+#
+#    settings:
+#
+#      host: 101.43.112.107 # 远程连接地址
+#
+#      username: root # 远程连接账号
+#
+#      password:
+#
+#        from_secret: ssh_password # 从Secret中读取SSH密码
+#
+#      port: 22 # 远程连接端口
+#
+#      command_timeout: 15m # 远程执行命令超时时间
+#
+#      script:
+#
+#        - echo "start copy"
 #        - cd /ludu/maven
 #        - tar -cf ludu-build.tar ./build
 #        - scp ludu-build.tar root@121.36.203.133:/ludu/maven
@@ -96,32 +121,32 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
 #        - echo "infra done"
 #        - scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build
 #        - echo "job done"
-        - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
-        - echo "datacenter done"
+#        - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
+#        - echo "datacenter done"
 
-  - name: build-other-service
-
-    image: appleboy/drone-ssh # SSH工具镜像
-
-    settings:
-
-      host: 120.46.37.243 # 远程连接地址
-
-      username: root # 远程连接账号
-
-      password:
-
-        from_secret: ssh_password2 # 从Secret中读取SSH密码
-
-      port: 22 # 远程连接端口
-
-      command_timeout: 5m # 远程执行命令超时时间
-
-      script:
-
-        - cd /ludu/maven/build/ludu-module-datacenter/
-        - chmod +x ./run.sh # 更改为可执行脚本
-        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
+#  - name: build-other-service
+#
+#    image: appleboy/drone-ssh # SSH工具镜像
+#
+#    settings:
+#
+#      host: 120.46.37.243 # 远程连接地址
+#
+#      username: root # 远程连接账号
+#
+#      password:
+#
+#        from_secret: ssh_password2 # 从Secret中读取SSH密码
+#
+#      port: 22 # 远程连接端口
+#
+#      command_timeout: 5m # 远程执行命令超时时间
+#
+#      script:
+#
+#        - cd /ludu/maven/build/ludu-module-datacenter/
+#        - chmod +x ./run.sh # 更改为可执行脚本
+#        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
 #  - name: object-build
 #
 #    image: appleboy/drone-ssh # SSH工具镜像
-- 
2.45.2


From aa10afb5bff1b0f04c0de10f713618afd945b914 Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 11:36:31 +0800
Subject: [PATCH 02/13] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 68 +++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c5ba71ddc..d925edf9b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -30,58 +30,58 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       - |
           if echo "$module" | grep -q "gateway" || echo "$module" | grep -q "all"; then
             echo "gateway start copy to volumes..."
-        #          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
+            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 echo "$module" | grep -q "system" || echo "$module" | grep -q "all"; then
-          echo "system start copy to volumes..."
-        #          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
+            echo "system start copy to volumes..."
+            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 echo "$module" | grep -q "infra" || echo "$module" | grep -q "all"; then
-          echo "infra start copy to volumes..."
-        #          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
+            echo "infra start copy to volumes..."
+            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 echo "$module" | grep -q "job" || echo "$module" | grep -q "all"; then
-          echo "job start copy to volumes..."
-        #          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
+            echo "job start copy to volumes..."
+            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 echo "$module" | grep -q "ticketing" || echo "$module" | grep -q "all"; then
-          echo "ticketing start copy to volumes..."
-        #          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
+            echo "ticketing start copy to volumes..."
+            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 echo "$module" | grep -q "parking" || echo "$module" | grep -q "all"; then
-          echo "parking start copy to volumes..."
-        #          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
+            echo "parking start copy to volumes..."
+            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 echo "$module" | grep -q "datacenter" || echo "$module" | grep -q "all"; then
-          echo "datacenter start copy to volumes..."
-        #          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
+            echo "datacenter start copy to volumes..."
+            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
 
 
-- 
2.45.2


From 23b5514cfaeb7f38c754ceed550b25017efee71e Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 11:37:13 +0800
Subject: [PATCH 03/13] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 28 ----------------------------
 1 file changed, 28 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index d925edf9b..b48d7b5f6 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -30,58 +30,30 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       - |
           if echo "$module" | grep -q "gateway" || echo "$module" | grep -q "all"; then
             echo "gateway start copy to volumes..."
-            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 echo "$module" | grep -q "system" || echo "$module" | grep -q "all"; then
             echo "system start copy to volumes..."
-            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 echo "$module" | grep -q "infra" || echo "$module" | grep -q "all"; then
             echo "infra start copy to volumes..."
-            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 echo "$module" | grep -q "job" || echo "$module" | grep -q "all"; then
             echo "job start copy to volumes..."
-            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 echo "$module" | grep -q "ticketing" || echo "$module" | grep -q "all"; then
             echo "ticketing start copy to volumes..."
-            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 echo "$module" | grep -q "parking" || echo "$module" | grep -q "all"; then
             echo "parking start copy to volumes..."
-            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 echo "$module" | grep -q "datacenter" || echo "$module" | grep -q "all"; then
             echo "datacenter start copy to volumes..."
-            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
 
 
-- 
2.45.2


From a44ebf270ea58748546f0d4a2e78e82bc5099918 Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 11:47:11 +0800
Subject: [PATCH 04/13] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95?=
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 b48d7b5f6..7a1660d36 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -25,7 +25,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
 
     commands: # 定义在Docker容器中执行的shell命令
 
-      - mvn package -Dmaven.test.skip=true # 应用打包命令
+#      - mvn package -Dmaven.test.skip=true # 应用打包命令
 
       - |
           if echo "$module" | grep -q "gateway" || echo "$module" | grep -q "all"; then
-- 
2.45.2


From e337adcc68bd51358a12e824fbde8833e3184c86 Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 11:50:16 +0800
Subject: [PATCH 05/13] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95?=
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 7a1660d36..0af9497b8 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -56,6 +56,8 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
             echo "datacenter start copy to volumes..."
           fi
 
+      - echo "Finished checks for module: $module"
+
 
 #  - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
 #
-- 
2.45.2


From f6855785c871f4f5f4e2adc461305245accab4cd Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 11:51:35 +0800
Subject: [PATCH 06/13] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95?=
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 0af9497b8..ab28c3495 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -56,7 +56,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
             echo "datacenter start copy to volumes..."
           fi
 
-      - echo "Finished checks for module: $module"
+      - echo "Finished checks for module"
 
 
 #  - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
-- 
2.45.2


From e042ccd5d9850c5dd0619d4d3ff23edb5e4cd80a Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 11:57:52 +0800
Subject: [PATCH 07/13] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95?=
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 ab28c3495..b69c9ff68 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -28,6 +28,7 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
 #      - mvn package -Dmaven.test.skip=true # 应用打包命令
 
       - |
+          echo "Module is: $module"
           if echo "$module" | grep -q "gateway" || echo "$module" | grep -q "all"; then
             echo "gateway start copy to volumes..."
           fi
@@ -56,7 +57,6 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
             echo "datacenter start copy to volumes..."
           fi
 
-      - echo "Finished checks for module"
 
 
 #  - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
-- 
2.45.2


From 27fd48e94309c486136535e2338f96d33deb522e Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 12:02:09 +0800
Subject: [PATCH 08/13] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E6=B5=8B=E8=AF=95?=
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 b69c9ff68..b84d59e22 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -5,7 +5,7 @@ type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型
 name: ludu-system-drone # 定义流水线名称
 
 environment:
-  module: ${module}
+  module: ${DRONE_MODULE}
 
 steps: # 定义流水线执行步骤，这些步骤将顺序执行
 
-- 
2.45.2


From 2ddf2ce75638fa9812f898301d15befb23cd0ae8 Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 13:11:45 +0800
Subject: [PATCH 09/13] =?UTF-8?q?=E6=9E=84=E5=BB=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 279 +++++++++++++++++++++++++++--------------------------
 1 file changed, 140 insertions(+), 139 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index b84d59e22..c63f31223 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -4,8 +4,6 @@ type: docker # 定义流水线类型，还有kubernetes、exec、ssh等类型
 
 name: ludu-system-drone # 定义流水线名称
 
-environment:
-  module: ${DRONE_MODULE}
 
 steps: # 定义流水线执行步骤，这些步骤将顺序执行
 
@@ -25,148 +23,151 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
 
     commands: # 定义在Docker容器中执行的shell命令
 
-#      - mvn package -Dmaven.test.skip=true # 应用打包命令
+      - mvn package -Dmaven.test.skip=true # 应用打包命令
 
-      - |
-          echo "Module is: $module"
-          if echo "$module" | grep -q "gateway" || echo "$module" | grep -q "all"; then
-            echo "gateway start copy to volumes..."
-          fi
-          
-          if echo "$module" | grep -q "system" || echo "$module" | grep -q "all"; then
-            echo "system start copy to volumes..."
-          fi
-          
-          if echo "$module" | grep -q "infra" || echo "$module" | grep -q "all"; then
-            echo "infra start copy to volumes..."
-          fi
-          
-          if echo "$module" | grep -q "job" || echo "$module" | grep -q "all"; then
-            echo "job start copy to volumes..."
-          fi
-          
-          if echo "$module" | grep -q "ticketing" || echo "$module" | grep -q "all"; then
-            echo "ticketing start copy to volumes..."
-          fi
-          
-          if echo "$module" | grep -q "parking" || echo "$module" | grep -q "all"; then
-            echo "parking start copy to volumes..."
-          fi
-          
-          if echo "$module" | grep -q "datacenter" || echo "$module" | grep -q "all"; then
-            echo "datacenter start copy to volumes..."
-          fi
+      #      - 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
+      #
+      #      - 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
+      #
+      #      - 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
+      #
+      - 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
+  #
+  #      - 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
+  #
+  #      - 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
 
+  #      - 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
 
+  - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
 
-#  - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
-#
-#    image: appleboy/drone-ssh # SSH工具镜像
-#
-#    settings:
-#
-#      host: 101.43.112.107 # 远程连接地址
-#
-#      username: root # 远程连接账号
-#
-#      password:
-#
-#        from_secret: ssh_password # 从Secret中读取SSH密码
-#
-#      port: 22 # 远程连接端口
-#
-#      command_timeout: 15m # 远程执行命令超时时间
-#
-#      script:
-#
-#        - echo "start copy"
-#        - cd /ludu/maven
-#        - tar -cf ludu-build.tar ./build
-#        - scp ludu-build.tar root@121.36.203.133:/ludu/maven
-#        - scp -r /ludu/maven/build/yudao-gateway root@121.36.203.133:/ludu/maven/build
-#        - echo "gateway done"
-#        - scp -r /ludu/maven/build/yudao-module-system root@121.36.203.133:/ludu/maven/build
-#        - echo "system done"
-#        - scp -r /ludu/maven/build/ludu-module-ticketing root@121.36.203.133:/ludu/maven/build
-#        - echo "ticketing done"
-#        - scp -r /ludu/maven/build/ludu-module-parking root@121.36.203.133:/ludu/maven/build
-#        - echo "parking done"
-#        - scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build
-#        - echo "infra done"
-#        - scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build
-#        - echo "job done"
-#        - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
-#        - echo "datacenter done"
+    image: appleboy/drone-ssh # SSH工具镜像
 
-#  - name: build-other-service
-#
-#    image: appleboy/drone-ssh # SSH工具镜像
-#
-#    settings:
-#
-#      host: 120.46.37.243 # 远程连接地址
-#
-#      username: root # 远程连接账号
-#
-#      password:
-#
-#        from_secret: ssh_password2 # 从Secret中读取SSH密码
-#
-#      port: 22 # 远程连接端口
-#
-#      command_timeout: 5m # 远程执行命令超时时间
-#
-#      script:
-#
-#        - cd /ludu/maven/build/ludu-module-datacenter/
-#        - chmod +x ./run.sh # 更改为可执行脚本
-#        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
-#  - name: object-build
-#
-#    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/maven
-#        - rm -rf ./build
-#        - tar -xf ludu-build.tar -C ./
-#
-#        - cd /ludu/maven/build/yudao-gateway/
-#        - chmod +x ./run.sh # 更改为可执行脚本
-#        - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
-#
-#        - cd /ludu/maven/build/yudao-module-system/
-#        - chmod +x ./run.sh # 更改为可执行脚本
-#        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
-#
-#        - cd /ludu/maven/build/ludu-module-ticketing/
-#        - chmod +x ./run.sh # 更改为可执行脚本
-#        - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
-#
-#        - cd /ludu/maven/build/ludu-module-parking/
-#        - chmod +x ./run.sh # 更改为可执行脚本
-#        - ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行
-#
-#        - cd /ludu/maven/build/yudao-module-infra/
-#        - chmod +x ./run.sh # 更改为可执行脚本
-#        - ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行
-#
-#        - cd /ludu/maven/build/ludu-job-admin/
-#        - chmod +x ./run.sh # 更改为可执行脚本
-#        - ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行
+    settings:
+
+      host: 101.43.112.107 # 远程连接地址
+
+      username: root # 远程连接账号
+
+      password:
+
+        from_secret: ssh_password # 从Secret中读取SSH密码
+
+      port: 22 # 远程连接端口
+
+      command_timeout: 15m # 远程执行命令超时时间
+
+      script:
+
+        - echo "start copy"
+        #        - cd /ludu/maven
+        #        - tar -cf ludu-build.tar ./build
+        #        - scp ludu-build.tar root@121.36.203.133:/ludu/maven
+        #        - scp -r /ludu/maven/build/yudao-gateway root@121.36.203.133:/ludu/maven/build
+        #        - echo "gateway done"
+        #        - scp -r /ludu/maven/build/yudao-module-system root@121.36.203.133:/ludu/maven/build
+        #        - echo "system done"
+        #        - scp -r /ludu/maven/build/ludu-module-ticketing root@121.36.203.133:/ludu/maven/build
+        #        - echo "ticketing done"
+        #        - scp -r /ludu/maven/build/ludu-module-parking root@121.36.203.133:/ludu/maven/build
+        #        - echo "parking done"
+        #        - scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build
+        #        - echo "infra done"
+        - scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build
+        - echo "job done"
+  #        - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
+  #        - echo "datacenter done"
+
+  #  - name: build-other-service
+  #
+  #    image: appleboy/drone-ssh # SSH工具镜像
+  #
+  #    settings:
+  #
+  #      host: 120.46.37.243 # 远程连接地址
+  #
+  #      username: root # 远程连接账号
+  #
+  #      password:
+  #
+  #        from_secret: ssh_password2 # 从Secret中读取SSH密码
+  #
+  #      port: 22 # 远程连接端口
+  #
+  #      command_timeout: 5m # 远程执行命令超时时间
+  #
+  #      script:
+  #
+  #        - cd /ludu/maven/build/ludu-module-datacenter/
+  #        - chmod +x ./run.sh # 更改为可执行脚本
+  #        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
+  - name: object-build
+
+    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/maven
+        #        - rm -rf ./build
+        #        - tar -xf ludu-build.tar -C ./
+        #
+        #        - cd /ludu/maven/build/yudao-gateway/
+        #        - chmod +x ./run.sh # 更改为可执行脚本
+        #        - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
+        #
+        #        - cd /ludu/maven/build/yudao-module-system/
+        #        - chmod +x ./run.sh # 更改为可执行脚本
+        #        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
+        #
+        #        - cd /ludu/maven/build/ludu-module-ticketing/
+        #        - chmod +x ./run.sh # 更改为可执行脚本
+        #        - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
+        #
+        #        - cd /ludu/maven/build/ludu-module-parking/
+        #        - chmod +x ./run.sh # 更改为可执行脚本
+        #        - ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行
+        #
+        #        - cd /ludu/maven/build/yudao-module-infra/
+        #        - chmod +x ./run.sh # 更改为可执行脚本
+        #        - ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行
+        #
+        - cd /ludu/maven/build/ludu-job-admin/
+        - chmod +x ./run.sh # 更改为可执行脚本
+        - ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行
 
 volumes: # 定义流水线挂载目录，用于共享数据
 
-- 
2.45.2


From 0b40464ad3c0c99ab964acf93db1f3a95556b293 Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 13:25:39 +0800
Subject: [PATCH 10/13] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8Cxxl-job=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml                                    | 36 +++++++++----------
 .../src/main/resources/application-dev.yaml   |  2 +-
 .../src/main/resources/application-local.yaml | 11 ++++--
 3 files changed, 28 insertions(+), 21 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index c63f31223..cb66ccf32 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -35,15 +35,15 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       #      - 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
       #
-      #      - 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
+      - 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
       #
-      - 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
+#      - 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
   #
   #      - 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
@@ -92,10 +92,10 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
         #        - echo "ticketing done"
         #        - scp -r /ludu/maven/build/ludu-module-parking root@121.36.203.133:/ludu/maven/build
         #        - echo "parking done"
-        #        - scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build
-        #        - echo "infra done"
-        - scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build
-        - echo "job done"
+        - scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build
+        - echo "infra done"
+#        - scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build
+#        - echo "job done"
   #        - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
   #        - echo "datacenter done"
 
@@ -161,13 +161,13 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
         #        - chmod +x ./run.sh # 更改为可执行脚本
         #        - ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行
         #
-        #        - cd /ludu/maven/build/yudao-module-infra/
-        #        - chmod +x ./run.sh # 更改为可执行脚本
-        #        - ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行
-        #
-        - cd /ludu/maven/build/ludu-job-admin/
+        - cd /ludu/maven/build/yudao-module-infra/
         - chmod +x ./run.sh # 更改为可执行脚本
-        - ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行
+        - ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行
+
+#        - cd /ludu/maven/build/ludu-job-admin/
+#        - chmod +x ./run.sh # 更改为可执行脚本
+#        - ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行
 
 volumes: # 定义流水线挂载目录，用于共享数据
 
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml
index 3c4c53c7a..cca440995 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml
@@ -98,7 +98,7 @@ spring:
 xxl:
   job:
     admin:
-      addresses: http://crm.fjptzykj.com:9090/xxl-job-admin
+      addresses: https://mt.ptzykjgs.com/xxl-job-admin
     executor:
       appname: ${spring.application.name} # 执行器 AppName
       address:
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml
index 949441c08..166d766fa 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml
@@ -97,9 +97,16 @@ spring:
 --- #################### 定时任务相关配置 ####################
 xxl:
   job:
-    enabled: false # 是否开启调度中心，默认为 true 开启
     admin:
-      addresses: http://127.0.0.1:9090/xxl-job-admin # 调度中心部署跟地址
+      addresses: http://127.0.0.1:9090/xxl-job-admin
+    executor:
+      appname: ${spring.application.name} # 执行器 AppName
+      address:
+      ip: # 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"；
+      port: 0 # ### 执行器端口号 [选填]：小于等于0则自动获取；默认端口为9999，单机部署多个执行器时，注意要配置不同执行器端口；
+      logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
+      logretentiondays: 30 # 执行器日志文件保存天数 [选填] ： 过期日志自动清理, 限制值大于等于3时生效; 否则, 如-1, 关闭自动清理功能；
+    accessToken: # 执行器通讯TOKEN
 
 --- #################### 服务保障相关配置 ####################
 
-- 
2.45.2


From 9edeeb7eda00f29f86f21fb46cf0f55db669be81 Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 13:30:35 +0800
Subject: [PATCH 11/13] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=9C=8D=E5=8A=A1?=
 =?UTF-8?q?=E6=B3=A8=E5=86=8Cxxl-job=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.yaml           | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application.yaml b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application.yaml
index 635d7399c..b29350900 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application.yaml
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/application.yaml
@@ -103,21 +103,6 @@ spring:
     listener:
       missing-topics-fatal: false # 消费监听接口监听的主题不存在时，默认会报错。所以通过设置为 false ，解决报错
 
---- #################### 定时任务相关配置 ####################
-
-xxl:
-  job:
-    admin:
-      addresses: http://127.0.0.1:9090/xxl-job-admin
-    executor:
-      appname: ${spring.application.name} # 执行器 AppName
-      address:
-      ip: # 执行器IP [选填]：默认为空表示自动获取IP，多网卡时可手动设置指定IP，该IP不会绑定Host仅作为通讯实用；地址信息用于 "执行器注册" 和 "调度中心请求并触发任务"；
-      port: 0 # ### 执行器端口号 [选填]：小于等于0则自动获取；默认端口为9999，单机部署多个执行器时，注意要配置不同执行器端口；
-      logpath: ${user.home}/logs/xxl-job/${spring.application.name} # 执行器运行日志文件存储磁盘路径
-      logretentiondays: 30 # 执行器日志文件保存天数 [选填] ： 过期日志自动清理, 限制值大于等于3时生效; 否则, 如-1, 关闭自动清理功能；
-    accessToken: # 执行器通讯TOKEN
-
 --- #################### 芋道相关配置 ####################
 
 yudao:
-- 
2.45.2


From 79a33315d05ced5add0ddf65859fb366d43fd2b6 Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 13:39:10 +0800
Subject: [PATCH 12/13] =?UTF-8?q?xxl-job=E6=B3=A8=E9=94=80=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ludu-job-admin-biz/src/main/resources/static/js/common.1.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/static/js/common.1.js b/ludu-job-admin/ludu-job-admin-biz/src/main/resources/static/js/common.1.js
index 372ca0317..85dbf9864 100644
--- a/ludu-job-admin/ludu-job-admin-biz/src/main/resources/static/js/common.1.js
+++ b/ludu-job-admin/ludu-job-admin-biz/src/main/resources/static/js/common.1.js
@@ -23,7 +23,7 @@ $(function(){
                 title: I18n.system_tips,
                 content: ('已退出登录！' || I18n.logout_success)
             });*/
-            window.location.href = "http://127.0.0.1:80/logout"
+            window.location.href = "https://mt.ptzykjgs.com/admin/logout"
 			/*$.post(base_url + "/logout", function(data, status) {
 				if (data.code == "200") {
                     layer.msg( I18n.logout_success );
-- 
2.45.2


From 4d5cb21c173f0232924b35cf8846d704c2ad0c22 Mon Sep 17 00:00:00 2001
From: XinWei <2718030729@qq.com>
Date: Thu, 22 Aug 2024 13:43:55 +0800
Subject: [PATCH 13/13] =?UTF-8?q?=E6=9E=84=E5=BB=BA=E5=8F=AA=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8datacenter?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 156 ++++++++++++++++++++++++++---------------------------
 1 file changed, 78 insertions(+), 78 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index cb66ccf32..821b1cab2 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -35,30 +35,30 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
       #      - 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
       #
-      - 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
+      #      - 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
       #
-#      - 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
-  #
-  #      - 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
-  #
-  #      - 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
+      #      - 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
+      #
+      #      - 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
+      #
+      #      - 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
 
-  #      - 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
+      - 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
 
   - name: copy-to-object # 构建基础模块和复制票务停车场到轮渡服务器
 
@@ -92,79 +92,79 @@ steps: # 定义流水线执行步骤，这些步骤将顺序执行
         #        - echo "ticketing done"
         #        - scp -r /ludu/maven/build/ludu-module-parking root@121.36.203.133:/ludu/maven/build
         #        - echo "parking done"
-        - scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build
-        - echo "infra done"
-#        - scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build
-#        - echo "job done"
-  #        - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
-  #        - echo "datacenter done"
+        #        - scp -r /ludu/maven/build/yudao-module-infra root@121.36.203.133:/ludu/maven/build
+        #        - echo "infra done"
+        #        - scp -r /ludu/maven/build/ludu-job-admin root@121.36.203.133:/ludu/maven/build
+        #        - echo "job done"
+        - scp -r /ludu/maven/build/ludu-module-datacenter root@120.46.37.243:/ludu/maven/build
+        - echo "datacenter done"
 
-  #  - name: build-other-service
-  #
-  #    image: appleboy/drone-ssh # SSH工具镜像
-  #
-  #    settings:
-  #
-  #      host: 120.46.37.243 # 远程连接地址
-  #
-  #      username: root # 远程连接账号
-  #
-  #      password:
-  #
-  #        from_secret: ssh_password2 # 从Secret中读取SSH密码
-  #
-  #      port: 22 # 远程连接端口
-  #
-  #      command_timeout: 5m # 远程执行命令超时时间
-  #
-  #      script:
-  #
-  #        - cd /ludu/maven/build/ludu-module-datacenter/
-  #        - chmod +x ./run.sh # 更改为可执行脚本
-  #        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
-  - name: object-build
+  - name: build-other-service
 
     image: appleboy/drone-ssh # SSH工具镜像
 
     settings:
 
-      host: 121.36.203.133 # 远程连接地址
+      host: 120.46.37.243 # 远程连接地址
 
       username: root # 远程连接账号
 
       password:
 
-        from_secret: ssh_password3 # 从Secret中读取SSH密码
+        from_secret: ssh_password2 # 从Secret中读取SSH密码
 
       port: 22 # 远程连接端口
 
-      command_timeout: 20m # 远程执行命令超时时间
+      command_timeout: 5m # 远程执行命令超时时间
 
       script:
-        #        - cd /ludu/maven
-        #        - rm -rf ./build
-        #        - tar -xf ludu-build.tar -C ./
-        #
-        #        - cd /ludu/maven/build/yudao-gateway/
-        #        - chmod +x ./run.sh # 更改为可执行脚本
-        #        - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
-        #
-        #        - cd /ludu/maven/build/yudao-module-system/
-        #        - chmod +x ./run.sh # 更改为可执行脚本
-        #        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
-        #
-        #        - cd /ludu/maven/build/ludu-module-ticketing/
-        #        - chmod +x ./run.sh # 更改为可执行脚本
-        #        - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
-        #
-        #        - cd /ludu/maven/build/ludu-module-parking/
-        #        - chmod +x ./run.sh # 更改为可执行脚本
-        #        - ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行
-        #
-        - cd /ludu/maven/build/yudao-module-infra/
-        - chmod +x ./run.sh # 更改为可执行脚本
-        - ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行
 
+        - cd /ludu/maven/build/ludu-module-datacenter/
+        - chmod +x ./run.sh # 更改为可执行脚本
+        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
+#  - name: object-build
+#
+#    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/maven
+#        - rm -rf ./build
+#        - tar -xf ludu-build.tar -C ./
+#
+#        - cd /ludu/maven/build/yudao-gateway/
+#        - chmod +x ./run.sh # 更改为可执行脚本
+#        - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
+#
+#        - cd /ludu/maven/build/yudao-module-system/
+#        - chmod +x ./run.sh # 更改为可执行脚本
+#        - ./run.sh || echo "ludu-module-datacenter build failed" # 运行脚本打包应用镜像并运行
+#
+#        - cd /ludu/maven/build/ludu-module-ticketing/
+#        - chmod +x ./run.sh # 更改为可执行脚本
+#        - ./run.sh || echo "ludu-module-ticketing build failed" # 运行脚本打包应用镜像并运行
+#
+#        - cd /ludu/maven/build/ludu-module-parking/
+#        - chmod +x ./run.sh # 更改为可执行脚本
+#        - ./run.sh || echo "ludu-module-parking build failed" # 运行脚本打包应用镜像并运行
+#
+#        - cd /ludu/maven/build/yudao-module-infra/
+#        - chmod +x ./run.sh # 更改为可执行脚本
+#        - ./run.sh || echo "yudao-module-infra build failed" # 运行脚本打包应用镜像并运行
+#
 #        - cd /ludu/maven/build/ludu-job-admin/
 #        - chmod +x ./run.sh # 更改为可执行脚本
 #        - ./run.sh || echo "ludu-job-admin build failed" # 运行脚本打包应用镜像并运行
-- 
2.45.2