与master分支同步

Lawrence

2020-12-16 44d216100b45c3337c593ee82ee68e7e0f35d24b

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java

@@ -7,6 +7,8 @@
import javax.sip.message.Request;

import javax.sip.message.Response;



import com.alibaba.fastjson.JSON;

import com.genersoft.iot.vmp.gb28181.transmit.response.impl.*;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.beans.factory.annotation.Autowired;

@@ -29,11 +31,8 @@
import com.genersoft.iot.vmp.gb28181.transmit.request.impl.RegisterRequestProcessor;

import com.genersoft.iot.vmp.gb28181.transmit.request.impl.SubscribeRequestProcessor;

import com.genersoft.iot.vmp.gb28181.transmit.response.ISIPResponseProcessor;

import com.genersoft.iot.vmp.gb28181.transmit.response.impl.ByeResponseProcessor;

import com.genersoft.iot.vmp.gb28181.transmit.response.impl.CancelResponseProcessor;

import com.genersoft.iot.vmp.gb28181.transmit.response.impl.InviteResponseProcessor;

import com.genersoft.iot.vmp.gb28181.transmit.response.impl.OtherResponseProcessor;

import com.genersoft.iot.vmp.storager.IVideoManagerStorager;

import com.genersoft.iot.vmp.utils.SpringBeanFactory;

import com.genersoft.iot.vmp.utils.redis.RedisUtil;



/**    

@@ -78,33 +77,34 @@
   

   @Autowired

   private CancelResponseProcessor cancelResponseProcessor;



   @Autowired

   private RegisterResponseProcessor registerResponseProcessor;

   

   @Autowired

   private OtherResponseProcessor otherResponseProcessor;

   

   @Autowired

   @Qualifier(value="tcpSipProvider")

   // 注：这里使用注解会导致循环依赖注入，暂用springBean

   private SipProvider tcpSipProvider;

	
   @Autowired

   @Qualifier(value="udpSipProvider")

		
   // 注：这里使用注解会导致循环依赖注入，暂用springBean

   private SipProvider udpSipProvider;

   

   public ISIPRequestProcessor createRequestProcessor(RequestEvent evt) {

      Request request = evt.getRequest();

      String method = request.getMethod();

      logger.info("接收到消息："+request.getMethod());

//      logger.info("接收到消息："+request.getMethod());

      if (Request.INVITE.equals(method)) {

         InviteRequestProcessor processor = new InviteRequestProcessor();

         processor.setRequestEvent(evt);

         processor.setTcpSipProvider(tcpSipProvider);

         processor.setUdpSipProvider(udpSipProvider);

         processor.setTcpSipProvider(getTcpSipProvider());

         processor.setUdpSipProvider(getUdpSipProvider());

         return processor;

      } else if (Request.REGISTER.equals(method)) {

         RegisterRequestProcessor processor = new RegisterRequestProcessor();

         processor.setRequestEvent(evt);

         processor.setTcpSipProvider(tcpSipProvider);

         processor.setUdpSipProvider(udpSipProvider);

         processor.setTcpSipProvider(getTcpSipProvider());

         processor.setUdpSipProvider(getUdpSipProvider());

         processor.setHandler(handler);

         processor.setPublisher(publisher);

         processor.setSipConfig(sipConfig);

@@ -127,10 +127,11 @@
         processor.setRequestEvent(evt);

         return processor;

      } else if (Request.MESSAGE.equals(method)) {



         MessageRequestProcessor processor = new MessageRequestProcessor();

         processor.setRequestEvent(evt);

         processor.setTcpSipProvider(tcpSipProvider);

         processor.setUdpSipProvider(udpSipProvider);

         processor.setTcpSipProvider(getTcpSipProvider());

         processor.setUdpSipProvider(getUdpSipProvider());

         processor.setPublisher(publisher);

         processor.setRedis(redis);

         processor.setDeferredResultHolder(deferredResultHolder);

@@ -153,9 +154,25 @@
         return byeResponseProcessor;

      } else if (Request.CANCEL.equals(method)) {

         return cancelResponseProcessor;

      }else if (Request.REGISTER.equals(method)) {

         return registerResponseProcessor;

      } else {

         return otherResponseProcessor;

      }

   }

   

   private SipProvider getTcpSipProvider() {

      if (tcpSipProvider == null) {

         tcpSipProvider = (SipProvider) SpringBeanFactory.getBean("tcpSipProvider");

      }

      return tcpSipProvider;

   }

	
   private SipProvider getUdpSipProvider() {

      if (udpSipProvider == null) {

         udpSipProvider = (SipProvider) SpringBeanFactory.getBean("udpSipProvider");

      }

      return udpSipProvider;

   }

	
}