Parcourir la source

去掉调试日志

xujunwei il y a 1 an
Parent
commit
679c6f7d91

+ 0 - 3
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/callback/DeferredResultHolder.java

@@ -135,7 +135,6 @@ public class DeferredResultHolder {
 	 * @param msg
 	 */
 	public void invokeAllResult(RequestMessage msg) {
-		logger.info("xjw 6 {}", JSONUtil.toJsonStr(msg));
 		Map<String, DeferredResultEx> deferredResultMap = map.get(msg.getKey());
 		if (deferredResultMap == null) {
 			return;
@@ -146,13 +145,11 @@ public class DeferredResultHolder {
 				return;
 			}
 			Set<String> ids = deferredResultMap.keySet();
-			logger.info("xjw 7 {}", JSONUtil.toJsonStr(ids));
 			for (String id : ids) {
 				DeferredResultEx result = deferredResultMap.get(id);
 				if (result == null) {
 					return;
 				}
-				logger.info("xjw 8 {}", JSONUtil.toJsonStr(result.getFilter()));
 				if (result.getFilter() != null) {
 					Object handler = result.getFilter().handler(msg.getData());
 					result.getDeferredResult().setResult(handler);

+ 0 - 7
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/cmd/impl/SIPCommander.java

@@ -272,17 +272,14 @@ public class SIPCommander implements ISIPCommander {
         if (device == null) {
             return;
         }
-        logger.info("xjw test!!!!!!!!!!!!");
         logger.info("{} 分配的ZLM为: {} [{}:{}]", stream, mediaServerItem.getId(), mediaServerItem.getSdpIp(), ssrcInfo.getPort());
         Hook rtpHook = Hook.getInstance(HookType.on_media_arrival, "rtp", stream, mediaServerItem.getId());
         subscribe.addSubscribe(rtpHook, (hookData) -> {
-            logger.info("xjw nnnnnnn");
             if (event != null) {
                 event.response(hookData);
                 subscribe.removeSubscribe(rtpHook);
             }
         });
-        logger.info("xjw ddddddddddd");
         String sdpIp;
         if (!ObjectUtils.isEmpty(device.getSdpIp())) {
             sdpIp = device.getSdpIp();
@@ -351,15 +348,12 @@ public class SIPCommander implements ISIPCommander {
 //			content.append("f=v/2/5/25/1/4000a/1/8/1" + "\r\n"); // 未发现支持此特性的设备
 
 
-        logger.info("xjw请求播流参数{}",content);
         Request request = headerProvider.createInviteRequest(device, channel.getChannelId(), content.toString(), SipUtils.getNewViaTag(), SipUtils.getNewFromTag(), null, ssrcInfo.getSsrc(),sipSender.getNewCallIdHeader(sipLayer.getLocalIp(device.getLocalIp()),device.getTransport()));
         sipSender.transmitRequest(sipLayer.getLocalIp(device.getLocalIp()), request, (e -> {
-            logger.info("xjw fffff  {}",e );
             streamSession.remove(device.getDeviceId(), channel.getChannelId(), ssrcInfo.getStream());
             mediaServerService.releaseSsrc(mediaServerItem.getId(), ssrcInfo.getSsrc());
             errorEvent.response(e);
         }), e -> {
-            logger.info("xjw ggggg  {}",e );
             ResponseEvent responseEvent = (ResponseEvent) e.event;
             SIPResponse response = (SIPResponse) responseEvent.getResponse();
             String callId = response.getCallIdHeader().getCallId();
@@ -367,7 +361,6 @@ public class SIPCommander implements ISIPCommander {
                     InviteSessionType.PLAY);
             okEvent.response(e);
         });
-        logger.info("xjw请求播流完成");
     }
 
     /**

+ 0 - 6
src/main/java/com/genersoft/iot/vmp/service/impl/PlayServiceImpl.java

@@ -557,7 +557,6 @@ public class PlayServiceImpl implements IPlayService {
                         channel.getStreamIdentification());
                 snapOnPlay(hookData.getMediaServer(), device.getDeviceId(), channel.getChannelId(), ssrcInfo.getStream());
             }, (eventResult) -> {
-                logger.info("xjw 9 {}", JSONUtil.toJsonStr(eventResult));
                 // 处理收到200ok后的TCP主动连接以及SSRC不一致的问题
                 InviteOKHandler(eventResult, ssrcInfo, mediaServerItem, device, channel.getChannelId(),
                         timeOutTaskKey, callback, inviteInfo, InviteSessionType.PLAY);
@@ -597,7 +596,6 @@ public class PlayServiceImpl implements IPlayService {
 
             inviteStreamService.removeInviteInfoByDeviceAndChannel(InviteSessionType.PLAY, device.getDeviceId(), channel.getChannelId());
         }
-        logger.info("xjw 2");
     }
 
     private void tcpActiveHandler(Device device, String channelId, String contentString,
@@ -865,19 +863,15 @@ public class PlayServiceImpl implements IPlayService {
                                  InviteInfo inviteInfo, InviteSessionType inviteSessionType){
         inviteInfo.setStatus(InviteSessionStatus.ok);
         ResponseEvent responseEvent = (ResponseEvent) eventResult.event;
-        logger.info("xjw 11 {}",JSONUtil.toJsonStr(responseEvent));
         String contentString = new String(responseEvent.getResponse().getRawContent());
         String ssrcInResponse = SipUtils.getSsrcFromSdp(contentString);
-        logger.info("xjw 12 {}",ssrcInResponse);
         // 兼容回复的消息中缺少ssrc(y字段)的情况
         if (ssrcInResponse == null) {
             ssrcInResponse = ssrcInfo.getSsrc();
         }
         if (ssrcInfo.getSsrc().equals(ssrcInResponse)) {
-            logger.info("xjw 13 {}",JSONUtil.toJsonStr(mediaServerItem));
             // ssrc 一致
             if (mediaServerItem.isRtpEnable()) {
-                logger.info("xjw 14 {}",JSONUtil.toJsonStr(device));
                 // 多端口
                 if (device.getStreamMode().equalsIgnoreCase("TCP-ACTIVE")) {
                     tcpActiveHandler(device, channelId, contentString, mediaServerItem, timeOutTaskKey, ssrcInfo, callback);

+ 0 - 3
src/main/java/com/genersoft/iot/vmp/vmanager/gb28181/play/PlayController.java

@@ -114,7 +114,6 @@ public class PlayController {
 		resultHolder.put(key, uuid, result);
 
 		playService.play(newMediaServerItem, deviceId, channelId, null, (code, msg, data) -> {
-			logger.info("xjw 4,{},{},{}",code, msg, JSONUtil.toJsonStr(data));
 			WVPResult<StreamContent> wvpResult = new WVPResult<>();
 			if (code == InviteErrorCode.SUCCESS.getCode()) {
 				wvpResult.setCode(ErrorCode.SUCCESS.getCode());
@@ -145,12 +144,10 @@ public class PlayController {
 				wvpResult.setCode(code);
 				wvpResult.setMsg(msg);
 			}
-			logger.info("xjw 5 {}",JSONUtil.toJsonStr(wvpResult));
 			requestMessage.setData(wvpResult);
 			// 此处必须释放所有请求
 			resultHolder.invokeAllResult(requestMessage);
 		});
-		logger.info("xjw 3,{}", JSONUtil.toJsonStr(result));
 		return result;
 	}