From 73f2c89d13ea7b332b3129e528ea3e14ccd05d78 Mon Sep 17 00:00:00 2001
From: Lawrence <1934378145@qq.com>
Date: 星期一, 14 十二月 2020 22:41:06 +0800
Subject: [PATCH] 修改查询录像回放接口，兼容部分设备发出MediaStatus信息时将ChannelId当作DeviceId的问题
---
pom.xml | 119 ++++++++++++++++++++++++++++++++---------------------------
1 files changed, 65 insertions(+), 54 deletions(-)
diff --git a/pom.xml b/pom.xml
index 31adf4f..86b4c17 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,35 +1,31 @@
<?xml version="1.0"?>
-<project
+<project
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.10.RELEASE</version>
+ <version>2.3.5.RELEASE</version>
</parent>
<groupId>com.genersoft</groupId>
<artifactId>wvp</artifactId>
<name>web video platform</name>
-
+
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <hystrix.version>1.5.12</hystrix.version>
<!-- 渚濊禆鐗堟湰 -->
- <mapper.version>3.4.0</mapper.version>
- <mybatis.version>3.3.1</mybatis.version>
- <mybatis.spring.version>1.2.4</mybatis.spring.version>
- <pagehelper.version>4.1.1</pagehelper.version>
+ <mapper.version>4.1.5</mapper.version>
+ <mybatis.version>3.5.5</mybatis.version>
+ <mybatis.spring.version>2.0.5</mybatis.spring.version>
+ <pagehelper.version>5.2.0</pagehelper.version>
<snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
<asciidoctor.input.directory>${project.basedir}/docs/asciidoc</asciidoctor.input.directory>
<generated.asciidoc.directory>${project.build.directory}/asciidoc</generated.asciidoc.directory>
<asciidoctor.html.output.directory>${project.build.directory}/asciidoc/html</asciidoctor.html.output.directory>
<asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory>
- <gson.version>2.8.0</gson.version>
- <jedis.version>3.0.1</jedis.version>
- <jsonlib.version>2.4</jsonlib.version>
</properties>
<dependencies>
@@ -42,27 +38,39 @@
<artifactId>spring-boot-starter-tomcat</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-web</artifactId>
- </dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ </dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
- </dependency>
-
-
- <!-- druid -->
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-context</artifactId>
+ </dependency>
+
+ <!-- redis -->
+ <dependency>
+ <groupId>org.springframework.data</groupId>
+ <artifactId>spring-data-redis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>redis.clients</groupId>
+ <artifactId>jedis</artifactId>
+ <version>3.3.0</version>
+ </dependency>
+
+ <!-- druid鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid</artifactId>
- <version>1.0.11</version>
+ <version>1.2.3</version>
</dependency>
+
+ <!-- mysql鏁版嵁搴� -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.30</version>
+ <version>8.0.22</version>
</dependency>
-
+
<!--Mybatis -->
<dependency>
<groupId>org.mybatis</groupId>
@@ -74,7 +82,7 @@
<artifactId>mybatis-spring</artifactId>
<version>${mybatis.spring.version}</version>
</dependency>
-
+
<!--鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
@@ -91,63 +99,65 @@
<dependency>
<groupId>org.apache.commons</groupId>
<artifactId>commons-lang3</artifactId>
- <version>3.4</version>
+ <version>3.11</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.33</version>
- </dependency>
-
+
<!--Swagger2 -->
<!--鍦ㄧ嚎鏂囨。 -->
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger2</artifactId>
- <version>2.6.1</version>
+ <version>2.9.2</version>
</dependency>
<dependency>
<groupId>io.springfox</groupId>
<artifactId>springfox-swagger-ui</artifactId>
<version>2.6.1</version>
</dependency>
-
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
+ </dependency>
+
<!-- 鏃ュ織鐩稿叧 -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
-
+
+ <!-- sip鍗忚鏍� -->
<dependency>
<groupId>javax.sip</groupId>
<artifactId>jain-sip-ri</artifactId>
- <version>1.3.0-91</version>
+ <version>1.3.0-92</version>
+ <scope>system</scope>
+ <systemPath>${project.basedir}/libs/jain-sip-ri-1.3.0-92.jar</systemPath>
</dependency>
<dependency>
- <groupId>org.dom4j</groupId>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.17</version>
+ </dependency>
+
+ <!-- xml瑙ｆ瀽搴� -->
+ <dependency>
+ <groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>2.1.3</version>
</dependency>
+
+ <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
<dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-redis</artifactId>
- <version>1.8.4.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- <version>2.9.0</version>
+ <groupId>com.alibaba</groupId>
+ <artifactId>fastjson</artifactId>
+ <version>1.2.73</version>
</dependency>
+ <!--Guava鏄竴绉嶅熀浜庡紑婧愮殑Java搴�-->
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>30.0-jre</version>
</dependency>
<!-- okhttp -->
@@ -156,16 +166,17 @@
<artifactId>okhttp</artifactId>
<version>4.9.0</version>
</dependency>
-
-
- </dependencies>
+ </dependencies>
<build>
+ <finalName>wvp-2.5.8</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>
--
Gitblit v1.8.0