Merge branch '2.6.8' into wvp-28181-2.0

648540858

2023-06-19 6b3732b8c43165342b7521b1e3ea788e471d58e8

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

@@ -80,7 +80,6 @@
    public void process(RequestEvent evt) {
        try {
            RequestEventExt evtExt = (RequestEventExt) evt;
            String requestAddress = evtExt.getRemoteIpAddress() + ":" + evtExt.getRemotePort();

            SIPRequest request = (SIPRequest)evt.getRequest();
            Response response = null;
@@ -91,12 +90,13 @@
            AddressImpl address = (AddressImpl) fromHeader.getAddress();
            SipUri uri = (SipUri) address.getURI();
            String deviceId = uri.getUser();
            logger.info("[注册请求] 设备：{}, 开始处理: {}", deviceId, requestAddress);

            Device device = deviceService.getDevice(deviceId);

            RemoteAddressInfo remoteAddressInfo = SipUtils.getRemoteAddressFromRequest(request,
                    userSetting.getSipUseSourceIpAsRemoteAddress());

            String requestAddress = remoteAddressInfo.getIp() + ":" + remoteAddressInfo.getPort();
                    logger.info("[注册请求] 设备：{}, 开始处理: {}", deviceId, requestAddress);
            if (device != null &&
                device.getSipTransactionInfo() != null &&
                request.getCallIdHeader().getCallId().equals(device.getSipTransactionInfo().getCallId())) {
@@ -166,7 +166,7 @@
                device.setGeoCoordSys("WGS84");
                device.setTreeType("CivilCode");
                device.setDeviceId(deviceId);
                device.setOnline(0);
                device.setOnLine(false);
            }
            device.setIp(remoteAddressInfo.getIp());
            device.setPort(remoteAddressInfo.getPort());