拉流代理支持国标级联之间共享

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java

@@ -346,7 +346,7 @@ public class ZLMHttpHookListener {
 						if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()
 								|| item.getOriginType() == OriginType.RTMP_PUSH.ordinal()
 								|| item.getOriginType() == OriginType.RTC_PUSH.ordinal() ) {
-							zlmMediaListManager.addMedia(item);
+							zlmMediaListManager.addPush(item);
 						}
 					}else {
 						// 兼容流注销时类型错误的问题，等zlm更新后删除

src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMMediaListManager.java

@@ -7,6 +7,7 @@ import com.genersoft.iot.vmp.media.zlm.dto.MediaItem;
 import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamProxyItem;
 import com.genersoft.iot.vmp.media.zlm.dto.StreamPushItem;
+import com.genersoft.iot.vmp.service.IStreamProxyService;
 import com.genersoft.iot.vmp.service.IStreamPushService;
 import com.genersoft.iot.vmp.service.bean.ThirdPartyGB;
 import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
@@ -47,6 +48,9 @@ public class ZLMMediaListManager {
     @Autowired
     private IStreamPushService streamPushService;
 
+    @Autowired
+    private IStreamProxyService streamProxyService;
+
     @Autowired
     private StreamPushMapper streamPushMapper;
 
@@ -101,7 +105,7 @@ public class ZLMMediaListManager {
         updateMedia(mediaServerItem, app, streamId);
     }
 
-    public void addMedia(MediaItem mediaItem) {
+    public void addPush(MediaItem mediaItem) {
         // 查找此直播流是否存在redis预设gbId
         StreamPushItem transform = streamPushService.transform(mediaItem);
         // 从streamId取出查询关键值
@@ -179,6 +183,8 @@ public class ZLMMediaListManager {
         return result;
     }
 
+
+
 //    public void clearAllSessions() {
 //        logger.info("清空所有国标相关的session");
 //        JSONObject allSessionJSON = zlmresTfulUtils.getAllSession();