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.2.1</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,7 +97,6 @@
      <dependency>
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
         <version>${jedis-version}</version>
      </dependency>

      <!-- druid数据库连接池 -->