From b20abe8a761d60f3da6ab94704fbf05400efafb2 Mon Sep 17 00:00:00 2001 From: quangz Date: Wed, 27 Apr 2022 19:31:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=95=E5=83=8F=E5=9B=9E?= =?UTF-8?q?=E8=B0=83=E5=89=8D=E7=BC=80=E5=8F=AF=E9=85=8D=E7=BD=AE=E6=94=AF?= =?UTF-8?q?=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java | 7 +++++++ .../iot/vmp/service/impl/MediaServerServiceImpl.java | 6 ++++++ 2 files changed, 13 insertions(+) diff --git a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java index bdd15034..c79386c0 100644 --- a/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java +++ b/src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java @@ -76,6 +76,9 @@ public class MediaConfig{ @Value("${media.record-assist-port:0}") private Integer recordAssistPort = 0; + @Value("${media.record-hook-prefix:}") + private String recordHookPrefix; + public String getId() { return id; } @@ -182,6 +185,10 @@ public class MediaConfig{ return sendRtpPortRange; } + public String getRecordHookPrefix() { + return recordHookPrefix; + } + public MediaServerItem getMediaSerItem(){ MediaServerItem mediaServerItem = new MediaServerItem(); mediaServerItem.setId(id); diff --git a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java index e7b9e513..309141b7 100644 --- a/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java +++ b/src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; import com.genersoft.iot.vmp.common.VideoManagerConstants; +import com.genersoft.iot.vmp.conf.MediaConfig; import com.genersoft.iot.vmp.conf.SipConfig; import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.gb28181.event.EventPublisher; @@ -89,6 +90,9 @@ public class MediaServerServiceImpl implements IMediaServerService { @Autowired JedisUtil jedisUtil; + @Autowired + private MediaConfig mediaConfig; + private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); /** @@ -487,6 +491,8 @@ public class MediaServerServiceImpl implements IMediaServerService { String recordHookPrex = null; if (mediaServerItem.getRecordAssistPort() != 0) { recordHookPrex = String.format("http://127.0.0.1:%s/api/record", mediaServerItem.getRecordAssistPort()); + } else if (StringUtils.hasText(mediaConfig.getRecordHookPrefix())) { + recordHookPrex = mediaConfig.getRecordHookPrefix(); } Map param = new HashMap<>(); param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline