From 06935d4d0d412c12146bde4321b22773475c26e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B0=8F=E4=BA=91?= <sunpengchina85@gmail.com>
Date: Mon, 26 Jan 2026 10:32:31 +0800
Subject: [PATCH] =?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