修复合并pr带来的bug

648540858

2022-03-16 4a0fd9ead3aaac3b923a9039c08e4de6b345321b

 pom.xml

@@ -10,8 +10,10 @@
   </parent>

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

   <repositories>
      <repository>
@@ -43,9 +45,11 @@

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

      <!-- 依赖版本 -->
      <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>
@@ -63,16 +67,31 @@
         <artifactId>spring-boot-starter-web</artifactId>
      </dependency>
      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-configuration-processor</artifactId>
         <optional>true</optional>
      </dependency>
      <dependency>
         <groupId>org.mybatis.spring.boot</groupId>
         <artifactId>mybatis-spring-boot-starter</artifactId>
         <version>2.1.4</version>
      </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.1.22</version>
      </dependency>

      <!-- mysql数据库 -->
@@ -93,7 +112,7 @@
      <dependency>
         <groupId>com.github.pagehelper</groupId>
         <artifactId>pagehelper-spring-boot-starter</artifactId>
         <version>1.2.10</version>
         <version>1.4.1</version>
      </dependency>

      <!--Swagger3 -->
@@ -129,10 +148,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解析库 -->
@@ -142,18 +162,11 @@
         <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>
      </dependency>

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

      <!-- okhttp -->
@@ -162,14 +175,90 @@
         <artifactId>okhttp</artifactId>
         <version>4.9.0</version>
      </dependency>
    </dependencies>
	

      <!-- okhttp 调试日志 -->
      <dependency>
         <groupId>com.squareup.okhttp3</groupId>
         <artifactId>logging-interceptor</artifactId>
         <version>4.9.0</version>
      </dependency>



      <!-- okhttp-digest -->
      <dependency>
         <groupId>com.burgstaller</groupId>
         <artifactId>okhttp-digest</artifactId>
         <version>2.1</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>

      <!--反向代理-->
      <dependency>
         <groupId>org.mitre.dsmiley.httpproxy</groupId>
         <artifactId>smiley-http-proxy-servlet</artifactId>
         <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>-->
<!--         <groupId>cpdetector</groupId>-->
<!--         <artifactId>cpdetector</artifactId>-->
<!--         <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.0.1-jre</version>
      </dependency>


      <dependency>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-test</artifactId>
<!--         <scope>test</scope>-->
      </dependency>
   </dependencies>



   <build>
      <finalName>wvp-2.0</finalName>
      <finalName>${project.artifactId}-${project.version}-${maven.build.timestamp}</finalName>
      <plugins>
         <plugin>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-maven-plugin</artifactId>
            <configuration>
               <includeSystemScope>true</includeSystemScope>
            </configuration>
         </plugin>
         <plugin>
            <groupId>org.apache.maven.plugins</groupId>
@@ -181,10 +270,32 @@
         </plugin>

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

         <plugin>
            <groupId>org.apache.maven.plugins</groupId>
            <artifactId>maven-surefire-plugin</artifactId>
            <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>