From e861c9dfab7d74444593b3cfa866544d648dca7f Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期二, 22 二月 2022 11:55:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into wvp-pro-record
---
pom.xml | 233 ++++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 155 insertions(+), 78 deletions(-)
diff --git a/pom.xml b/pom.xml
index 8367e70..9331de3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -10,52 +10,81 @@
</parent>
<groupId>com.genersoft</groupId>
- <artifactId>wvp</artifactId>
+ <artifactId>wvp-pro</artifactId>
+ <version>2.0.2</version>
<name>web video platform</name>
+ <description>鍥芥爣28181瑙嗛骞冲彴</description>
+
+ <repositories>
+ <repository>
+ <id>nexus-aliyun</id>
+ <name>Nexus aliyun</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <layout>default</layout>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ </repositories>
+ <pluginRepositories>
+ <pluginRepository>
+ <id>nexus-aliyun</id>
+ <name>Nexus aliyun</name>
+ <url>https://maven.aliyun.com/repository/public</url>
+ <snapshots>
+ <enabled>false</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
+ </pluginRepositories>
<properties>
<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>
<!-- 渚濊禆鐗堟湰 -->
- <mapper.version>4.1.5</mapper.version>
- <mybatis.version>3.5.5</mybatis.version>
- <mybatis.spring.version>2.0.5</mybatis.spring.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>
- <gson.version>2.8.6</gson.version>
</properties>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jdbc</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-tomcat</artifactId>
+ <artifactId>spring-boot-starter-data-redis</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-context</artifactId>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-configuration-processor</artifactId>
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <version>2.1.4</version>
+ </dependency>
+ <dependency>
+ <groupId>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-security</artifactId>
</dependency>
- <!-- redis -->
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-redis</artifactId>
- </dependency>
<dependency>
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
- <version>3.3.0</version>
+ <version>${jedis-version}</version>
</dependency>
<!-- druid鏁版嵁搴撹繛鎺ユ睜 -->
@@ -72,49 +101,35 @@
<version>8.0.22</version>
</dependency>
- <!--Mybatis -->
+ <!-- 娣诲姞sqlite-jdbc鏁版嵁搴撻┍鍔� -->
<dependency>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis</artifactId>
- <version>${mybatis.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mybatis</groupId>
- <artifactId>mybatis-spring</artifactId>
- <version>${mybatis.spring.version}</version>
+ <groupId>org.xerial</groupId>
+ <artifactId>sqlite-jdbc</artifactId>
+ <version>3.32.3.2</version>
</dependency>
- <!--鍒嗛〉鎻掍欢 -->
+ <!--Mybatis鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper</artifactId>
- <version>${pagehelper.version}</version>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
+ <version>1.4.1</version>
</dependency>
- <!--閫氱敤Mapper -->
- <dependency>
- <groupId>tk.mybatis</groupId>
- <artifactId>mapper</artifactId>
- <version>${mapper.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.commons</groupId>
- <artifactId>commons-lang3</artifactId>
- <version>3.11</version>
- </dependency>
-
- <!--Swagger2 -->
+ <!--Swagger3 -->
<!--鍦ㄧ嚎鏂囨。 -->
<dependency>
<groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>2.9.2</version>
+ <artifactId>springfox-boot-starter</artifactId>
+ <version>3.0.0</version>
</dependency>
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>2.6.1</version>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-spring-boot-starter</artifactId>
+ <version>3.0.2</version>
</dependency>
+
+
+ <!--鍙傛暟鏍￠獙 -->
<dependency>
<groupId>javax.validation</groupId>
<artifactId>validation-api</artifactId>
@@ -130,33 +145,28 @@
<dependency>
<groupId>javax.sip</groupId>
<artifactId>jain-sip-ri</artifactId>
- <version>1.3.0-92</version>
- <scope>system</scope>
- <systemPath>${project.basedir}/libs/jain-sip-ri-1.3.0-92.jar</systemPath>
+ <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.35</version>
</dependency>
<!-- xml瑙ｆ瀽搴� -->
<dependency>
- <groupId>org.dom4j</groupId>
+ <groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>2.1.3</version>
</dependency>
- <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
+ <!-- json瑙ｆ瀽搴揻astjson -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>fastjson</artifactId>
<version>1.2.73</version>
- </dependency>
- <!-- google json搴� -->
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
</dependency>
<!--Guava鏄竴绉嶅熀浜庡紑婧愮殑Java搴�-->
@@ -172,11 +182,71 @@
<artifactId>okhttp</artifactId>
<version>4.9.0</version>
</dependency>
- </dependencies>
-
- <build>
- <plugins>
+ <!-- okhttp-digest -->
+ <dependency>
+ <groupId>com.burgstaller</groupId>
+ <artifactId>okhttp-digest</artifactId>
+ <version>2.1</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>
+
+ <!--鍙嶅悜浠ｇ悊-->
+ <dependency>
+ <groupId>org.mitre.dsmiley.httpproxy</groupId>
+ <artifactId>smiley-http-proxy-servlet</artifactId>
+ <version>1.12</version>
+ </dependency>
+
+ <!--excel瑙ｆ瀽搴�-->
+ <dependency>
+ <groupId>com.alibaba</groupId>
+ <artifactId>easyexcel</artifactId>
+ <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>
+ </dependency>
+
+<!-- <!– 妫�娴嬫枃浠剁紪鐮� –>-->
+<!-- <!– https://mvnrepository.com/artifact/cpdetector/cpdetector –>-->
+<!-- <dependency>-->
+<!-- <groupId>cpdetector</groupId>-->
+<!-- <artifactId>cpdetector</artifactId>-->
+<!-- <version>1.0.8</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>
+
+
+
+ <build>
+ <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
+ <plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
@@ -190,26 +260,33 @@
<configuration>
<source>1.8</source>
<target>1.8</target>
- <!--
- <webResources>
- <resource>
- <directory>${project.basedir}/libs</directory>
- <targetPath>WEB-INF/lib</targetPath>
- <filtering>true</filtering>
- <includes>
- <include>**/*.jar</include>
- </includes>
- </resource>
- </webResources>
- -->
</configuration>
+ </plugin>
+
+ <plugin>
+ <groupId>pl.project13.maven</groupId>
+ <artifactId>git-commit-id-plugin</artifactId>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <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