尝试修复catalog获取失败。服务重启后设备未注册仍上报keeplive处理

songww

2020-05-13 ca5139929b8b5853229ca3d63e2bca1ce82fa0ab

 src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java

@@ -25,10 +25,10 @@
import com.genersoft.iot.vmp.conf.SipConfig;

import com.genersoft.iot.vmp.gb28181.SipLayer;

import com.genersoft.iot.vmp.gb28181.auth.DigestServerAuthenticationHelper;

import com.genersoft.iot.vmp.gb28181.auth.RegisterLogicHandler;

import com.genersoft.iot.vmp.gb28181.bean.Device;

import com.genersoft.iot.vmp.gb28181.bean.Host;

import com.genersoft.iot.vmp.gb28181.event.EventPublisher;

import com.genersoft.iot.vmp.gb28181.transmit.cmd.impl.SIPCommander;

import com.genersoft.iot.vmp.gb28181.transmit.request.ISIPRequestProcessor;

import com.genersoft.iot.vmp.storager.IVideoManagerStorager;



@@ -45,10 +45,10 @@
public class RegisterRequestProcessor implements ISIPRequestProcessor {



   @Autowired

   private SipConfig config;

   private SipConfig sipConfig;

   

   @Autowired

   private SIPCommander cmder;

   private RegisterLogicHandler handler;

   

   @Autowired

   private IVideoManagerStorager storager;

@@ -77,7 +77,7 @@
         // 校验密码是否正确

         if (authorhead != null) {

            passwordCorrect = new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request,

                  config.getSipPassword());

                  sipConfig.getSipPassword());

         }



         // 未携带授权头或者密码错误 回复401

@@ -89,7 +89,7 @@
               System.out.println("密码错误 回复401");

            }

            response = layer.getMessageFactory().createResponse(Response.UNAUTHORIZED, request);

            new DigestServerAuthenticationHelper().generateChallenge(layer.getHeaderFactory(), response, config.getSipDomain());

            new DigestServerAuthenticationHelper().generateChallenge(layer.getHeaderFactory(), response, sipConfig.getSipDomain());

         }

         // 携带授权头并且密码正确

         else if (passwordCorrect) {

@@ -149,7 +149,7 @@
            System.out.println("注册成功! deviceId:" + device.getDeviceId());

            storager.update(device);

            publisher.onlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_ONLINE_REGISTER);

            cmder.deviceInfoQuery(device);

            handler.onRegister(device);

         } else if (registerFlag == 2) {

            System.out.println("注销成功! deviceId:" + device.getDeviceId());

            publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);