From e861c9dfab7d74444593b3cfa866544d648dca7f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 22 二月 2022 11:55:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-pro-record

---
 pom.xml |   61 +++++++++++++++++++++---------
 1 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/pom.xml b/pom.xml
index 5cd5f04..9331de3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>com.genersoft</groupId>
 	<artifactId>wvp-pro</artifactId>
-	<version>2.0</version>
+	<version>2.0.2</version>
 	<name>web video platform</name>
 	<description>鍥芥爣28181瑙嗛骞冲彴</description>
 
@@ -50,7 +50,6 @@
 		<jedis-version>3.1.0</jedis-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>
@@ -113,7 +112,7 @@
 		<dependency>
 			<groupId>com.github.pagehelper</groupId>
 			<artifactId>pagehelper-spring-boot-starter</artifactId>
-			<version>1.2.10</version>
+			<version>1.4.1</version>
 		</dependency>
 
 		<!--Swagger3 -->
@@ -149,10 +148,11 @@
 			<version>1.3.0-91</version>
 		</dependency>
 
+		<!-- 鍙栦唬log4j -->
 		<dependency>
-			<groupId>log4j</groupId>
-			<artifactId>log4j</artifactId>
-			<version>1.2.17</version>
+			<groupId>org.slf4j</groupId>
+			<artifactId>log4j-over-slf4j</artifactId>
+			<version>1.7.35</version>
 		</dependency>
 
 		<!-- xml瑙ｆ瀽搴� -->
@@ -162,7 +162,7 @@
 			<version>2.1.3</version>
 		</dependency>
 
-		<!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+		<!-- json瑙ｆ瀽搴揻astjson -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
 			<artifactId>fastjson</artifactId>
@@ -204,6 +204,25 @@
 			<version>1.12</version>
 		</dependency>
 
+		<!--excel瑙ｆ瀽搴�-->
+		<dependency>
+			<groupId>com.alibaba</groupId>
+			<artifactId>easyexcel</artifactId>
+			<version>3.0.4</version>
+		</dependency>
+
+		<!-- 鑾峰彇绯荤粺淇℃伅 -->
+		<dependency>
+			<groupId>com.github.oshi</groupId>
+			<artifactId>oshi-core</artifactId>
+			<version>6.1.0</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.springframework.session</groupId>
+			<artifactId>spring-session-core</artifactId>
+		</dependency>
+
 <!--		&lt;!&ndash; 妫�娴嬫枃浠剁紪鐮� &ndash;&gt;-->
 <!--		&lt;!&ndash; https://mvnrepository.com/artifact/cpdetector/cpdetector &ndash;&gt;-->
 <!--		<dependency>-->
@@ -212,26 +231,19 @@
 <!--			<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>
-
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 <!--			<scope>test</scope>-->
 		</dependency>
+		<dependency>
+			<groupId>org.projectlombok</groupId>
+			<artifactId>lombok</artifactId>
+		</dependency>
 	</dependencies>
 
 
-	
+
 	<build>
 		<finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
 		<plugins>
@@ -265,5 +277,16 @@
 			</plugin>
 
 		</plugins>
+		<resources>
+			<resource>
+				<directory>src/main/resources</directory>
+			</resource>
+			<resource>
+				<directory>src/main/java</directory>
+				<includes>
+					<include>**/*.xml</include>
+				</includes>
+			</resource>
+		</resources>
 	</build>
 </project>

--
Gitblit v1.8.0