优化拉流代理逻辑,修复ffmpeg拉流代理鉴权
This commit is contained in:
@@ -199,6 +199,13 @@ public class ZLMHttpHookListener {
|
||||
}
|
||||
// 推流鉴权的处理
|
||||
if (!"rtp".equals(param.getApp())) {
|
||||
StreamProxyItem stream = streamProxyService.getStreamProxyByAppAndStream(param.getApp(), param.getStream());
|
||||
if (stream != null) {
|
||||
HookResultForOnPublish result = HookResultForOnPublish.SUCCESS();
|
||||
result.setEnable_audio(stream.isEnableAudio());
|
||||
result.setEnable_mp4(stream.isEnableMp4());
|
||||
return result;
|
||||
}
|
||||
if (userSetting.getPushAuthority()) {
|
||||
// 推流鉴权
|
||||
if (param.getParams() == null) {
|
||||
|
||||
@@ -272,6 +272,12 @@ public class ZLMRESTfulUtils {
|
||||
return sendPost(mediaServerItem, "delFFmpegSource",param, null);
|
||||
}
|
||||
|
||||
public JSONObject delStreamProxy(MediaServerItem mediaServerItem, String key){
|
||||
Map<String, Object> param = new HashMap<>();
|
||||
param.put("key", key);
|
||||
return sendPost(mediaServerItem, "delStreamProxy",param, null);
|
||||
}
|
||||
|
||||
public JSONObject getMediaServerConfig(MediaServerItem mediaServerItem){
|
||||
return sendPost(mediaServerItem, "getServerConfig",null, null);
|
||||
}
|
||||
|
||||
@@ -41,6 +41,9 @@ public class StreamProxyItem extends GbStream {
|
||||
@Schema(description = "是否 无人观看时自动停用")
|
||||
private boolean enableDisableNoneReader;
|
||||
|
||||
@Schema(description = "拉流代理时zlm返回的key,用于停止拉流代理")
|
||||
private String streamKey;
|
||||
|
||||
public String getType() {
|
||||
return type;
|
||||
}
|
||||
@@ -167,5 +170,11 @@ public class StreamProxyItem extends GbStream {
|
||||
this.enableAudio = enable_audio;
|
||||
}
|
||||
|
||||
public String getStreamKey() {
|
||||
return streamKey;
|
||||
}
|
||||
|
||||
public void setStreamKey(String streamKey) {
|
||||
this.streamKey = streamKey;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user