From 7f79b925686e36e830499f103ffbd439d74dd701 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 18 一月 2024 10:17:03 +0800
Subject: [PATCH] 修复设备在事务内注销失败的问题
---
pom.xml | 46 ++++++++++++++++++++++++----------------------
1 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/pom.xml b/pom.xml
index 5b3e945..9273ccb 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,21 +170,16 @@
</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>
<dependency>
--
Gitblit v1.8.0