aunix/wvp-GB28181-pro
1
0
Fork 0
mirror of https://gitee.com/pan648540858/wvp-GB28181-pro.git synced 2026-05-23 05:37:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

[拉流代理] 修复 #1718

Browse Source
This commit is contained in:
648540858 2024-12-31 10:31:03 +08:00
parent 8f7016878d
commit f078c6f7a0
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaNodeServerService.java
View File

@ -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;

4
web_src/src/components/StreamProxyEdit.vue
View File

@ -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;