Thirdparty
/
wvp-GB28181-pro
mirror of https://github.com/648540858/wvp-GB28181-pro
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

增加录像回调前缀可配置支持

pull/459/head
quangz 2022-04-27 19:31:14 +08:00
parent 102aad1f5d
commit b20abe8a76
2 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/com/genersoft/iot/vmp/conf/MediaConfig.java
View File

@ -76,6 +76,9 @@ public class MediaConfig{
@Value("${media.record-assist-port:0}") @Value("${media.record-assist-port:0}")
private Integer recordAssistPort = 0; private Integer recordAssistPort = 0;
@Value("${media.record-hook-prefix:}")
private String recordHookPrefix;
public String getId() { public String getId() {
return id; return id;
} }
@ -182,6 +185,10 @@ public class MediaConfig{
return sendRtpPortRange; return sendRtpPortRange;
} }
public String getRecordHookPrefix() {
return recordHookPrefix;
}
public MediaServerItem getMediaSerItem(){ public MediaServerItem getMediaSerItem(){
MediaServerItem mediaServerItem = new MediaServerItem(); MediaServerItem mediaServerItem = new MediaServerItem();
mediaServerItem.setId(id); mediaServerItem.setId(id);

6
src/main/java/com/genersoft/iot/vmp/service/impl/MediaServerServiceImpl.java
View File

@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject; import com.alibaba.fastjson.JSONObject;
import com.genersoft.iot.vmp.common.VideoManagerConstants; 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.SipConfig;
import com.genersoft.iot.vmp.conf.UserSetting; import com.genersoft.iot.vmp.conf.UserSetting;
import com.genersoft.iot.vmp.gb28181.event.EventPublisher; import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
@ -89,6 +90,9 @@ public class MediaServerServiceImpl implements IMediaServerService {
@Autowired @Autowired
JedisUtil jedisUtil; JedisUtil jedisUtil;
@Autowired
private MediaConfig mediaConfig;
private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); private final SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
/** /**
@ -487,6 +491,8 @@ public class MediaServerServiceImpl implements IMediaServerService {
String recordHookPrex = null; String recordHookPrex = null;
if (mediaServerItem.getRecordAssistPort() != 0) { if (mediaServerItem.getRecordAssistPort() != 0) {
recordHookPrex = String.format("http://127.0.0.1:%s/api/record", mediaServerItem.getRecordAssistPort()); recordHookPrex = String.format("http://127.0.0.1:%s/api/record", mediaServerItem.getRecordAssistPort());
} else if (StringUtils.hasText(mediaConfig.getRecordHookPrefix())) {
recordHookPrex = mediaConfig.getRecordHookPrefix();
} }
Map<String, Object> param = new HashMap<>(); Map<String, Object> param = new HashMap<>();
param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline param.put("api.secret",mediaServerItem.getSecret()); // -profile:v Baseline