From 8acd64eac67b9b0a8d3f160b704faeebc91db0a0 Mon Sep 17 00:00:00 2001
From: mrjackwang <30337754+mrjackwang@users.noreply.github.com>
Date: 星期六, 04 三月 2023 21:37:39 +0800
Subject: [PATCH] Merge branch '648540858:wvp-28181-2.0' into wvp-28181-2.0
---
pom.xml | 189 +++++++++++++++++++++++++++++++++--------------
1 files changed, 133 insertions(+), 56 deletions(-)
diff --git a/pom.xml b/pom.xml
index 49fa3b3..bcc3c36 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,13 +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.0</version>
+ <version>2.6.7</version>
<name>web video platform</name>
+ <description>鍥芥爣28181瑙嗛骞冲彴</description>
+ <packaging>${project.packaging}</packaging>
<repositories>
<repository>
@@ -46,16 +48,50 @@
<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>
<!-- 渚濊禆鐗堟湰 -->
- <pagehelper.version>5.2.0</pagehelper.version>
<snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
<asciidoctor.input.directory>${project.basedir}/docs/asciidoc</asciidoctor.input.directory>
<generated.asciidoc.directory>${project.build.directory}/asciidoc</generated.asciidoc.directory>
<asciidoctor.html.output.directory>${project.build.directory}/asciidoc/html</asciidoctor.html.output.directory>
<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>
@@ -74,60 +110,52 @@
<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>
+ <artifactId>HikariCP</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-security</artifactId>
</dependency>
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- <version>${jedis-version}</version>
- </dependency>
-
<!-- druid鏁版嵁搴撹繛鎺ユ睜 -->
<dependency>
<groupId>com.alibaba</groupId>
- <artifactId>druid</artifactId>
- <version>1.2.3</version>
+ <artifactId>druid-spring-boot-starter</artifactId>
+ <version>1.2.11</version>
</dependency>
<!-- mysql鏁版嵁搴� -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>8.0.22</version>
- </dependency>
-
- <!-- 娣诲姞sqlite-jdbc鏁版嵁搴撻┍鍔� -->
- <dependency>
- <groupId>org.xerial</groupId>
- <artifactId>sqlite-jdbc</artifactId>
- <version>3.32.3.2</version>
+ <version>8.0.30</version>
</dependency>
<!--Mybatis鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
- <version>1.2.10</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>
@@ -148,10 +176,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.36</version>
</dependency>
<!-- xml瑙ｆ瀽搴� -->
@@ -161,32 +190,39 @@
<version>2.1.3</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+ <!-- json瑙ｆ瀽搴揻astjson2 -->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.73</version>
+ <groupId>com.alibaba.fastjson2</groupId>
+ <artifactId>fastjson2</artifactId>
+ <version>2.0.17</version>
</dependency>
-
- <!--Guava鏄竴绉嶅熀浜庡紑婧愮殑Java搴�-->
<dependency>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- <version>30.0-jre</version>
+ <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.10.0</version>
+ </dependency>
+
+
<!-- okhttp-digest -->
<dependency>
- <groupId>com.burgstaller</groupId>
+ <groupId>io.github.rburgst</groupId>
<artifactId>okhttp-digest</artifactId>
- <version>2.1</version>
+ <version>2.7</version>
</dependency>
<!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
@@ -200,7 +236,26 @@
<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.1.1</version>
+ </dependency>
+
+ <!-- 鑾峰彇绯荤粺淇℃伅 -->
+ <dependency>
+ <groupId>com.github.oshi</groupId>
+ <artifactId>oshi-core</artifactId>
+ <version>6.2.2</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.springframework.session</groupId>
+ <artifactId>spring-session-core</artifactId>
</dependency>
<!-- <!– 妫�娴嬫枃浠剁紪鐮� –>-->
@@ -211,32 +266,30 @@
<!-- <version>1.0.8</version>-->
<!-- </dependency>-->
-
-
- <!-- onvif鍗忚鏍� -->
+ <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
<dependency>
- <groupId>be.teletask</groupId>
- <artifactId>onvif-java</artifactId>
- <version>1.0.2</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/libs/onvif-java-1.0.2.jar</systemPath>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ <version>31.1-jre</version>
</dependency>
+
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<!-- <scope>test</scope>-->
</dependency>
+
</dependencies>
-
<build>
<finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
+ <version>2.3.5.RELEASE</version>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
@@ -244,6 +297,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
+ <version>3.8.1</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
@@ -251,13 +305,36 @@
</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>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.22.2</version>
<configuration>
<skipTests>true</skipTests>
</configuration>
</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