From 44ed57622b92cc602322fd5e74a0208e60af250b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 26 Mar 2026 13:55:49 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devops/config.yaml b/.devops/config.yaml index 8fe2da0..bae7610 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -121,7 +121,7 @@ repositories: type: nodejs build_commands: - pnpm install - - pnpm run build-prod:hyf + - pnpm run build-test:hyf artifact_path: apps/tuoheng_hyf_web/dist docker_path: docker/a_th_web/html/dist docker_service: ruoyi-hyf @@ -132,7 +132,7 @@ repositories: type: nodejs build_commands: - pnpm install - - pnpm run build-prod:hxf + - pnpm run build-test:hxf artifact_path: apps/tuoheng_hxf_web/dist docker_path: docker/b_th_web/html/dist docker_service: ruoyi-hxf From 02e24d5538a04c3161013d18981b4803725679b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 26 Mar 2026 13:56:25 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devops/config.yaml b/.devops/config.yaml index bae7610..08a8a7a 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -1,7 +1,7 @@ # DevOps 自动化部署配置文件 # 全局分支配置（所有仓库统一使用此分支） -global_branch: main +global_branch: test # 主仓库配置 main_repository: From f4719c25829c71ec654bbcc62c539287d765c3e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 26 Mar 2026 14:05:57 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=92=89=E9=92=89?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.devops/config.yaml b/.devops/config.yaml index 08a8a7a..d80873d 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -27,8 +27,8 @@ logging: # 钉钉通知配置 dingtalk: enabled: true # 是否启用钉钉通知 - access_token: fccb17a6c74ca862d7994630562d9d3d5be7b60d012d53dce32c64c566b9a3de - secret: SEC54a73636473f324b8f77741ee41ee278d22eba4af898bba739c11183d851c8b0 + access_token: 6add370f6b31b98e71ad5e1862cf574ab3f2350fb7d5eb07675a23d25a6f8144 + secret: SEC89990cf37671b10c3ddce9446eb10c7022179f638cad3c403ad2944a6ce51e56 # 数据库配置（用于数据库管理页面） database: From ccb6cca17f830a4272513a6c1b081bf96d0779d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 26 Mar 2026 15:40:27 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/monitor.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.devops/monitor.py b/.devops/monitor.py index 6ec5972..da11ffd 100644 --- a/.devops/monitor.py +++ b/.devops/monitor.py @@ -909,14 +909,14 @@ class DeploymentServer: 航运服务 (HYF) http://{host_ip}:9988 - - - - + admin + admin123 核心服务 (HXF) http://{host_ip}:9898 - - - - + admin + admin123 视频监控 (WVP) From 5e92bfff496de3ca50c23bce0d74918463aa31c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Thu, 26 Mar 2026 15:42:33 +0800 Subject: [PATCH 5/8] xx --- .devops/monitor.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.devops/monitor.py b/.devops/monitor.py index da11ffd..a7d12b5 100644 --- a/.devops/monitor.py +++ b/.devops/monitor.py @@ -909,14 +909,14 @@ class DeploymentServer: 航运服务 (HYF) http://{host_ip}:9988 - admin - admin123 + admin + admin123 核心服务 (HXF) http://{host_ip}:9898 - admin - admin123 + admin + admin123 视频监控 (WVP) From 9df04d252d28cec91b0d43baf1c7c090c5e05d7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 27 Mar 2026 09:23:14 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/thingsboard/tuoheng.conf | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/docker/thingsboard/tuoheng.conf b/docker/thingsboard/tuoheng.conf index 9660b18..d8db70f 100644 --- a/docker/thingsboard/tuoheng.conf +++ b/docker/thingsboard/tuoheng.conf @@ -1,13 +1,13 @@ { "broker": { - "host": "mqtt.t-aaron.com", - "port": 10883, + "host": "45.120.102.65", + "port": 1883, "version": 5, "clientId": "ThingsBoard_gateway_tuoheng", "security": { "type": "basic", "username": "admin", - "password": "admin" + "password": "EmQx2026@th" }, "maxNumberOfWorkers": 100, "maxMessageNumberPerWorker": 10 @@ -315,6 +315,16 @@ "key": "distance_to_home", "type": "double", "value": "${data.distToHome}" + }, + { + "key": "camerapitch", + "type": "double", + "value": "${data.camerapitch}" + }, + { + "key": "camerayaw", + "type": "double", + "value": "${data.camerayaw}" } ] } From f9e0ddccb9bc2553c00408f2e1c50a3c49b752e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 27 Mar 2026 09:55:39 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ruoyi/device/api/domain/DockDetailVO.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java index e15cb32..d2fcf0d 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/DockDetailVO.java @@ -233,4 +233,28 @@ public class DockDetailVO extends DockVO { private Double longitude; + //爬升速度 + private Double vertical_speed; + + //平飞速度 + private Double horizontal_speed; + + //距离机场 + private Double distance_to_home; + + //海拔高度 + private Double altitude; + + //无人机俯仰角 + private Double pitch; + + //无人机偏航角 + private Double yaw; + + //云台俯仰角 + private Double camerapitch; + + //云台偏航角 + private Double camerayaw; + } From 04726ce2f96e6dd7fc4527551a7320c23b7ff00d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Fri, 27 Mar 2026 10:41:50 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/config-dev.yaml | 293 ++++++++++++++++++++++ .devops/config-main.yaml | 293 ++++++++++++++++++++++ .devops/{config.yaml => config-test.yaml} | 0 3 files changed, 586 insertions(+) create mode 100644 .devops/config-dev.yaml create mode 100644 .devops/config-main.yaml rename .devops/{config.yaml => config-test.yaml} (100%) diff --git a/.devops/config-dev.yaml b/.devops/config-dev.yaml new file mode 100644 index 0000000..db5f05f --- /dev/null +++ b/.devops/config-dev.yaml @@ -0,0 +1,293 @@ +# DevOps 自动化部署配置文件 + +# 全局分支配置（所有仓库统一使用此分支） +global_branch: dev + +# 主仓库配置 +main_repository: + url: http://th.local.t-aaron.com:13000/THENG/a-cloud-all.git + runtime_path: ./runtime + +# 监听配置 +monitor: + poll_interval: 10 # 轮询间隔（秒） + enabled_repos: [] # 空数组表示监听所有仓库，或指定具体仓库名称列表 + watch_tags: false # 是否监听 tag 变化（打 tag 时触发部署） + tag_pattern: "v*" # 监听的 tag 模式，支持通配符（如 v*、release-*） + +# 部署配置 +deploy: + docker_compose_path: ./docker/docker-compose.yml + +# 日志配置 +logging: + file: .devops/logs/devops.log + max_size: 10485760 # 10MB + +# 钉钉通知配置 +dingtalk: + enabled: true # 是否启用钉钉通知 + access_token: fccb17a6c74ca862d7994630562d9d3d5be7b60d012d53dce32c64c566b9a3de + secret: SEC54a73636473f324b8f77741ee41ee278d22eba4af898bba739c11183d851c8b0 + +# 数据库配置（用于数据库管理页面） +database: + container_name: ruoyi-mysql # MySQL 容器名称 + host: localhost + port: 3306 + user: root + password: password + charset: utf8mb4 + +# 基础设施服务配置（只部署一次） +infrastructure: + - name: ruoyi-mysql + docker_service: ruoyi-mysql + pre_deploy_commands: + - cp sql/ry_20260319.sql docker/mysql/db/ + - cp sql/ry_config_20250902.sql docker/mysql/db/ + - cp sql/wvp.sql docker/mysql/db/ + wait_time: 30 # MySQL 需要更长时间初始化 + + - name: ruoyi-redis + docker_service: ruoyi-redis + wait_time: 10 # Redis 启动较快 + + - name: ruoyi-minio + docker_service: ruoyi-minio + wait_time: 15 # MinIO 对象存储服务 + + - name: ruoyi-nacos + docker_service: ruoyi-nacos + wait_time: 20 # Nacos 需要等待 MySQL 就绪 + + - name: zlmediakit + docker_service: zlmediakit + wait_time: 10 # 流媒体服务器启动较快 + + - name: wvp-pro + docker_service: wvp-pro + pre_deploy_commands: + - cd wvpjar && mvn clean package -DskipTests + - cp wvpjar/target/wvp-pro-*.jar docker/wvp/wvpjar/jar/ + wait_time: 30 # WVP 后端需要等待 MySQL、Redis 和 zlmediakit + + - name: wvp-web + docker_service: wvp-web + pre_deploy_commands: + - cd wvpweb && npm install && npm run build:prod + - cp -r wvpweb/dist docker/wvp/web/html/dist + wait_time: 10 # Nginx 启动较快 + +# Git 仓库配置 +repositories: + # 认证服务 + - name: ruoyi-auth + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-auth.git + path: ruoyi-auth + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/auth/jar + docker_service: ruoyi-auth + + # 网关服务 + - name: ruoyi-gateway + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-gateway.git + path: ruoyi-gateway + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/gateway/jar + docker_service: ruoyi-gateway + + # 前端UI + - name: ruoyi-ui + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-ui.git + path: ruoyi-ui + type: nodejs + build_commands: + - npm install + - npm run build:prod + artifact_path: dist + docker_path: docker/nginx/html/dist + docker_service: ruoyi-nginx + + - name: ruoyi-hyf + url: http://th.local.t-aaron.com:13000/THENG/a_th_web.git + path: a_th_web + type: nodejs + build_commands: + - pnpm install + - pnpm run build-dev:hyf + artifact_path: apps/tuoheng_hyf_web/dist + docker_path: docker/a_th_web/html/dist + docker_service: ruoyi-hyf + + - name: ruoyi-hxf + url: http://th.local.t-aaron.com:13000/THENG/a_th_web.git + path: a_th_web + type: nodejs + build_commands: + - pnpm install + - pnpm run build-dev:hxf + artifact_path: apps/tuoheng_hxf_web/dist + docker_path: docker/b_th_web/html/dist + docker_service: ruoyi-hxf + + # 系统服务 + - name: ruoyi-system + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-system.git + path: ruoyi-modules/ruoyi-system + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/system/jar + docker_service: ruoyi-modules-system + + # 文件服务 + - name: ruoyi-file + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-file.git + path: ruoyi-modules/ruoyi-file + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/file/jar + docker_service: ruoyi-modules-file + + # 代码生成 + - name: ruoyi-gen + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-gen.git + path: ruoyi-modules/ruoyi-gen + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/gen/jar + docker_service: ruoyi-modules-gen + + # 定时任务 + - name: ruoyi-job + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-job.git + path: ruoyi-modules/ruoyi-job + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/job/jar + docker_service: ruoyi-modules-job + + # 监控服务 + - name: ruoyi-monitor + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-visual.git + path: ruoyi-visual/ruoyi-monitor + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/visual/monitor/jar + docker_service: ruoyi-visual-monitor + + # 设备服务 + - name: tuoheng-device + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-device.git + path: ruoyi-modules/tuoheng-device + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/device/jar + docker_service: tuoheng-modules-device + + # 审批服务 + - name: tuoheng-approval + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-approval.git + path: ruoyi-modules/tuoheng-approval + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/approval/jar + docker_service: tuoheng-modules-approval + + # 航线服务 + - name: tuoheng-airline + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-airline.git + path: ruoyi-modules/tuoheng-airline + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/airline/jar + docker_service: tuoheng-modules-airline + + # 任务服务 + - name: tuoheng-task + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-task.git + path: ruoyi-modules/tuoheng-task + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/task/jar + docker_service: tuoheng-modules-task + + # FMS服务 + - name: tuoheng-fms + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-fms.git + path: ruoyi-modules/tuoheng-fms + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/fms/jar + docker_service: tuoheng-modules-fms + + # 媒体服务 + - name: tuoheng-media + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-media.git + path: ruoyi-modules/tuoheng-media + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/media/jar + docker_service: tuoheng-modules-media + + # WVP 后端服务 + - name: wvp-pro + url: http://th.local.t-aaron.com:13000/THENG/a-wvp-java.git + path: wvpjar + type: java + build_commands: + - cd wvpjar && export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/wvp/wvpjar/jar + docker_service: wvp-pro + + # WVP 前端服务 + - name: wvp-web + url: http://th.local.t-aaron.com:13000/THENG/a-wvp-web.git + path: wvpweb + type: nodejs + build_commands: + - npm install + - npm run build:prod + artifact_path: dist + docker_path: docker/wvp/web/html/dist + docker_service: wvp-web + + # HYF 后端服务 + - name: hyf-backend + url: http://th.local.t-aaron.com:13000/THENG/hyf-backend.git + path: hyf-backend + type: python + build_commands: [] # Python 项目不需要构建，直接复制源码 + artifact_path: . # 复制整个项目目录 + docker_path: docker/hyf_backend/src + docker_service: hyf-backend + docker_build: true # 需要重新构建镜像 diff --git a/.devops/config-main.yaml b/.devops/config-main.yaml new file mode 100644 index 0000000..8fe2da0 --- /dev/null +++ b/.devops/config-main.yaml @@ -0,0 +1,293 @@ +# DevOps 自动化部署配置文件 + +# 全局分支配置（所有仓库统一使用此分支） +global_branch: main + +# 主仓库配置 +main_repository: + url: http://th.local.t-aaron.com:13000/THENG/a-cloud-all.git + runtime_path: ./runtime + +# 监听配置 +monitor: + poll_interval: 10 # 轮询间隔（秒） + enabled_repos: [] # 空数组表示监听所有仓库，或指定具体仓库名称列表 + watch_tags: false # 是否监听 tag 变化（打 tag 时触发部署） + tag_pattern: "v*" # 监听的 tag 模式，支持通配符（如 v*、release-*） + +# 部署配置 +deploy: + docker_compose_path: ./docker/docker-compose.yml + +# 日志配置 +logging: + file: .devops/logs/devops.log + max_size: 10485760 # 10MB + +# 钉钉通知配置 +dingtalk: + enabled: true # 是否启用钉钉通知 + access_token: fccb17a6c74ca862d7994630562d9d3d5be7b60d012d53dce32c64c566b9a3de + secret: SEC54a73636473f324b8f77741ee41ee278d22eba4af898bba739c11183d851c8b0 + +# 数据库配置（用于数据库管理页面） +database: + container_name: ruoyi-mysql # MySQL 容器名称 + host: localhost + port: 3306 + user: root + password: password + charset: utf8mb4 + +# 基础设施服务配置（只部署一次） +infrastructure: + - name: ruoyi-mysql + docker_service: ruoyi-mysql + pre_deploy_commands: + - cp sql/ry_20260319.sql docker/mysql/db/ + - cp sql/ry_config_20250902.sql docker/mysql/db/ + - cp sql/wvp.sql docker/mysql/db/ + wait_time: 30 # MySQL 需要更长时间初始化 + + - name: ruoyi-redis + docker_service: ruoyi-redis + wait_time: 10 # Redis 启动较快 + + - name: ruoyi-minio + docker_service: ruoyi-minio + wait_time: 15 # MinIO 对象存储服务 + + - name: ruoyi-nacos + docker_service: ruoyi-nacos + wait_time: 20 # Nacos 需要等待 MySQL 就绪 + + - name: zlmediakit + docker_service: zlmediakit + wait_time: 10 # 流媒体服务器启动较快 + + - name: wvp-pro + docker_service: wvp-pro + pre_deploy_commands: + - cd wvpjar && mvn clean package -DskipTests + - cp wvpjar/target/wvp-pro-*.jar docker/wvp/wvpjar/jar/ + wait_time: 30 # WVP 后端需要等待 MySQL、Redis 和 zlmediakit + + - name: wvp-web + docker_service: wvp-web + pre_deploy_commands: + - cd wvpweb && npm install && npm run build:prod + - cp -r wvpweb/dist docker/wvp/web/html/dist + wait_time: 10 # Nginx 启动较快 + +# Git 仓库配置 +repositories: + # 认证服务 + - name: ruoyi-auth + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-auth.git + path: ruoyi-auth + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/auth/jar + docker_service: ruoyi-auth + + # 网关服务 + - name: ruoyi-gateway + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-gateway.git + path: ruoyi-gateway + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/gateway/jar + docker_service: ruoyi-gateway + + # 前端UI + - name: ruoyi-ui + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-ui.git + path: ruoyi-ui + type: nodejs + build_commands: + - npm install + - npm run build:prod + artifact_path: dist + docker_path: docker/nginx/html/dist + docker_service: ruoyi-nginx + + - name: ruoyi-hyf + url: http://th.local.t-aaron.com:13000/THENG/a_th_web.git + path: a_th_web + type: nodejs + build_commands: + - pnpm install + - pnpm run build-prod:hyf + artifact_path: apps/tuoheng_hyf_web/dist + docker_path: docker/a_th_web/html/dist + docker_service: ruoyi-hyf + + - name: ruoyi-hxf + url: http://th.local.t-aaron.com:13000/THENG/a_th_web.git + path: a_th_web + type: nodejs + build_commands: + - pnpm install + - pnpm run build-prod:hxf + artifact_path: apps/tuoheng_hxf_web/dist + docker_path: docker/b_th_web/html/dist + docker_service: ruoyi-hxf + + # 系统服务 + - name: ruoyi-system + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-system.git + path: ruoyi-modules/ruoyi-system + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/system/jar + docker_service: ruoyi-modules-system + + # 文件服务 + - name: ruoyi-file + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-file.git + path: ruoyi-modules/ruoyi-file + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/file/jar + docker_service: ruoyi-modules-file + + # 代码生成 + - name: ruoyi-gen + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-gen.git + path: ruoyi-modules/ruoyi-gen + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/gen/jar + docker_service: ruoyi-modules-gen + + # 定时任务 + - name: ruoyi-job + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-job.git + path: ruoyi-modules/ruoyi-job + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/job/jar + docker_service: ruoyi-modules-job + + # 监控服务 + - name: ruoyi-monitor + url: http://th.local.t-aaron.com:13000/THENG/a-ruoyi-visual.git + path: ruoyi-visual/ruoyi-monitor + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/visual/monitor/jar + docker_service: ruoyi-visual-monitor + + # 设备服务 + - name: tuoheng-device + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-device.git + path: ruoyi-modules/tuoheng-device + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/device/jar + docker_service: tuoheng-modules-device + + # 审批服务 + - name: tuoheng-approval + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-approval.git + path: ruoyi-modules/tuoheng-approval + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/approval/jar + docker_service: tuoheng-modules-approval + + # 航线服务 + - name: tuoheng-airline + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-airline.git + path: ruoyi-modules/tuoheng-airline + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/airline/jar + docker_service: tuoheng-modules-airline + + # 任务服务 + - name: tuoheng-task + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-task.git + path: ruoyi-modules/tuoheng-task + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/task/jar + docker_service: tuoheng-modules-task + + # FMS服务 + - name: tuoheng-fms + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-fms.git + path: ruoyi-modules/tuoheng-fms + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/fms/jar + docker_service: tuoheng-modules-fms + + # 媒体服务 + - name: tuoheng-media + url: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-media.git + path: ruoyi-modules/tuoheng-media + type: java + build_commands: + - export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/ruoyi/modules/media/jar + docker_service: tuoheng-modules-media + + # WVP 后端服务 + - name: wvp-pro + url: http://th.local.t-aaron.com:13000/THENG/a-wvp-java.git + path: wvpjar + type: java + build_commands: + - cd wvpjar && export JAVA_HOME=/data/jdk/jdk17 && export PATH=$JAVA_HOME/bin:$PATH && mvn clean package -DskipTests -Dmaven.compiler.source=17 -Dmaven.compiler.target=17 + artifact_path: target/*.jar + docker_path: docker/wvp/wvpjar/jar + docker_service: wvp-pro + + # WVP 前端服务 + - name: wvp-web + url: http://th.local.t-aaron.com:13000/THENG/a-wvp-web.git + path: wvpweb + type: nodejs + build_commands: + - npm install + - npm run build:prod + artifact_path: dist + docker_path: docker/wvp/web/html/dist + docker_service: wvp-web + + # HYF 后端服务 + - name: hyf-backend + url: http://th.local.t-aaron.com:13000/THENG/hyf-backend.git + path: hyf-backend + type: python + build_commands: [] # Python 项目不需要构建，直接复制源码 + artifact_path: . # 复制整个项目目录 + docker_path: docker/hyf_backend/src + docker_service: hyf-backend + docker_build: true # 需要重新构建镜像 diff --git a/.devops/config.yaml b/.devops/config-test.yaml similarity index 100% rename from .devops/config.yaml rename to .devops/config-test.yaml