From ecb5b691018c8ff71583833ec9a09d8f2bef81f6 Mon Sep 17 00:00:00 2001
From: 64850858 <648540858@qq.com>
Date: 星期三, 09 六月 2021 09:28:29 +0800
Subject: [PATCH] 增加同步通道超时时间，修复hookIP空字符串时的hookIP的默认值赋值
---
pom.xml | 76 +++++++++++++++++++++++++------------
1 files changed, 51 insertions(+), 25 deletions(-)
diff --git a/pom.xml b/pom.xml
index 09ed630..20bf6d8 100644
--- a/pom.xml
+++ b/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>
@@ -126,21 +130,11 @@
</dependency>
<!-- sip鍗忚鏍� -->
-<!-- <dependency>-->
-<!-- <groupId>javax.sip</groupId>-->
-<!-- <artifactId>jain-sip-ri</artifactId>-->
-<!-- <version>1.3.0-92</version>-->
-<!-- <scope>system</scope>-->
-<!-- <systemPath>${pom.basedir}/libs/jain-sip-ri-1.3.0-92.jar</systemPath>-->
-<!-- </dependency>-->
-
- <!-- https://mvnrepository.com/artifact/javax.sip/jain-sip-ri -->
<dependency>
<groupId>javax.sip</groupId>
<artifactId>jain-sip-ri</artifactId>
<version>1.3.0-91</version>
</dependency>
-
<dependency>
<groupId>log4j</groupId>
@@ -175,10 +169,42 @@
<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>
--
Gitblit v1.8.0