From dbb4a206029043d5dab8327ddbccc11fd0af8080 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 22 三月 2023 09:52:23 +0800
Subject: [PATCH] 优化点播后截图以及截图的展示
---
pom.xml | 128 +++++++++++++++++++++++++++---------------
1 files changed, 81 insertions(+), 47 deletions(-)
diff --git a/pom.xml b/pom.xml
index ecf1aff..a675c6f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,15 @@
<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.6.7</version>
<name>web video platform</name>
<description>鍥芥爣28181瑙嗛骞冲彴</description>
+ <packaging>${project.packaging}</packaging>
<repositories>
<repository>
@@ -47,7 +48,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>
@@ -57,17 +57,46 @@
<asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory>
</properties>
+ <profiles>
+ <profile>
+ <id>jar</id>
+ <activation>
+ <activeByDefault>true</activeByDefault>
+ </activation>
+ <properties>
+ <project.packaging>jar</project.packaging>
+ </properties>
+ </profile>
+ <profile>
+ <id>war</id>
+ <properties>
+ <project.packaging>war</project.packaging>
+ </properties>
+ <dependencies>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-web</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jetty</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>javax.servlet-api</artifactId>
+ <version>3.1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-redis</artifactId>
- <exclusions>
- <!-- 鍘绘帀 Lettuce 鐨勪緷璧栵紝 Spring Boot 浼樺厛浣跨敤 Lettuce 浣滀负 Redis 瀹㈡埛绔� -->
- <exclusion>
- <groupId>io.lettuce</groupId>
- <artifactId>lettuce-core</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -81,7 +110,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>
@@ -94,45 +123,39 @@
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- </dependency>
-
<!-- druid鏁版嵁搴撹繛鎺ユ睜 -->
<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>
@@ -157,7 +180,7 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>log4j-over-slf4j</artifactId>
- <version>1.7.35</version>
+ <version>1.7.36</version>
</dependency>
<!-- xml瑙ｆ瀽搴� -->
@@ -167,63 +190,72 @@
<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>
-
-
<!-- okhttp-digest -->
<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 -->
+<!-- <dependency>-->
+<!-- <groupId>net.sf.kxml</groupId>-->
+<!-- <artifactId>kxml2</artifactId>-->
+<!-- <version>2.3.0</version>-->
+<!-- </dependency>-->
+
+ <!-- jwt瀹炵幇 -->
<dependency>
- <groupId>net.sf.kxml</groupId>
- <artifactId>kxml2</artifactId>
- <version>2.3.0</version>
+ <groupId>org.bitbucket.b_c</groupId>
+ <artifactId>jose4j</artifactId>
+ <version>0.9.3</version>
</dependency>
<!--鍙嶅悜浠ｇ悊-->
<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>
@@ -243,7 +275,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>31.0.1-jre</version>
+ <version>31.1-jre</version>
</dependency>
@@ -252,8 +284,8 @@
<artifactId>spring-boot-starter-test</artifactId>
<!-- <scope>test</scope>-->
</dependency>
- </dependencies>
+ </dependencies>
<build>
@@ -283,6 +315,8 @@
<version>3.0.1</version>
<configuration>
<offline>true</offline>
+ <failOnNoGitDirectory>false</failOnNoGitDirectory>
+ <dateFormat>yyyyMMdd</dateFormat>
</configuration>
</plugin>
--
Gitblit v1.8.0