Merge branch 'master' of https://github.com/swwheihei/wvp.git

swwheihei

2020-07-16 29710b7cc154191ae56acf6af32ec70241886e78

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

@@ -93,13 +93,14 @@
    * @param transaction  

    */  

   @Override

   public void process(RequestEvent evt, SipLayer layer, ServerTransaction transaction) {

   public void process(RequestEvent evt, SipLayer layer) {

      

      this.layer = layer;

      this.transaction = transaction;

      this.transaction = layer.getServerTransaction(evt);

      

      Request request = evt.getRequest();

      SAXReader reader = new SAXReader();

      reader.setEncoding("gbk");

      Document xml;

      try {

         xml = reader.read(new ByteArrayInputStream(request.getRawContent()));

@@ -375,7 +376,7 @@
   private Element getRootElement(RequestEvent evt) throws DocumentException {

      Request request = evt.getRequest();

      SAXReader reader = new SAXReader();

      reader.setEncoding("GB2312");

      reader.setEncoding("gbk");

      Document xml = reader.read(new ByteArrayInputStream(request.getRawContent()));

      return xml.getRootElement();

   }