From fc89b7b517e191fb6c9b66fa86dd05ebab0f54c5 Mon Sep 17 00:00:00 2001
From: jiang <893224616@qq.com>
Date: 星期三, 13 七月 2022 11:29:46 +0800
Subject: [PATCH] 测试提交权限

---
 src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java |  544 ++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 425 insertions(+), 119 deletions(-)

diff --git a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
index 6fd4cf5..f4a2744 100644
--- a/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
+++ b/src/main/java/com/genersoft/iot/vmp/media/zlm/ZLMHttpHookListener.java
@@ -1,22 +1,28 @@
 package com.genersoft.iot.vmp.media.zlm;
 
-import java.math.BigInteger;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
 import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.conf.MediaServerConfig;
-import com.genersoft.iot.vmp.storager.IVideoManagerStorager;
-import com.genersoft.iot.vmp.utils.IpUtil;
+import com.genersoft.iot.vmp.conf.UserSetting;
+import com.genersoft.iot.vmp.gb28181.bean.Device;
+import com.genersoft.iot.vmp.gb28181.bean.DeviceChannel;
+import com.genersoft.iot.vmp.gb28181.bean.GbStream;
+import com.genersoft.iot.vmp.gb28181.bean.SsrcTransaction;
+import com.genersoft.iot.vmp.gb28181.event.EventPublisher;
+import com.genersoft.iot.vmp.gb28181.session.VideoStreamSessionManager;
+import com.genersoft.iot.vmp.media.zlm.dto.*;
+import com.genersoft.iot.vmp.service.*;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
+import com.genersoft.iot.vmp.storager.IVideoManagerStorage;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -29,7 +35,7 @@
 import javax.servlet.http.HttpServletRequest;
 
 /**    
- * @Description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
+ * @description:閽堝 ZLMediaServer鐨刪ook浜嬩欢鐩戝惉
  * @author: swwheihei
  * @date:   2020骞�5鏈�8鏃� 涓婂崍10:46:48     
  */
@@ -39,21 +45,72 @@
 
 	private final static Logger logger = LoggerFactory.getLogger(ZLMHttpHookListener.class);
 
-
 	@Autowired
 	private SIPCommander cmder;
 
 	@Autowired
-	private IVideoManagerStorager storager;
+	private IPlayService playService;
 
 	@Autowired
-	private ZLMRESTfulUtils zlmresTfulUtils;
+	private IVideoManagerStorage storager;
 
-	@Value("${media.ip}")
-	private String mediaIp;
+	@Autowired
+	private IRedisCatchStorage redisCatchStorage;
 
