From 619a66f9998fa646a69903a4c22e2bbf92e2221b Mon Sep 17 00:00:00 2001
From: lawrencehj <1934378145@qq.com>
Date: 星期三, 28 七月 2021 09:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'upstream/wvp-28181-2.0' into wvp-28181-2.0

---
 pom.xml |   98 ++++++++++++++++++++++++++++++++++++------------
 1 files changed, 73 insertions(+), 25 deletions(-)

diff --git a/pom.xml b/pom.xml
index 09ed630..077f8f1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,7 +10,8 @@
 	</parent>
 
 	<groupId>com.genersoft</groupId>
-	<artifactId>wvp</artifactId>
+	<artifactId>wvp-pro</artifactId>
+	<version>2.0</version>
 	<name>web video platform</name>
 
 	<repositories>
@@ -43,6 +44,9 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<maven.build.timestamp.format>MMddHHmm</maven.build.timestamp.format>
+		<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
+		<jedis-version>3.1.0</jedis-version>
 
 		<!-- 渚濊禆鐗堟湰 -->
 		<pagehelper.version>5.2.0</pagehelper.version>
@@ -63,9 +67,24 @@
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-configuration-processor</artifactId>
+			<optional>true</optional>
+		</dependency>
+		<dependency>
 			<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>
+
+		<dependency>
+			<groupId>redis.clients</groupId>
+			<artifactId>jedis</artifactId>
+			<version>${jedis-version}</version>
 		</dependency>
 
 		<!-- druid鏁版嵁搴撹繛鎺ユ睜 -->
@@ -96,24 +115,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 +142,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 +181,52 @@
 			<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>
+
+<!--		&lt;!&ndash; 妫�娴嬫枃浠剁紪鐮� &ndash;&gt;-->
+<!--		&lt;!&ndash; https://mvnrepository.com/artifact/cpdetector/cpdetector &ndash;&gt;-->
+<!--		<dependency>-->
+<!--			<groupId>cpdetector</groupId>-->
+<!--			<artifactId>cpdetector</artifactId>-->
+<!--			<version>1.0.8</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