From cf8a22f50b81fa30abaa518bdce660cd65deabea Mon Sep 17 00:00:00 2001
From: panlinlin <648540858@qq.com>
Date: 星期五, 15 一月 2021 15:33:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java | 70 +++++++++++++++++++++++++++-------
1 files changed, 55 insertions(+), 15 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
index 88e7ccf..eb81ed3 100644
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java
@@ -4,13 +4,22 @@
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;
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;
@@ -34,6 +43,7 @@
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;
/**
@@ -54,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;
@@ -78,33 +94,37 @@
@Autowired
private CancelResponseProcessor cancelResponseProcessor;
-
+
+ @Autowired
+ @Lazy
+ 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,16 +147,19 @@
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);
processor.setOffLineDetector(offLineDetector);
processor.setCmder(cmder);
+ processor.setCmderFroPlatform(cmderFroPlatform);
processor.setStorager(storager);
+ processor.setRedisCatchStorage(redisCatchStorage);
return processor;
} else {
return new OtherRequestProcessor();
@@ -144,6 +167,7 @@
}
public ISIPResponseProcessor createResponseProcessor(ResponseEvent evt) {
+
Response response = evt.getResponse();
CSeqHeader cseqHeader = (CSeqHeader) response.getHeader(CSeqHeader.NAME);
String method = cseqHeader.getMethod();
@@ -153,9 +177,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;
+ }
+
}
--
Gitblit v1.8.0