Merge pull request #33 from lawrencehj/wvp-28181-2.0

648540858

2021-01-11 d8635682bbb37253e0d14cdd9bad2a37315011f7

 pom.xml

@@ -6,111 +6,117 @@
   <parent>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-parent</artifactId>
      <version>1.5.10.RELEASE</version>
      <version>2.3.5.RELEASE</version>
   </parent>

   <groupId>com.genersoft</groupId>
   <artifactId>wvp</artifactId>
   <name>web video platform</name>

   <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>

      <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>
      <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.0</gson.version>
      <jedis.version>3.0.1</jedis.version>
      <jsonlib.version>2.4</jsonlib.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.mybatis.spring.boot</groupId>
         <artifactId>mybatis-spring-boot-starter</artifactId>
         <version>2.1.4</version>
      </dependency>


      <!-- druid -->
      <!-- druid数据库连接池 -->
      <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>druid</artifactId>
         <version>1.0.11</version>
         <version>1.2.3</version>
      </dependency>

      <!-- mysql数据库 -->
      <dependency>
         <groupId>mysql</groupId>
         <artifactId>mysql-connector-java</artifactId>
         <version>5.1.30</version>
         <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.2.10</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>
<!--      <dependency>-->
<!--         <groupId>org.apache.commons</groupId>-->
<!--         <artifactId>commons-lang3</artifactId>-->
<!--         <version>3.11</version>-->
<!--      </dependency>-->

      <!--Swagger2 -->
      <!--在线文档 -->
      <dependency>
         <groupId>io.springfox</groupId>
         <artifactId>springfox-swagger2</artifactId>
         <version>2.6.1</version>
         <version>2.9.2</version>
      </dependency>
      <dependency>
         <groupId>io.springfox</groupId>
         <artifactId>springfox-swagger-ui</artifactId>
         <version>2.6.1</version>
      </dependency>
      <dependency>
         <groupId>javax.validation</groupId>
         <artifactId>validation-api</artifactId>
      </dependency>

      <!-- 日志相关 -->
@@ -119,37 +125,39 @@
         <artifactId>spring-boot-starter-aop</artifactId>
      </dependency>

      <!-- sip协议栈 -->
      <dependency>
         <groupId>javax.sip</groupId>
         <artifactId>jain-sip-ri</artifactId>
         <version>1.3.0-91</version>
         <version>1.3.0-92</version>
         <scope>system</scope>
         <systemPath>${basedir}/libs/jain-sip-ri-1.3.0-91.jar</systemPath>
         <systemPath>${pom.basedir}/libs/jain-sip-ri-1.3.0-92.jar</systemPath>
      </dependency>
      <dependency>
         <groupId>log4j</groupId>
         <artifactId>log4j</artifactId>
         <version>1.2.17</version>
      </dependency>

      <!-- xml解析库 -->
      <dependency>
         <groupId>org.dom4j</groupId>
         <artifactId>dom4j</artifactId>
         <version>2.1.3</version>
      </dependency>

      <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
      <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>
         <groupId>com.alibaba</groupId>
         <artifactId>fastjson</artifactId>
         <version>1.2.73</version>
      </dependency>

      <!--Guava是一种基于开源的Java库-->
      <dependency>
         <groupId>com.google.guava</groupId>
         <artifactId>guava</artifactId>
         <version>18.0</version>
         <version>30.0-jre</version>
      </dependency>

      <!-- okhttp -->
@@ -158,15 +166,17 @@
         <artifactId>okhttp</artifactId>
         <version>4.9.0</version>
      </dependency>

    </dependencies>
   
   <build>
      <finalName>wvp-2.5.8</finalName>
      <plugins>

         <plugin>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-maven-plugin</artifactId>
            <configuration>
               <includeSystemScope>true</includeSystemScope>
            </configuration>
         </plugin>
         <plugin>
            <groupId>org.apache.maven.plugins</groupId>