guzijian / wvp-GB28181-pro · Commits

Commit f5061aa7ff6c14231d113141c75b354c4c5d8153

Authored by 648540858
1 parent 120eaa53

去除多余空格

Inline Side-by-side
Showing 2 changed files with 6 additions and 9 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMRunner.java
  View file @f5061aa
@@ -65,12 +65,9 @@ public class ZLMRunner implements CommandLineRunner { @@ -65,12 +65,9 @@ public class ZLMRunner implements CommandLineRunner {
65 saveZLMConfig(); 65 saveZLMConfig();
66 mediaServerConfig = getMediaServerConfig(); 66 mediaServerConfig = getMediaServerConfig();
67 storager.updateMediaInfo(mediaServerConfig); 67 storager.updateMediaInfo(mediaServerConfig);
68 -  
69 } 68 }
70 } 69 }
71 70
72 -  
73 -  
74 public MediaServerConfig getMediaServerConfig() { 71 public MediaServerConfig getMediaServerConfig() {
75 JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig(); 72 JSONObject responseJSON = zlmresTfulUtils.getMediaServerConfig();
76 MediaServerConfig mediaServerConfig = null; 73 MediaServerConfig mediaServerConfig = null;
src/main/java/com/genersoft/iot/vmp/web/ApiStreamController.java
  View file @f5061aa
@@ -106,9 +106,9 @@ public class ApiStreamController { @@ -106,9 +106,9 @@ public class ApiStreamController {
106 result.put("DeviceID", device.getDeviceId()); 106 result.put("DeviceID", device.getDeviceId());
107 result.put("ChannelID", code); 107 result.put("ChannelID", code);
108 result.put("ChannelName", deviceChannel.getName()); 108 result.put("ChannelName", deviceChannel.getName());
109 - result.put("ChannelCustomName ", "");  
110 - result.put("FLV ", streamInfo.getFlv());  
111 - result.put("WS_FLV ", streamInfo.getWs_flv()); 109 + result.put("ChannelCustomName", "");
  110 + result.put("FLV", streamInfo.getFlv());
  111 + result.put("WS_FLV", streamInfo.getWs_flv());
112 result.put("RTMP", streamInfo.getRtmp()); 112 result.put("RTMP", streamInfo.getRtmp());
113 result.put("HLS", streamInfo.getHls()); 113 result.put("HLS", streamInfo.getHls());
114 result.put("RTSP", streamInfo.getRtsp()); 114 result.put("RTSP", streamInfo.getRtsp());
@@ -178,9 +178,9 @@ public class ApiStreamController { @@ -178,9 +178,9 @@ public class ApiStreamController {
178 result.put("DeviceID", device.getDeviceId()); 178 result.put("DeviceID", device.getDeviceId());
179 result.put("ChannelID", code); 179 result.put("ChannelID", code);
180 result.put("ChannelName", deviceChannel.getName()); 180 result.put("ChannelName", deviceChannel.getName());
181 - result.put("ChannelCustomName ", "");  
182 - result.put("FLV ", streamInfo.getFlv());  
183 - result.put("WS_FLV ", streamInfo.getWs_flv()); 181 + result.put("ChannelCustomName", "");
  182 + result.put("FLV", streamInfo.getFlv());
  183 + result.put("WS_FLV", streamInfo.getWs_flv());
184 result.put("RTMP", streamInfo.getRtmp()); 184 result.put("RTMP", streamInfo.getRtmp());
185 result.put("HLS", streamInfo.getHls()); 185 result.put("HLS", streamInfo.getHls());
186 result.put("RTSP", streamInfo.getRtsp()); 186 result.put("RTSP", streamInfo.getRtsp());