From 86a701ce885871d2468ec31eb13be5595673a01b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 28 三月 2024 10:24:13 +0800
Subject: [PATCH] Merge branch 'master' into dev/abl支持
---
pom.xml | 98 ++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 76 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5b3e945..7ec73b8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
<groupId>com.genersoft</groupId>
<artifactId>wvp-pro</artifactId>
- <version>2.6.9</version>
+ <version>2.7.0</version>
<name>web video platform</name>
<description>鍥芥爣28181瑙嗛骞冲彴</description>
<packaging>${project.packaging}</packaging>
@@ -143,17 +143,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>
@@ -163,22 +170,31 @@
</dependency>
<!--鍦ㄧ嚎鏂囨。 -->
+ <!--鍦ㄧ嚎鏂囨。 -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
- <version>1.7.0</version>
- <exclusions>
- <exclusion>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- </exclusion>
- </exclusions>
+ <version>1.6.10</version>
</dependency>
<dependency>
- <groupId>org.yaml</groupId>
- <artifactId>snakeyaml</artifactId>
- <version>2.2</version>
+ <groupId>org.springdoc</groupId>
+ <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>
@@ -366,6 +382,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>
--
Gitblit v1.8.0