Commit 5e598f7debaea230720d2d27b7baac680410fb13
1 parent
667257a7
关闭接口鉴权与自动一起使用可以完成单网页集成
Showing
1 changed file
with
4 additions
and
3 deletions
src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
| @@ -55,6 +55,9 @@ public class ZLMHttpHookListener { | @@ -55,6 +55,9 @@ public class ZLMHttpHookListener { | ||
| 55 | private IRedisCatchStorage redisCatchStorage; | 55 | private IRedisCatchStorage redisCatchStorage; |
| 56 | 56 | ||
| 57 | @Autowired | 57 | @Autowired |
| 58 | + private ZLMRESTfulUtils zlmresTfulUtils; | ||
| 59 | + | ||
| 60 | + @Autowired | ||
| 58 | private ZLMServerManger zlmServerManger; | 61 | private ZLMServerManger zlmServerManger; |
| 59 | 62 | ||
| 60 | @Autowired | 63 | @Autowired |
| @@ -335,8 +338,7 @@ public class ZLMHttpHookListener { | @@ -335,8 +338,7 @@ public class ZLMHttpHookListener { | ||
| 335 | if (userSetup.isAutoApplyPlay()) { | 338 | if (userSetup.isAutoApplyPlay()) { |
| 336 | String app = json.getString("app"); | 339 | String app = json.getString("app"); |
| 337 | String streamId = json.getString("stream"); | 340 | String streamId = json.getString("stream"); |
| 338 | - StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId); | ||
| 339 | - if ("rtp".equals(app) && streamId.contains("gb_play") && streamInfo == null) { | 341 | + if ("rtp".equals(app) && streamId.contains("gb_play") ) { |
| 340 | String[] s = streamId.split("_"); | 342 | String[] s = streamId.split("_"); |
| 341 | if (s.length == 4) { | 343 | if (s.length == 4) { |
| 342 | String deviceId = s[2]; | 344 | String deviceId = s[2]; |
| @@ -351,7 +353,6 @@ public class ZLMHttpHookListener { | @@ -351,7 +353,6 @@ public class ZLMHttpHookListener { | ||
| 351 | } | 353 | } |
| 352 | 354 | ||
| 353 | } | 355 | } |
| 354 | - | ||
| 355 | } | 356 | } |
| 356 | 357 | ||
| 357 | } | 358 | } |