增加同步通道超时时间，修复hookIP空字符串时的hookIP的默认值赋值

64850858

2021-06-09 ecb5b691018c8ff71583833ec9a09d8f2bef81f6

 pom.xml

@@ -10,7 +10,8 @@
   </parent>

   <groupId>com.genersoft</groupId>
   <artifactId>wvp</artifactId>
   <artifactId>wvp-gb28181</artifactId>
   <version>2.0.0</version>
   <name>web video platform</name>

   <repositories>
@@ -43,6 +44,8 @@

   <properties>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
      <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>

      <!-- 依赖版本 -->
      <pagehelper.version>5.2.0</pagehelper.version>
@@ -66,6 +69,10 @@
         <groupId>org.mybatis.spring.boot</groupId>
         <artifactId>mybatis-spring-boot-starter</artifactId>
         <version>2.1.4</version>
      </dependency>
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-security</artifactId>
      </dependency>

      <!-- druid数据库连接池 -->
@@ -96,24 +103,21 @@
         <version>1.2.10</version>
      </dependency>

<!--      <dependency>-->
<!--         <groupId>org.apache.commons</groupId>-->
<!--         <artifactId>commons-lang3</artifactId>-->
<!--         <version>3.11</version>-->
<!--      </dependency>-->

      <!--Swagger2 -->
      <!--Swagger3 -->
      <!--在线文档 -->
      <dependency>
         <groupId>io.springfox</groupId>
         <artifactId>springfox-swagger2</artifactId>
         <version>2.9.2</version>
         <artifactId>springfox-boot-starter</artifactId>
         <version>3.0.0</version>
      </dependency>
      <dependency>
         <groupId>io.springfox</groupId>
         <artifactId>springfox-swagger-ui</artifactId>
         <version>2.6.1</version>
         <groupId>com.github.xiaoymin</groupId>
         <artifactId>knife4j-spring-boot-starter</artifactId>
         <version>3.0.2</version>
      </dependency>


      <!--参数校验 -->
      <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
@@ -165,14 +169,49 @@
         <artifactId>okhttp</artifactId>
         <version>4.9.0</version>
      </dependency>
    </dependencies>

      <!-- okhttp-digest -->
      <dependency>
         <groupId>com.burgstaller</groupId>
         <artifactId>okhttp-digest</artifactId>
         <version>2.1</version>
      </dependency>

      <!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
      <dependency>
         <groupId>net.sf.kxml</groupId>
         <artifactId>kxml2</artifactId>
         <version>2.3.0</version>
      </dependency>

      <!--反向代理-->
      <dependency>
         <groupId>org.mitre.dsmiley.httpproxy</groupId>
         <artifactId>smiley-http-proxy-servlet</artifactId>
         <version>1.12</version>
      </dependency>

      <!-- onvif协议栈 -->
      <dependency>
         <groupId>be.teletask</groupId>
         <artifactId>onvif-java</artifactId>
         <version>1.0.2</version>
         <scope>system</scope>
         <systemPath>${project.basedir}/libs/onvif-java-1.0.2.jar</systemPath>
      </dependency>
   </dependencies>


   
   <build>
      <finalName>wvp-2.5.8</finalName>
      <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
      <plugins>
         <plugin>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-maven-plugin</artifactId>
            <configuration>
               <includeSystemScope>true</includeSystemScope>
            </configuration>
         </plugin>
         <plugin>
            <groupId>org.apache.maven.plugins</groupId>