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

mrjackwang

2022-07-20 8d87741dea3d174f098269073429a0f6b982baa1

 pom.xml

@@ -11,8 +11,9 @@

   <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>

   <repositories>
      <repository>
@@ -49,7 +50,6 @@
      <jedis-version>3.1.0</jedis-version>

      <!-- 依赖版本 -->
      <pagehelper.version>5.2.0</pagehelper.version>
      <snippetsDirectory>${project.build.directory}/generated-snippets</snippetsDirectory>
      <asciidoctor.input.directory>${project.basedir}/docs/asciidoc</asciidoctor.input.directory>
      <generated.asciidoc.directory>${project.build.directory}/asciidoc</generated.asciidoc.directory>
@@ -90,8 +90,8 @@
      <!-- 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数据库 -->
@@ -101,18 +101,11 @@
         <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分页插件 -->
      <dependency>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot-starter</artifactId>
         <version>1.2.10</version>
         <version>1.4.1</version>
      </dependency>

      <!--Swagger3 -->
@@ -148,10 +141,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解析库 -->
@@ -161,19 +155,13 @@
         <version>2.1.3</version>
      </dependency>

      <!-- https://mvnrepository.com/artifact/com.alibaba/fastjson -->
      <!-- json解析库fastjson -->
      <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 +170,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 -->
@@ -203,6 +200,25 @@
         <version>1.12</version>
      </dependency>

      <!--excel解析库-->
      <dependency>
         <groupId>com.alibaba</groupId>
         <artifactId>easyexcel</artifactId>
         <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>
      </dependency>

<!--      &lt;!&ndash; 检测文件编码 &ndash;&gt;-->
<!--      &lt;!&ndash; https://mvnrepository.com/artifact/cpdetector/cpdetector &ndash;&gt;-->
<!--      <dependency>-->
@@ -211,26 +227,30 @@
<!--         <version>1.0.8</version>-->
<!--      </dependency>-->



      <!-- onvif协议栈 -->
      <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
      <dependency>
         <groupId>be.teletask</groupId>
         <artifactId>onvif-java</artifactId>
         <version>1.0.2</version>
         <scope>system</scope>
         <systemPath>${project.basedir}/libs/onvif-java-1.0.2.jar</systemPath>
         <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>
   </dependencies>


	

   <build>
      <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
      <plugins>
         <plugin>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-maven-plugin</artifactId>
            <version>2.3.5.RELEASE</version>
            <configuration>
               <includeSystemScope>true</includeSystemScope>
            </configuration>
@@ -238,17 +258,42 @@
         <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>
            </configuration>
         </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>
            <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>