64850858
2021-06-07 641d7d8e42ac45a339b885191822646cec842fc7
src/main/java/com/genersoft/iot/vmp/gb28181/transmit/request/impl/RegisterRequestProcessor.java
@@ -77,6 +77,9 @@
            passwordCorrect = new DigestServerAuthenticationHelper().doAuthenticatePlainTextPassword(request,
                  sipConfig.getSipPassword());
         }
         if (StringUtils.isEmpty(sipConfig.getSipPassword())){
            passwordCorrect = true;
         }
         // 未携带授权头或者密码错误 回复401
         if (authorhead == null || !passwordCorrect) {
@@ -105,12 +108,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();
@@ -152,15 +154,12 @@
         // 下发catelog查询目录
         if (registerFlag == 1 ) {
            logger.info("[{}] 注册成功! deviceId:" + device.getDeviceId(), requestAddress);
            // boolean exists = storager.exists(device.getDeviceId());
            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(), requestAddress);
            publisher.outlineEventPublish(device.getDeviceId(), VideoManagerConstants.EVENT_OUTLINE_UNREGISTER);