修复一处日志打印错误

xiaoxie

2022-04-24 bea61f909d17e4acc55ba0500feb264e879a92ef

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

@@ -1,20 +1,25 @@
package com.genersoft.iot.vmp.media.zlm;



import java.math.BigInteger;

import java.text.DecimalFormat;

import java.util.ArrayList;

import java.util.List;



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.event.subscribe.catalog.CatalogEvent;

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.web.bind.annotation.PostMapping;

@@ -29,7 +34,7 @@
import javax.servlet.http.HttpServletRequest;



/**    

 * @Description:针对 ZLMediaServer的hook事件监听

 * @description:针对 ZLMediaServer的hook事件监听

 * @author: swwheihei

 * @date:   2020年5月8日 上午10:46:48     

 */

@@ -39,21 +44,70 @@


   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 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 +118,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 +136,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", "");

@@ -105,10 +156,17 @@
   public ResponseEntity<String> onPlay(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

         logger.debug("ZLM HOOK on_play API调用，参数：" + json.toString());

         logger.debug("[ ZLM HOOK ]on_play API调用，参数：" + json.toString());

      }

      // TODO Auto-generated method stub

		
      String mediaServerId = json.getString("mediaServerId");

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

      ret.put("code", 0);

      ret.put("msg", "success");

@@ -121,47 +179,56 @@
    */

   @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 JSONObject json) {





      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.getWanIp(), mediaInfo.getHttpPort(), streamId));

         streamInfoForPlay.setWs_flv(String.format("ws://%s:%s/rtp/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));

         streamInfoForPlay.setRtmp(String.format("rtmp://%s:%s/rtp/%s", mediaInfo.getWanIp(), mediaInfo.getRtmpPort(), streamId));

         streamInfoForPlay.setHls(String.format("http://%s:%s/rtp/%s/hls.m3u8", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));

         streamInfoForPlay.setRtsp(String.format("rtsp://%s:%s/rtp/%s", mediaInfo.getWanIp(), mediaInfo.getRtspPort(), streamId));

         storager.startPlay(streamInfoForPlay);

      }



      StreamInfo streamInfoForPlayBack = storager.queryPlaybackBySSRC(ssrc);

      if ("rtp".equals(app) && streamInfoForPlayBack != null ) {

         MediaServerConfig mediaInfo = storager.getMediaInfo();

         streamInfoForPlayBack.setFlv(String.format("http://%s:%s/rtp/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));

         streamInfoForPlayBack.setWs_flv(String.format("ws://%s:%s/rtp/%s.flv", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));

         streamInfoForPlayBack.setRtmp(String.format("rtmp://%s:%s/rtp/%s", mediaInfo.getWanIp(), mediaInfo.getRtmpPort(), streamId));

         streamInfoForPlayBack.setHls(String.format("http://%s:%s/rtp/%s/hls.m3u8", mediaInfo.getWanIp(), mediaInfo.getHttpPort(), streamId));

         streamInfoForPlayBack.setRtsp(String.format("rtsp://%s:%s/rtp/%s", mediaInfo.getWanIp(), mediaInfo.getRtspPort(), streamId));

         storager.startPlayback(streamInfoForPlayBack);

      }



      // TODO Auto-generated method stub

		
      logger.info("[ ZLM HOOK ]on_publish API调用，参数：" + json.toString());

      JSONObject ret = new JSONObject();

      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 (json.getInteger("originType") == 1

            || json.getInteger("originType") == 2

            || json.getInteger("originType") == 3) {

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

         }

      }

       String app = json.getString("app");

       String stream = json.getString("stream");

      if ("rtp".equals(app)) {

         ret.put("enable_mp4", userSetting.getRecordSip());

      }else {

         ret.put("enable_mp4", userSetting.isRecordPushLive());

      }

      List<SsrcTransaction> ssrcTransactionForAll = sessionManager.getSsrcTransactionForAll(null, null, null, stream);

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

   }

   

   /**

@@ -173,10 +240,9 @@
   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");

@@ -192,10 +258,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 +277,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 +296,21 @@
   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

		
      // TODO 如果是带有rtpstream则开启按需拉流

      // String app = json.getString("app");

      // String stream = json.getString("stream");

      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,27 +323,109 @@
    */

   @ResponseBody

   @PostMapping(value = "/on_stream_changed", produces = "application/json;charset=UTF-8")

   public ResponseEntity<String> onStreamChanged(@RequestBody JSONObject json){

		
   public ResponseEntity<String> onStreamChanged(@RequestBody MediaItem item){



      if (logger.isDebugEnabled()) {

         logger.debug("ZLM HOOK on_stream_changed API调用，参数：" + json.toString());

         logger.debug("[ ZLM HOOK ]on_stream_changed API调用，参数：" + JSONObject.toJSONString(item));

      }

      // 流消失移除redis 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 ) {

         if (streamInfo!=null){

            storager.stopPlay(streamInfo);

         }else{

            streamInfo = storager.queryPlaybackBySSRC(ssrc);

            storager.stopPlayback(streamInfo);

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

         }

      }

      // 流消失移除redis play

      String app = item.getApp();

      String streamId = item.getStream();

      String schema = item.getSchema();

      List<MediaItem.MediaTrack> tracks = item.getTracks();

      boolean regist = item.isRegist();

      if ("rtmp".equals(schema)){

         logger.info("on_stream_changed：注册->{}, app->{}, stream->{}", regist, app, streamId);

         if (regist) {

            mediaServerService.addCount(mediaServerId);

         }else {

            mediaServerService.removeCount(mediaServerId);

         }

         if (item.getOriginType() == OriginType.PULL.ordinal()

               || item.getOriginType() == OriginType.FFMPEG_PULL.ordinal()) {

            // 设置拉流代理上线/离线

            streamProxyService.updateStatus(regist, app, streamId);

         }

         if ("rtp".equals(app) && !regist ) {

            StreamInfo streamInfo = redisCatchStorage.queryPlayByStreamId(streamId);

            if (streamInfo!=null){

               redisCatchStorage.stopPlay(streamInfo);

               storager.stopPlay(streamInfo.getDeviceID(), streamInfo.getChannelId());

            }else{

               streamInfo = redisCatchStorage.queryPlayback(null, null, streamId, 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) {

                     StreamPushItem streamPushItem = null;

                     StreamInfo streamInfoByAppAndStream = mediaService.getStreamInfoByAppAndStream(mediaServerItem, app, streamId, tracks);

                     item.setStreamInfo(streamInfoByAppAndStream);



                     redisCatchStorage.addStream(mediaServerItem, type, app, streamId, item);

                     if (item.getOriginType() == OriginType.RTSP_PUSH.ordinal()

                           || item.getOriginType() == OriginType.RTMP_PUSH.ordinal()

                           || item.getOriginType() == OriginType.RTC_PUSH.ordinal() ) {

                        streamPushItem = 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, streamId, mediaServerId);

                     if (mediaItem != null) {

                        type = OriginType.values()[mediaItem.getOriginType()].getType();

                        redisCatchStorage.removeStream(mediaServerItem.getId(), type, app, streamId);

                     }

                     GbStream gbStream = storager.getGbStream(app, streamId);

                     if (gbStream != null) {

//                        eventPublisher.catalogEventPublishForStream(null, gbStream, CatalogEvent.OFF);

                     }

                     zlmMediaListManager.removeMedia(app, streamId);

                  }

                  if (type != null) {

                     // 发送流变化redis消息

                     JSONObject jsonObject = new JSONObject();

                     jsonObject.put("serverId", userSetting.getServerId());

                     jsonObject.put("app", app);

                     jsonObject.put("stream", streamId);

                     jsonObject.put("register", regist);

                     jsonObject.put("mediaServerId", mediaServerId);

                     redisCatchStorage.sendStreamChangeMsg(type, jsonObject);

                  }

               }

            }

         }

      }



      JSONObject ret = new JSONObject();

      ret.put("code", 0);

@@ -285,26 +442,59 @@
   public ResponseEntity<String> onStreamNoneReader(@RequestBody JSONObject json){

      

      if (logger.isDebugEnabled()) {

         logger.debug("ZLM HOOK on_stream_none_reader API调用，参数：" + json.toString());

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

      StreamInfo streamInfo = storager.queryPlayBySSRC(ssrc);

      if (streamInfo!=null){

         storager.stopPlay(streamInfo);

      }else{

         streamInfo = storager.queryPlaybackBySSRC(ssrc);

         storager.stopPlayback(streamInfo);

      }

		
      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("[{}/{}]<-[{}] 拉流代理无人观看已经移除",  app, streamId, url);

         }else {

            ret.put("close", false);

         }

         return new ResponseEntity<String>(ret.toString(),HttpStatus.OK);

      }

   }

   

   /**

@@ -314,16 +504,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);

   }

   

   /**

@@ -332,20 +537,19 @@
    */

   @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");