-	@Value("${media.port}")
-	private int mediaPort;
+	@Autowired
+	private IMediaServerService mediaServerService;
+
+	@Autowired
+	private IStreamProxyService streamProxyService;
+
+	@Autowired
+	private IStreamPushService streamPushService;
+
+	@Autowired
+	private IMediaService mediaService;
+
+	@Autowired
+	private EventPublisher eventPublisher;
+
+	 @Autowired
+	 private ZLMMediaListManager zlmMediaListManager;
+
+	@Autowired
+	private ZLMHttpHookSubscribe subscribe;
+
+	@Autowired
+	private UserSetting userSetting;
+
+	@Autowired
+	private IUserService userService;
+
+	@Autowired
+	private VideoStreamSessionManager sessionManager;
+
+	/**
+	 * 鏈嶅姟鍣ㄥ畾鏃朵笂鎶ユ椂闂达紝涓婃姤闂撮殧鍙厤缃紝榛樿10s涓婃姤涓�娆�
+	 *
+	 */
+	@ResponseBody
+	@PostMapping(value = "/on_server_keepalive", produces = "application/json;charset=UTF-8")
+	public ResponseEntity<String> onServerKeepalive(@RequestBody JSONObject json){
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("[ ZLM HOOK ] on_server_keepalive API璋冪敤锛屽弬鏁帮細" + json.toString());
+		}
+		String mediaServerId = json.getString("mediaServerId");
+		List<ZLMHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(ZLMHttpHookSubscribe.HookType.on_server_keepalive);
+		if (subscribes != null  && subscribes.size() > 0) {
+			for (ZLMHttpHookSubscribe.Event subscribe : subscribes) {
+				subscribe.response(null, json);
+			}
+		}
+
+		JSONObject ret = new JSONObject();
+		ret.put("code", 0);
+		ret.put("msg", "success");
+		return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+	}
 
 	/**
 	 * 娴侀噺缁熻浜嬩欢锛屾挱鏀惧櫒鎴栨帹娴佸櫒鏂紑鏃跺苟涓旇�楃敤娴侀噺瓒呰繃鐗瑰畾闃堝�兼椂浼氳Е鍙戞浜嬩欢锛岄槇鍊奸�氳繃閰嶇疆鏂囦欢general.flowThreshold閰嶇疆锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
@@ -64,11 +121,9 @@
 	public ResponseEntity<String> onFlowReport(@RequestBody JSONObject json){
 		
 		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_flow_report API璋冪敤锛屽弬鏁帮細" + json.toString());
+			logger.debug("[ ZLM HOOK ]on_flow_report API璋冪敤锛屽弬鏁帮細" + json.toString());
 		}
-		// TODO Auto-generated method stub
-
-		
+		String mediaServerId = json.getString("mediaServerId");
 		JSONObject ret = new JSONObject();
 		ret.put("code", 0);
 		ret.put("msg", "success");
@@ -84,10 +139,9 @@
 	public ResponseEntity<String> onHttpAccess(@RequestBody JSONObject json){
 		
 		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_http_access API 璋冪敤锛屽弬鏁帮細" + json.toString());
+			logger.debug("[ ZLM HOOK ]on_http_access API 璋冪敤锛屽弬鏁帮細" + json.toString());
 		}
-		// TODO Auto-generated method stub
-		
+		String mediaServerId = json.getString("mediaServerId");
 		JSONObject ret = new JSONObject();
 		ret.put("code", 0);
 		ret.put("err", "");
@@ -102,17 +156,36 @@
 	 */
 	@ResponseBody
 	@PostMapping(value = "/on_play", produces = "application/json;charset=UTF-8")
-	public ResponseEntity<String> onPlay(@RequestBody JSONObject json){
-		
+	public ResponseEntity<String> onPlay(@RequestBody OnPlayHookParam param){
+
+		JSONObject json = (JSONObject)JSON.toJSON(param);
+
 		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_play API璋冪敤锛屽弬鏁帮細" + json.toString());
+			logger.debug("[ ZLM HOOK ]on_play API璋冪敤锛屽弬鏁帮細" + JSON.toJSONString(param));
 		}
-		// TODO Auto-generated method stub
-		
+		String mediaServerId = param.getMediaServerId();
+		ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_play, json);
+		if (subscribe != null ) {
+			MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+			if (mediaInfo != null) {
+				subscribe.response(mediaInfo, json);
+			}
+		}
 		JSONObject ret = new JSONObject();
+		if (!"rtp".equals(param.getApp())) {
+			Map<String, String> paramMap = urlParamToMap(param.getParams());
+			StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(param.getApp(), param.getStream());
+			if (streamAuthorityInfo == null
+					|| (streamAuthorityInfo.getCallId() != null && !streamAuthorityInfo.getCallId().equals(paramMap.get("callId")))) {
+				ret.put("code", 401);
+				ret.put("msg", "Unauthorized");
+				return new ResponseEntity<>(ret.toString(),HttpStatus.OK);
+			}
+		}
+
 		ret.put("code", 0);
 		ret.put("msg", "success");
-		return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+		return new ResponseEntity<>(ret.toString(),HttpStatus.OK);
 	}
 	
 	/**
@@ -121,49 +194,91 @@
 	 */
 	@ResponseBody
 	@PostMapping(value = "/on_publish", produces = "application/json;charset=UTF-8")
