diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java index e7cfdb21..66f8e61e 100644 --- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java +++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java @@ -65,12 +65,9 @@ public class ZLMRunner implements CommandLineRunner { saveZLMConfig(); mediaServerConfig = getMediaServerConfig(); storager.updateMediaInfo(mediaServerConfig); - } } - - public MediaServerConfig getMediaServerConfig() { JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(); MediaServerConfig mediaServerConfig = null; diff --git a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java index 76df0d2d..40b1b5b6 100644 --- a/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java +++ b/src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java @@ -106,9 +106,9 @@ public class ApiStreamController { result.put("DeviceID", device.getDeviceId()); result.put("ChannelID", code); result.put("ChannelName", deviceChannel.getName()); - result.put("ChannelCustomName ", ""); - result.put("FLV ", streamInfo.getFlv()); - result.put("WS_FLV ", streamInfo.getWs_flv()); + result.put("ChannelCustomName", ""); + result.put("FLV", streamInfo.getFlv()); + result.put("WS_FLV", streamInfo.getWs_flv()); result.put("RTMP", streamInfo.getRtmp()); result.put("HLS", streamInfo.getHls()); result.put("RTSP", streamInfo.getRtsp()); @@ -178,9 +178,9 @@ public class ApiStreamController { result.put("DeviceID", device.getDeviceId()); result.put("ChannelID", code); result.put("ChannelName", deviceChannel.getName()); - result.put("ChannelCustomName ", ""); - result.put("FLV ", streamInfo.getFlv()); - result.put("WS_FLV ", streamInfo.getWs_flv()); + result.put("ChannelCustomName", ""); + result.put("FLV", streamInfo.getFlv()); + result.put("WS_FLV", streamInfo.getWs_flv()); result.put("RTMP", streamInfo.getRtmp()); result.put("HLS", streamInfo.getHls()); result.put("RTSP", streamInfo.getRtsp());