Merge remote-tracking branch 'origin/master' into wvp-28181-2.0

panlinlin

2021-01-05 34135cce5d59f6ad7653737dd035bb1d441e185f

 pom.xml

@@ -13,13 +13,38 @@
   <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>

      <!-- 依赖版本 -->
      <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>
@@ -31,30 +56,16 @@
   <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>
      </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>
         <groupId>org.mybatis.spring.boot</groupId>
         <artifactId>mybatis-spring-boot-starter</artifactId>
         <version>2.1.4</version>
      </dependency>

      <!-- druid数据库连接池 -->
@@ -71,36 +82,25 @@
         <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.11</version>
      </dependency>
<!--      <dependency>-->
<!--         <groupId>org.apache.commons</groupId>-->
<!--         <artifactId>commons-lang3</artifactId>-->
<!--         <version>3.11</version>-->
<!--      </dependency>-->

      <!--Swagger2 -->
      <!--在线文档 -->