From c2a9a16a3a84bb3d056a78f9c16c79621dd30731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Sat, 24 Jan 2026 15:18:25 +0800 Subject: [PATCH 01/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81ruoyi?= =?UTF-8?q?-file-prod.yml=20=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/ry_config_20250902.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/ry_config_20250902.sql b/sql/ry_config_20250902.sql index 48541ca..af2fdc6 100644 --- a/sql/ry_config_20250902.sql +++ b/sql/ry_config_20250902.sql @@ -40,7 +40,7 @@ insert into config_info(id, data_id, group_id, content, md5, gmt_create, gmt_mod (5,'ruoyi-system-prod.yml','DEFAULT_GROUP','# spring配置\nspring:\n data:\n redis:\n host: ruoyi-redis\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: ruoyi\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n connectTimeout: 30000\n socketTimeout: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://ruoyi-mysql:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n # 从库数据源\n # slave:\n # username: \n # password: \n # url: \n # driver-class-name: \n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.system\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://ruoyi-gateway:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'系统模块接口文档\'\n # 描述\n description: \'系统模块接口描述\'\n # 作者信息\n contact:\n name: RuoYi\n url: https://ruoyi.vip\n','a79ae256018abb7f3bbaba923baeb6af','2020-11-20 00:00:00','2024-09-14 04:49:54','nacos','0:0:0:0:0:0:0:1','','','系统模块','null','null','yaml','',''), (6,'ruoyi-gen-prod.yml','DEFAULT_GROUP','# spring配置\nspring:\n data:\n redis:\n host: ruoyi-redis\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://ruoyi-mysql:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.gen.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://ruoyi-gateway:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'代码生成接口文档\'\n # 描述\n description: \'代码生成接口描述\'\n # 作者信息\n contact:\n name: RuoYi\n url: https://ruoyi.vip\n\n# 代码生成\ngen:\n # 作者\n author: ruoyi\n # 默认生成包路径 system 需改成自己的模块名称 如 system monitor tool\n packageName: com.ruoyi.system\n # 自动去除表前缀，默认是false\n autoRemovePre: false\n # 表前缀（生成类名不会包含表前缀，多个用逗号分隔）\n tablePrefix: sys_\n # 是否允许生成文件覆盖到本地（自定义路径），默认不允许\n allowOverwrite: false','669b20230daf5b2eddda1c87a1e755d7','2020-11-20 00:00:00','2024-12-25 08:39:25','nacos','0:0:0:0:0:0:0:1','','','代码生成','null','null','yaml','',''), (7,'ruoyi-job-prod.yml','DEFAULT_GROUP','# spring配置\nspring:\n data:\n redis:\n host: ruoyi-redis\n port: 6379\n password: \n datasource:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://ruoyi-mysql:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.job.domain\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://ruoyi-gateway:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'定时任务接口文档\'\n # 描述\n description: \'定时任务接口描述\'\n # 作者信息\n contact:\n name: RuoYi\n url: https://ruoyi.vip\n','225445e638148dbcbadda8d9774ce3fd','2020-11-20 00:00:00','2024-09-14 04:50:12','nacos','0:0:0:0:0:0:0:1','','','定时任务','null','null','yaml','',''), -(8,'ruoyi-file-prod.yml','DEFAULT_GROUP','# 本地文件上传 \nfile:\n domain: http://ruoyi-modules-file:9300\n path: /home/ruoyi/uploadPath\n prefix: /statics\n\n# FastDFS配置\nfdfs:\n domain: http://127.0.0.1\n soTimeout: 3000\n connectTimeout: 2000\n trackerList: 127.0.0.1:22122\n\n# Minio配置\nminio:\n url: http://127.0.0.1:9000\n accessKey: minioadmin\n secretKey: minioadmin\n bucketName: test\n\n # 防盗链配置\nreferer:\n # 防盗链开关\n enabled: false\n # 允许的域名列表\n allowed-domains: localhost,127.0.0.1,ruoyi.vip,www.ruoyi.vip\n','095791a04211d6e3d294359b21357394','2020-11-20 00:00:00','2025-09-02 05:10:11','nacos','0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml','',''), +(8,'ruoyi-file-prod.yml','DEFAULT_GROUP','# 本地文件上传 \nfile:\n domain: http://ruoyi-modules-file:9300\n path: /home/ruoyi/uploadPath\n prefix: /statics\n\n# FastDFS配置\nfdfs:\n domain: http://127.0.0.1\n soTimeout: 3000\n connectTimeout: 2000\n trackerList: 127.0.0.1:22122\n\n# Minio配置\nminio:\n url: http://ruoyi-minio:9000\n accessKey: minioadmin\n secretKey: minioadmin\n bucketName: default\n\n # 防盗链配置\nreferer:\n # 防盗链开关\n enabled: false\n # 允许的域名列表\n allowed-domains: localhost,127.0.0.1,ruoyi.vip,www.ruoyi.vip\n','095791a04211d6e3d294359b21357394','2020-11-20 00:00:00','2025-09-02 05:10:11','nacos','0:0:0:0:0:0:0:1','','','文件服务','null','null','yaml','',''), (10,'tuoheng-approval-prod.yml','DEFAULT_GROUP','# spring配置\nspring:\n data:\n redis:\n host: ruoyi-redis\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: ruoyi\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n connectTimeout: 30000\n socketTimeout: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://ruoyi-mysql:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.approval\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/approval/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://ruoyi-gateway:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'拓恒审批模块接口文档\'\n # 描述\n description: \'拓恒审批模块接口描述\'\n # 作者信息\n contact:\n name: TuoHeng\n url: https://ruoyi.vip\n','a79ae256018abb7f3bbaba923baeb6af','2020-11-20 00:00:00','2025-01-09 00:00:00','nacos','0:0:0:0:0:0:0:1','','','拓恒审批模块','null','null','yaml','',''), (11,'tuoheng-device-prod.yml','DEFAULT_GROUP','# spring配置\nspring:\n data:\n redis:\n host: ruoyi-redis\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: ruoyi\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n connectTimeout: 30000\n socketTimeout: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://ruoyi-mysql:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.device\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/device/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://ruoyi-gateway:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'拓恒设备模块接口文档\'\n # 描述\n description: \'拓恒设备模块接口描述\'\n # 作者信息\n contact:\n name: TuoHeng\n url: https://ruoyi.vip\n','a79ae256018abb7f3bbaba923baeb6af','2020-11-20 00:00:00','2025-01-09 00:00:00','nacos','0:0:0:0:0:0:0:1','','','拓恒设备模块','null','null','yaml','',''), (12,'tuoheng-airline-prod.yml','DEFAULT_GROUP','# spring配置\nspring:\n data:\n redis:\n host: ruoyi-redis\n port: 6379\n password: \n datasource:\n druid:\n stat-view-servlet:\n enabled: true\n loginUsername: ruoyi\n loginPassword: 123456\n dynamic:\n druid:\n initial-size: 5\n min-idle: 5\n maxActive: 20\n maxWait: 60000\n connectTimeout: 30000\n socketTimeout: 60000\n timeBetweenEvictionRunsMillis: 60000\n minEvictableIdleTimeMillis: 300000\n validationQuery: SELECT 1 FROM DUAL\n testWhileIdle: true\n testOnBorrow: false\n testOnReturn: false\n poolPreparedStatements: true\n maxPoolPreparedStatementPerConnectionSize: 20\n filters: stat,slf4j\n connectionProperties: druid.stat.mergeSql\\=true;druid.stat.slowSqlMillis\\=5000\n datasource:\n # 主库数据源\n master:\n driver-class-name: com.mysql.cj.jdbc.Driver\n url: jdbc:mysql://ruoyi-mysql:3306/ry-cloud?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8\n username: root\n password: password\n\n# mybatis配置\nmybatis:\n # 搜索指定包别名\n typeAliasesPackage: com.ruoyi.airline\n # 配置mapper的扫描，找到所有的mapper.xml映射文件\n mapperLocations: classpath:mapper/airline/**/*.xml\n\n# springdoc配置\nspringdoc:\n gatewayUrl: http://ruoyi-gateway:8080/${spring.application.name}\n api-docs:\n # 是否开启接口文档\n enabled: true\n info:\n # 标题\n title: \'拓恒航线模块接口文档\'\n # 描述\n description: \'拓恒航线模块接口描述\'\n # 作者信息\n contact:\n name: TuoHeng\n url: https://ruoyi.vip\n','a79ae256018abb7f3bbaba923baeb6af','2020-11-20 00:00:00','2025-01-09 00:00:00','nacos','0:0:0:0:0:0:0:1','','','拓恒航线模块','null','null','yaml','',''), From 87a68fd630991a58f602c9f89b3052cd84928be2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Sat, 24 Jan 2026 17:23:45 +0800 Subject: [PATCH 02/28] =?UTF-8?q?group/switch=20=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=94=AF=E6=8C=81=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/device/api/domain/SwitchDockGroupRequest.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java index 7955764..77e5e6d 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java @@ -3,6 +3,8 @@ package com.ruoyi.device.api.domain; import com.ruoyi.common.core.annotation.Excel; import lombok.Data; +import java.util.List; + /** * 切换机场分组请求对象 * @@ -15,6 +17,9 @@ public class SwitchDockGroupRequest @Excel(name = "机场ID") private Long dockId; + @Excel(name = "机场ID 列表") + private List dockIds; + @Excel(name = "分组ID") private Long groupId; From 88ee853d5e316b1b32a4fc15b9bfface2ae0bccc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 09:01:49 +0800 Subject: [PATCH 03/28] delete id --- .../com/ruoyi/device/api/domain/SwitchDockGroupRequest.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java index 77e5e6d..d112e01 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java @@ -14,8 +14,7 @@ import java.util.List; @Data public class SwitchDockGroupRequest { - @Excel(name = "机场ID") - private Long dockId; + @Excel(name = "机场ID 列表") private List dockIds; From 301c273a6f850202845e5e7f542b960e3c4253d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 10:08:38 +0800 Subject: [PATCH 04/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/copy.sh | 3 +++ docker/docker-compose.yml | 21 +++++++++++++++++++++ docker/wvp/wvpjar/dockerfile | 15 +++++++++++++++ wvpjar | 2 +- 4 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 docker/wvp/wvpjar/dockerfile diff --git a/docker/copy.sh b/docker/copy.sh index a10a499..e827c3f 100755 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -62,3 +62,6 @@ cp ../ruoyi-modules/tuoheng-fms/target/tuoheng-fms.jar ./ruoyi/modules/fms/jar echo "begin copy tuoheng-media " cp ../ruoyi-modules/tuoheng-media/target/tuoheng-media.jar ./ruoyi/modules/media/jar + +echo "begin copy wvp-jar " +cp ../wvpjar/target/wvp-pro-2.7.4.jar ./wvp/wvpjar/jar diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 8dbc33b..8985058 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -293,3 +293,24 @@ services: links: - ruoyi-redis - ruoyi-mysql + wvp-pro: + container_name: wvp-pro + image: wvp-pro-runtime + build: + context: ./wvp/wvpjar + dockerfile: dockerfile + environment: + - TZ=Asia/Shanghai + ports: + - "18080:18080" + - "5060:5060/udp" + - "6379:6379" + volumes: + - ./wvp/logs:/home/ruoyi/logs + depends_on: + - ruoyi-redis + - ruoyi-mysql + links: + - ruoyi-redis + - ruoyi-mysql + restart: unless-stopped diff --git a/docker/wvp/wvpjar/dockerfile b/docker/wvp/wvpjar/dockerfile new file mode 100644 index 0000000..fe5388f --- /dev/null +++ b/docker/wvp/wvpjar/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM registry.t-aaron.com/eclipse-temurin:21.0.9_10-jre-alpine-3.23 +# author +MAINTAINER ruoyi + +# 挂载目录 +VOLUME /home/ruoyi +# 创建目录 +RUN mkdir -p /home/ruoyi +# 指定路径 +WORKDIR /home/ruoyi +# 复制jar文件到路径 +COPY ./jar/wvp-pro-2.7.4.jar /home/ruoyi/wvp-pro-2.7.4.jar +# 启动系统服务 +ENTRYPOINT ["java","-jar","wvp-pro-2.7.4.jar"] \ No newline at end of file diff --git a/wvpjar b/wvpjar index 4c6b0d1..4863eea 160000 --- a/wvpjar +++ b/wvpjar @@ -1 +1 @@ -Subproject commit 4c6b0d126784e9935a97efb7541afe79d3d43075 +Subproject commit 4863eea007593565890c646473e7888e6b90ac1d From 06935d4d0d412c12146bde4321b22773475c26e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 10:32:31 +0800 Subject: [PATCH 05/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/{zlmmediakit/.env.default => .env} | 1 - docker/deploy.sh | 1 + docker/docker-compose.yml | 17 ++++++++++++++++- wvpjar | 2 +- 4 files changed, 18 insertions(+), 3 deletions(-) rename docker/{zlmmediakit/.env.default => .env} (82%) diff --git a/docker/zlmmediakit/.env.default b/docker/.env similarity index 82% rename from docker/zlmmediakit/.env.default rename to docker/.env index dfbfa07..b829f6f 100644 --- a/docker/zlmmediakit/.env.default +++ b/docker/.env @@ -6,4 +6,3 @@ RTP_TCP_PORT=10000 RTP_UDP_PORT=10000 WEBRTC_UDP_PORT1=8000 WEBRTC_UDP_PORT2=9000 -RESTART_POLICY=unless-stopped diff --git a/docker/deploy.sh b/docker/deploy.sh index afaede9..96a3122 100644 --- a/docker/deploy.sh +++ b/docker/deploy.sh @@ -50,6 +50,7 @@ docker-compose build --no-cache tuoheng-modules-airline && docker-compose up -d docker-compose build --no-cache tuoheng-modules-task && docker-compose up -d tuoheng-modules-task docker-compose build --no-cache tuoheng-modules-fms && docker-compose up -d tuoheng-modules-fms docker-compose build --no-cache tuoheng-modules-media && docker-compose up -d tuoheng-modules-media +docker-compose build --no-cache wvp-pro && docker-compose up -d wvp-pro # 关闭所有环境/模块 stop(){ diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 8985058..e9b3465 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -304,7 +304,7 @@ services: ports: - "18080:18080" - "5060:5060/udp" - - "6379:6379" +# - "6379:6379" volumes: - ./wvp/logs:/home/ruoyi/logs depends_on: @@ -314,3 +314,18 @@ services: - ruoyi-redis - ruoyi-mysql restart: unless-stopped + zlmediakit: + container_name: zlmediakit + image: registry.t-aaron.com/zlmediakit/zlmediakit:Release.latest + environment: + - TZ=Asia/Shanghai + ports: + - "1935:1935" # RTMP + - "9090:80" # HTTP + - "8443:443" # HTTPS + - "8554:554" # RTSP + - "10000:10000" # RTP TCP + - "10000:10000/udp" # RTP UDP + - "8000:8000/udp" # WebRTC UDP + - "9900:9000/udp" # WebRTC UDP (注意：与 minio 9000 端口冲突，可能需要调整) + restart: unless-stopped diff --git a/wvpjar b/wvpjar index 4863eea..d07950c 160000 --- a/wvpjar +++ b/wvpjar @@ -1 +1 @@ -Subproject commit 4863eea007593565890c646473e7888e6b90ac1d +Subproject commit d07950cecde5e39d75068e9c17a367d59014c629 From 4ea396320b2d3c9fe684d05447f883e6a8445bc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 10:32:35 +0800 Subject: [PATCH 06/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/zlmmediakit/docker-compose.yml | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 docker/zlmmediakit/docker-compose.yml diff --git a/docker/zlmmediakit/docker-compose.yml b/docker/zlmmediakit/docker-compose.yml deleted file mode 100644 index e912472..0000000 --- a/docker/zlmmediakit/docker-compose.yml +++ /dev/null @@ -1,20 +0,0 @@ -# 此镜像为github持续集成自动编译推送，跟代码(master分支)保持最新状态 -services: - zlmediakit: - image: registry.t-aaron.com/zlmediakit/zlmediakit:Release.latest - container_name: zlmediakit - restart: unless-stopped - ports: - - "${RTMP_PORT:-1935}:1935" # RTMP - - "${HTTP_PORT:-9090}:80" # HTTP - - "${HTTPS_PORT:-8443}:443" # HTTPS - - "${RTSP_PORT:-8554}:554" # RTSP - - "${RTP_TCP_PORT:-10000}:10000" # RTP TCP - - "${RTP_UDP_PORT:-10000}:10000/udp" # RTP UDP - - "${WEBRTC_UDP_PORT1:-8000}:8000/udp" # WebRTC UDP - - "${WEBRTC_UDP_PORT2:-9000}:9000/udp" # WebRTC UDP - -networks: - default: - external: true - name: docker_default From f0adb30707473aae88ef49c303cb1538fade6c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 11:03:53 +0800 Subject: [PATCH 07/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yml | 2 ++ .../com/ruoyi/device/api/domain/SwitchDockGroupRequest.java | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index e9b3465..a31bb22 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -310,9 +310,11 @@ services: depends_on: - ruoyi-redis - ruoyi-mysql + - zlmediakit links: - ruoyi-redis - ruoyi-mysql + - zlmediakit restart: unless-stopped zlmediakit: container_name: zlmediakit diff --git a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java index d112e01..f26a5fa 100644 --- a/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java +++ b/ruoyi-api/tuoheng-api-device/src/main/java/com/ruoyi/device/api/domain/SwitchDockGroupRequest.java @@ -14,7 +14,8 @@ import java.util.List; @Data public class SwitchDockGroupRequest { - + @Excel(name = "机场ID 列表") + private Long dockId; @Excel(name = "机场ID 列表") private List dockIds; From b7ab7d833076819b7606d9a716cbbcff9a4b8fe6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 11:14:23 +0800 Subject: [PATCH 08/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/deploy.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docker/deploy.sh b/docker/deploy.sh index 96a3122..58711ef 100644 --- a/docker/deploy.sh +++ b/docker/deploy.sh @@ -50,8 +50,10 @@ docker-compose build --no-cache tuoheng-modules-airline && docker-compose up -d docker-compose build --no-cache tuoheng-modules-task && docker-compose up -d tuoheng-modules-task docker-compose build --no-cache tuoheng-modules-fms && docker-compose up -d tuoheng-modules-fms docker-compose build --no-cache tuoheng-modules-media && docker-compose up -d tuoheng-modules-media +# cp ../wvpjar/target/wvp-pro-2.7.4.jar ./wvp/wvpjar/jar/ docker-compose build --no-cache wvp-pro && docker-compose up -d wvp-pro + # 关闭所有环境/模块 stop(){ docker-compose stop From c851677c6163d8e19fe15b2122eb78a9c3f8234b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 11:45:36 +0800 Subject: [PATCH 09/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/wvp/wvpjar/dockerfile | 2 -- docker/wvp/wvpjar/jar/.gitkeep | 0 wvpjar | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) create mode 100644 docker/wvp/wvpjar/jar/.gitkeep diff --git a/docker/wvp/wvpjar/dockerfile b/docker/wvp/wvpjar/dockerfile index fe5388f..a0278b6 100644 --- a/docker/wvp/wvpjar/dockerfile +++ b/docker/wvp/wvpjar/dockerfile @@ -3,8 +3,6 @@ FROM registry.t-aaron.com/eclipse-temurin:21.0.9_10-jre-alpine-3.23 # author MAINTAINER ruoyi -# 挂载目录 -VOLUME /home/ruoyi # 创建目录 RUN mkdir -p /home/ruoyi # 指定路径 diff --git a/docker/wvp/wvpjar/jar/.gitkeep b/docker/wvp/wvpjar/jar/.gitkeep new file mode 100644 index 0000000..e69de29 diff --git a/wvpjar b/wvpjar index d07950c..778ab6b 160000 --- a/wvpjar +++ b/wvpjar @@ -1 +1 @@ -Subproject commit d07950cecde5e39d75068e9c17a367d59014c629 +Subproject commit 778ab6b54ae287d3920da74d623d8baf1414b57a From bf15fb25adb9b8faee696ed079fdb12ac760610b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 12:15:55 +0800 Subject: [PATCH 10/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- wvpjar | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wvpjar b/wvpjar index 778ab6b..4d0a1f2 160000 --- a/wvpjar +++ b/wvpjar @@ -1 +1 @@ -Subproject commit 778ab6b54ae287d3920da74d623d8baf1414b57a +Subproject commit 4d0a1f269aa70b6961d048b1ef1f7e66450ca1e7 From 6cd3e13c392391fd1d66c0918ae4268556b6a5ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 12:24:50 +0800 Subject: [PATCH 11/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yml | 32 +++++++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index a31bb22..fe9e8a3 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -301,8 +301,38 @@ services: dockerfile: dockerfile environment: - TZ=Asia/Shanghai + # Redis 配置 + - REDIS_HOST=ruoyi-redis + - REDIS_PORT=6379 + # MySQL 数据库配置 + - DATABASE_HOST=ruoyi-mysql + - DATABASE_PORT=3306 + - DATABASE_USER=ylcx + - DATABASE_PASSWORD=Tuoheng@2025 + # SIP 配置 + - SIP_ShowIP=127.0.0.1 + - SIP_Port=5060 + - SIP_Domain=3502000000 + - SIP_Id=35020000002000000001 + - SIP_Password=wvp_sip_password + # ZLM 媒体服务器配置 + - ZLM_HOST=zlmediakit + - ZLM_HOOK_HOST=wvp-pro + - ZLM_SERCERT=fgVdaI75GcSBPeSBvg8NL7aRrlkCtGPv + # 流媒体地址配置 + - Stream_IP=127.0.0.1 + - SDP_IP=127.0.0.1 + # 流媒体端口配置 + - MediaHttp=9090 + - MediaHttps= + - MediaRtp=10000 + - MediaRtmp=1935 + - MediaRtsp=8554 + # 录像配置 + - RecordPushLive=false + - RecordSip=false ports: - - "18080:18080" + - "18080:18978" - "5060:5060/udp" # - "6379:6379" volumes: From d00aec594470e8cb2a499aebac69bff9cb3ef7d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 13:15:17 +0800 Subject: [PATCH 12/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 + docker/docker-compose.yml | 18 +++++++++ docker/wvp/web/conf/nginx.conf | 68 ++++++++++++++++++++++++++++++++++ docker/wvp/web/dockerfile | 15 ++++++++ 4 files changed, 103 insertions(+) create mode 100644 docker/wvp/web/conf/nginx.conf create mode 100644 docker/wvp/web/dockerfile diff --git a/.gitignore b/.gitignore index 5a886e4..34e6f5d 100644 --- a/.gitignore +++ b/.gitignore @@ -56,6 +56,8 @@ docker/minio/data/ docker/minio/config/ docker/nginx/html/dist/* !docker/nginx/html/dist/.gitkeep +docker/wvp/web/html/dist/* +!docker/wvp/web/html/dist/.gitkeep runtime/* !runtime/.gitkeep *.jar diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index fe9e8a3..2b6ebe1 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -361,3 +361,21 @@ services: - "8000:8000/udp" # WebRTC UDP - "9900:9000/udp" # WebRTC UDP (注意：与 minio 9000 端口冲突，可能需要调整) restart: unless-stopped + wvp-web: + container_name: wvp-web + image: wvp-web-runtime + build: + context: ./wvp/web + environment: + - TZ=Asia/Shanghai + ports: + - "28181:80" + volumes: + - ./wvp/web/html/dist:/home/ruoyi/projects/wvp-ui + - ./wvp/web/conf/nginx.conf:/etc/nginx/nginx.conf + - ./wvp/web/logs:/var/log/nginx + - ./wvp/web/conf.d:/etc/nginx/conf.d + depends_on: + - wvp-pro + links: + - wvp-pro diff --git a/docker/wvp/web/conf/nginx.conf b/docker/wvp/web/conf/nginx.conf new file mode 100644 index 0000000..fe25844 --- /dev/null +++ b/docker/wvp/web/conf/nginx.conf @@ -0,0 +1,68 @@ +worker_processes 1; + +events { + worker_connections 1024; +} + +http { + include mime.types; + default_type application/octet-stream; + sendfile on; + keepalive_timeout 65; + + server { + listen 80; + server_name localhost; + + location / { + root /home/ruoyi/projects/wvp-ui; + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + + # 前端静态资源（CSS、JS、图片等） + location /static/ { + root /home/ruoyi/projects/wvp-ui; + expires 30d; + access_log off; + } + + # WVP 后端 API 代理 + location /api/ { + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header REMOTE-HOST $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + proxy_pass http://wvp-pro:18978; + } + + # 后端静态资源代理（快照图片等，来自后端服务） + location /snap/ { + proxy_pass http://wvp-pro:18978; + proxy_set_header Host $http_host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + # WebSocket 代理支持 + location /ws/ { + proxy_pass http://wvp-pro:18978; + proxy_http_version 1.1; + proxy_set_header Upgrade $http_upgrade; + proxy_set_header Connection "upgrade"; + proxy_set_header Host $host; + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } + + # 避免actuator暴露 + if ($uri ~ "/actuator") { + return 403; + } + + error_page 500 502 503 504 /50x.html; + location = /50x.html { + root html; + } + } +} \ No newline at end of file diff --git a/docker/wvp/web/dockerfile b/docker/wvp/web/dockerfile new file mode 100644 index 0000000..25329d8 --- /dev/null +++ b/docker/wvp/web/dockerfile @@ -0,0 +1,15 @@ +# 基础镜像 +FROM registry.t-aaron.com/nginx:latest +# author +MAINTAINER ruoyi + +# 挂载目录 +VOLUME /home/ruoyi/projects/wvp-ui +# 创建目录 +RUN mkdir -p /home/ruoyi/projects/wvp-ui +# 指定路径 +WORKDIR /home/ruoyi/projects/wvp-ui +# 复制conf文件到路径 +COPY ./conf/nginx.conf /etc/nginx/nginx.conf +# 复制html文件到路径 +COPY ./html/dist /home/ruoyi/projects/wvp-ui \ No newline at end of file From fe7c7e014600e7680bbc13a5183e70c9e34493d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 13:17:49 +0800 Subject: [PATCH 13/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E6=89=93=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/wvp/web/conf/nginx.conf | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/docker/wvp/web/conf/nginx.conf b/docker/wvp/web/conf/nginx.conf index fe25844..b64309d 100644 --- a/docker/wvp/web/conf/nginx.conf +++ b/docker/wvp/web/conf/nginx.conf @@ -14,20 +14,7 @@ http { listen 80; server_name localhost; - location / { - root /home/ruoyi/projects/wvp-ui; - try_files $uri $uri/ /index.html; - index index.html index.htm; - } - - # 前端静态资源（CSS、JS、图片等） - location /static/ { - root /home/ruoyi/projects/wvp-ui; - expires 30d; - access_log off; - } - - # WVP 后端 API 代理 + # WVP 后端 API 代理（优先匹配） location /api/ { proxy_set_header Host $http_host; proxy_set_header X-Real-IP $remote_addr; @@ -55,6 +42,20 @@ http { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; } + # 前端静态资源（CSS、JS、图片等） + location /static/ { + root /home/ruoyi/projects/wvp-ui; + expires 30d; + access_log off; + } + + # 前端页面（最后匹配） + location / { + root /home/ruoyi/projects/wvp-ui; + try_files $uri $uri/ /index.html; + index index.html index.htm; + } + # 避免actuator暴露 if ($uri ~ "/actuator") { return 403; From 11ad5036870849b53100a7e12a917fc6290f847b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 13:25:39 +0800 Subject: [PATCH 14/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=83=A8=E7=BD=B2=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/copy.sh | 5 ++++- docker/deploy.sh | 13 ++++++++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docker/copy.sh b/docker/copy.sh index e827c3f..0702255 100755 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -63,5 +63,8 @@ echo "begin copy tuoheng-media " cp ../ruoyi-modules/tuoheng-media/target/tuoheng-media.jar ./ruoyi/modules/media/jar -echo "begin copy wvp-jar " +echo "begin copy wvp-jar" cp ../wvpjar/target/wvp-pro-2.7.4.jar ./wvp/wvpjar/jar + +echo "begin copy wvp-web" +cp -r ../wvpweb/dist ./wvp/web/html/ \ No newline at end of file diff --git a/docker/deploy.sh b/docker/deploy.sh index 58711ef..58471ef 100644 --- a/docker/deploy.sh +++ b/docker/deploy.sh @@ -52,7 +52,7 @@ docker-compose build --no-cache tuoheng-modules-fms && docker-compose up -d tuoh docker-compose build --no-cache tuoheng-modules-media && docker-compose up -d tuoheng-modules-media # cp ../wvpjar/target/wvp-pro-2.7.4.jar ./wvp/wvpjar/jar/ docker-compose build --no-cache wvp-pro && docker-compose up -d wvp-pro - +docker-compose build --no-cache wvp-web && docker-compose up -d wvp-web # 关闭所有环境/模块 stop(){ @@ -86,3 +86,14 @@ case "$1" in usage ;; esac + + +# cd /Users/sunpeng/workspace/hyf_project/RuoYi-Cloud/wvpweb +# +# # 1. 安装依赖（如果还没安装） +# npm install +# +# # 2. 生产环境打包 +# npm run build:prod +# +# 打包完成后，生成的文件会在 dist 目录中。 \ No newline at end of file From c1ba024d8d5db7267c2809eac6d98f339f35d061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 13:27:53 +0800 Subject: [PATCH 15/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=83=A8=E7=BD=B2=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/copy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/copy.sh b/docker/copy.sh index 0702255..7a182f8 100755 --- a/docker/copy.sh +++ b/docker/copy.sh @@ -67,4 +67,4 @@ echo "begin copy wvp-jar" cp ../wvpjar/target/wvp-pro-2.7.4.jar ./wvp/wvpjar/jar echo "begin copy wvp-web" -cp -r ../wvpweb/dist ./wvp/web/html/ \ No newline at end of file +cp -r ../wvpweb/dist/* ./wvp/web/html/dist/ \ No newline at end of file From e7197e3d19dfc34f9c643d9b70bd64a6eb389903 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 13:34:58 +0800 Subject: [PATCH 16/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9WVP=20=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E9=83=A8=E7=BD=B2=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/config.yaml | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/.devops/config.yaml b/.devops/config.yaml index 93a0f8f..a8da526 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -208,3 +208,26 @@ repositories: 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: + - mvn clean package -DskipTests + 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 From 4c97b8655ba9710aa4c42deed106ecb90d0b1e7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 13:39:12 +0800 Subject: [PATCH 17/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20thingsboard=20?= =?UTF-8?q?=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 2b6ebe1..7eb35ee 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -379,3 +379,38 @@ services: - wvp-pro links: - wvp-pro + thingsboard-postgres: + container_name: thingsboard-postgres + image: registry.t-aaron.com/postgres:16 + restart: always + environment: + - TZ=Asia/Shanghai + - POSTGRES_DB=thingsboard + - POSTGRES_PASSWORD=postgres + ports: + - "5432:5432" + volumes: + - ./thingsboard/postgres-data:/var/lib/postgresql/data + thingsboard-ce: + container_name: thingsboard-ce + image: registry.t-aaron.com/thingsboard/tb-node:4.2.1.1 + restart: always + environment: + - TZ=Asia/Shanghai + - TB_SERVICE_ID=tb-ce-node + - SPRING_DATASOURCE_URL=jdbc:postgresql://thingsboard-postgres:5432/thingsboard + ports: + - "18081:8080" + - "7070:7070" + - "1883:1883" + - "8883:8883" + - "5683-5688:5683-5688/udp" + logging: + driver: "json-file" + options: + max-size: "100m" + max-file: "10" + depends_on: + - thingsboard-postgres + links: + - thingsboard-postgres From c5c65c2a462958db572e741746fc61cd3d2109b4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 13:49:12 +0800 Subject: [PATCH 18/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20thingsboard=20?= =?UTF-8?q?=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/config.yaml | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/.devops/config.yaml b/.devops/config.yaml index a8da526..c5459ce 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -41,6 +41,26 @@ infrastructure: docker_service: ruoyi-nacos wait_time: 20 # Nacos 需要等待 MySQL 就绪 + - name: thingsboard-postgres + docker_service: thingsboard-postgres + wait_time: 20 # PostgreSQL 需要时间初始化 + + - name: zlmediakit + docker_service: zlmediakit + wait_time: 10 # 流媒体服务器启动较快 + + - name: wvp-pro + docker_service: wvp-pro + wait_time: 30 # WVP 后端需要等待 MySQL、Redis 和 zlmediakit + + - name: wvp-web + docker_service: wvp-web + wait_time: 10 # Nginx 启动较快 + + - name: thingsboard-ce + docker_service: thingsboard-ce + wait_time: 40 # ThingsBoard 需要等待 PostgreSQL 并初始化 + # Git 仓库配置 repositories: # 认证服务 From a0fe9edf59d987d9cf19b698c6c0feef632ebb0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 14:01:22 +0800 Subject: [PATCH 19/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20thingsboard=20?= =?UTF-8?q?=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/config.yaml | 6 +++ .devops/monitor.py | 109 +++++++++++++++++++++++++++++--------------- 2 files changed, 78 insertions(+), 37 deletions(-) diff --git a/.devops/config.yaml b/.devops/config.yaml index c5459ce..b98e5be 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -51,10 +51,16 @@ infrastructure: - 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/ wait_time: 10 # Nginx 启动较快 - name: thingsboard-ce diff --git a/.devops/monitor.py b/.devops/monitor.py index f3638b1..2f64653 100644 --- a/.devops/monitor.py +++ b/.devops/monitor.py @@ -179,49 +179,84 @@ class GitMonitor: return True def init_infrastructure(self): - """初始化基础设施（MySQL、Redis、Nacos）""" + """初始化基础设施服务（动态读取配置）""" repo_path = self.runtime_path / 'a-cloud-all' - # 检查是否已初始化 - mysql_flag = repo_path / '.devops' / '.deployed_mysql' - redis_flag = repo_path / '.devops' / '.deployed_redis' - nacos_flag = repo_path / '.devops' / '.deployed_nacos' + # 从配置文件读取基础设施列表 + infra_config = self.config.get('infrastructure', []) - # 初始化 MySQL - if not mysql_flag.exists(): - Logger.info("初始化 MySQL...") - # 从配置文件中获取 MySQL 的预部署命令 - infra_config = self.config.get('infrastructure', []) - mysql_config = next((item for item in infra_config if item['name'] == 'ruoyi-mysql'), None) - pre_deploy_commands = mysql_config.get('pre_deploy_commands', []) if mysql_config else [] + for infra in infra_config: + service_name = infra['name'] + docker_service = infra['docker_service'] + wait_time = infra.get('wait_time', 10) - if mysql.init_mysql(repo_path, pre_deploy_commands): - mysql_flag.parent.mkdir(parents=True, exist_ok=True) - mysql_flag.touch() - Logger.info("等待 MySQL 启动（30秒）...") - time.sleep(30) - else: - return False + # 检查是否已初始化 + flag_file = repo_path / '.devops' / f'.deployed_{service_name}' - # 初始化 Redis - if not redis_flag.exists(): - Logger.info("初始化 Redis...") - if redis.init_redis(repo_path): - redis_flag.touch() - Logger.info("等待 Redis 启动（10秒）...") - time.sleep(10) - else: - return False + if not flag_file.exists(): + Logger.info(f"初始化 {service_name}...") - # 初始化 Nacos - if not nacos_flag.exists(): - Logger.info("初始化 Nacos...") - if nacos.init_nacos(repo_path): - nacos_flag.touch() - Logger.info("等待 Nacos 启动（20秒）...") - time.sleep(20) - else: - return False + # 执行预部署命令（如果有） + pre_deploy_commands = infra.get('pre_deploy_commands', []) + if pre_deploy_commands: + Logger.info(f"执行 {service_name} 预部署命令...") + for cmd in pre_deploy_commands: + Logger.info(f"执行命令: {cmd}") + result = subprocess.run( + cmd, + shell=True, + cwd=repo_path, + capture_output=True, + text=True + ) + if result.returncode != 0: + Logger.error(f"预部署命令执行失败: {result.stderr}") + return False + + # 构建并启动服务 + docker_dir = repo_path / 'docker' + + # 构建镜像 + Logger.info(f"构建 {service_name} 镜像...") + build_cmd = f"docker-compose build --no-cache {docker_service}" + result = subprocess.run( + build_cmd, + shell=True, + cwd=docker_dir, + capture_output=True, + text=True + ) + + if result.returncode != 0: + Logger.error(f"{service_name} 镜像构建失败: {result.stderr}") + return False + + Logger.info(f"{service_name} 镜像构建成功") + + # 启动容器 + Logger.info(f"启动 {service_name} 容器...") + up_cmd = f"docker-compose up -d {docker_service}" + result = subprocess.run( + up_cmd, + shell=True, + cwd=docker_dir, + capture_output=True, + text=True + ) + + if result.returncode != 0: + Logger.error(f"{service_name} 容器启动失败: {result.stderr}") + return False + + Logger.info(f"{service_name} 容器启动成功") + + # 创建标记文件 + flag_file.parent.mkdir(parents=True, exist_ok=True) + flag_file.touch() + + # 等待服务启动 + Logger.info(f"等待 {service_name} 启动（{wait_time}秒）...") + time.sleep(wait_time) return True From 1f5ba130fb10f73e407bb4a0f65c2023889d7174 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 14:04:19 +0800 Subject: [PATCH 20/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20thingsboard=20?= =?UTF-8?q?=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/config.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/.devops/config.yaml b/.devops/config.yaml index b98e5be..5128605 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -30,7 +30,6 @@ infrastructure: - cp sql/ry_20250523.sql docker/mysql/db/ - cp sql/ry_config_20250902.sql docker/mysql/db/ - cp sql/wvp.sql docker/mysql/db/ - - cp sql/privileges.sql docker/mysql/db/ wait_time: 30 # MySQL 需要更长时间初始化 - name: ruoyi-redis From ef5032d2b83f638b3d4905e8c9d92d1cb21c9700 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 14:12:59 +0800 Subject: [PATCH 21/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20thingsboard=20?= =?UTF-8?q?=E9=83=A8=E7=BD=B2?= 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 5128605..f50ffae 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -59,7 +59,7 @@ infrastructure: docker_service: wvp-web pre_deploy_commands: - cd wvpweb && npm install && npm run build:prod - - cp -r wvpweb/dist docker/wvp/web/html/ + - cp -r wvpweb/dist docker/wvp/web/html/dist wait_time: 10 # Nginx 启动较快 - name: thingsboard-ce From 6a19842ad35e2a219116a5d525908f5a5e50b921 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 14:21:21 +0800 Subject: [PATCH 22/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20wvp-web=20html=20?= =?UTF-8?q?=E7=9B=AE=E5=BD=95=E5=8D=A0=E4=BD=8D=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 确保 docker/wvp/web/html 目录被 Git 跟踪，用于部署时复制前端构建产物 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude --- docker/wvp/web/html/.gitkeep | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 docker/wvp/web/html/.gitkeep diff --git a/docker/wvp/web/html/.gitkeep b/docker/wvp/web/html/.gitkeep new file mode 100644 index 0000000..e69de29 From 74a3a8ad6dcada636a3ce12a5f6e9b71bf61a437 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 14:22:37 +0800 Subject: [PATCH 23/28] x --- docker/wvp/web/html/.gitkeep | 1 + 1 file changed, 1 insertion(+) diff --git a/docker/wvp/web/html/.gitkeep b/docker/wvp/web/html/.gitkeep index e69de29..c59d9b6 100644 --- a/docker/wvp/web/html/.gitkeep +++ b/docker/wvp/web/html/.gitkeep @@ -0,0 +1 @@ +d \ No newline at end of file From b4f2b37c9ffa0e5fa2f4a209faf80badd18664ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 14:34:32 +0800 Subject: [PATCH 24/28] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20thingsboard=20?= =?UTF-8?q?=E9=83=A8=E7=BD=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker/docker-compose.yml | 2 + docker/zlmediakit/config.ini | 464 +++++++++++++++++++++++++++++++++++ 2 files changed, 466 insertions(+) create mode 100644 docker/zlmediakit/config.ini diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 7eb35ee..3b6732d 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -360,6 +360,8 @@ services: - "10000:10000/udp" # RTP UDP - "8000:8000/udp" # WebRTC UDP - "9900:9000/udp" # WebRTC UDP (注意：与 minio 9000 端口冲突，可能需要调整) + volumes: + - ./zlmediakit/config.ini:/opt/media/conf/config.ini restart: unless-stopped wvp-web: container_name: wvp-web diff --git a/docker/zlmediakit/config.ini b/docker/zlmediakit/config.ini new file mode 100644 index 0000000..aae76be --- /dev/null +++ b/docker/zlmediakit/config.ini @@ -0,0 +1,464 @@ +#!!!!此配置文件为范例配置文件，意在告诉读者，各个配置项的具体含义和作用， +#!!!!该配置文件在执行cmake时，会拷贝至release/${操作系统类型}/${编译类型}(例如release/linux/Debug) 文件夹。 +#!!!!该文件夹(release/${操作系统类型}/${编译类型})同时也是可执行程序生成目标路径，在执行MediaServer进程时，它会默认加载同目录下的config.ini文件作为配置文件， +#!!!!你如果修改此范例配置文件(conf/config.ini)，并不会被MediaServer进程加载，因为MediaServer进程默认加载的是release/${操作系统类型}/${编译类型}/config.ini。 +#!!!!当然，你每次执行cmake，该文件确实会被拷贝至release/${操作系统类型}/${编译类型}/config.ini， +#!!!!但是一般建议你直接修改release/${操作系统类型}/${编译类型}/config.ini文件，修改此文件一般不起作用,除非你运行MediaServer时使用-c参数指定到此文件。 +[api] +#是否调试http api,启用调试后，会打印每次http请求的内容和回复 +apiDebug=1 +#一些比较敏感的http api在访问时需要提供secret，否则无权限调用 +#如果是通过127.0.0.1访问,那么可以不提供secret +secret=fgVdaI75GcSBPeSBvg8NL7aRrlkCtGPv +#截图保存路径根目录，截图通过http api(/index/api/getSnap)生成和获取 +snapRoot=./www/snap/ +#默认截图图片，在启动FFmpeg截图后但是截图还未生成时，可以返回默认的预设图片 +defaultSnap=./www/logo.png +#downloadFile http接口可访问文件的根目录，支持多个目录，不同目录通过分号(;)分隔 +downloadRoot=./www + +[ffmpeg] +#FFmpeg可执行程序路径,支持相对路径/绝对路径 +bin=/usr/bin/ffmpeg +#FFmpeg拉流再推流的命令模板，通过该模板可以设置再编码的一些参数 +cmd=%s -re -i %s -c:a aac -strict -2 -ar 44100 -ab 48k -c:v libx264 -f flv %s +#FFmpeg生成截图的命令，可以通过修改该配置改变截图分辨率或质量 +snap=%s -rtsp_transport tcp -i %s -y -f mjpeg -frames:v 1 %s +#FFmpeg日志的路径，如果置空则不生成FFmpeg日志 +#可以为相对(相对于本可执行程序目录)或绝对路径 +log=./ffmpeg/ffmpeg.log +# 自动重启的时间(秒), 默认为0, 也就是不自动重启. 主要是为了避免长时间ffmpeg拉流导致的不同步现象 +restart_sec=0 +#转协议相关开关；如果addStreamProxy api和on_publish hook回复未指定转协议参数，则采用这些配置项 +[protocol] +#转协议时，是否开启帧级时间戳覆盖 +# 0:采用源视频流绝对时间戳，不做任何改变 +# 1:采用zlmediakit接收数据时的系统时间戳(有平滑处理) +# 2:采用源视频流时间戳相对时间戳(增长量)，有做时间戳跳跃和回退矫正 +modify_stamp=2 +#转协议是否开启音频 +enable_audio=1 +#添加acc静音音频，在关闭音频时，此开关无效 +add_mute_audio=1 +#无人观看时，是否直接关闭(而不是通过on_none_reader hook返回close) +#此配置置1时，此流如果无人观看，将不触发on_none_reader hook回调， +#而是将直接关闭流 +auto_close=0 +#推流断开后可以在超时时间内重新连接上继续推流，这样播放器会接着播放。 +#置0关闭此特性(推流断开会导致立即断开播放器) +#此参数不应大于播放器超时时间;单位毫秒 +continue_push_ms=3000 +#平滑发送定时器间隔，单位毫秒，置0则关闭；开启后影响cpu性能同时增加内存 +#该配置开启后可以解决一些流发送不平滑导致zlmediakit转发也不平滑的问题 +paced_sender_ms=0 +#是否开启转换为hls(mpegts) +enable_hls=1 +#是否开启转换为hls(fmp4) +enable_hls_fmp4=0 +#是否开启MP4录制 +enable_mp4=0 +#是否开启转换为rtsp/webrtc +enable_rtsp=1 +#是否开启转换为rtmp/flv +enable_rtmp=1 +#是否开启转换为http-ts/ws-ts +enable_ts=1 +#是否开启转换为http-fmp4/ws-fmp4 +enable_fmp4=1 +#是否将mp4录制当做观看者 +mp4_as_player=0 +#mp4切片大小，单位秒 +mp4_max_second=3600 +#mp4录制保存路径 +mp4_save_path=/opt/media/bin/www +#hls录制保存路径 +hls_save_path=./www +###### 以下是按需转协议的开关，在测试ZLMediaKit的接收推流性能时，请把下面开关置1 +###### 如果某种协议你用不到，你可以把以下开关置1以便节省资源(但是还是可以播放，只是第一个播放者体验稍微差点)， +###### 如果某种协议你想获取最好的用户体验，请置0(第一个播放者可以秒开，且不花屏) +#hls协议是否按需生成，如果hls.segNum配置为0(意味着hls录制)，那么hls将一直生成(不管此开关) +hls_demand=0 +#rtsp[s]协议是否按需生成 +rtsp_demand=0 +#rtmp[s]、http[s]-flv、ws[s]-flv协议是否按需生成 +rtmp_demand=0 +#http[s]-ts协议是否按需生成 +ts_demand=0 +#http[s]-fmp4、ws[s]-fmp4协议是否按需生成 +fmp4_demand=0 + +[general] +#是否启用虚拟主机 +enableVhost=0 +#播放器或推流器在断开后会触发hook.on_flow_report事件(使用多少流量事件)， +#flowThreshold参数控制触发hook.on_flow_report事件阈值，使用流量超过该阈值后才触发，单位KB +flowThreshold=1024 +#播放最多等待时间，单位毫秒 +#播放在播放某个流时，如果该流不存在， +#ZLMediaKit会最多让播放器等待maxStreamWaitMS毫秒 +#如果在这个时间内，该流注册成功，那么会立即返回播放器播放成功 +#否则返回播放器未找到该流，该机制的目的是可以先播放再推流 +maxStreamWaitMS=15000 +#某个流无人观看时，触发hook.on_stream_none_reader事件的最大等待时间，单位毫秒 +#在配合hook.on_stream_none_reader事件时，可以做到无人观看自动停止拉流或停止接收推流 +streamNoneReaderDelayMS=20000 +#拉流代理时如果断流再重连成功是否删除前一次的媒体流数据，如果删除将重新开始， +#如果不删除将会接着上一次的数据继续写(录制hls/mp4时会继续在前一个文件后面写) +resetWhenRePlay=1 +#合并写缓存大小(单位毫秒)，合并写指服务器缓存一定的数据后才会一次性写入socket，这样能提高性能，但是会提高延时 +#开启后会同时关闭TCP_NODELAY并开启MSG_MORE +mergeWriteMS=0 +#服务器唯一id，用于触发hook时区别是哪台服务器 +mediaServerId=your_server_id +#最多等待未初始化的Track时间，单位毫秒，超时之后会忽略未初始化的Track +wait_track_ready_ms=10000 +#最多等待音频Track收到数据时间，单位毫秒，超时且完全没收到音频数据，忽略音频Track +#加快某些带封装的流metadata说明有音频，但是实际上没有的流ready时间（比如很多厂商的GB28181 PS） +wait_audio_track_data_ms=1000 +#如果流只有单Track，最多等待若干毫秒，超时后未收到其他Track的数据，则认为是单Track +#如果协议元数据有声明特定track数，那么无此等待时间 +wait_add_track_ms=3000 +#如果track未就绪，我们先缓存帧数据，但是有最大个数限制，防止内存溢出 +unready_frame_cache=100 +#是否启用观看人数变化事件广播，置1则启用，置0则关闭 +broadcast_player_count_changed=0 +#绑定的本地网卡ip +listen_ip=:: + +[hls] +#hls写文件的buf大小，调整参数可以提高文件io性能 +fileBufSize=65536 +#hls最大切片时间 +segDur=2 +#m3u8索引中,hls保留切片个数(实际保留切片个数+segRetain个) +#如果设置为0，则不删除切片且m3u8文件全量记录切片列表 +segNum=3 +#HLS切片延迟个数，大于0将生成hls_delay.m3u8文件，0则不生成 +segDelay=0 +#HLS切片从m3u8文件中移除后，继续保留在磁盘上的个数 +segRetain=5 +#是否广播 hls切片(ts/fmp4)完成通知(on_record_ts) +broadcastRecordTs=0 +#直播hls文件删除延时，单位秒，issue: #913 +deleteDelaySec=10 +#此选项开启后m3u8文件还是表现为直播，但是切片文件会被全部保留为点播用 +#segDur设置为0或segKeep设置为1的情况下，每个切片文件夹下会生成一个vod.m3u8文件用于点播该时间段的录像 +segKeep=0 +#如果设置为1，则第一个切片长度强制设置为1个GOP。当GOP小于segDur，可以提高首屏速度 +fastRegister=0 + +[hook] +#是否启用hook事件，启用后，推拉流都将进行鉴权 +enable=1 +#播放器或推流器使用流量事件，置空则关闭 +on_flow_report= +#访问http文件鉴权事件，置空则关闭鉴权 +on_http_access= +#播放鉴权事件，置空则关闭鉴权 +on_play=http://wvp-pro:18978/index/hook/on_play +#推流鉴权事件，置空则关闭鉴权 +on_publish=http://wvp-pro:18978/index/hook/on_publish +#录制mp4切片完成事件 +on_record_mp4=http://wvp-pro:18978/index/hook/on_record_mp4 +# 录制 hls ts(或fmp4) 切片完成事件 +on_record_ts= +#rtsp播放鉴权事件，此事件中比对rtsp的用户名密码 +on_rtsp_auth= +#rtsp播放是否开启专属鉴权事件，置空则关闭rtsp鉴权。rtsp播放鉴权还支持url方式鉴权 +#建议开发者统一采用url参数方式鉴权，rtsp用户名密码鉴权一般在设备上用的比较多 +#开启rtsp专属鉴权后，将不再触发on_play鉴权事件 +on_rtsp_realm= +#远程telnet调试鉴权事件 +on_shell_login= +#直播流注册或注销事件 +on_stream_changed=http://wvp-pro:18978/index/hook/on_stream_changed +#过滤on_stream_changed hook的协议类型，可以选择只监听某些感兴趣的协议；置空则不过滤协议 +stream_changed_schemas=rtsp/rtmp/fmp4/ts/hls/hls.fmp4 +#无人观看流事件，通过该事件，可以选择是否关闭无人观看的流。配合general.streamNoneReaderDelayMS选项一起使用 +on_stream_none_reader=http://wvp-pro:18978/index/hook/on_stream_none_reader +#播放时，未找到流事件，通过配合hook.on_stream_none_reader事件可以完成按需拉流 +on_stream_not_found=http://wvp-pro:18978/index/hook/on_stream_not_found +#服务器启动报告，可以用于服务器的崩溃重启事件监听 +on_server_started=http://wvp-pro:18978/index/hook/on_server_started +#服务器退出报告，当服务器正常退出时触发 +on_server_exited= +#server保活上报 +on_server_keepalive=http://wvp-pro:18978/index/hook/on_server_keepalive +#发送rtp(startSendRtp)被动关闭时回调 +on_send_rtp_stopped=http://wvp-pro:18978/index/hook/on_send_rtp_stopped +#rtp server 超时未收到数据 +on_rtp_server_timeout=http://wvp-pro:18978/index/hook/on_rtp_server_timeout +#hook api最大等待回复时间，单位秒 +timeoutSec=30 +#keepalive hook触发间隔,单位秒，float类型 +alive_interval=10.0 +#hook通知失败重试次数,正整数。为0不重试，1时重试一次，以此类推 +retry=1 +#hook通知失败重试延时，单位秒，float型 +retry_delay=3.0 + +[cluster] +#设置源站拉流url模板, 格式跟printf类似，第一个%s指定app,第二个%s指定stream_id, +#开启集群模式后，on_stream_not_found和on_stream_none_reader hook将无效. +#溯源模式支持以下类型: +#rtmp方式: rtmp://127.0.0.1:1935/%s/%s +#rtsp方式: rtsp://127.0.0.1:554/%s/%s +#hls方式: http://127.0.0.1:80/%s/%s/hls.m3u8 +#http-ts方式: http://127.0.0.1:80/%s/%s.live.ts +#支持多个源站，不同源站通过分号(;)分隔 +origin_url= +#溯源总超时时长，单位秒，float型；假如源站有3个，那么单次溯源超时时间为timeout_sec除以3 +#单次溯源超时时间不要超过general.maxStreamWaitMS配置 +timeout_sec=15 +#溯源失败尝试次数，-1时永久尝试 +retry_count=3 + +[http] +#http服务器字符编码集 +charSet=utf-8 +#http链接超时时间 +keepAliveSecond=30 +#http请求体最大字节数，如果post的body太大，则不适合缓存body在内存 +maxReqSize=40960 +#404网页内容，用户可以自定义404网页 +#notFound=404 Not Found

您访问的资源不存在！

ZLMediaKit-4.0
+#http服务器监听端口 +port=80 +#http文件服务器根目录 +#可以为相对(相对于本可执行程序目录)或绝对路径 +rootPath=./www +#http文件服务器读文件缓存大小，单位BYTE，调整该参数可以优化文件io性能 +sendBufSize=65536 +#https服务器监听端口 +sslport=443 +#是否显示文件夹菜单，开启后可以浏览文件夹 +dirMenu=1 +#虚拟目录, 虚拟目录名和文件路径使用","隔开，多个配置路径间用";"隔开 +#例如赋值为 app_a,/path/to/a;app_b,/path/to/b 那么 +#访问 http://127.0.0.1/app_a/file_a 对应的文件路径为 /path/to/a/file_a +#访问 http://127.0.0.1/app_b/file_b 对应的文件路径为 /path/to/b/file_b +#访问其他http路径,对应的文件路径还是在rootPath内 +virtualPath= +#禁止后缀的文件使用mmap缓存，使用“,”隔开 +#例如赋值为 .mp4,.flv +#那么访问后缀为.mp4与.flv 的文件不缓存 +forbidCacheSuffix= +#可以把http代理前真实客户端ip放在http头中：https://github.com/ZLMediaKit/ZLMediaKit/issues/1388 +#切勿暴露此key，否则可能导致伪造客户端ip +forwarded_ip_header= +#默认允许所有跨域请求 +allow_cross_domains=1 +#允许访问http api和http文件索引的ip地址范围白名单，置空情况下不做限制 +allow_ip_range=::1,127.0.0.1,172.16.0.0-172.31.255.255,192.168.0.0-192.168.255.255,10.0.0.0-10.255.255.255 + +[multicast] +#rtp组播截止组播ip地址 +addrMax=239.255.255.255 +#rtp组播起始组播ip地址 +addrMin=239.0.0.0 +#组播udp ttl +udpTTL=64 + +[record] +#mp4录制或mp4点播的应用名，通过限制应用名，可以防止随意点播 +#点播的文件必须放置在此文件夹下 +appName=record +#mp4录制写文件缓存，单位BYTE,调整参数可以提高文件io性能 +fileBufSize=65536 +#mp4点播每次流化数据量，单位毫秒， +#减少该值可以让点播数据发送量更平滑，增大该值则更节省cpu资源 +sampleMS=500 +#mp4录制完成后是否进行二次关键帧索引写入头部 +fastStart=0 +#MP4点播(rtsp/rtmp/http-flv/ws-flv)是否循环播放文件 +fileRepeat=0 +#MP4录制写文件格式是否采用fmp4，启用的话，断电未完成录制的文件也能正常打开 +enableFmp4=0 + +[rtmp] +#rtmp必须在此时间内完成握手，否则服务器会断开链接，单位秒 +handshakeSecond=15 +#rtmp超时时间，如果该时间内未收到客户端的数据， +#或者tcp发送缓存超过这个时间，则会断开连接，单位秒 +keepAliveSecond=15 +#rtmp服务器监听端口 +port=1935 +#rtmps服务器监听地址 +sslport=0 +# rtmp是否直接代理模式 +directProxy=1 +#h265/opus/vp8/vp9/av1 rtmp打包采用增强型rtmp标准还是国内拓展标准 +enhanced=1 + +[rtp] +#音频mtu大小，该参数限制rtp最大字节数，推荐不要超过1400 +#加大该值会明显增加直播延时 +audioMtuSize=600 +#视频mtu大小，该参数限制rtp最大字节数，推荐不要超过1400 +videoMtuSize=1400 +#rtp包最大长度限制，单位KB,主要用于识别TCP上下文破坏时，获取到错误的rtp +rtpMaxSize=10 +# rtp 打包时，低延迟开关，默认关闭（为0），h264存在一帧多个slice（NAL）的情况，在这种情况下，如果开启可能会导致画面花屏 +lowLatency=0 +# H264 rtp打包模式是否采用stap-a模式(为了在老版本浏览器上兼容webrtc)还是采用Single NAL unit packet per H.264 模式 +# 有些老的rtsp设备不支持stap-a rtp，设置此配置为0可提高兼容性 +h264_stap_a=1 + +[rtp_proxy] +#导出调试数据(包括rtp/ps/h264)至该目录,置空则关闭数据导出 +dumpDir= +#udp和tcp代理服务器，支持rtp(必须是ts或ps类型)代理 +port=10000 +#rtp超时时间，单位秒 +timeoutSec=15 +#随机端口范围，最少确保36个端口 +#该范围同时限制rtsp服务器udp端口范围 +port_range=30000-30500 +#rtp h264 负载的pt +h264_pt=98 +#rtp h265 负载的pt +h265_pt=99 +#rtp ps 负载的pt +ps_pt=96 +#rtp opus 负载的pt +opus_pt=100 +#startSendRtp、startRecord相关功能是否提前开启gop缓存优化级联秒开体验，默认开启, 并缓存1个GOP +#如果不调用startSendRtp、startRecord后相关接口，可以置0节省内存；如果缓存多个gop，可以加大该参数 +gop_cache=1 +#国标发送g711 rtp 打包时，每个包的语音时长是多少，默认是100 ms，范围为20~180ms (gb28181-2016，c.2.4规定)， +#最好为20 的倍数，程序自动向20的倍数取整 +rtp_g711_dur_ms=100 +#udp接收数据socket buffer大小配置 +#4*1024*1024=4196304 +udp_recv_socket_buffer=4194304 +#ps/ts解析后是否等待下一帧以判断本帧是否完整，开启后提高兼容性，但是可能增加延时 +merge_frame=1 + +[rtc] +#webrtc 信令服务器端口 +signalingPort=3000 +signalingSslPort=3001 +#STUN/TURN服务器端口 +icePort=3478 +iceTcpPort=3478 +#STUN/TURN端口是否使能TURN服务 +enableTurn=1 +#ICE传输策略：0=不限制(默认)，1=仅支持Relay转发，2=仅支持P2P直连 +iceTransportPolicy=0 +#STUN/TURN 服务Ice密码 +iceUfrag=ZLMediaKit +icePwd=ZLMediaKit +#webrtc datachannel是否回显数据，测试用 +datachannel_echo=1 +max_stun_retry=7 +#TURN服务分配端口池 +port_range=49152-65535 +#rtc播放推流、播放超时时间 +timeoutSec=15 +#本机对rtc客户端的可见ip，作为服务器时一般为公网ip，可有多个，用','分开，当置空时，会自动获取网卡ip +#同时支持环境变量，以$开头，如"$EXTERN_IP"; 请参考：https://github.com/ZLMediaKit/ZLMediaKit/pull/1786 +externIP= +#当指定了interfaces,ICE服务器会使用指定网卡bind socket +#以解决公网IP使用弹性公网IP配置实现(部署机器无法bind该公网ip的问题) +#支持环境变量，以$开头，如"$PRIVATE_IP" +interfaces= +#rtc udp服务器监听端口号，所有rtc客户端将通过该端口传输stun/dtls/srtp/srtcp数据， +#该端口是多线程的，同时支持客户端网络切换导致的连接迁移 +#需要注意的是，如果服务器在nat内，需要做端口映射时，必须确保外网映射端口跟该端口一致 +port=8000 +#rtc tcp服务器监听端口号，在udp 不通的情况下，会使用tcp传输数据 +#该端口是多线程的，同时支持客户端网络切换导致的连接迁移 +#需要注意的是，如果服务器在nat内，需要做端口映射时，必须确保外网映射端口跟该端口一致 +tcpPort=8000 +#设置remb比特率，非0时关闭twcc并开启remb。该设置在rtc推流时有效，可以控制推流画质 +#目前已经实现twcc自动调整码率，关闭remb根据真实网络状况调整码率 +rembBitRate=0 +#rtc支持的音频codec类型,在前面的优先级更高 +#以下范例为所有支持的音频codec +preferredCodecA=PCMA,PCMU,opus,mpeg4-generic +#rtc支持的视频codec类型,在前面的优先级更高 +#以下范例为所有支持的视频codec +preferredCodecV=H264,H265,AV1,VP9,VP8 +#webrtc比特率设置 +start_bitrate=0 +max_bitrate=0 +min_bitrate=0 +#nack接收端, rtp发送端，zlm发送rtc流 +#rtp重发缓存列队最大长度，单位毫秒 +maxRtpCacheMS=5000 +#rtp重发缓存列队最大长度，单位个数 +maxRtpCacheSize=2048 +#nack发送端，rtp接收端，zlm接收rtc推流 +#最大保留的rtp丢包状态个数 +nackMaxSize=2048 +#rtp丢包状态最长保留时间 +nackMaxMS=3000 +#nack最多请求重传次数 +nackMaxCount=15 +#nack重传频率，rtt的倍数 +nackIntervalRatio=1.0 +#视频nack包中rtp个数，减小此值可以让nack包响应更灵敏 +nackRtpSize=8 +#音频nack包中rtp个数，减小此值可以让nack包响应更灵敏 +nackAudioRtpSize=4 +#是否尝试过滤 b帧 +bfilter=0 +# 是否优先采用webrtc over tcp模式 +preferred_tcp=0 + +[srt] +#srt播放推流、播放超时时间,单位秒 +timeoutSec=5 +#srt udp服务器监听端口号，所有srt客户端将通过该端口传输srt数据， +#该端口是多线程的，同时支持客户端网络切换导致的连接迁移 +port=9000 +#srt 协议中延迟缓存的估算参数，在握手阶段估算rtt ,然后latencyMul*rtt 为最大缓存时长，此参数越大，表示等待重传的时长就越大 +latencyMul=4 +#包缓存的大小 +pktBufSize=8192 +#srt udp服务器的密码,为空表示不加密 +passPhrase= + +[rtsp] +#rtsp专有鉴权方式是采用base64还是md5方式 +authBasic=0 +#rtsp拉流、推流代理是否是直接代理模式 +#直接代理后支持任意编码格式，但是会导致GOP缓存无法定位到I帧，可能会导致开播花屏 +#并且如果是tcp方式拉流，如果rtp大于mtu会导致无法使用udp方式代理 +#假定您的拉流源地址不是264或265或AAC，那么你可以使用直接代理的方式来支持rtsp代理 +#如果你是rtsp推拉流，但是webrtc播放，也建议关闭直接代理模式， +#因为直接代理时，rtp中可能没有sps pps,会导致webrtc无法播放; 另外webrtc也不支持Single NAL Unit Packets类型rtp +#默认开启rtsp直接代理，rtmp由于没有这些问题，是强制开启直接代理的 +directProxy=1 +#rtsp必须在此时间内完成握手，否则服务器会断开链接，单位秒 +handshakeSecond=15 +#rtsp超时时间，如果该时间内未收到客户端的数据， +#或者tcp发送缓存超过这个时间，则会断开连接，单位秒 +keepAliveSecond=15 +#rtsp服务器监听地址 +port=554 +#rtsps服务器监听地址 +sslport=0 +#rtsp 转发是否使用低延迟模式，当开启时，不会缓存rtp包，来提高并发，可以降低一帧的延迟 +lowLatency=0 +#强制协商rtp传输方式 (0:TCP,1:UDP,2:MULTICAST,-1:不限制) +#当客户端发起RTSP SETUP的时候如果传输类型和此配置不一致则返回461 Unsupported transport +#迫使客户端重新SETUP并切换到对应协议。目前支持FFMPEG和VLC +rtpTransportType=-1 + +[shell] +#调试telnet服务器接受最大buffer大小 +maxReqSize=1024 +#调试telnet服务器监听端口 +port=0 +# onvif搜索用 +[onvif] +port=3702 + +[general] +check_nvidia_dev=1 +enable_ffmpeg_log=0 + +[http] +notFound=404 Not Found

您访问的资源不存在！

ZLMediaKit(git hash:/,branch:,build time:2026-01-14T08:09:34)
+ From 85c1f6f3c0420c9aec467a8cef09a57695850413 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 15:16:22 +0800 Subject: [PATCH 25/28] xx --- .devops/config.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.devops/config.yaml b/.devops/config.yaml index f50ffae..37f5fd0 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -240,8 +240,9 @@ repositories: path: wvpjar type: java build_commands: + - cd wvpjar - mvn clean package -DskipTests - artifact_path: target/*.jar + artifact_path: wvpjar/target/*.jar docker_path: docker/wvp/wvpjar/jar docker_service: wvp-pro From 381dcefe8a32bd6bf962e05daa31e5c50d5719cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 15:20:40 +0800 Subject: [PATCH 26/28] xx --- .devops/config.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.devops/config.yaml b/.devops/config.yaml index 37f5fd0..c255011 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -242,7 +242,7 @@ repositories: build_commands: - cd wvpjar - mvn clean package -DskipTests - artifact_path: wvpjar/target/*.jar + artifact_path: target/*.jar docker_path: docker/wvp/wvpjar/jar docker_service: wvp-pro From 31b0e4e1582f1bba40790fe9b67ddaf551157935 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 15:24:50 +0800 Subject: [PATCH 27/28] xx --- .devops/config.yaml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.devops/config.yaml b/.devops/config.yaml index c255011..ed5312b 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -240,8 +240,7 @@ repositories: path: wvpjar type: java build_commands: - - cd wvpjar - - mvn clean package -DskipTests + - cd wvpjar && mvn clean package -DskipTests artifact_path: target/*.jar docker_path: docker/wvp/wvpjar/jar docker_service: wvp-pro From 4d78110ee45ecdb21789fa69ccff39bd1bd5c3f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= Date: Mon, 26 Jan 2026 15:47:40 +0800 Subject: [PATCH 28/28] =?UTF-8?q?=E6=B7=BB=E5=8A=A0minio=E7=9A=84=E5=90=AF?= =?UTF-8?q?=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devops/config.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.devops/config.yaml b/.devops/config.yaml index ed5312b..f4766e7 100644 --- a/.devops/config.yaml +++ b/.devops/config.yaml @@ -36,6 +36,10 @@ infrastructure: 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 就绪