[拉流代理] 修复 #1718
parent
8f7016878d
commit
f078c6f7a0
|
@ -423,8 +423,11 @@ public class ZLMMediaNodeServerService implements IMediaNodeServerService {
|
||||||
port = mediaServer.getRtspPort();
|
port = mediaServer.getRtspPort();
|
||||||
schemaForUri = schema;
|
schemaForUri = schema;
|
||||||
}else if (schema.equalsIgnoreCase("flv")) {
|
}else if (schema.equalsIgnoreCase("flv")) {
|
||||||
|
if (mediaServer.getRtmpPort() == 0) {
|
||||||
|
throw new ControllerException(ErrorCode.ERROR100.getCode(), "ffmpeg拉流代理播放时发现未设置rtmp端口");
|
||||||
|
}
|
||||||
port = mediaServer.getRtmpPort();
|
port = mediaServer.getRtmpPort();
|
||||||
schemaForUri = schema;
|
schemaForUri = "rtmp";
|
||||||
}else {
|
}else {
|
||||||
port = mediaServer.getRtmpPort();
|
port = mediaServer.getRtmpPort();
|
||||||
schemaForUri = schema;
|
schemaForUri = schema;
|
||||||
|
|
|
@ -219,12 +219,12 @@ export default {
|
||||||
this.closeEdit()
|
this.closeEdit()
|
||||||
},
|
},
|
||||||
mediaServerIdChange:function (){
|
mediaServerIdChange:function (){
|
||||||
if (this.streamProxy.mediaServerId !== "auto"){
|
if (this.streamProxy.relatesMediaServerId !== "auto"){
|
||||||
this.$axios({
|
this.$axios({
|
||||||
method: 'get',
|
method: 'get',
|
||||||
url:`/api/proxy/ffmpeg_cmd/list`,
|
url:`/api/proxy/ffmpeg_cmd/list`,
|
||||||
params: {
|
params: {
|
||||||
mediaServerId: this.streamProxy.mediaServerId
|
mediaServerId: this.streamProxy.relatesMediaServerId
|
||||||
}
|
}
|
||||||
}).then((res)=> {
|
}).then((res)=> {
|
||||||
this.ffmpegCmdList = res.data.data;
|
this.ffmpegCmdList = res.data.data;
|
||||||
|
|
Loading…
Reference in New Issue