From f4f3e60a6b84bb9368ac3d1bc515a96310fed1e8 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期五, 27 十月 2023 15:47:27 +0800
Subject: [PATCH] Merge pull request #1082 from DavidSche/Live_streaming_push
---
pom.xml | 357 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 262 insertions(+), 95 deletions(-)
diff --git a/pom.xml b/pom.xml
index 0f6e9c9..9899d27 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,111 +6,178 @@
<parent>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
- <version>1.5.10.RELEASE</version>
+ <version>2.7.2</version>
</parent>
<groupId>com.genersoft</groupId>
- <artifactId>wvp</artifactId>
+ <artifactId>wvp-pro</artifactId>
+ <version>2.6.9</version>
<name>web video platform</name>
+ <description>鍥芥爣28181瑙嗛骞冲彴</description>
+ <packaging>${project.packaging}</packaging>
+
+ <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>
- <hystrix.version>1.5.12</hystrix.version>
<!-- 渚濊禆鐗堟湰 -->
- <mapper.version>3.4.0</mapper.version>
- <mybatis.version>3.3.1</mybatis.version>
- <mybatis.spring.version>1.2.4</mybatis.spring.version>
- <pagehelper.version>4.1.1</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.0</gson.version>
- <jedis.version>3.0.1</jedis.version>
- <jsonlib.version>2.4</jsonlib.version>
</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-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>
-
-
- <!-- druid -->
<dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>druid</artifactId>
- <version>1.0.11</version>
+ <groupId>org.mybatis.spring.boot</groupId>
+ <artifactId>mybatis-spring-boot-starter</artifactId>
+ <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>org.springframework.boot</groupId>
+ <artifactId>spring-boot-starter-jdbc</artifactId>
+ </dependency>
+
+ <!-- mysql鏁版嵁搴� -->
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.30</version>
+ <version>8.0.30</version>
</dependency>
- <!--Mybatis -->
+ <!--postgresql-->
<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.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ <version>42.5.1</version>
</dependency>
- <!--鍒嗛〉鎻掍欢 -->
+ <!-- kingbase浜哄ぇ閲戜粨 -->
+ <!-- 鎵嬪姩涓嬭浇椹卞姩鍚庡畨瑁� -->
+ <!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8 -Dversion=8.6.0 -Dpackaging=jar
+ -->
+ <dependency>
+ <groupId>com.kingbase</groupId>
+ <artifactId>kingbase8</artifactId>
+ <version>8.6.0</version>
+ <scope>system</scope>
+ <systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
+ </dependency>
+
+ <!--Mybatis鍒嗛〉鎻掍欢 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
- <artifactId>pagehelper</artifactId>
- <version>${pagehelper.version}</version>
+ <artifactId>pagehelper-spring-boot-starter</artifactId>
+ <version>1.4.6</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.4</version>
- </dependency>
- <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
- <dependency>
- <groupId>com.alibaba</groupId>
- <artifactId>fastjson</artifactId>
- <version>1.2.33</version>
- </dependency>
-
- <!--Swagger2 -->
<!--鍦ㄧ嚎鏂囨。 -->
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger2</artifactId>
- <version>2.6.1</version>
+ <groupId>org.springdoc</groupId>
+ <artifactId>springdoc-openapi-ui</artifactId>
+ <version>1.6.10</version>
</dependency>
+
<dependency>
- <groupId>io.springfox</groupId>
- <artifactId>springfox-swagger-ui</artifactId>
- <version>2.6.1</version>
+ <groupId>com.github.xiaoymin</groupId>
+ <artifactId>knife4j-springdoc-ui</artifactId>
+ <version>3.0.3</version>
+ </dependency>
+
+ <!--鍙傛暟鏍￠獙 -->
+ <dependency>
+ <groupId>javax.validation</groupId>
+ <artifactId>validation-api</artifactId>
</dependency>
<!-- 鏃ュ織鐩稿叧 -->
@@ -119,53 +186,138 @@
<artifactId>spring-boot-starter-aop</artifactId>
</dependency>
+ <!-- sip鍗忚鏍� -->
<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>org.slf4j</groupId>
+ <artifactId>log4j-over-slf4j</artifactId>
+ <version>1.7.36</version>
+ </dependency>
+
+ <!-- xml瑙ｆ瀽搴� -->
<dependency>
<groupId>org.dom4j</groupId>
<artifactId>dom4j</artifactId>
<version>2.1.3</version>
</dependency>
- <dependency>
- <groupId>com.google.code.gson</groupId>
- <artifactId>gson</artifactId>
- </dependency>
- <dependency>
- <groupId>org.springframework.data</groupId>
- <artifactId>spring-data-redis</artifactId>
- <version>1.8.4.RELEASE</version>
- </dependency>
- <dependency>
- <groupId>redis.clients</groupId>
- <artifactId>jedis</artifactId>
- <version>2.9.0</version>
- </dependency>
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>20.0</version>
+ </dependency>
+
+ <!-- json瑙ｆ瀽搴揻astjson2 -->
+ <dependency>
+ <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>
- </dependencies>
-
+ <!-- okhttp 璋冭瘯鏃ュ織 -->
+ <dependency>
+ <groupId>com.squareup.okhttp3</groupId>
+ <artifactId>logging-interceptor</artifactId>
+ <version>4.10.0</version>
+ </dependency>
+
+ <!-- okhttp-digest -->
+ <dependency>
+ <groupId>io.github.rburgst</groupId>
+ <artifactId>okhttp-digest</artifactId>
+ <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>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.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>
+
+<!-- <!– 妫�娴嬫枃浠剁紪鐮� –>-->
+<!-- <!– https://mvnrepository.com/artifact/cpdetector/cpdetector –>-->
+<!-- <dependency>-->
+<!-- <groupId>cpdetector</groupId>-->
+<!-- <artifactId>cpdetector</artifactId>-->
+<!-- <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.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.7.2</version>
<configuration>
<includeSystemScope>true</includeSystemScope>
</configuration>
@@ -173,29 +325,44 @@
<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>
-<<<<<<< HEAD
- <webResources>
- <resource>
- <directory>${project.basedir}/libs</directory>
- <targetPath>WEB-INF/lib</targetPath>
- <filtering>true</filtering>
- <includes>
- <include>**/*.jar</include>
- </includes>
- </resource>
- </webResources>
-=======
->>>>>>> upstream/master
+ </configuration>
+ </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