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

@@ -4,13 +4,17 @@
import javax.sip.ResponseEvent;

import javax.sip.SipProvider;

import javax.sip.header.CSeqHeader;

import javax.sip.header.CallIdHeader;

import javax.sip.header.Header;

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;

@@ -34,6 +38,10 @@
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;

@@ -65,6 +73,9 @@
   

   @Autowired

   private SIPCommander cmder;



   @Autowired

   private SIPCommanderFroPlatform cmderFroPlatform;

   

   @Autowired

   private RedisUtil redis;

@@ -87,6 +98,7 @@
   @Autowired

   @Lazy

   private RegisterResponseProcessor registerResponseProcessor;





   @Autowired

   private OtherResponseProcessor otherResponseProcessor;

@@ -145,6 +157,7 @@
         processor.setDeferredResultHolder(deferredResultHolder);

         processor.setOffLineDetector(offLineDetector);

         processor.setCmder(cmder);

         processor.setCmderFroPlatform(cmderFroPlatform);

         processor.setStorager(storager);

         processor.setRedisCatchStorage(redisCatchStorage);

         return processor;