XW-AIOT/wvp-platform
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

适配abl新的端口命名

Browse Source
This commit is contained in:
lin
2025-09-19 20:48:41 +08:00
parent fd306d8ede
commit af3a283b3d
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/genersoft/iot/vmp/media/abl/ABLMediaServerStatusManger.java
View File

@@ -220,11 +220,11 @@ public class ABLMediaServerStatusManger {
if (ablServerConfig.getHttpFlvPort() != null && mediaServer.getFlvPort() != ablServerConfig.getHttpFlvPort()) { if (ablServerConfig.getHttpFlvPort() != null && mediaServer.getFlvPort() != ablServerConfig.getHttpFlvPort()) {
mediaServer.setFlvPort(ablServerConfig.getHttpFlvPort()); mediaServer.setFlvPort(ablServerConfig.getHttpFlvPort());
} }
if (ablServerConfig.getMp4Port() != null && mediaServer.getMp4Port() != ablServerConfig.getMp4Port()) { if (ablServerConfig.getHttpMp4Port() != null && mediaServer.getMp4Port() != ablServerConfig.getHttpMp4Port()) {
mediaServer.setMp4Port(ablServerConfig.getMp4Port()); mediaServer.setMp4Port(ablServerConfig.getHttpMp4Port());
} }
if (ablServerConfig.getWsPort() != null && mediaServer.getWsFlvPort() != ablServerConfig.getWsPort()) { if (ablServerConfig.getWsFlvPort() != null && mediaServer.getWsFlvPort() != ablServerConfig.getWsFlvPort()) {
mediaServer.setWsFlvPort(ablServerConfig.getWsPort()); mediaServer.setWsFlvPort(ablServerConfig.getWsFlvPort());
} }
if (ablServerConfig.getPsTsRecvPort() != null && mediaServer.getRtpProxyPort() != ablServerConfig.getPsTsRecvPort()) { if (ablServerConfig.getPsTsRecvPort() != null && mediaServer.getRtpProxyPort() != ablServerConfig.getPsTsRecvPort()) {
mediaServer.setRtpProxyPort(ablServerConfig.getPsTsRecvPort()); mediaServer.setRtpProxyPort(ablServerConfig.getPsTsRecvPort());

8
src/main/java/com/genersoft/iot/vmp/media/abl/bean/AblServerConfig.java
View File

@@ -44,11 +44,11 @@ public class AblServerConfig {
@ConfigKeyId("hlsPort") @ConfigKeyId("hlsPort")
private Integer hlsPort; private Integer hlsPort;
@ConfigKeyId("wsPort") @ConfigKeyId("wsFlvPort")
private Integer wsPort; private Integer wsFlvPort;
@ConfigKeyId("mp4Port") @ConfigKeyId("httpMp4Port")
private Integer mp4Port; private Integer httpMp4Port;
@ConfigKeyId("ps_tsRecvPort") @ConfigKeyId("ps_tsRecvPort")
private Integer psTsRecvPort; private Integer psTsRecvPort;

4
src/main/java/com/genersoft/iot/vmp/media/bean/MediaServer.java
View File

@@ -149,8 +149,8 @@ public class MediaServer {
streamIp = config.getServerIp(); streamIp = config.getServerIp();
httpPort = config.getHttpServerPort(); httpPort = config.getHttpServerPort();
flvPort = config.getHttpFlvPort(); flvPort = config.getHttpFlvPort();
mp4Port = config.getMp4Port(); mp4Port = config.getHttpMp4Port();
wsFlvPort = config.getWsPort(); wsFlvPort = config.getWsFlvPort();
rtmpPort = config.getRtmpPort(); rtmpPort = config.getRtmpPort();
rtpProxyPort = config.getJtt1078RecvPort(); rtpProxyPort = config.getJtt1078RecvPort();
rtspPort = config.getRtspPort(); rtspPort = config.getRtspPort();