From f5061aa7ff6c14231d113141c75b354c4c5d8153 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: Fri, 20 Nov 2020 10:40:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E5=A4=9A=E4=BD=99=E7=A9=BA?=
 =?UTF-8?q?=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/genersoft/iot/vmp/media/zlm/ZLMRunner.java   |  3 ---
 .../genersoft/iot/vmp/web/ApiStreamController.java   | 12 ++++++------
 2 files changed, 6 insertions(+), 9 deletions(-)

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