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

兼容arm zlm 无法获取到Params的问题

2.7.2
648540858 2024-08-07 09:38:48 +08:00
parent 050882d6a6
commit a915897c53
1 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
View File

@ -47,7 +47,10 @@ import org.springframework.web.context.request.async.DeferredResult;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import javax.sip.InvalidArgumentException; import javax.sip.InvalidArgumentException;
import javax.sip.SipException; import javax.sip.SipException;
import java.net.MalformedURLException;
import java.net.URL;
import java.text.ParseException; import java.text.ParseException;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.UUID; import java.util.UUID;
@ -377,10 +380,27 @@ public class ZLMHttpHookListener {
redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo); redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);
if (!"broadcast".equals(param.getApp()) && !"talk".equals(param.getApp())) { if (!"broadcast".equals(param.getApp()) && !"talk".equals(param.getApp())) {
Map<String, String> params = MediaServerUtils.urlParamToMap(param.getParams()); String paramsStr = param.getParams();
if (paramsStr == null) {
// 兼容arm zlm 无法获取到Params的问题
URL url = null;
try {
url = new URL("http" + param.getOriginUrl().substring(4));
} catch (MalformedURLException ignored) {}
if (url != null) {
paramsStr = url.getQuery();
}
}
if (paramsStr != null) {
Map<String, String> params = MediaServerUtils.urlParamToMap(paramsStr);
param.setParamMap(params); param.setParamMap(params);
}else {
param.setParamMap(new HashMap<>());
logger.warn("获取推流的params信息失败");
}
StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo, StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaInfo,
param.getApp(), param.getStream(), tracks, params.get("callId")); param.getApp(), param.getStream(), tracks, param.getParamMap().get("callId"));
param.setStreamInfo(new StreamContent(streamInfoByAppAndStream)); param.setStreamInfo(new StreamContent(streamInfoByAppAndStream));
param.setSeverId(userSetting.getServerId()); param.setSeverId(userSetting.getServerId());