panlinlin
2021-05-08 e48fa711a3664bece9b3e58840a75fe7c05bc47c
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
@@ -17,7 +17,9 @@
import javax.sip.message.Response;
import com.genersoft.iot.vmp.gb28181.bean.WvpSipDate;
import gov.nist.javax.sip.RequestEventExt;
import gov.nist.javax.sip.header.SIPDateHeader;
import gov.nist.javax.sip.message.SIPRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.util.StringUtils;
@@ -59,7 +61,9 @@
   @Override
   public void process(RequestEvent evt) {
      try {
         logger.info("收到注册请求,开始处理");
         RequestEventExt evtExt = (RequestEventExt)evt;
         String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();
         logger.info("[{}] 收到注册请求,开始处理", requestAddress);
         Request request = evt.getRequest();
         Response response = null; 
@@ -78,9 +82,9 @@
         if (authorhead == null || !passwordCorrect) {
            
            if (authorhead == null) {
               logger.info("未携带授权头 回复401");
               logger.info("[{}] 未携带授权头 回复401", requestAddress);
            } else if (!passwordCorrect) {
               logger.info("密码错误 回复401");
               logger.info("[{}] 密码错误 回复401", requestAddress);
            }
            response = getMessageFactory().createResponse(Response.UNAUTHORIZED, request);
            new DigestServerAuthenticationHelper().generateChallenge(getHeaderFactory(), response, sipConfig.getSipDomain());
@@ -101,12 +105,11 @@
            // 添加Expires头
            response.addHeader(request.getExpires());
            
            // 1.获取到通信地址等信息,保存到Redis
            // 获取到通信地址等信息
            FromHeader fromHeader = (FromHeader) request.getHeader(FromHeader.NAME);
            ViaHeader viaHeader = (ViaHeader) request.getHeader(ViaHeader.NAME);
            String received = viaHeader.getReceived();
            int rPort = viaHeader.getRPort();
            // 本地模拟设备 received 为空 rPort 为 -1
            // 解析本地地址替代
            if (StringUtils.isEmpty(received) || rPort == -1) {
               received = viaHeader.getHost();
@@ -147,18 +150,15 @@
         // 保存到redis
         // 下发catelog查询目录
         if (registerFlag == 1 ) {
            logger.info("注册成功! deviceId:" + device.getDeviceId());
            // boolean exists = storager.exists(device.getDeviceId());
            logger.info("[{}] 注册成功! deviceId:" + device.getDeviceId(), requestAddress);
            device.setRegisterTimeMillis(System.currentTimeMillis());
            storager.updateDevice(device);
            publisher.onlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_ONLINE_REGISTER);
            // 重新注册更新设备和通道,以免设备替换或更新后信息无法更新
            //if (!exists) {
               handler.onRegister(device);
            //}
            handler.onRegister(device);
         } else if (registerFlag == 2) {
            logger.info("注销成功! deviceId:" + device.getDeviceId());
            logger.info("[{}] 注销成功! deviceId:" + device.getDeviceId(), requestAddress);
            publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);
         }
      } catch (SipException | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {