From 615448c2cec3a902613b7e0037fa651d896c727a Mon Sep 17 00:00:00 2001
From: thinkgem <thinkgem@163.com>
Date: Mon, 28 Jul 2025 12:01:27 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=20spring=20boot=203.4=20jta?=
 =?UTF-8?q?=20=E4=BA=8B=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 modules/core/pom.xml                                    | 7 -------
 modules/core/src/main/resources/config/jeesite-core.yml | 2 +-
 web-api/src/main/resources/config/application.yml       | 2 +-
 web/src/main/resources/config/application.yml           | 4 ++--
 4 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/modules/core/pom.xml b/modules/core/pom.xml
index 2899bd22..161125b0 100644
--- a/modules/core/pom.xml
+++ b/modules/core/pom.xml
@@ -129,13 +129,6 @@
 			<version>${project.parent.version}</version>
 		</dependency>
 
-		<!-- JTA 事务（当 spring.jta.enabled 为 true 的时候开启，不使用 jta 的时候不要引入该依赖）
-		<dependency>
-			<groupId>com.atomikos</groupId>
-			<artifactId>transactions-spring-boot3-starter</artifactId>
-			<version>${atomikos.version}</version>
-		</dependency> -->
-
 		<!-- ELK 日志收集 -->
 		<dependency>
 			<groupId>net.logstash.logback</groupId>
diff --git a/modules/core/src/main/resources/config/jeesite-core.yml b/modules/core/src/main/resources/config/jeesite-core.yml
index c752f420..cb829e85 100644
--- a/modules/core/src/main/resources/config/jeesite-core.yml
+++ b/modules/core/src/main/resources/config/jeesite-core.yml
@@ -98,7 +98,7 @@ spring:
     #    maxPoolSize: 20
     #    keepAliveSeconds: 60
 
-  # JTA XA 事务（spring boot 3） 请在 jeesite-module-core/pom.xml 中打开 atomikos 依赖
+  # JTA XA 事务（spring boot 3）
   jta:
     enabled: false
     
diff --git a/web-api/src/main/resources/config/application.yml b/web-api/src/main/resources/config/application.yml
index 1397681f..648af151 100644
--- a/web-api/src/main/resources/config/application.yml
+++ b/web-api/src/main/resources/config/application.yml
@@ -280,7 +280,7 @@ spring:
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
 
-  # JTA XA 事务（spring boot 3） 请在 jeesite-module-core/pom.xml 中打开 atomikos 依赖
+  # JTA XA 事务（spring boot 3）
   jta:
     enabled: false
 
diff --git a/web/src/main/resources/config/application.yml b/web/src/main/resources/config/application.yml
index 1060eeed..6425fe72 100644
--- a/web/src/main/resources/config/application.yml
+++ b/web/src/main/resources/config/application.yml
@@ -220,7 +220,7 @@ jdbc:
 #  ds2:
 #    type: mysql
 #    driver: com.mysql.cj.jdbc.Driver
-#    url: jdbc:mysql://127.0.0.1:3306/jeesite2?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
+#    url: jdbc:mysql://127.0.0.1:3306/jeesite_test?useSSL=false&allowPublicKeyRetrieval=true&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai
 #    username: root
 #    password: 123456
 #    testSql: SELECT 1
@@ -280,7 +280,7 @@ spring:
     pathmatch:
       matching-strategy: ANT_PATH_MATCHER
 
-  # JTA XA 事务（spring boot 3） 请在 jeesite-module-core/pom.xml 中打开 atomikos 依赖
+  # JTA XA 事务（spring boot 3）
   jta:
     enabled: false