guzijian / wvp-GB28181-pro · Commits

Commit 07fa589e06415ca41fc29d22c7c8f3f1b4917147

Authored by xiaoxie
1 parent 3aa2665f

处理冲突

Inline Side-by-side
Showing 1 changed file with 2 additions and 15 deletions
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/event/request/impl/RegisterRequestProcessor.java
  View file @07fa589
1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl; 1 package com.genersoft.iot.vmp.gb28181.transmit.event.request.impl;
2 2
3 -import com.genersoft.iot.vmp.common.VideoManagerConstants;  
4 import com.genersoft.iot.vmp.conf.SipConfig; 3 import com.genersoft.iot.vmp.conf.SipConfig;
5 -import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;  
6 import com.genersoft.iot.vmp.gb28181.bean.Device; 4 import com.genersoft.iot.vmp.gb28181.bean.Device;
7 import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate; 5 import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;
8 -import com.genersoft.iot.vmp.gb28181.event.EventPublisher;  
9 import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver; 6 import com.genersoft.iot.vmp.gb28181.transmit.SIPProcessorObserver;
10 import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor; 7 import com.genersoft.iot.vmp.gb28181.transmit.event.request.ISIPRequestProcessor;
11 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent; 8 import com.genersoft.iot.vmp.gb28181.transmit.event.request.SIPRequestProcessorParent;
12 import com.genersoft.iot.vmp.service.IDeviceService; 9 import com.genersoft.iot.vmp.service.IDeviceService;
13 -import com.genersoft.iot.vmp.storager.IRedisCatchStorage;  
14 -import com.genersoft.iot.vmp.storager.IVideoManagerStorage;  
15 import com.genersoft.iot.vmp.utils.DateUtil; 10 import com.genersoft.iot.vmp.utils.DateUtil;
16 import gov.nist.javax.sip.RequestEventExt; 11 import gov.nist.javax.sip.RequestEventExt;
17 import gov.nist.javax.sip.address.AddressImpl; 12 import gov.nist.javax.sip.address.AddressImpl;
18 import gov.nist.javax.sip.address.SipUri; 13 import gov.nist.javax.sip.address.SipUri;
  14 +import gov.nist.javax.sip.clientauthutils.DigestServerAuthenticationHelper;
19 import gov.nist.javax.sip.header.Expires; 15 import gov.nist.javax.sip.header.Expires;
20 import gov.nist.javax.sip.header.SIPDateHeader; 16 import gov.nist.javax.sip.header.SIPDateHeader;
21 import org.slf4j.Logger; 17 import org.slf4j.Logger;
@@ -51,15 +47,6 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen @@ -51,15 +47,6 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
51 private SipConfig sipConfig; 47 private SipConfig sipConfig;
52 48
53 @Autowired 49 @Autowired
54 - private IRedisCatchStorage redisCatchStorage;  
55 -  
56 - @Autowired  
57 - private IVideoManagerStorage storager;  
58 -  
59 - @Autowired  
60 - private EventPublisher publisher;  
61 -  
62 - @Autowired  
63 private SIPProcessorObserver sipProcessorObserver; 50 private SIPProcessorObserver sipProcessorObserver;
64 51
65 @Autowired 52 @Autowired
@@ -86,7 +73,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen @@ -86,7 +73,7 @@ public class RegisterRequestProcessor extends SIPRequestProcessorParent implemen
86 ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME); 73 ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);
87 Response response = null; 74 Response response = null;
88 boolean passwordCorrect = false; 75 boolean passwordCorrect = false;
89 - // 注册标志 0：未携带授权头或者密码错误 1：注册成功 2：注销成功 76 + // 注册标志 true：注册成功 false：注册成功
90 boolean registerFlag = false; 77 boolean registerFlag = false;
91 FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME); 78 FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME);
92 AddressImpl address = (AddressImpl) fromHeader.getAddress(); 79 AddressImpl address = (AddressImpl) fromHeader.getAddress();