From 1e10524ba497dc176419dc4f808f2a125c88b88d Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 22 四月 2022 16:58:42 +0800
Subject: [PATCH] Merge pull request #444 from hotcoffie/wvp-28181-2.0

---
 pom.xml |   20 ++++++--------------
 1 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index 770cc25..befb74f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
 
 	<groupId>com.genersoft</groupId>
 	<artifactId>wvp-pro</artifactId>
-	<version>2.0.2</version>
+	<version>2.1.1</version>
 	<name>web video platform</name>
 	<description>鍥芥爣28181瑙嗛骞冲彴</description>
 
@@ -90,8 +90,8 @@
 		<!-- druid鏁版嵁搴撹繛鎺ユ睜 -->
 		<dependency>
 			<groupId>com.alibaba</groupId>
-			<artifactId>druid</artifactId>
-			<version>1.2.3</version>
+			<artifactId>druid-spring-boot-starter</artifactId>
+			<version>1.1.22</version>
 		</dependency>
 
 		<!-- mysql鏁版嵁搴� -->
@@ -167,13 +167,6 @@
 			<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>30.0-jre</version>
 		</dependency>
 
 		<!-- okhttp -->
@@ -253,10 +246,6 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 <!--			<scope>test</scope>-->
 		</dependency>
-		<dependency>
-			<groupId>org.projectlombok</groupId>
-			<artifactId>lombok</artifactId>
-		</dependency>
 	</dependencies>
 
 
@@ -283,6 +272,9 @@
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
+				<configuration>
+					<offline>true</offline>
+				</configuration>
 			</plugin>
 
 			<plugin>

--
Gitblit v1.8.0