合并主线

648540858

2022-08-09 116d979d87f53f878a8c930cfad2c6a7cc831b19

 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数据库连接池 -->
@@ -265,14 +277,14 @@
            </configuration>
         </plugin>

         <plugin>
   <!--      <plugin>
            <groupId>pl.project13.maven</groupId>
            <artifactId>git-commit-id-plugin</artifactId>
            <version>3.0.1</version>
            <configuration>
               <offline>true</offline>
            </configuration>
         </plugin>
         </plugin>-->

         <plugin>
            <groupId>org.apache.maven.plugins</groupId>