修改WVP打包

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

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(){

docker/docker-compose.yml

@@ -304,13 +304,30 @@ services:
     ports:
       - "18080:18080"
       - "5060:5060/udp"
-      - "6379:6379"
+#      - "6379:6379"
     volumes:
       - ./wvp/logs:/home/ruoyi/logs
     depends_on:
       - ruoyi-redis
       - ruoyi-mysql
+      - zlmediakit
     links:
       - ruoyi-redis
       - ruoyi-mysql
+      - zlmediakit
+    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

docker/zlmmediakit/docker-compose.yml

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

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<Long> dockIds;

wvpjar

@@ -1 +1 @@
-Subproject commit 4863eea007593565890c646473e7888e6b90ac1d
+Subproject commit d07950cecde5e39d75068e9c17a367d59014c629