From 73c7dab47f7370f946d239c436b7a1c0ce6f8c0f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 08 十一月 2022 20:04:30 +0800
Subject: [PATCH] Merge pull request #660 from shawn-tangsc/wvp-28181-2.0
---
pom.xml | 66 +++++++++++++++++---------------
1 files changed, 35 insertions(+), 31 deletions(-)
diff --git a/pom.xml b/pom.xml
index 2abd9d8..64d414d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,12 +6,12 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>2.3.5.RELEASE</version>
+ <version>2.7.2</version>
</parent>
<groupId>com.genersoft</groupId>
<artifactId>wvp-pro</artifactId>
- <version>2.3.1</version>
+ <version>2.3.2</version>
<name>web video platform</name>
<description>鍥芥爣28181瑙嗛骞冲彴</description>
@@ -47,7 +47,6 @@
<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>
<!-- 渚濊禆鐗堟湰 -->
<snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
@@ -74,7 +73,7 @@
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
- <version>2.1.4</version>
+ <version>2.2.2</version>
<exclusions>
<exclusion>
<groupId>com.zaxxer</groupId>
@@ -91,36 +90,35 @@
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-starter</artifactId>
- <version>1.1.22</version>
+ <version>1.2.11</version>
</dependency>
<!-- mysql鏁版嵁搴� -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>8.0.22</version>
+ <version>8.0.30</version>
</dependency>
<!--Mybatis鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>1.4.1</version>
+ <version>1.4.3</version>
</dependency>
- <!--Swagger3 -->
<!--鍦ㄧ嚎鏂囨。 -->
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-boot-starter</artifactId>
- <version>3.0.0</version>
- </dependency>
- <dependency>
- <groupId>com.github.xiaoymin</groupId>
- <artifactId>knife4j-spring-boot-starter</artifactId>
- <version>3.0.2</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-ui</artifactId>
+ <version>1.6.10</version>
</dependency>
+ <dependency>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-springdoc-ui</artifactId>
+ <version>3.0.3</version>
+ </dependency>
<!--鍙傛暟鏍￠獙 -->
<dependency>
@@ -145,7 +143,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.35</version>
+ <version>1.7.36</version>
</dependency>
<!-- xml瑙ｆ瀽搴� -->
@@ -155,26 +153,30 @@
<version>2.1.3</version>
</dependency>
- <!-- json瑙ｆ瀽搴揻astjson -->
+ <!-- json瑙ｆ瀽搴揻astjson2 -->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.83</version>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
+ <version>2.0.17</version>
</dependency>
-
+ <dependency>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2-extension</artifactId>
+ <version>2.0.17</version>
+ </dependency>
<!-- okhttp -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>okhttp</artifactId>
- <version>4.9.0</version>
+ <version>4.10.0</version>
</dependency>
<!-- okhttp 璋冭瘯鏃ュ織 -->
<dependency>
<groupId>com.squareup.okhttp3</groupId>
<artifactId>logging-interceptor</artifactId>
- <version>4.9.0</version>
+ <version>4.10.0</version>
</dependency>
@@ -183,7 +185,7 @@
<dependency>
<groupId>io.github.rburgst</groupId>
<artifactId>okhttp-digest</artifactId>
- <version>2.5</version>
+ <version>2.7</version>
</dependency>
<!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
@@ -197,21 +199,21 @@
<dependency>
<groupId>org.mitre.dsmiley.httpproxy</groupId>
<artifactId>smiley-http-proxy-servlet</artifactId>
- <version>1.12</version>
+ <version>1.12.1</version>
</dependency>
<!--excel瑙ｆ瀽搴�-->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>easyexcel</artifactId>
- <version>3.0.4</version>
+ <version>3.1.1</version>
</dependency>
<!-- 鑾峰彇绯荤粺淇℃伅 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
- <version>6.1.0</version>
+ <version>6.2.2</version>
</dependency>
<dependency>
@@ -231,7 +233,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.0.1-jre</version>
+ <version>31.1-jre</version>
</dependency>
@@ -265,14 +267,16 @@
</configuration>
</plugin>
- <!-- <plugin>
+ <plugin>
<groupId>pl.project13.maven</groupId>
<artifactId>git-commit-id-plugin</artifactId>
<version>3.0.1</version>
<configuration>
<offline>true</offline>
+ <failOnNoGitDirectory>false</failOnNoGitDirectory>
+ <dateFormat>yyyyMMdd</dateFormat>
</configuration>
- </plugin>-->
+ </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
--
Gitblit v1.8.0