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