From a9cf5131e1a54406c954cfac908469e50551c7b1 Mon Sep 17 00:00:00 2001
From: lin <648540858@qq.com>
Date: Fri, 21 Mar 2025 11:30:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dzlm=E6=99=AE=E9=80=9A?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=8E=A5=E5=85=A5=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java  | 2 +-
 .../iot/vmp/media/zlm/ZLMMediaServerStatusManager.java        | 4 +++-
 .../com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java | 3 +--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 9c2cd6b96..23b96de24 100755
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -177,7 +177,7 @@ public class ZLMHttpHookListener {
             ret.put("code", 0);
             return ret;
         }
-        if (param.getStream().endsWith(mediaInfo.getTranscodeSuffix())) {
+        if (mediaInfo.getTranscodeSuffix() != null && param.getStream().endsWith(mediaInfo.getTranscodeSuffix())) {
             param.setStream(param.getStream().substring(0, param.getStream().lastIndexOf(mediaInfo.getTranscodeSuffix()) - 1));
         }
         if (!ObjectUtils.isEmpty(mediaInfo.getTranscodeSuffix())
diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManager.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManager.java
index df105e369..37e6e846d 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManager.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaServerStatusManager.java
@@ -242,7 +242,9 @@ public class ZLMMediaServerStatusManager {
         if (mediaServerItem.getWsFlvSSLPort() == 0) {
             mediaServerItem.setWsFlvSSLPort(zlmServerConfig.getHttpSSLport());
         }
-        if (Objects.isNull(mediaServerItem.getTranscodeSuffix())) {
+        if (Objects.isNull(zlmServerConfig.getTranscodeSuffix())) {
+            mediaServerItem.setTranscodeSuffix(null);
+        }else {
             mediaServerItem.setTranscodeSuffix(zlmServerConfig.getTranscodeSuffix());
         }
         mediaServerItem.setHookAliveInterval(10F);
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
index 8682461fe..f440d57c9 100755
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/MediaServerMapper.java
@@ -81,7 +81,7 @@ public interface MediaServerMapper {
 
     @Update(value = {" <script>" +
             "UPDATE wvp_media_server " +
-            "SET update_time=#{updateTime}" +
+            "SET update_time=#{updateTime}, transcode_suffix=#{transcodeSuffix} " +
             "<if test=\"ip != null\">, ip=#{ip}</if>" +
             "<if test=\"hookIp != null\">, hook_ip=#{hookIp}</if>" +
             "<if test=\"sdpIp != null\">, sdp_ip=#{sdpIp}</if>" +
@@ -106,7 +106,6 @@ public interface MediaServerMapper {
             "<if test=\"hookAliveInterval != null\">, hook_alive_interval=#{hookAliveInterval}</if>" +
             "<if test=\"recordDay != null\">, record_day=#{recordDay}</if>" +
             "<if test=\"recordPath != null\">, record_path=#{recordPath}</if>" +
-            "<if test=\"transcodeSuffix != null\">, transcode_suffix=#{transcodeSuffix}</if>" +
             "<if test=\"serverId != null\">, server_id=#{serverId}</if>" +
             "<if test=\"type != null\">, type=#{type}</if>" +
             "WHERE id=#{id}"+