From b915e7bc37701896ad13db4c438ab3e56eb679f3 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期三, 27 一月 2021 15:27:35 +0800
Subject: [PATCH] 增加配置选项
---
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/SIPProcessorFactory.java | 50 ++++++++++++++++++++++++++++++++++++--------------
1 files changed, 36 insertions(+), 14 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..13866e8 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
@@ -7,6 +7,7 @@
import javax.sip.message.Request;
import javax.sip.message.Response;
+import com.genersoft.iot.vmp.storager.IRedisCatchStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -34,6 +35,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,6 +56,9 @@
@Autowired
private IVideoManagerStorager storager;
+
+ @Autowired
+ private IRedisCatchStorage redisCatchStorage;
@Autowired
private EventPublisher publisher;
@@ -81,30 +86,30 @@
@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());
+// sipSubscribe.getSubscribe(evt.getServerTransaction().getBranchId()).response(evt);
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);
@@ -129,17 +134,20 @@
} 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.setStorager(storager);
+ processor.setRedisCatchStorage(redisCatchStorage);
return processor;
} else {
- return new OtherRequestProcessor();
+ OtherRequestProcessor processor = new OtherRequestProcessor();
+ processor.setRequestEvent(evt);
+ return processor;
}
}
@@ -158,4 +166,18 @@
}
}
+ 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