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 |   27 +++++++++++++++++++++++----
 1 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index cf2c4cf..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>
 
@@ -148,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瑙ｆ瀽搴� -->
@@ -208,6 +209,13 @@
 			<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>
@@ -269,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