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

lin

2023-02-01 44b250eed29fab7959d18015c27b96da3e4beb47

 pom.xml

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

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

@@ -153,13 +153,17 @@
         <version>2.1.3</version>
      </dependency>

      <!-- json解析库fastjson -->
      <!-- json解析库fastjson2 -->
      <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>fastjson</artifactId>
         <version>1.2.83</version>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2</artifactId>
         <version>2.0.17</version>
      </dependency>

      <dependency>
         <groupId>com.alibaba.fastjson2</groupId>
         <artifactId>fastjson2-extension</artifactId>
         <version>2.0.17</version>
      </dependency>

      <!-- okhttp -->
      <dependency>
@@ -263,14 +267,16 @@
            </configuration>
         </plugin>

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

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