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

panlinlin

2021-01-05 34135cce5d59f6ad7653737dd035bb1d441e185f

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

@@ -7,12 +7,15 @@
import javax.sip.message.Request;

import javax.sip.message.Response;



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

@@ -53,7 +56,10 @@
   

   @Autowired

   private IVideoManagerStorager storager;

	


   @Autowired

   private IRedisCatchStorage redisCatchStorage;



   @Autowired

   private EventPublisher publisher;

   

@@ -79,11 +85,13 @@
   private CancelResponseProcessor cancelResponseProcessor;



   @Autowired

   @Lazy

   private RegisterResponseProcessor registerResponseProcessor;

	


   @Autowired

   private OtherResponseProcessor otherResponseProcessor;

	




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

   private SipProvider tcpSipProvider;

      

@@ -138,6 +146,7 @@
         processor.setOffLineDetector(offLineDetector);

         processor.setCmder(cmder);

         processor.setStorager(storager);

         processor.setRedisCatchStorage(redisCatchStorage);

         return processor;

      } else {

         return new OtherRequestProcessor();

@@ -145,6 +154,7 @@
   }

   

   public ISIPResponseProcessor createResponseProcessor(ResponseEvent evt) {



      Response response = evt.getResponse();

      CSeqHeader cseqHeader = (CSeqHeader) response.getHeader(CSeqHeader.NAME);

      String method = cseqHeader.getMethod();