root/ludu-cloud
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

xinwei #28

Merged
root merged 14 commits from xinwei into master 2024-08-22 13:44:30 +08:00
Conversation 0 Commits 14 Files Changed 5 +28 -21
3 changed files with 28 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 0b40464ad3 - Show all commits

36
.drone.yml
View File

@ -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: # 定义流水线挂载目录，用于共享数据

2
yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-dev.yaml
View File

@ -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:

11
yudao-module-infra/yudao-module-infra-biz/src/main/resources/application-local.yaml
View File

@ -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
--- #################### 服务保障相关配置 ####################