Merge branch 'wvp-28181-2.0' into wvp-28181-2.0

648540858

2022-07-28 646c3e41b7fac40acbdb7bbfec5608daab2a28d3

 pom.xml

@@ -11,7 +11,7 @@

   <groupId>com.genersoft</groupId>
   <artifactId>wvp-pro</artifactId>
   <version>2.0</version>
   <version>2.3.1</version>
   <name>web video platform</name>
   <description>国标28181视频平台</description>

@@ -61,6 +61,13 @@
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-data-redis</artifactId>
          <exclusions>
                <!-- 去掉  Lettuce 的依赖，  Spring Boot 优先使用 Lettuce 作为 Redis 客户端 -->
                <exclusion>
                    <groupId>io.lettuce</groupId>
                    <artifactId>lettuce-core</artifactId>
                </exclusion>
            </exclusions>
      </dependency>
      <dependency>
         <groupId>org.springframework.boot</groupId>
@@ -75,6 +82,12 @@
         <groupId>org.mybatis.spring.boot</groupId>
         <artifactId>mybatis-spring-boot-starter</artifactId>
         <version>2.1.4</version>
         <exclusions>
            <exclusion>
               <groupId>com.zaxxer</groupId>
               <artifactId>HikariCP</artifactId>
            </exclusion>
         </exclusions>
      </dependency>
      <dependency>
         <groupId>org.springframework.boot</groupId>
@@ -84,14 +97,13 @@
      <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.1.22</version>
      </dependency>

      <!-- mysql数据库 -->
@@ -99,13 +111,6 @@
         <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>
      </dependency>

      <!--Mybatis分页插件 -->
@@ -148,10 +153,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.35</version>
      </dependency>

      <!-- xml解析库 -->
@@ -165,15 +171,9 @@
      <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>fastjson</artifactId>
         <version>1.2.73</version>
         <version>1.2.83</version>
      </dependency>

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

      <!-- okhttp -->
      <dependency>
@@ -182,11 +182,20 @@
         <version>4.9.0</version>
      </dependency>

      <!-- okhttp 调试日志 -->
      <dependency>
         <groupId>com.squareup.okhttp3</groupId>
         <artifactId>logging-interceptor</artifactId>
         <version>4.9.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.5</version>
      </dependency>

      <!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
@@ -210,6 +219,13 @@
         <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>
@@ -223,14 +239,18 @@
<!--         <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.0.1-jre</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>

@@ -242,6 +262,7 @@
         <plugin>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-maven-plugin</artifactId>
            <version>2.3.5.RELEASE</version>
            <configuration>
               <includeSystemScope>true</includeSystemScope>
            </configuration>
@@ -249,6 +270,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>
@@ -258,16 +280,32 @@
         <plugin>
            <groupId>pl.project13.maven</groupId>
            <artifactId>git-commit-id-plugin</artifactId>
            <version>3.0.1</version>
            <configuration>
               <offline>true</offline>
            </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>