diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 6e663b86..2fc069e0 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -95,6 +95,13 @@
${project.parent.version}
+
+
net.logstash.logback
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index 1c41f2e3..661dc607 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -53,19 +53,6 @@ jdbc:
# 设置连接属性,可获取到表的 remark (备注)
remarksReporting: false
- # JTA XA 事务(v4.0.4+)
- jta:
- enabled: false
-
-# 注意:如果报 oracle.jdbc.xa.OracleXAResource.recover 错误,则需要授权如下:
-# grant select on sys.dba_pending_transactions to jeesite;
-# grant select on sys.pending_trans$ to jeesite;
-# grant select on sys.dba_2pc_pending to jeesite;
-# grant execute on sys.dbms_system to jeesite;
-
- # 事务超时时间,单位秒(30分钟)(v4.1.5+)
- transactionTimeout: 1800
-
# # 表名和字段名(前缀|后缀)是否强制大写(v4.1.8+)
# tableAndColumn:
# prefixSuffix: "`|`"
diff --git a/parent/pom.xml b/parent/pom.xml
index b2ad2af6..6d69fd11 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -21,7 +21,7 @@
-
+
2.13.0
1.10.0
1.5
@@ -30,7 +30,6 @@
2.0
4.5.14
-
1.21
0.4.19
diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml
index 06bc0af3..30bd0c25 100644
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -217,19 +217,6 @@ jdbc:
# com.jeesite.modules.sys = default
# com.jeesite.modules.filemanager = ds2
-# # JTA XA 事务(v4.0.4+)
-# jta:
-# enabled: false
-
-# 注意:如果报 oracle.jdbc.xa.OracleXAResource.recover 错误,则需要授权如下:
-# grant select on sys.dba_pending_transactions to jeesite;
-# grant select on sys.pending_trans$ to jeesite;
-# grant select on sys.dba_2pc_pending to jeesite;
-# grant execute on sys.dbms_system to jeesite;
-
-# # 事务超时时间,单位秒(30分钟)(v4.1.5+)
-# transactionTimeout: 1800
-#
# # 表名和字段名(前缀|后缀)是否强制大写(v4.1.8+)
# tableAndColumn:
# prefixSuffix: "`|`"
@@ -260,6 +247,20 @@ spring:
mvc:
pathmatch:
matching-strategy: ANT_PATH_MATCHER
+
+ # JTA XA 事务(spring boot 3) 请在 jeesite-module-core/pom.xml 中打开 atomikos 依赖
+ jta:
+ enabled: false
+
+ # 注意:如果报 oracle.jdbc.xa.OracleXAResource.recover 错误,则需要授权如下:
+ # grant select on sys.dba_pending_transactions to jeesite;
+ # grant select on sys.pending_trans$ to jeesite;
+ # grant select on sys.dba_2pc_pending to jeesite;
+ # grant execute on sys.dbms_system to jeesite;
+
+ # 事务超时时间,单位秒(30分钟)(spring boot 3)
+ transaction:
+ default-timeout: 30m
# # Redis 连接参数 (RedisProperties)
# redis:
diff --git a/web/pom.xml b/web/pom.xml
index 5aaf1666..1cd3d839 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -45,12 +45,12 @@
${project.parent.version}
-
com.jeesite
jeesite-module-swagger
${project.parent.version}
- -->
+
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 1f98dac3..31fabf01 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -217,19 +217,6 @@ jdbc:
# com.jeesite.modules.sys = default
# com.jeesite.modules.filemanager = ds2
-# # JTA XA 事务(v4.0.4+)
-# jta:
-# enabled: false
-
-# 注意:如果报 oracle.jdbc.xa.OracleXAResource.recover 错误,则需要授权如下:
-# grant select on sys.dba_pending_transactions to jeesite;
-# grant select on sys.pending_trans$ to jeesite;
-# grant select on sys.dba_2pc_pending to jeesite;
-# grant execute on sys.dbms_system to jeesite;
-
-# # 事务超时时间,单位秒(30分钟)(v4.1.5+)
-# transactionTimeout: 1800
-#
# # 表名和字段名(前缀|后缀)是否强制大写(v4.1.8+)
# tableAndColumn:
# prefixSuffix: "`|`"
@@ -261,6 +248,20 @@ spring:
pathmatch:
matching-strategy: ANT_PATH_MATCHER
+ # JTA XA 事务(spring boot 3) 请在 jeesite-module-core/pom.xml 中打开 atomikos 依赖
+ jta:
+ enabled: false
+
+ # 注意:如果报 oracle.jdbc.xa.OracleXAResource.recover 错误,则需要授权如下:
+ # grant select on sys.dba_pending_transactions to jeesite;
+ # grant select on sys.pending_trans$ to jeesite;
+ # grant select on sys.dba_2pc_pending to jeesite;
+ # grant execute on sys.dbms_system to jeesite;
+
+ # 事务超时时间,单位秒(30分钟)(spring boot 3)
+ transaction:
+ default-timeout: 30m
+
# # Redis 连接参数 (RedisProperties)
# redis:
# host: 127.0.0.1