-	public ResponseEntity<String> onPublish(@RequestBody JSONObject json){
-		
-		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_publish API璋冪敤锛屽弬鏁帮細" + json.toString());
-		}
-		String app = json.getString("app");
-		String streamId = json.getString("id");
+	public ResponseEntity<String> onPublish(@RequestBody OnPublishHookParam param) {
 
+		JSONObject json = (JSONObject) JSON.toJSON(param);
 
-		String ssrc = new DecimalFormat("0000000000").format(Integer.parseInt(streamId, 16));
-		StreamInfo streamInfoForPlay = storager.queryPlayBySSRC(ssrc);
-		if ("rtp".equals(app) && streamInfoForPlay != null ) {
-			MediaServerConfig mediaInfo = storager.getMediaInfo();
-			streamInfoForPlay.setFlv(String.format("http://%s:%s/rtp/%s.flv", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
-			streamInfoForPlay.setWs_flv(String.format("ws://%s:%s/rtp/%s.flv", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
-			streamInfoForPlay.setRtmp(String.format("rtmp://%s:%s/rtp/%s", mediaInfo.getLocalIP(), mediaInfo.getRtmpPort(), streamId));
-			streamInfoForPlay.setHls(String.format("http://%s:%s/rtp/%s/hls.m3u8", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
-			streamInfoForPlay.setRtsp(String.format("rtsp://%s:%s/rtp/%s", mediaInfo.getLocalIP(), mediaInfo.getRtspPort(), streamId));
-			storager.startPlay(streamInfoForPlay);
-		}
-
-		StreamInfo streamInfoForPlayBack = storager.queryPlayBlackBySSRC(ssrc);
-		if ("rtp".equals(app) && streamInfoForPlayBack != null ) {
-			MediaServerConfig mediaInfo = storager.getMediaInfo();
-			streamInfoForPlayBack.setFlv(String.format("http://%s:%s/rtp/%s.flv", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
-			streamInfoForPlayBack.setWs_flv(String.format("ws://%s:%s/rtp/%s.flv", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
-			streamInfoForPlayBack.setRtmp(String.format("rtmp://%s:%s/rtp/%s", mediaInfo.getLocalIP(), mediaInfo.getRtmpPort(), streamId));
-			streamInfoForPlayBack.setHls(String.format("http://%s:%s/rtp/%s/hls.m3u8", mediaInfo.getLocalIP(), mediaInfo.getHttpPort(), streamId));
-			streamInfoForPlayBack.setRtsp(String.format("rtsp://%s:%s/rtp/%s", mediaInfo.getLocalIP(), mediaInfo.getRtspPort(), streamId));
-			storager.startPlayBlack(streamInfoForPlayBack);
-		}
-
-		// TODO Auto-generated method stub
-		
+		logger.info("[ ZLM HOOK ]on_publish API璋冪敤锛屽弬鏁帮細" + json.toString());
 		JSONObject ret = new JSONObject();
+		if (!"rtp".equals(param.getApp())) {
+			// 鎺ㄦ祦閴存潈
+			if (param.getParams() == null) {
+				logger.info("鎺ㄦ祦閴存潈澶辫触锛� 缂哄皯涓嶈鍙傛暟锛歴ign=md5(user琛ㄧ殑pushKey)");
+				ret.put("code", 401);
+				ret.put("msg", "Unauthorized");
+				return new ResponseEntity<>(ret.toString(), HttpStatus.OK);
+			}
+			Map<String, String> paramMap = urlParamToMap(param.getParams());
+			String sign = paramMap.get("sign");
+			if (sign == null) {
+				logger.info("鎺ㄦ祦閴存潈澶辫触锛� 缂哄皯涓嶈鍙傛暟锛歴ign=md5(user琛ㄧ殑pushKey)");
+				ret.put("code", 401);
+				ret.put("msg", "Unauthorized");
+				return new ResponseEntity<>(ret.toString(), HttpStatus.OK);
+			}
+			// 鎺ㄦ祦鑷畾涔夋挱鏀鹃壌鏉冪爜
+			String callId = paramMap.get("callId");
+			// 閴存潈閰嶇疆
+			boolean hasAuthority = userService.checkPushAuthority(callId, sign);
+			if (!hasAuthority) {
+				logger.info("鎺ㄦ祦閴存潈澶辫触锛� sign 鏃犳潈闄�: callId={}. sign={}", callId, sign);
+				ret.put("code", 401);
+				ret.put("msg", "Unauthorized");
+				return new ResponseEntity<>(ret.toString(), HttpStatus.OK);
+			}
+			StreamAuthorityInfo streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(param);
+			streamAuthorityInfo.setCallId(callId);
+			streamAuthorityInfo.setSign(sign);
+			// 閴存潈閫氳繃
+			redisCatchStorage.updateStreamAuthorityInfo(param.getApp(), param.getStream(), streamAuthorityInfo);
+		}
+
 		ret.put("code", 0);
 		ret.put("msg", "success");
-		ret.put("enableHls", true);
-		ret.put("enableMP4", false);
-		ret.put("enableRtxp", true);
-		return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+		ret.put("enable_hls", true);
+		if (!"rtp".equals(param.getApp())) {
+			ret.put("enable_audio", true);
+		}
+
+		String mediaServerId = json.getString("mediaServerId");
+		ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_publish, json);
+		if (subscribe != null) {
+			MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+			if (mediaInfo != null) {
+				subscribe.response(mediaInfo, json);
+			}else {
+				ret.put("code", 1);
+				ret.put("msg", "zlm not register");
+			}
+		}
+
+		if ("rtp".equals(param.getApp())) {
+			ret.put("enable_mp4", userSetting.getRecordSip());
+		}else {
+			ret.put("enable_mp4", userSetting.isRecordPushLive());
+		}
+		List<SsrcTransaction> ssrcTransactionForAll = sessionManager.getSsrcTransactionForAll(null, null, null, param.getStream());
+		if (ssrcTransactionForAll != null && ssrcTransactionForAll.size() == 1) {
+			String deviceId = ssrcTransactionForAll.get(0).getDeviceId();
+			String channelId = ssrcTransactionForAll.get(0).getChannelId();
+			DeviceChannel deviceChannel = storager.queryChannel(deviceId, channelId);
+			if (deviceChannel != null) {
+				ret.put("enable_audio", deviceChannel.isHasAudio());
+			}
+			// 濡傛灉鏄綍鍍忎笅杞藉氨璁剧疆瑙嗛闂撮殧鍗佺
+			if (ssrcTransactionForAll.get(0).getType() == VideoStreamSessionManager.SessionType.download) {
+				ret.put("mp4_max_second", 10);
+				ret.put("enable_mp4", true);
+				ret.put("enable_audio", true);
+			}
+		}
+
+
+		return new ResponseEntity<String>(ret.toString(), HttpStatus.OK);
 	}
-	
+
+
+
 	/**
 	 * 褰曞埗mp4瀹屾垚鍚庨�氱煡浜嬩欢锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
 	 *  
@@ -173,10 +288,26 @@
 	public ResponseEntity<String> onRecordMp4(@RequestBody JSONObject json){
 		
 		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_record_mp4 API璋冪敤锛屽弬鏁帮細" + json.toString());
+			logger.debug("[ ZLM HOOK ]on_record_mp4 API璋冪敤锛屽弬鏁帮細" + json.toString());
 		}
-		// TODO Auto-generated method stub
-		
+		String mediaServerId = json.getString("mediaServerId");
+		JSONObject ret = new JSONObject();
+		ret.put("code", 0);
+		ret.put("msg", "success");
+		return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+	}
+	/**
+	 * 褰曞埗hls瀹屾垚鍚庨�氱煡浜嬩欢锛涙浜嬩欢瀵瑰洖澶嶄笉鏁忔劅銆�
+	 *
+	 */
+	@ResponseBody
+	@PostMapping(value = "/on_record_ts", produces = "application/json;charset=UTF-8")
+	public ResponseEntity<String> onRecordTs(@RequestBody JSONObject json){
+
+		if (logger.isDebugEnabled()) {
+			logger.debug("[ ZLM HOOK ]on_record_ts API璋冪敤锛屽弬鏁帮細" + json.toString());
+		}
+		String mediaServerId = json.getString("mediaServerId");
 		JSONObject ret = new JSONObject();
 		ret.put("code", 0);
 		ret.put("msg", "success");
@@ -192,10 +323,9 @@
 	public ResponseEntity<String> onRtspRealm(@RequestBody JSONObject json){
 		
 		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_rtsp_realm API璋冪敤锛屽弬鏁帮細" + json.toString());
+			logger.debug("[ ZLM HOOK ]on_rtsp_realm API璋冪敤锛屽弬鏁帮細" + json.toString());
 		}
-		// TODO Auto-generated method stub
-		
+		String mediaServerId = json.getString("mediaServerId");
 		JSONObject ret = new JSONObject();
 		ret.put("code", 0);
 		ret.put("realm", "");
@@ -212,10 +342,9 @@
 	public ResponseEntity<String> onRtspAuth(@RequestBody JSONObject json){
 		
 		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_rtsp_auth API璋冪敤锛屽弬鏁帮細" + json.toString());
+			logger.debug("[ ZLM HOOK ]on_rtsp_auth API璋冪敤锛屽弬鏁帮細" + json.toString());
 		}
-		// TODO Auto-generated method stub
-		
+		String mediaServerId = json.getString("mediaServerId");
 		JSONObject ret = new JSONObject();
 		ret.put("code", 0);
 		ret.put("encrypted", false);
@@ -232,10 +361,18 @@
 	public ResponseEntity<String> onShellLogin(@RequestBody JSONObject json){
 		
 		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_shell_login API璋冪敤锛屽弬鏁帮細" + json.toString());
+			logger.debug("[ ZLM HOOK ]on_shell_login API璋冪敤锛屽弬鏁帮細" + json.toString());
 		}
-		// TODO Auto-generated method stub
-		
+		String mediaServerId = json.getString("mediaServerId");
+		ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_shell_login, json);
+		if (subscribe != null ) {
+			MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+			if (mediaInfo != null) {
+				subscribe.response(mediaInfo, json);
+			}
+
+		}
+
 		JSONObject ret = new JSONObject();
 		ret.put("code", 0);
 		ret.put("msg", "success");
@@ -248,22 +385,121 @@
 	 */
 	@ResponseBody
 	@PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")
-	public ResponseEntity<String> onStreamChanged(@RequestBody JSONObject json){
-		
-		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_stream_changed API璋冪敤锛屽弬鏁帮細" + json.toString());
+	public ResponseEntity<String> onStreamChanged(@RequestBody MediaItem item){
+
+		logger.info("[ ZLM HOOK ]on_stream_changed API璋冪敤锛屽弬鏁帮細" + JSONObject.toJSONString(item));
+		String mediaServerId = item.getMediaServerId();
+		JSONObject json = (JSONObject) JSON.toJSON(item);
+		ZLMHttpHookSubscribe.Event subscribe = this.subscribe.getSubscribe(ZLMHttpHookSubscribe.HookType.on_stream_changed, json);
+		if (subscribe != null ) {
+			MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+			if (mediaInfo != null) {
+				subscribe.response(mediaInfo, json);
+			}
 		}
 		// 娴佹秷澶辩Щ闄edis play
-		String app = json.getString("app");
-		String streamId = json.getString("stream");
-		boolean regist = json.getBoolean("regist");
-//		String ssrc = String.format("%10d", Integer.parseInt(streamId, 16)); // ZLM 瑕佹眰澶у啓涓旈浣嶈ˉ闆�
-		String ssrc = new DecimalFormat("0000000000").format(Integer.parseInt(streamId, 16));
-		StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);
-		if ("rtp".equals(app) && !regist ) {
-			storager.stopPlay(streamInfo);
+		String app = item.getApp();
+		String stream = item.getStream();
+		String schema = item.getSchema();
+		List<MediaItem.MediaTrack> tracks = item.getTracks();
+		boolean regist = item.isRegist();
+		if (regist) {
+			StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(app, stream);
+			if (streamAuthorityInfo == null) {
+				streamAuthorityInfo = StreamAuthorityInfo.getInstanceByHook(item);
+			}else {
+				streamAuthorityInfo.setOriginType(item.getOriginType());
+				streamAuthorityInfo.setOriginTypeStr(item.getOriginTypeStr());
+			}
+			redisCatchStorage.updateStreamAuthorityInfo(app, stream, streamAuthorityInfo);
+		}else {
+			redisCatchStorage.removeStreamAuthorityInfo(app, stream);
 		}
+		if ("rtmp".equals(schema)){
+			logger.info("on_stream_changed锛氭敞鍐�->{}, app->{}, stream->{}", regist, app, stream);
+			if (regist) {
+				mediaServerService.addCount(mediaServerId);
+			}else {
+				mediaServerService.removeCount(mediaServerId);
+			}
+			if (item.getOriginType() == OriginType.PULL.ordinal()
+					|| item.getOriginType() == OriginType.FFMPEG_PULL.ordinal()) {
+				// 璁剧疆鎷夋祦浠g悊涓婄嚎/绂荤嚎
+				streamProxyService.updateStatus(regist, app, stream);
+			}
+			if ("rtp".equals(app) && !regist ) {
+				StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(stream);
+				if (streamInfo!=null){
+					redisCatchStorage.stopPlay(streamInfo);
+					storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());
+				}else{
+					streamInfo = redisCatchStorage.queryPlayback(null, null, stream, null);
+					if (streamInfo != null) {
+						redisCatchStorage.stopPlayback(streamInfo.getDeviceID(), streamInfo.getChannelId(),
+								streamInfo.getStream(), null);
+					}
 
+				}
+			}else {
+				if (!"rtp".equals(app)){
+					String type = OriginType.values()[item.getOriginType()].getType();
+					MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+
+					if (mediaServerItem != null){
+						if (regist) {
+							StreamAuthorityInfo streamAuthorityInfo = redisCatchStorage.getStreamAuthorityInfo(app, stream);
+							StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem,
+									app, stream, tracks, streamAuthorityInfo.getCallId());
+							item.setStreamInfo(streamInfoByAppAndStream);
+
+							redisCatchStorage.addStream(mediaServerItem, type, app, stream, item);
+							if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()
+									|| item.getOriginType() == OriginType.RTMP_PUSH.ordinal()
+									|| item.getOriginType() == OriginType.RTC_PUSH.ordinal() ) {
+								item.setSeverId(userSetting.getServerId());
+								zlmMediaListManager.addPush(item);
+							}
+
+//							List<GbStream> gbStreams = new ArrayList<>();
+//							if (streamPushItem == null || streamPushItem.getGbId() == null) {
+//								GbStream gbStream = storager.getGbStream(app, streamId);
+//								gbStreams.add(gbStream);
+//							}else {
+//								if (streamPushItem.getGbId() != null) {
+//									gbStreams.add(streamPushItem);
+//								}
+//							}
+//							if (gbStreams.size() > 0) {
+//								eventPublisher.catalogEventPublishForStream(null, gbStreams, CatalogEvent.ON);
+//							}
+
+						}else {
+							// 鍏煎娴佹敞閿�鏃剁被鍨嬩粠redis璁板綍鑾峰彇
+							MediaItem mediaItem = redisCatchStorage.getStreamInfo(app, stream, mediaServerId);
+							if (mediaItem != null) {
+								type = OriginType.values()[mediaItem.getOriginType()].getType();
+								redisCatchStorage.removeStream(mediaServerItem.getId(), type, app, stream);
+							}
+							GbStream gbStream = storager.getGbStream(app, stream);
+							if (gbStream != null) {
+//								eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);
+							}
+							zlmMediaListManager.removeMedia(app, stream);
+						}
+						if (type != null) {
+							// 鍙戦�佹祦鍙樺寲redis娑堟伅
+							JSONObject jsonObject = new JSONObject();
+							jsonObject.put("serverId", userSetting.getServerId());
+							jsonObject.put("app", app);
+							jsonObject.put("stream", stream);
+							jsonObject.put("register", regist);
+							jsonObject.put("mediaServerId", mediaServerId);
+							redisCatchStorage.sendStreamChangeMsg(type, jsonObject);
+						}
+					}
+				}
+			}
+		}
 
 		JSONObject ret = new JSONObject();
 		ret.put("code", 0);
@@ -278,21 +514,59 @@
 	@ResponseBody
 	@PostMapping(value = "/on_stream_none_reader", produces = "application/json;charset=UTF-8")
 	public ResponseEntity<String> onStreamNoneReader(@RequestBody JSONObject json){
-		
-		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_stream_none_reader API璋冪敤锛屽弬鏁帮細" + json.toString());
-		}
-		
-		BigInteger bigint=new BigInteger(json.getString("stream"), 16);
-		int numb=bigint.intValue();
-		String ssrc = String.format("%010d", numb); 
-		
-		cmder.streamByeCmd(ssrc);
-		
+
+		logger.info("[ ZLM HOOK ]on_stream_none_reader API璋冪敤锛屽弬鏁帮細" + json.toString());
+		String mediaServerId = json.getString("mediaServerId");
+		String streamId = json.getString("stream");
+		String app = json.getString("app");
 		JSONObject ret = new JSONObject();
 		ret.put("code", 0);
-		ret.put("close", true);
-		return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+		if ("rtp".equals(app)){
+			ret.put("close", true);
+			StreamInfo streamInfoForPlayCatch = redisCatchStorage.queryPlayByStreamId(streamId);
+			SsrcTransaction ssrcTransaction = sessionManager.getSsrcTransaction(null, null, null, streamId);
+			if (streamInfoForPlayCatch != null) {
+				// 濡傛灉鍦ㄧ粰涓婄骇鎺ㄦ祦锛屼篃涓嶅仠姝€��
+				if (redisCatchStorage.isChannelSendingRTP(streamInfoForPlayCatch.getChannelId())) {
+					ret.put("close", false);
+				} else {
+					cmder.streamByeCmd(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId(),
+							streamInfoForPlayCatch.getStream(), null);
+					redisCatchStorage.stopPlay(streamInfoForPlayCatch);
+					storager.stopPlay(streamInfoForPlayCatch.getDeviceID(), streamInfoForPlayCatch.getChannelId());
+				}
+			}else{
+				StreamInfo streamInfoForPlayBackCatch = redisCatchStorage.queryPlayback(null, null, streamId, null);
+				if (streamInfoForPlayBackCatch != null) {
+					cmder.streamByeCmd(streamInfoForPlayBackCatch.getDeviceID(),
+							streamInfoForPlayBackCatch.getChannelId(), streamInfoForPlayBackCatch.getStream(), null);
+					redisCatchStorage.stopPlayback(streamInfoForPlayBackCatch.getDeviceID(),
+							streamInfoForPlayBackCatch.getChannelId(), streamInfoForPlayBackCatch.getStream(), null);
+				}else {
+					StreamInfo streamInfoForDownload = redisCatchStorage.queryDownload(null, null, streamId, null);
+					// 杩涜褰曞儚涓嬭浇鏃舵棤浜鸿鐪嬩笉鏂祦
+					if (streamInfoForDownload != null) {
+						ret.put("close", false);
+					}
+				}
+			}
+			MediaServerItem mediaServerItem = mediaServerService.getOne(mediaServerId);
+			if (mediaServerItem != null && mediaServerItem.getStreamNoneReaderDelayMS() == -1) {
+				ret.put("close", false);
+			}
+			return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+		}else {
+			StreamProxyItem streamProxyItem = streamProxyService.getStreamProxyByAppAndStream(app, streamId);
+			if (streamProxyItem != null && streamProxyItem.isEnable_remove_none_reader()) {
+				ret.put("close", true);
+				streamProxyService.del(app, streamId);
+				String url = streamProxyItem.getUrl() != null?streamProxyItem.getUrl():streamProxyItem.getSrc_url();
+				logger.info("[{}/{}]<-[{}] 鎷夋祦浠g悊鏃犱汉瑙傜湅宸茬粡绉婚櫎",  app, streamId, url);
+			}else {
+				ret.put("close", false);
+			}
+			return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+		}
 	}
 	
 	/**
@@ -302,16 +576,31 @@
 	@ResponseBody
 	@PostMapping(value = "/on_stream_not_found", produces = "application/json;charset=UTF-8")
 	public ResponseEntity<String> onStreamNotFound(@RequestBody JSONObject json){
-		
 		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_stream_not_found API璋冪敤锛屽弬鏁帮細" + json.toString());
+			logger.debug("[ ZLM HOOK ]on_stream_not_found API璋冪敤锛屽弬鏁帮細" + json.toString());
 		}
-		// TODO Auto-generated method stub
-		
+		String mediaServerId = json.getString("mediaServerId");
+		MediaServerItem mediaInfo = mediaServerService.getOne(mediaServerId);
+		if (userSetting.isAutoApplyPlay() && mediaInfo != null && mediaInfo.isRtpEnable()) {
+			String app = json.getString("app");
+			String streamId = json.getString("stream");
+			if ("rtp".equals(app)) {
+				String[] s = streamId.split("_");
+				if (s.length == 2) {
+					String deviceId = s[0];
+					String channelId = s[1];
+					Device device = redisCatchStorage.getDevice(deviceId);
+					if (device != null) {
+						playService.play(mediaInfo,deviceId, channelId, null, null, null);
+					}
+				}
+			}
+		}
+
 		JSONObject ret = new JSONObject();
 		ret.put("code", 0);
 		ret.put("msg", "success");
-		return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
+		return new ResponseEntity<>(ret.toString(),HttpStatus.OK);
 	}
 	
 	/**
@@ -320,23 +609,40 @@
 	 */
 	@ResponseBody
 	@PostMapping(value = "/on_server_started", produces = "application/json;charset=UTF-8")
-	public ResponseEntity<String> onServerStarted(HttpServletRequest request, @RequestBody JSONObject json){
+	public ResponseEntity<String> onServerStarted(HttpServletRequest request, @RequestBody JSONObject jsonObject){
 		
 		if (logger.isDebugEnabled()) {
-			logger.debug("ZLM HOOK on_server_started API璋冪敤锛屽弬鏁帮細" + json.toString());
+			logger.debug("[ ZLM HOOK ]on_server_started API璋冪敤锛屽弬鏁帮細" + jsonObject.toString());
 		}
-
-//		String data = json.getString("data");
-//		List<MediaServerConfig> mediaServerConfigs = JSON.parseArray(JSON.toJSONString(json), MediaServerConfig.class);
-//		MediaServerConfig mediaServerConfig = mediaServerConfigs.get(0);
-		MediaServerConfig mediaServerConfig = JSON.toJavaObject(json, MediaServerConfig.class);
-		mediaServerConfig.setLocalIP(mediaIp);
-		storager.updateMediaInfo(mediaServerConfig);
-		// TODO Auto-generated method stub
-		
+		String remoteAddr = request.getRemoteAddr();
+		jsonObject.put("ip", remoteAddr);
+		List<ZLMHttpHookSubscribe.Event> subscribes = this.subscribe.getSubscribes(ZLMHttpHookSubscribe.HookType.on_server_started);
+		if (subscribes != null  && subscribes.size() > 0) {
+			for (ZLMHttpHookSubscribe.Event subscribe : subscribes) {
+				subscribe.response(null, jsonObject);
+			}
+		}
 		JSONObject ret = new JSONObject();
 		ret.put("code", 0);
 		ret.put("msg", "success");
 		return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);
 	}
+
+	private Map<String, String> urlParamToMap(String params) {
+		HashMap<String, String> map = new HashMap<>();
+		if (StringUtils.isEmpty(params)) {
+			return map;
+		}
+		String[] paramsArray = params.split("&");
+		if (paramsArray.length == 0) {
+			return map;
+		}
+		for (String param : paramsArray) {
+			String[] paramArray = param.split("=");
+			if (paramArray.length == 2){
+				map.put(paramArray[0], paramArray[1]);
+			}
+		}
+		return map;
+	}
 }

--
Gitblit v1.8.0