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] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E6=9C=8D=E5=8A=A1=E6=B3=A8?= =?UTF-8?q?=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 --- #################### 服务保障相关配置 ####################