Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-15 cf8a22f50b81fa30abaa518bdce660cd65deabea

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

@@ -9,12 +9,17 @@
import javax.sip.message.Request;

import javax.sip.message.Response;



import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommanderFroPlatform;

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

import com.alibaba.fastjson.JSON;

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

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

import com.genersoft.iot.vmp.gb28181.event.SipSubscribe;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

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

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

import org.springframework.context.annotation.Lazy;

import org.springframework.stereotype.Component;



import com.genersoft.iot.vmp.conf.SipConfig;

@@ -59,12 +64,18 @@
   

   @Autowired

   private IVideoManagerStorager storager;

	


   @Autowired

   private IRedisCatchStorage redisCatchStorage;



   @Autowired

   private EventPublisher publisher;

   

   @Autowired

   private SIPCommander cmder;



   @Autowired

   private SIPCommanderFroPlatform cmderFroPlatform;

   

   @Autowired

   private RedisUtil redis;

@@ -83,7 +94,12 @@
   

   @Autowired

   private CancelResponseProcessor cancelResponseProcessor;

	


   @Autowired

   @Lazy

   private RegisterResponseProcessor registerResponseProcessor;





   @Autowired

   private OtherResponseProcessor otherResponseProcessor;



@@ -98,7 +114,6 @@
      Request request = evt.getRequest();

      String method = request.getMethod();

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

//      sipSubscribe.getSubscribe(evt.getServerTransaction().getBranchId()).response(evt);

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

         InviteRequestProcessor processor = new InviteRequestProcessor();

         processor.setRequestEvent(evt);

@@ -142,7 +157,9 @@
         processor.setDeferredResultHolder(deferredResultHolder);

         processor.setOffLineDetector(offLineDetector);

         processor.setCmder(cmder);

         processor.setCmderFroPlatform(cmderFroPlatform);

         processor.setStorager(storager);

         processor.setRedisCatchStorage(redisCatchStorage);

         return processor;

      } else {

         return new OtherRequestProcessor();

@@ -160,6 +177,8 @@
         return byeResponseProcessor;

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

         return cancelResponseProcessor;

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

         return registerResponseProcessor;

      } else {

         return otherResponseProcessor;

      }