Browse Source

去除多余空格

648540858 5 years ago
parent
commit
f5061aa7ff

+ 0 - 3
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;

+ 6 - 6
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());