Merge pull request #786 from zhulangren/wvp-28181-2.0

648540858

2023-03-22 8773864b5b5b3818f0007071d35a2c7c6ca5540b

 pom.xml

@@ -6,14 +6,15 @@
   <parent>
      <groupId>org.springframework.boot</groupId>
      <artifactId>spring-boot-starter-parent</artifactId>
      <version>2.3.5.RELEASE</version>
      <version>2.7.2</version>
   </parent>

   <groupId>com.genersoft</groupId>
   <artifactId>wvp-pro</artifactId>
   <version>2.0.2</version>
   <version>2.6.7</version>
   <name>web video platform</name>
   <description>国标28181视频平台</description>
   <packaging>${project.packaging}</packaging>

   <repositories>
      <repository>
@@ -47,7 +48,6 @@
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
      <maven.build.timestamp.format>MMddHHmm</maven.build.timestamp.format>
      <maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
      <jedis-version>3.1.0</jedis-version>

      <!-- 依赖版本 -->
      <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
@@ -56,6 +56,42 @@
      <asciidoctor.html.output.directory>${project.build.directory}/asciidoc/html</asciidoctor.html.output.directory>
      <asciidoctor.pdf.output.directory>${project.build.directory}/asciidoc/pdf</asciidoctor.pdf.output.directory>
   </properties>

   <profiles>
      <profile>
         <id>jar</id>
         <activation>
            <activeByDefault>true</activeByDefault>
         </activation>
         <properties>
            <project.packaging>jar</project.packaging>
         </properties>
      </profile>
      <profile>
         <id>war</id>
         <properties>
            <project.packaging>war</project.packaging>
         </properties>
         <dependencies>
            <dependency>
               <groupId>org.springframework.boot</groupId>
               <artifactId>spring-boot-starter-web</artifactId>
               <exclusions>
                  <exclusion>
                     <groupId>org.springframework.boot</groupId>
                     <artifactId>spring-boot-starter-jetty</artifactId>
                  </exclusion>
               </exclusions>
            </dependency>
            <dependency>
               <groupId>javax.servlet</groupId>
               <artifactId>javax.servlet-api</artifactId>
               <version>3.1.0</version>
               <scope>provided</scope>
            </dependency>
         </dependencies>
      </profile>
   </profiles>

   <dependencies>
      <dependency>
@@ -74,60 +110,52 @@
      <dependency>
         <groupId>org.mybatis.spring.boot</groupId>
         <artifactId>mybatis-spring-boot-starter</artifactId>
         <version>2.1.4</version>
         <version>2.2.2</version>
         <exclusions>
            <exclusion>
               <groupId>com.zaxxer</groupId>
               <artifactId>HikariCP</artifactId>
            </exclusion>
         </exclusions>
      </dependency>
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-security</artifactId>
      </dependency>

      <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.2.11</version>
      </dependency>

      <!-- mysql数据库 -->
      <dependency>
         <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>
         <version>8.0.30</version>
      </dependency>

      <!--Mybatis分页插件 -->
      <dependency>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot-starter</artifactId>
         <version>1.4.1</version>
         <version>1.4.3</version>
      </dependency>

      <!--Swagger3 -->
      <!--在线文档 -->
      <dependency>
         <groupId>io.springfox</groupId>
         <artifactId>springfox-boot-starter</artifactId>
         <version>3.0.0</version>
      </dependency>
      <dependency>
         <groupId>com.github.xiaoymin</groupId>
         <artifactId>knife4j-spring-boot-starter</artifactId>
         <version>3.0.2</version>
         <groupId>org.springdoc</groupId>
         <artifactId>springdoc-openapi-ui</artifactId>
         <version>1.6.10</version>
      </dependency>

      <dependency>
         <groupId>com.github.xiaoymin</groupId>
         <artifactId>knife4j-springdoc-ui</artifactId>
         <version>3.0.3</version>
      </dependency>

      <!--参数校验 -->
      <dependency>
@@ -152,7 +180,7 @@
      <dependency>
         <groupId>org.slf4j</groupId>
         <artifactId>log4j-over-slf4j</artifactId>
         <version>1.7.35</version>
         <version>1.7.36</version>
      </dependency>

      <!-- xml解析库 -->
@@ -162,60 +190,72 @@
         <version>2.1.3</version>
      </dependency>

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

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

      <!-- okhttp -->
      <dependency>
         <groupId>com.squareup.okhttp3</groupId>
         <artifactId>okhttp</artifactId>
         <version>4.9.0</version>
         <version>4.10.0</version>
      </dependency>

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

      <!-- https://mvnrepository.com/artifact/net.sf.kxml/kxml2 -->
<!--      <dependency>-->
<!--         <groupId>net.sf.kxml</groupId>-->
<!--         <artifactId>kxml2</artifactId>-->
<!--         <version>2.3.0</version>-->
<!--      </dependency>-->

      <!-- jwt实现 -->
      <dependency>
         <groupId>net.sf.kxml</groupId>
         <artifactId>kxml2</artifactId>
         <version>2.3.0</version>
         <groupId>org.bitbucket.b_c</groupId>
         <artifactId>jose4j</artifactId>
         <version>0.9.3</version>
      </dependency>

      <!--反向代理-->
      <dependency>
         <groupId>org.mitre.dsmiley.httpproxy</groupId>
         <artifactId>smiley-http-proxy-servlet</artifactId>
         <version>1.12</version>
         <version>1.12.1</version>
      </dependency>

      <!--excel解析库-->
      <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>easyexcel</artifactId>
         <version>3.0.4</version>
         <version>3.1.1</version>
      </dependency>

      <!-- 获取系统信息 -->
      <dependency>
         <groupId>com.github.oshi</groupId>
         <artifactId>oshi-core</artifactId>
         <version>6.1.0</version>
         <version>6.2.2</version>
      </dependency>

      <dependency>
@@ -231,17 +271,21 @@
<!--         <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.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>

   </dependencies>


   <build>
@@ -250,6 +294,7 @@
         <plugin>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-maven-plugin</artifactId>
            <version>2.3.5.RELEASE</version>
            <configuration>
               <includeSystemScope>true</includeSystemScope>
            </configuration>
@@ -257,6 +302,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>
@@ -266,11 +312,18 @@
         <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>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-surefire-plugin</artifactId>
            <version>2.22.2</version>
            <configuration>
               <skipTests>true</skipTests>
            </configuration>