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

去除多余空格

pull/13/head
648540858 2020-11-20 10:40:43 +08:00
parent 120eaa534e
commit f5061aa7ff
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
View File

@ -65,12 +65,9 @@ public class ZLMRunner implements CommandLineRunner {
saveZLMConfig(); saveZLMConfig();
mediaServerConfig = getMediaServerConfig(); mediaServerConfig = getMediaServerConfig();
storager.updateMediaInfo(mediaServerConfig); storager.updateMediaInfo(mediaServerConfig);
} }
} }
public MediaServerConfig getMediaServerConfig() { public MediaServerConfig getMediaServerConfig() {
JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(); JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig();
MediaServerConfig mediaServerConfig = null; MediaServerConfig mediaServerConfig = null;

12
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
View File

@ -106,9 +106,9 @@ public class ApiStreamController {
result.put("DeviceID", device.getDeviceId()); result.put("DeviceID", device.getDeviceId());
result.put("ChannelID", code); result.put("ChannelID", code);
result.put("ChannelName", deviceChannel.getName()); result.put("ChannelName", deviceChannel.getName());
result.put("ChannelCustomName ", ""); result.put("ChannelCustomName", "");
result.put("FLV ", streamInfo.getFlv()); result.put("FLV", streamInfo.getFlv());
result.put("WS_FLV ", streamInfo.getWs_flv()); result.put("WS_FLV", streamInfo.getWs_flv());
result.put("RTMP", streamInfo.getRtmp()); result.put("RTMP", streamInfo.getRtmp());
result.put("HLS", streamInfo.getHls()); result.put("HLS", streamInfo.getHls());
result.put("RTSP", streamInfo.getRtsp()); result.put("RTSP", streamInfo.getRtsp());
@ -178,9 +178,9 @@ public class ApiStreamController {
result.put("DeviceID", device.getDeviceId()); result.put("DeviceID", device.getDeviceId());
result.put("ChannelID", code); result.put("ChannelID", code);
result.put("ChannelName", deviceChannel.getName()); result.put("ChannelName", deviceChannel.getName());
result.put("ChannelCustomName ", ""); result.put("ChannelCustomName", "");
result.put("FLV ", streamInfo.getFlv()); result.put("FLV", streamInfo.getFlv());
result.put("WS_FLV ", streamInfo.getWs_flv()); result.put("WS_FLV", streamInfo.getWs_flv());
result.put("RTMP", streamInfo.getRtmp()); result.put("RTMP", streamInfo.getRtmp());
result.put("HLS", streamInfo.getHls()); result.put("HLS", streamInfo.getHls());
result.put("RTSP", streamInfo.getRtsp()); result.put("RTSP", streamInfo.getRtsp());