From eef78c7873ba2426a2163fd10cad965bfc89a5c9 Mon Sep 17 00:00:00 2001
From: mk1990 <153958232@qq.com>
Date: 星期五, 15 四月 2022 17:05:26 +0800
Subject: [PATCH] 同步使用临时方案解决更新通道调用百度API问题之前的内容

---
 pom.xml |   56 +++++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/pom.xml b/pom.xml
index edd37d9..7ad53db 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>
 
@@ -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鏁版嵁搴� -->
@@ -155,7 +155,6 @@
 			<version>1.7.35</version>
 		</dependency>
 
-
 		<!-- xml瑙ｆ瀽搴� -->
 		<dependency>
 			<groupId>org.dom4j</groupId>
@@ -170,19 +169,21 @@
 			<version>1.2.73</version>
 		</dependency>
 
-		<!--Guava鏄竴绉嶅熀浜庡紑婧愮殑Java搴�-->
-		<dependency>
-			<groupId>com.google.guava</groupId>
-			<artifactId>guava</artifactId>
-			<version>30.0-jre</version>
-		</dependency>
-
 		<!-- okhttp -->
 		<dependency>
 			<groupId>com.squareup.okhttp3</groupId>
 			<artifactId>okhttp</artifactId>
 			<version>4.9.0</version>
 		</dependency>
+
+		<!-- okhttp 璋冭瘯鏃ュ織 -->
+		<dependency>
+			<groupId>com.squareup.okhttp3</groupId>
+			<artifactId>logging-interceptor</artifactId>
+			<version>4.9.0</version>
+		</dependency>
+
+
 
 		<!-- okhttp-digest -->
 		<dependency>
@@ -212,6 +213,13 @@
 			<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>
@@ -225,14 +233,18 @@
 <!--			<version>1.0.8</version>-->
 <!--		</dependency>-->
 
+		<!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+		<dependency>
+			<groupId>com.google.guava</groupId>
+			<artifactId>guava</artifactId>
+			<version>31.0.1-jre</version>
+		</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>
 
@@ -260,6 +272,9 @@
 			<plugin>
 				<groupId>pl.project13.maven</groupId>
 				<artifactId>git-commit-id-plugin</artifactId>
+				<configuration>
+					<offline>true</offline>
+				</configuration>
 			</plugin>
 
 			<plugin>
@@ -271,5 +286,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