From af3a283b3dc66b24dc9ea21310d97179be51fd2a Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Fri, 19 Sep 2025 20:48:41 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=82=E9=85=8Dabl=E6=96=B0=E7=9A=84?=
 =?UTF-8?q?=E7=AB=AF=E5=8F=A3=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../iot/vmp/media/abl/ABLMediaServerStatusManger.java     | 8 ++++----
 .../genersoft/iot/vmp/media/abl/bean/AblServerConfig.java | 8 ++++----
 .../com/genersoft/iot/vmp/media/bean/MediaServer.java     | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaServerStatusManger.java b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaServerStatusManger.java
index f435fb825..a820851dd 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaServerStatusManger.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaServerStatusManger.java
@@ -220,11 +220,11 @@ public class ABLMediaServerStatusManger {
         if (ablServerConfig.getHttpFlvPort() != null && mediaServer.getFlvPort() != ablServerConfig.getHttpFlvPort()) {
             mediaServer.setFlvPort(ablServerConfig.getHttpFlvPort());
         }
-        if (ablServerConfig.getMp4Port() != null && mediaServer.getMp4Port() != ablServerConfig.getMp4Port()) {
-            mediaServer.setMp4Port(ablServerConfig.getMp4Port());
+        if (ablServerConfig.getHttpMp4Port() != null && mediaServer.getMp4Port() != ablServerConfig.getHttpMp4Port()) {
+            mediaServer.setMp4Port(ablServerConfig.getHttpMp4Port());
         }
-        if (ablServerConfig.getWsPort() != null && mediaServer.getWsFlvPort() != ablServerConfig.getWsPort()) {
-            mediaServer.setWsFlvPort(ablServerConfig.getWsPort());
+        if (ablServerConfig.getWsFlvPort() != null && mediaServer.getWsFlvPort() != ablServerConfig.getWsFlvPort()) {
+            mediaServer.setWsFlvPort(ablServerConfig.getWsFlvPort());
         }
         if (ablServerConfig.getPsTsRecvPort() != null && mediaServer.getRtpProxyPort() != ablServerConfig.getPsTsRecvPort()) {
             mediaServer.setRtpProxyPort(ablServerConfig.getPsTsRecvPort());
diff --git a/src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblServerConfig.java b/src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblServerConfig.java
index 50ac140a5..af36faf54 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblServerConfig.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblServerConfig.java
@@ -44,11 +44,11 @@ public class AblServerConfig {
     @ConfigKeyId("hlsPort")
     private Integer hlsPort;
 
-    @ConfigKeyId("wsPort")
-    private Integer wsPort;
+    @ConfigKeyId("wsFlvPort")
+    private Integer wsFlvPort;
 
-    @ConfigKeyId("mp4Port")
-    private Integer mp4Port;
+    @ConfigKeyId("httpMp4Port")
+    private Integer httpMp4Port;
 
     @ConfigKeyId("ps_tsRecvPort")
     private Integer psTsRecvPort;
diff --git a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
index 63662db8c..38de6394a 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
@@ -149,8 +149,8 @@ public class MediaServer {
         streamIp = config.getServerIp();
         httpPort = config.getHttpServerPort();
         flvPort = config.getHttpFlvPort();
-        mp4Port = config.getMp4Port();
-        wsFlvPort = config.getWsPort();
+        mp4Port = config.getHttpMp4Port();
+        wsFlvPort = config.getWsFlvPort();
         rtmpPort = config.getRtmpPort();
         rtpProxyPort = config.getJtt1078RecvPort();
         rtspPort = config.getRtspPort();