合并271分支

648540858

2024-06-25 87c071fd5e774091c7d87f3d7c24fd2360148d58

 pom.xml

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

    <groupId>com.genersoft</groupId>
    <artifactId>wvp-pro</artifactId>
    <version>2.7.0</version>
    <version>2.7.2</version>
    <name>web video platform</name>
    <description>国标28181视频平台</description>
    <packaging>${project.packaging}</packaging>
@@ -101,6 +101,10 @@
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-cache</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-web</artifactId>
        </dependency>
        <dependency>
@@ -143,17 +147,24 @@
            <version>42.5.1</version>
        </dependency>

        <!-- kingbase人大金仓 -->
        <!-- 手动下载驱动后安装 -->
        <!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8
        -Dversion=8.6.0 -Dpackaging=jar -->
        <dependency>
            <groupId>com.kingbase</groupId>
            <artifactId>kingbase8</artifactId>
            <version>8.6.0</version>
            <scope>system</scope>
            <systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
        </dependency>
      <!-- kingbase人大金仓 -->
      <!-- 手动下载驱动后安装 -->
      <!-- mvn install:install-file -Dfile=/home/lin/soft/kingbase/jdbc-aarch/kingbase8-8.6.0.jar -DgroupId=com.kingbase -DartifactId=kingbase8 -Dversion=8.6.0 -Dpackaging=jar
 -->
      <dependency>
         <groupId>com.kingbase</groupId>
         <artifactId>kingbase8</artifactId>
         <version>8.6.0</version>
         <scope>system</scope>
         <systemPath>${basedir}/libs/jdbc-aarch/kingbase8-8.6.0.jar</systemPath>
      </dependency>
      <dependency>
         <groupId>com.kingbase</groupId>
         <artifactId>kingbase8</artifactId>
         <version>8.6.0</version>
         <scope>system</scope>
         <systemPath>${basedir}/libs/jdbc-x86/kingbase8-8.6.0.jar</systemPath>
      </dependency>

        <!--Mybatis分页插件 -->
        <dependency>
@@ -174,6 +185,20 @@
            <artifactId>springdoc-openapi-security</artifactId>
            <version>1.6.10</version>
        </dependency>
      <!-- https://mvnrepository.com/artifact/com.baomidou/dynamic-datasource-spring-boot-starter -->
      <dependency>
         <groupId>com.baomidou</groupId>
         <artifactId>dynamic-datasource-spring-boot-starter</artifactId>
         <version>3.6.1</version>
      </dependency>


      <!--在线文档 -->
      <dependency>
         <groupId>org.springdoc</groupId>
         <artifactId>springdoc-openapi-ui</artifactId>
         <version>1.6.10</version>
      </dependency>

        <dependency>
            <groupId>com.github.xiaoymin</groupId>
@@ -361,6 +386,44 @@
                    <skipTests>true</skipTests>
                </configuration>
            </plugin>

            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <version>3.3.0</version>
                <configuration>
                    <excludes>
                        <exclude>**/all-application.yml</exclude>
                        <exclude>**/application.yml</exclude>
                        <exclude>**/application-*.yml</exclude>
                        <exclude>**/local.jks</exclude>
                    </excludes>
                </configuration>
            </plugin>
            <plugin>
                <artifactId>maven-resources-plugin</artifactId>
                <executions>
                    <execution> <!-- 复制配置文件 -->
                        <id>copy-resources</id>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-resources</goal>
                        </goals>
                        <configuration>
                            <resources>
                                <resource>
                                    <directory>src/main/resources</directory>
                                    <includes>
                                        <include>application.yml</include>
                                        <include>application-*.yml</include>
                                    </includes>
                                </resource>
                            </resources>
                            <outputDirectory>${project.build.directory}</outputDirectory>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
        </plugins>
        <resources>
            <resource>