fix typo and broken url

Dectinc Chen

2021-04-16 681351d74040d64024c924a6d7da4e17b96d6a38

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

@@ -7,7 +7,6 @@


import javax.sip.InvalidArgumentException;

import javax.sip.RequestEvent;

import javax.sip.ServerTransaction;

import javax.sip.SipException;

import javax.sip.header.AuthorizationHeader;

import javax.sip.header.ContactHeader;

@@ -17,19 +16,19 @@
import javax.sip.message.Request;

import javax.sip.message.Response;



import org.springframework.beans.factory.annotation.Autowired;

import org.springframework.stereotype.Component;

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

import gov.nist.javax.sip.header.SIPDateHeader;

import org.slf4j.Logger;

import org.slf4j.LoggerFactory;

import org.springframework.util.StringUtils;



import com.genersoft.iot.vmp.common.VideoManagerConstants;

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.request.ISIPRequestProcessor;

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

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



import gov.nist.javax.sip.address.AddressImpl;

@@ -41,31 +40,26 @@
 * @author: swwheihei

 * @date:   2020年5月3日 下午4:47:25     

 */

@Component

public class RegisterRequestProcessor implements ISIPRequestProcessor {

public class RegisterRequestProcessor extends SIPRequestAbstractProcessor {



   @Autowired

   private Logger logger = LoggerFactory.getLogger(RegisterRequestProcessor.class);



   private SipConfig sipConfig;

   

   @Autowired

   private RegisterLogicHandler handler;

   

   @Autowired

   private IVideoManagerStorager storager;

   

   @Autowired

   private EventPublisher publisher;

	
   /***



   /**

    * 收到注册请求 处理

    * 
    * @param request

    *            请求消息

    */ 
     * @param evt

    */

   @Override

   public void process(RequestEvent evt, SipLayer layer) {

   public void process(RequestEvent evt) {

      try {

         System.out.println("收到注册请求，开始处理");

         logger.info("收到注册请求，开始处理");

         Request request = evt.getRequest();



         Response response = null; 

@@ -84,18 +78,23 @@
         if (authorhead == null || !passwordCorrect) {

            

            if (authorhead == null) {

               System.out.println("未携带授权头 回复401");

               logger.info("未携带授权头 回复401");

            } else if (!passwordCorrect) {

               System.out.println("密码错误 回复401");

               logger.info("密码错误 回复401");

            }

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

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

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

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

         }

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

         else if (passwordCorrect) {

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

            response = getMessageFactory().createResponse(Response.OK, request);

            // 添加date头

            response.addHeader(layer.getHeaderFactory().createDateHeader(Calendar.getInstance(Locale.ENGLISH)));

            SIPDateHeader dateHeader = new SIPDateHeader();

            // 使用自己修改的

            WvpSipDate wvpSipDate = new WvpSipDate(Calendar.getInstance(Locale.ENGLISH).getTimeInMillis());

            dateHeader.setDate(wvpSipDate);

            response.addHeader(dateHeader);



            ExpiresHeader expiresHeader = (ExpiresHeader) request.getHeader(Expires.NAME);

            // 添加Contact头

            response.addHeader(request.getHeader(ContactHeader.NAME));

@@ -114,16 +113,15 @@
               rPort = viaHeader.getPort();

            }

            //

            Host host = new Host();

            host.setIp(received);

            host.setPort(rPort);

            host.setAddress(received.concat(":").concat(String.valueOf(rPort)));

            AddressImpl address = (AddressImpl) fromHeader.getAddress();

            SipUri uri = (SipUri) address.getURI();

            String deviceId = uri.getUser();

            device = new Device();

            device.setStreamMode("UDP");

            device.setDeviceId(deviceId);

            device.setHost(host);

            device.setIp(received);

            device.setPort(rPort);

            device.setHostAddress(received.concat(":").concat(String.valueOf(rPort)));

            // 注销成功

            if (expiresHeader != null && expiresHeader.getExpires() == 0) {

               registerFlag = 2;

@@ -141,17 +139,23 @@
               device.setTransport(isTcp ? "TCP" : "UDP");

            }

         }

         layer.getServerTransaction(evt).sendResponse(response);

         getServerTransaction(evt).sendResponse(response);

         // 注册成功

         // 保存到redis

         // 下发catelog查询目录

         if (registerFlag == 1 && device != null) {

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

            storager.update(device);

            logger.info("注册成功! deviceId:" + device.getDeviceId());

            // boolean exists = storager.exists(device.getDeviceId());

            device.setRegisterTimeMillis(System.currentTimeMillis());

            storager.updateDevice(device);

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

            handler.onRegister(device);



            // 重新注册更新设备和通道，以免设备替换或更新后信息无法更新

            //if (!exists) {

               handler.onRegister(device);

            //}

         } else if (registerFlag == 2) {

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

            logger.info("注销成功! deviceId:" + device.getDeviceId());

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

         }

      } catch (SipException | InvalidArgumentException | NoSuchAlgorithmException | ParseException e) {

@@ -159,5 +163,21 @@
      }

      

   }

	
   public void setSipConfig(SipConfig sipConfig) {

      this.sipConfig = sipConfig;

   }



   public void setHandler(RegisterLogicHandler handler) {

      this.handler = handler;

   }



   public void setVideoManagerStorager(IVideoManagerStorager storager) {

      this.storager = storager;

   }



   public void setPublisher(EventPublisher publisher) {

      this.publisher = publisher;

   }



}